Merge pull request #585 from FlowzPlatform/issue-515-v1

Issue 515 v1
FlowzPlatform · Oct 1, 2018 · a2938f0 · a2938f0
2 parents 6899133 + f792239
commit a2938f0
Showing 1 changed file with 71 additions and 48 deletions.
diff --git a/client/src/pages/flow/List.vue b/client/src/pages/flow/List.vue
@@ -34,6 +34,10 @@
                                     <template v-for="(field,fieldNumber) in fields[moduleName]">
                                         <td v-if="fieldNumber ==0" style="padding:10px;font-weight:bold;border-right: 3px solid #cdd0d4;">
                                             {{selectedFlowObject.processList[titleCase(item.service)].name}}
+                                            <!-- {{item.service}}
+                                            <br>
+                                            <br>
+                                            {{selectedFlowObject.processList[titleCase(item.service)]}} -->
                                         </td>
                                         <td v-else>
                                             <table class="table-bordered" style="width:100%">
@@ -162,7 +166,7 @@
 <script>
 import flowz from '@/api/flowz'
 import _ from 'lodash'
-// import finstanceModal from '@/api/finstance'
+import finstanceModal from '@/api/finstance'
 import axios from 'axios'
 import viewSVG from './viewSVG'
 import psl from 'psl'
@@ -180,7 +184,7 @@ import moment from 'moment'
 export default {
   name: 'Flowz',
   components: {
-    viewSVG: (resolve) => { require(['./viewSVG'], resolve) },
+    'viewSVG': (resolve) => { require(['./viewSVG'], resolve) },
     expandRow2: (resolve) => { require(['./assigned_invite_table-expand.vue'], resolve) },
     subscription: (resolve) => { require(['@/components/subscription'], resolve) }
   },
@@ -244,32 +248,32 @@ export default {
           align: 'center',
           render: (h, params) => {
             return h('div', [
-              // h('Button', {
-              //   props: {
-              //     type: 'text',
-              //     size: 'large',
-              //     icon: 'arrow-right-b'
-              //   },
-              //   domProps: {
-              //     title: 'Start Instance'
-              //   },
-              //   style: {
-              //     marginRight: '3px',
-              //     padding: '0px',
-              //     fontSize: '20px',
-              //     color: '#2411c5'
-              //   },
-              //   on: {
-              //     click: () => {
-              //       this.createNewInstance(params.row.id)
-              //     }
-              //   }
-              // }, ''),
               h('Button', {
                 props: {
                   type: 'text',
                   size: 'large',
-                  icon: 'key'
+                  icon: 'arrow-right-b'
+                },
+                domProps: {
+                  title: 'Start Instance'
+                },
+                style: {
+                  marginRight: '3px',
+                  padding: '0px',
+                  fontSize: '20px',
+                  color: '#2411c5'
+                },
+                on: {
+                  click: () => {
+                    this.createNewInstance(params.row.id)
+                  }
+                }
+              }, ''),
+              h('Button', {
+                props: {
+                  type: 'text',
+                  size: 'large',
+                  icon: 'settings'
                 },
                 domProps: {
                   title: 'Set Permission'
@@ -313,9 +317,6 @@ export default {
                   size: 'large',
                   icon: 'ios-personadd'
                 },
-                domProps: {
-                  title: 'Invite User'
-                },
                 style: {
                   marginRight: '3px',
                   padding: '0px',
@@ -333,9 +334,6 @@ export default {
                   type: 'text',
                   size: 'large'
                 },
-                domProps: {
-                  title: 'Field Permissions'
-                },
                 style: {
                   marginRight: '3px',
                   padding: '0px',
@@ -534,6 +532,32 @@ export default {
           console.log(error)
         })
       }
+    },
+    'flowz': {
+      created (data) {
+        // console.log(this.limit)
+        if (this.total < this.limit) {
+          this.flowzList.push(data)
+        } else {
+          this.total = ((this.total) + 1)
+        }
+      },
+      updated (data) {
+        if (this.flowzList < this.limit) {
+          let inx = _.findIndex(this.flowzList, (o) => { return o.id === data.id })
+          this.flowzList.splice(inx, 1)
+          this.flowzList.push(data)
+        }
+      },
+      removed (data) {
+        // console.log('Removed Data: ', data)
+        if (this.$store.state.role === 1) {
+          // this.$store.state.flowz = []
+          // this.init()
+          let i = _.findIndex(this.flowzList, (o) => { return o.id === data.id })
+          this.flowzList.splice(i, 1)
+        }
+      }
     }
   },
   methods: {
@@ -709,7 +733,6 @@ export default {
       this.init()
     },
     init () {
-      // var string = '?$skip=' + this.skip + '&$limit=' + this.limit
       this.loading = true
       flowz.get(null, {
         $skip: this.skip,
@@ -722,26 +745,26 @@ export default {
       })
       .catch(error => {
         this.loading = false
-        this.$Notice.error({duration: '3', title: error.message, desc: ''})
+        this.$Notice({duration: '3', title: 'Network Error', desc: ''})
         console.log(error)
       })
     },
-    // createNewInstance (item) {
-    //   this.$Loading.start()
-    //   let fheaders = null
-    //   finstanceModal.post({fid: item.id}, null, fheaders).then(res => {
-    //     this.$Notice.success({title: 'Instance Generated'})
-    //     this.$Loading.finish()
-    //   }).catch(e => {
-    //     this.$Loading.error()
-    //     console.log('error', e.response)
-    //     if (e.response.data.message) {
-    //       this.$Notice.error({title: 'Error', desc: e.response.data.message.toString()})
-    //     } else {
-    //       this.$Notice.error({title: 'Error', desc: 'Instace Not Generated'})
-    //     }
-    //   })
-    // },
+    createNewInstance (item) {
+      this.$Loading.start()
+      let fheaders = null
+      finstanceModal.post({fid: item.id}, null, fheaders).then(res => {
+        this.$Notice.success({title: 'Instance Generated'})
+        this.$Loading.finish()
+      }).catch(e => {
+        this.$Loading.error()
+        console.log('error', e.response)
+        if (e.response.data.message) {
+          this.$Notice.error({title: 'Error', desc: e.response.data.message.toString()})
+        } else {
+          this.$Notice.error({title: 'Error', desc: 'Instace Not Generated'})
+        }
+      })
+    },
     addNewFlow () {
       this.$store.dispatch('removeXMLtoLocalStorage')
       this.$router.push({name: 'flow/new'})