Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 2dd1409

Browse files
authored
Merge pull request #550 from FlowzPlatform/Issue#543SortProcessList
Process List sorted by order number on role permissions and field per…
2 parents 881ba06 + 4e56da6 commit 2dd1409

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

client/src/components/SchemaView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1256,7 +1256,7 @@ export default {
12561256
},
12571257
12581258
async init () {
1259-
this.currentFlowzId = this.$route.params.id.replace(/-/g, '_')
1259+
this.currentFlowzId = this.$route.params.id
12601260
this.dataLoading = true
12611261
this.instanceEntries = []
12621262
this.isFlowzLoaded = false

client/src/components/permission.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,18 @@ export default {
7474
this.flowzdata = res.data
7575
schemaModal.get(res.data.schema).then(schemaRes => {
7676
this.schemaRes = schemaRes.data
77-
for (let proc in res.data.processList) {
78-
if (res.data.processList[proc].type !== 'startevent' && res.data.processList[proc].type !== 'endevent') {
77+
let sortedArray = _.sortBy(res.data.processList, [function (o) { return o.order }])
78+
for (let proc in sortedArray) {
79+
if (sortedArray[proc].type !== 'startevent' && sortedArray[proc].type !== 'endevent') {
7980
let mdata = {
80-
state: res.data.processList[proc].name || proc,
81+
state: sortedArray[proc].name || proc,
8182
_state: proc
8283
}
8384
for (let ent of schemaRes.data.entity) {
84-
if (res.data.processList[proc].hasOwnProperty('permission') && res.data.processList[proc].permission[ent.name] !== undefined) {
85+
if (sortedArray[proc].hasOwnProperty('permission') && sortedArray[proc].permission[ent.name] !== undefined) {
8586
mdata[ent.name] = {
86-
read: res.data.processList[proc].permission[ent.name].read,
87-
write: res.data.processList[proc].permission[ent.name].write
87+
read: sortedArray[proc].permission[ent.name].read,
88+
write: sortedArray[proc].permission[ent.name].write
8889
}
8990
} else {
9091
if (res.data.first === proc) {

client/src/pages/flow/List.vue

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,18 @@ export default {
850850
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
851851
}
852852
}).then(async function (response) {
853-
let arrResources = await _.groupBy(response.data.data, 'module')
853+
// console.log('Response: ', response.data.data)
854+
let actionsArray = response.data.data
855+
// console.log('processList: ', self.selectedFlowObject.processList)
856+
let processListArray = self.selectedFlowObject.processList
857+
let sortedArray = []
858+
for (let item of actionsArray) {
859+
// console.log('Item: ', item, processListArray[self.titleCase(item.service)])
860+
item['order'] = processListArray[self.titleCase(item.service)].order
861+
sortedArray.push(item)
862+
}
863+
sortedArray = _.sortBy(sortedArray, [function (o) { return o.order }])
864+
let arrResources = await _.groupBy(sortedArray, 'module')
854865
// self.tableData = arrResources
855866
// self.tableData = ['hi']
856867
self.tableData = await _.extend(self.tableData, arrResources)

0 commit comments

Comments
 (0)