Merge pull request #521 from FlowzPlatform/issue-469-n5

Issue 469 n5

Author: chiragob

client/src/components/SchemaSubForm.vue

@@ -565,7 +565,7 @@ export default {
     }
   },
   mounted () {
-    this.oldFiles = this.schemainstance.data[0].Fileattachment.length
+    // this.oldFiles = this.schemainstance.data[0].Fileattachment.length
   },
   created () {}
 }

client/src/components/SchemaView.vue

@@ -130,7 +130,7 @@
             </div>
           </div>
           </TabPane>
-          <TabPane v-if="this.$store.state.role === 2" :label="'Data ('+ dataData2.length + ')'" icon="lock-combination">
+          <TabPane v-if="this.$store.state.role === 2" :label="'Work Pool ('+ dataData2.length + ')'" icon="lock-combination">
             <schemalist :schema="dataSchema" :datashow="'dataU'" :pageno="pageno" v-on:on-paginate="pagination" v-on:on-handlepage="handlepage" :limit="limit" :skip="skip" :dataTotal="dataTotal" :data="dataData2" :configuration="configuration" :instanceEntries="instanceEntries" :dynamicData="dynamicData" v-on:setValues="setValues" :flowzData="flowzData" v-on:sort-data="sortData" v-on:search-data="searchData"></schemalist>
           </TabPane>
           <TabPane v-if="this.$store.state.role === 2" :label="'In Progress ('+ dataClaim.length + ')'" icon="lock-combination">

client/src/pages/flow/New.vue

@@ -78,7 +78,8 @@
           xml: '',
           svg: '',
           first: ''
-        }
+        },
+        oldFlow: {}
       }
     },
     methods: {
@@ -229,22 +230,36 @@
                   subscriptionNew.moduleResource.registerAppModule = registerAppModuleNew
                   subscriptionNew.moduleResource.appRoles = userRolesArr
                   subscriptionNew.registeredAppModulesRole().then(resp => {
-                    let result = null
+                    // let result = null
                     if (this.$route.params.id !== undefined) {
-                      result = flowz.put(this.$route.params.id, this.flowObject)
+                      // if (this.flowObject.schema === this.oldFlow.schema) {
+                      //   console.log('...........')
+                      // } else {
+                      //   this.$Notice.warning({title: 'You\'ve change schema of <b>' + this.flowObject.name + '</b>', desc: '<a>Click Here</a> Set permissions', duration: 0})
+                      // }
+                      // this.btnLoading = false
+                      flowz.put(this.$route.params.id, this.flowObject).then(response => {
+                        this.$Notice.success({title: 'Success..!', desc: 'Flow Updated..'})
+                        this.$router.push({name: 'flow/list'})
+                        localStorage.removeItem('BPMNXml')
+                        this.btnLoading = false
+                      }).catch(error => {
+                        console.log(error)
+                        this.$Notice.error({title: 'Error..!', desc: 'Flow Not Updated...'})
+                        this.btnLoading = false
+                      })
                     } else {
-                      result = flowz.post(this.flowObject)
+                      flowz.post(this.flowObject).then(response => {
+                        this.$Notice.success({title: 'Success..!', desc: 'Flow Saved..'})
+                        this.$router.push({name: 'flow/list'})
+                        localStorage.removeItem('BPMNXml')
+                        this.btnLoading = false
+                      }).catch(error => {
+                        console.log(error)
+                        this.$Notice.error({title: 'Error..!', desc: 'Flow Not Saved...'})
+                        this.btnLoading = false
+                      })
                     }
-                    result.then(response => {
-                      this.$Notice.success({title: 'Success..!', desc: 'Flow Saved..'})
-                      this.$router.push({name: 'flow/list'})
-                      localStorage.removeItem('BPMNXml')
-                      this.btnLoading = false
-                    }).catch(error => {
-                      console.log(error)
-                      this.$Notice.error({title: 'Error..!', desc: 'Flow Not Saved...'})
-                      this.btnLoading = false
-                    })
                   }).catch(err => {
                     this.$Notice.error({title: 'Error..!', desc: 'Flow Not Saved. Try again.'})
                     console.log('Error: ', err)
@@ -387,8 +402,9 @@
         Promise.all(this.processVar).then(async (response) => {
           if (this.$route.params.id !== undefined) {
             this.bpmnXML = flowz.get(this.$route.params.id).then(async (result) => {
+              this.oldFlow = result.data
               this.bpmnXML = result.data.xml
-              await this.initBPMN({
+              this.initBPMN({
                 userId: this.$store.state.user._id,
                 emailTemplate: tempVar,
                 cdata: result.data,
@@ -405,7 +421,7 @@
               }) // Create bpmn
             })
           } else {
-            await this.initBPMN({
+            this.initBPMN({
               userId: this.$store.state.user._id,
               emailTemplate: tempVar,
               schema: response[0],

service/src/services/flowzdata/flowzdata.hooks.js

@@ -61,10 +61,10 @@ function afterCreate (hook) {
     return hook.app.service('flowz').get(hook.data.fid, {query}).then(res => {
       // let cuurentObj = _.find(res.json.processList, {id: hook.data.state});
       let cuurentObj = res.processList[hook.data.state];
-      console.log('________________________________________________cuurentObj', cuurentObj)
+      // console.log('________________________________________________cuurentObj', cuurentObj)
       // let nextTargetObj = getNextTarget(res.json.processList, cuurentObj.target[0].id);
       let nextTargetObj = res.processList[cuurentObj.target[0].id];
-      console.log('________________________________________________nextTargetObj', nextTargetObj)
+      // console.log('________________________________________________nextTargetObj', nextTargetObj)
       return hook.app.service('finstance').get(hook.data.iid).then(finstRes => {
         let mdata = {
           currentStatus: nextTargetObj.id,
@@ -104,7 +104,7 @@ function afterCreate (hook) {
         if (nextTargetObj.type === 'endevent') {
           mdata.mainStatus = 'completed';
         }
-        return hook.app.service('finstance').patch(hook.data.iid, mdata).then(pRes => {
+        return hook.app.service('finstance').patch(hook.data.iid, mdata, hook.params).then(pRes => {
           return hook;
         }).catch(err => {
           throw new errors.BadRequest('Error', {