Merge pull request #20867 from nextcloud/warnigns/js/workflowengine

Fix linter warnings in workflowengine
nextcloud · May 8, 2020 · d476c7a · d476c7a
2 parents 02b1420 + e3bb6b6
commit d476c7a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 25 deletions.
diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
diff --git 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
@@ -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
@@ -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 {