diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js index 5bb3ae0d648517e31bb60e2a478782e16466269e..7e73627cf8c33f2cdc8e93cb2db216b4695682f3 100644 Binary files a/apps/workflowengine/js/workflowengine.js and b/apps/workflowengine/js/workflowengine.js differ diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map index a23961a387ac80e4f8e548d1b68284447ec830a3..c9e05e35f50bad049ce4254fe42bd79667fcc84d 100644 Binary files a/apps/workflowengine/js/workflowengine.js.map and b/apps/workflowengine/js/workflowengine.js.map differ diff --git a/apps/workflowengine/src/components/Checks/FileMimeType.vue b/apps/workflowengine/src/components/Checks/FileMimeType.vue index 7f1f6567298535d6a05d20792debdb9940a48cd7..e27481ec4d0ebb55f4f7eeae4fa8d405da8ca9e8 100644 --- a/apps/workflowengine/src/components/Checks/FileMimeType.vue +++ b/apps/workflowengine/src/components/Checks/FileMimeType.vue @@ -53,6 +53,7 @@ <script> import Multiselect from '@nextcloud/vue/dist/Components/Multiselect' import valueMixin from './../../mixins/valueMixin' +import { imagePath } from '@nextcloud/router' export default { name: 'FileMimeType', @@ -76,12 +77,12 @@ export default { pattern: '/image\\/.*/', }, { - iconUrl: OC.imagePath('core', 'filetypes/x-office-document'), + iconUrl: imagePath('core', 'filetypes/x-office-document'), label: t('workflowengine', 'Office documents'), pattern: '/(vnd\\.(ms-|openxmlformats-).*)$/', }, { - iconUrl: OC.imagePath('core', 'filetypes/application-pdf'), + iconUrl: imagePath('core', 'filetypes/application-pdf'), label: t('workflowengine', 'PDF documents'), pattern: 'application/pdf', }, diff --git a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue index 897a6ea5f4d33547b8a9fffc9875f6976172de94..e053ab20a58d42ac1934a68cd0761ce2eecaed32 100644 --- a/apps/workflowengine/src/components/Checks/RequestUserGroup.vue +++ b/apps/workflowengine/src/components/Checks/RequestUserGroup.vue @@ -36,6 +36,7 @@ <script> import Multiselect from '@nextcloud/vue/dist/Components/Multiselect' import axios from '@nextcloud/axios' +import { generateOcsUrl } from '@nextcloud/router' const groups = [] const status = { @@ -83,7 +84,7 @@ export default { } this.status.isLoading = true - return axios.get(OC.linkToOCS('cloud', 2) + 'groups?limit=20&search=' + encodeURI(searchQuery)).then((response) => { + return axios.get(generateOcsUrl('cloud', 2) + 'groups?limit=20&search=' + encodeURI(searchQuery)).then((response) => { response.data.ocs.data.groups.reduce((obj, item) => { obj.push({ id: item, diff --git a/apps/workflowengine/src/helpers/api.js b/apps/workflowengine/src/helpers/api.js index c8a019de625c709809c7d3db4bd71ea5c093e23a..59e0248ed60a310a71418b5329f1d91be883faba 100644 --- a/apps/workflowengine/src/helpers/api.js +++ b/apps/workflowengine/src/helpers/api.js @@ -21,11 +21,12 @@ */ import { loadState } from '@nextcloud/initial-state' +import { generateOcsUrl } from '@nextcloud/router' const scopeValue = loadState('workflowengine', 'scope') === 0 ? 'global' : 'user' const getApiUrl = (url) => { - return OC.linkToOCS('apps/workflowengine/api/v1/workflows', 2) + scopeValue + url + '?format=json' + return generateOcsUrl('apps/workflowengine/api/v1/workflows', 2) + scopeValue + url + '?format=json' } export {