Merge pull request #550 from FlowzPlatform/Issue#543SortProcessList

Process List sorted by order number on role permissions and field per…

Author: faizansaiyed

client/src/components/SchemaView.vue

@@ -1256,7 +1256,7 @@ export default {
     },
 
     async init () {
-      this.currentFlowzId = this.$route.params.id.replace(/-/g, '_')
+      this.currentFlowzId = this.$route.params.id
       this.dataLoading = true
       this.instanceEntries = []
       this.isFlowzLoaded = false

client/src/components/permission.vue

@@ -74,17 +74,18 @@ export default {
         this.flowzdata = res.data
         schemaModal.get(res.data.schema).then(schemaRes => {
           this.schemaRes = schemaRes.data
-          for (let proc in res.data.processList) {
-            if (res.data.processList[proc].type !== 'startevent' && res.data.processList[proc].type !== 'endevent') {
+          let sortedArray = _.sortBy(res.data.processList, [function (o) { return o.order }])
+          for (let proc in sortedArray) {
+            if (sortedArray[proc].type !== 'startevent' && sortedArray[proc].type !== 'endevent') {
               let mdata = {
-                state: res.data.processList[proc].name || proc,
+                state: sortedArray[proc].name || proc,
                 _state: proc
               }
               for (let ent of schemaRes.data.entity) {
-                if (res.data.processList[proc].hasOwnProperty('permission') && res.data.processList[proc].permission[ent.name] !== undefined) {
+                if (sortedArray[proc].hasOwnProperty('permission') && sortedArray[proc].permission[ent.name] !== undefined) {
                   mdata[ent.name] = {
-                    read: res.data.processList[proc].permission[ent.name].read,
-                    write: res.data.processList[proc].permission[ent.name].write
+                    read: sortedArray[proc].permission[ent.name].read,
+                    write: sortedArray[proc].permission[ent.name].write
                   }
                 } else {
                   if (res.data.first === proc) {

client/src/pages/flow/List.vue

@@ -850,7 +850,18 @@ export default {
           'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
         }
       }).then(async function (response) {
-        let arrResources = await _.groupBy(response.data.data, 'module')
+        // console.log('Response: ', response.data.data)
+        let actionsArray = response.data.data
+        // console.log('processList: ', self.selectedFlowObject.processList)
+        let processListArray = self.selectedFlowObject.processList
+        let sortedArray = []
+        for (let item of actionsArray) {
+          // console.log('Item: ', item, processListArray[self.titleCase(item.service)])
+          item['order'] = processListArray[self.titleCase(item.service)].order
+          sortedArray.push(item)
+        }
+        sortedArray = _.sortBy(sortedArray, [function (o) { return o.order }])
+        let arrResources = await _.groupBy(sortedArray, 'module')
         // self.tableData = arrResources
         // self.tableData = ['hi']
         self.tableData = await _.extend(self.tableData, arrResources)