diff options
Diffstat (limited to 'apps/workflowengine')
-rw-r--r-- | apps/workflowengine/l10n/lt_LT.js | 6 | ||||
-rw-r--r-- | apps/workflowengine/l10n/lt_LT.json | 6 | ||||
-rw-r--r-- | apps/workflowengine/l10n/lv.js | 2 | ||||
-rw-r--r-- | apps/workflowengine/l10n/lv.json | 2 | ||||
-rw-r--r-- | apps/workflowengine/l10n/pt_PT.js | 1 | ||||
-rw-r--r-- | apps/workflowengine/l10n/pt_PT.json | 1 | ||||
-rw-r--r-- | apps/workflowengine/src/components/Checks/RequestUserGroup.vue | 37 | ||||
-rw-r--r-- | apps/workflowengine/src/components/Rule.vue | 4 |
8 files changed, 47 insertions, 12 deletions
diff --git a/apps/workflowengine/l10n/lt_LT.js b/apps/workflowengine/l10n/lt_LT.js index d3a2dd39d1f..e7a443d4638 100644 --- a/apps/workflowengine/l10n/lt_LT.js +++ b/apps/workflowengine/l10n/lt_LT.js @@ -4,7 +4,7 @@ OC.L10N.register( "The given operator is invalid" : "Nurodytas operatorius yra neteisingas", "The given regular expression is invalid" : "Nurodytas reguliarusis reiškinys yra neteisingas", "The given file size is invalid" : "Nurodytas failo dydis yra neteisingas", - "The given tag id is invalid" : "Nurodytas žymės id yra neteisingas", + "The given tag id is invalid" : "Nurodytas žymos id yra neteisingas", "The given IP range is invalid" : "Nurodytas IP rėžis yra neteisingas", "The given IP range is not valid for IPv4" : "Nurodytas IPv4 adresas neteisingas", "The given IP range is not valid for IPv6" : "Nurodytas IPv6 adresas neteisingas", @@ -19,7 +19,7 @@ OC.L10N.register( "File deleted" : "Failas ištrintas", "File accessed" : "Gauta prieiga prie failo", "File copied" : "Failas nukopijuotas", - "Tag assigned" : "Priskirta žymė", + "Tag assigned" : "Priskirta žyma", "Someone" : "Kažkas", "%s created %s" : "%s sukūrė %s", "%s modified %s" : "%s modifikavo %s", @@ -102,7 +102,7 @@ OC.L10N.register( "does not match IPv4" : "neatitinka IPv4", "matches IPv6" : "atitinka IPv6", "does not match IPv6" : "neatitinka IPv6", - "File system tag" : "Failų sistemos žymė", + "File system tag" : "Failų sistemos žyma", "is tagged with" : "pažymėtas", "is not tagged with" : "nepažymėtas", "Request URL" : "Užklausos URL", diff --git a/apps/workflowengine/l10n/lt_LT.json b/apps/workflowengine/l10n/lt_LT.json index 59730017215..4eb679fe493 100644 --- a/apps/workflowengine/l10n/lt_LT.json +++ b/apps/workflowengine/l10n/lt_LT.json @@ -2,7 +2,7 @@ "The given operator is invalid" : "Nurodytas operatorius yra neteisingas", "The given regular expression is invalid" : "Nurodytas reguliarusis reiškinys yra neteisingas", "The given file size is invalid" : "Nurodytas failo dydis yra neteisingas", - "The given tag id is invalid" : "Nurodytas žymės id yra neteisingas", + "The given tag id is invalid" : "Nurodytas žymos id yra neteisingas", "The given IP range is invalid" : "Nurodytas IP rėžis yra neteisingas", "The given IP range is not valid for IPv4" : "Nurodytas IPv4 adresas neteisingas", "The given IP range is not valid for IPv6" : "Nurodytas IPv6 adresas neteisingas", @@ -17,7 +17,7 @@ "File deleted" : "Failas ištrintas", "File accessed" : "Gauta prieiga prie failo", "File copied" : "Failas nukopijuotas", - "Tag assigned" : "Priskirta žymė", + "Tag assigned" : "Priskirta žyma", "Someone" : "Kažkas", "%s created %s" : "%s sukūrė %s", "%s modified %s" : "%s modifikavo %s", @@ -100,7 +100,7 @@ "does not match IPv4" : "neatitinka IPv4", "matches IPv6" : "atitinka IPv6", "does not match IPv6" : "neatitinka IPv6", - "File system tag" : "Failų sistemos žymė", + "File system tag" : "Failų sistemos žyma", "is tagged with" : "pažymėtas", "is not tagged with" : "nepažymėtas", "Request URL" : "Užklausos URL", diff --git a/apps/workflowengine/l10n/lv.js b/apps/workflowengine/l10n/lv.js index 6eb82456fc5..a70d5ddba19 100644 --- a/apps/workflowengine/l10n/lv.js +++ b/apps/workflowengine/l10n/lv.js @@ -64,6 +64,6 @@ OC.L10N.register( "not between" : "nav starp", "Request user agent" : "Nepieciešams lietotāja aģents", "is member of" : "ir biedrs", - "is not member of" : "nav biedrs" + "is not member of" : "nav dalībnieks" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"); diff --git a/apps/workflowengine/l10n/lv.json b/apps/workflowengine/l10n/lv.json index 2f1ea3b0f10..24a24e9dd25 100644 --- a/apps/workflowengine/l10n/lv.json +++ b/apps/workflowengine/l10n/lv.json @@ -62,6 +62,6 @@ "not between" : "nav starp", "Request user agent" : "Nepieciešams lietotāja aģents", "is member of" : "ir biedrs", - "is not member of" : "nav biedrs" + "is not member of" : "nav dalībnieks" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/workflowengine/l10n/pt_PT.js b/apps/workflowengine/l10n/pt_PT.js index 1b863f0c0c7..24aa45be975 100644 --- a/apps/workflowengine/l10n/pt_PT.js +++ b/apps/workflowengine/l10n/pt_PT.js @@ -55,6 +55,7 @@ OC.L10N.register( "and" : "e", "Cancel" : "Cancelar", "Delete" : "Apagar", + "Show less" : "Mostrar menos", "matches" : "corresponde", "does not match" : "não corresponde", "is" : "é", diff --git a/apps/workflowengine/l10n/pt_PT.json b/apps/workflowengine/l10n/pt_PT.json index ce087aeebd4..5cec10df737 100644 --- a/apps/workflowengine/l10n/pt_PT.json +++ b/apps/workflowengine/l10n/pt_PT.json @@ -53,6 +53,7 @@ "and" : "e", "Cancel" : "Cancelar", "Delete" : "Apagar", + "Show less" : "Mostrar menos", "matches" : "corresponde", "does not match" : "não corresponde", "is" : "é", diff --git a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue index 978732aed09..f9606b7ca26 100644 --- a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue +++ b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue @@ -25,6 +25,7 @@ import axios from '@nextcloud/axios' import NcSelect from '@nextcloud/vue/components/NcSelect' const groups = [] +const wantedGroups = [] const status = { isLoading: false, } @@ -49,6 +50,7 @@ export default { return { groups, status, + wantedGroups, newValue: '', } }, @@ -82,6 +84,13 @@ export default { searchAsync(searchQuery) { if (this.status.isLoading) { + if (searchQuery) { + // The first 20 groups are loaded up front (indicated by an + // empty searchQuery parameter), afterwards we may load + // groups that have not been fetched yet, but are used + // in existing rules. + this.enqueueWantedGroup(searchQuery) + } return } @@ -94,11 +103,15 @@ export default { }) }) this.status.isLoading = false + this.findGroupByQueue() }, (error) => { console.error('Error while loading group list', error.response) }) }, - updateInternalValue() { + async updateInternalValue() { + if (!this.newValue) { + await this.searchAsync(this.modelValue) + } this.newValue = this.modelValue }, addGroup(group) { @@ -107,10 +120,32 @@ export default { this.groups.push(group) } }, + hasGroup(group) { + const index = this.groups.findIndex((item) => item.id === group) + return index > -1 + }, update(value) { this.newValue = value.id this.$emit('update:model-value', this.newValue) }, + enqueueWantedGroup(expectedGroupId) { + const index = this.wantedGroups.findIndex((groupId) => groupId === expectedGroupId) + if (index === -1) { + this.wantedGroups.push(expectedGroupId) + } + }, + async findGroupByQueue() { + let nextQuery + do { + nextQuery = this.wantedGroups.shift() + if (this.hasGroup(nextQuery)) { + nextQuery = undefined + } + } while (!nextQuery && this.wantedGroups.length > 0) + if (nextQuery) { + await this.searchAsync(nextQuery) + } + }, }, } </script> diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue index c9632d6c196..1c321fd014c 100644 --- a/apps/workflowengine/src/components/Rule.vue +++ b/apps/workflowengine/src/components/Rule.vue @@ -31,7 +31,6 @@ <Operation :operation="operation" :colored="false"> <component :is="operation.element" v-if="operation.element" - ref="operationComponent" :model-value="inputValue" @update:model-value="updateOperationByEvent" /> <component :is="operation.options" @@ -133,9 +132,8 @@ export default { }, mounted() { this.originalRule = JSON.parse(JSON.stringify(this.rule)) - if (this.operation?.element) { - this.$refs.operationComponent.value = this.rule.operation + this.inputValue = this.rule.operation } else if (this.operation?.options) { // keeping this in an else for apps that try to be backwards compatible and may ship both // to be removed in 03/2028 |