This repository was archived by the owner on Oct 30, 2023. It is now read-only.
File tree 3 files changed +20
-8
lines changed
3 files changed +20
-8
lines changed Original file line number Diff line number Diff line change @@ -1256,7 +1256,7 @@ export default {
1256
1256
},
1257
1257
1258
1258
async init () {
1259
- this .currentFlowzId = this .$route .params .id . replace ( / - / g , ' _ ' )
1259
+ this .currentFlowzId = this .$route .params .id
1260
1260
this .dataLoading = true
1261
1261
this .instanceEntries = []
1262
1262
this .isFlowzLoaded = false
Original file line number Diff line number Diff line change @@ -74,17 +74,18 @@ export default {
74
74
this .flowzdata = res .data
75
75
schemaModal .get (res .data .schema ).then (schemaRes => {
76
76
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' ) {
79
80
let mdata = {
80
- state: res . data . processList [proc].name || proc,
81
+ state: sortedArray [proc].name || proc,
81
82
_state: proc
82
83
}
83
84
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 ) {
85
86
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
88
89
}
89
90
} else {
90
91
if (res .data .first === proc) {
Original file line number Diff line number Diff line change @@ -850,7 +850,18 @@ export default {
850
850
' Content-Type' : ' application/x-www-form-urlencoded; charset=UTF-8'
851
851
}
852
852
}).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' )
854
865
// self.tableData = arrResources
855
866
// self.tableData = ['hi']
856
867
self .tableData = await _ .extend (self .tableData , arrResources)
You can’t perform that action at this time.
0 commit comments