Merge pull request #498 from FlowzPlatform/SocketFixing

Socket fix on list page

Author: HarshOB

client/src/components/SchemaView.vue

@@ -227,7 +227,8 @@ export default {
       sendDataEmail: null,
       loadingEmail: true,
       currentSchema: null,
-      dataLoading: true
+      dataLoading: true,
+      entriesTotal: 10
     }
   },
   components: {
@@ -282,11 +283,13 @@ export default {
     pagination (skip, limit, page) {
       this.skip = skip
       this.limit = limit
+      this.entriesTotal = limit
       this.pageno = page
       this.populateTables()
     },
     handlepage (skip, limit, size) {
       this.limit = size
+      this.entriesTotal = size
       this.skip = 0
       this.populateTables()
     },
@@ -910,6 +913,7 @@ export default {
         $limit: this.limit
       }).then(queryresp => {
         // console.log('queryresp: ', queryresp)
+        // this.entriesTotal = queryresp.data.data.length
         this.isFlowzLoaded = true
         this.dataTotal = queryresp.data.total
         if (queryresp.data.data.length > 0) {
@@ -1010,7 +1014,29 @@ export default {
             //     console.log('err: ', err)
             //   })
             // }, 2000)
-            this.init()
+            // console.log('Length: ', this.instanceEntries.length)
+            // console.log('instanceEntries: ', this.instanceEntries.length, this.entriesTotal)
+            if (this.instanceEntries.length < this.entriesTotal) {
+              // console.log('Ready to push: ', this.instanceEntries.length)
+              // push to table
+              let instanceObj = data
+              // console.log('instanceObj: ', instanceObj)
+              let lastEntryId = data.stageReference[data.stageReference.length - 1].stageRecordId
+              // console.log('lastEntryId: ', lastEntryId)
+              if (lastEntryId !== undefined) {
+                flowzdataModal.get(lastEntryId).then(res => {
+                  // console.log('Response fdata: ', res)
+                  instanceObj['data'] = res.data.data
+                  instanceObj['iid'] = data.id
+                  this.instanceEntries.push(instanceObj)
+                  this.dataData.push(instanceObj)
+                  // console.log('Pushed data: ', this.instanceEntries, this.dataData)
+                })
+              }
+            } else {
+              // don't do anything
+            }
+            // this.init()
           } else if (this.$route.params.stateid === data.stageReference[(data.stageReference.length - 1)].StageName) {
             let inx = _.findIndex(this.instanceEntries, (o) => { return o.id === data.id })
             this.instanceEntries.splice(inx, 1)

client/src/components/cellRender.vue

@@ -30,6 +30,7 @@
 
     <span v-if="item.obj != null && item.isCompletedTask == true" title="Duration" style="display: block;">
       <i class="fa fa-clock-o fa-fw"></i>
+      <!-- <span>{{item.obj.createdAt}} : {{ item.obj.completedAt}}</span> -->
       <small>{{ getDuration(item.obj.createdAt, item.obj.completedAt) }}</small>
     </span>
 
@@ -122,17 +123,21 @@ export default {
       return moment(item).fromNow()
     },
     getDuration (x, y) {
-      if (x) {
-        let x1 = moment(x)
-        let y1 = moment(y)
-        let milliseconds = y1.diff(x1)
-        return this.msToTime(milliseconds)
+      // if (x) {
+      let x1 = moment(x)
+      let y1 = moment(y)
+      let milliseconds = y1.diff(x1)
+      if (milliseconds < 1000) {
+        return ((milliseconds / 1000) + 's')
       } else {
-        let x1 = moment(y)
-        let y1 = moment()
-        let milliseconds = y1.diff(x1)
         return this.msToTime(milliseconds)
       }
+      // } else {
+      //   let x1 = moment(y)
+      //   let y1 = moment()
+      //   let milliseconds = y1.diff(x1)
+      //   return this.msToTime(milliseconds)
+      // }
     },
     msToTime (duration) {
       // let milliseconds = parseInt((duration % 1000) / 100)
@@ -313,15 +318,5 @@ export default {
   border-radius: 50px; 
   width: 20px;
 }
-.ivu-table-cell{
-  padding-left: 0;
-  padding-right: 0;
-}
-</style>
 
-<style>
-  .ivu-table-cell{
-    padding-left: 0;
-    padding-right: 0;
-  }
 </style>

client/src/pages/flow/analytics.vue

@@ -800,10 +800,12 @@ export default {
   .notfirst {
     display: none
   }
-
-
 </style>
 <style>
+  .ivu-table-cell{
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+  }
   .ivu-modal-body{
     max-height: 550px !important;
     overflow-y: auto !important;
@@ -847,11 +849,6 @@ export default {
     padding-left: 10px;
   }
 
-  .ivu-table-cell{
-    padding-left: 0 !important;
-    padding-right: 0 !important;
-  }
-
   .searchQueries{
     margin: 5px 0;
   }

client/src/pages/user/SchemaList.vue

@@ -708,4 +708,6 @@
     overflow: hidden !important;
     text-overflow: ellipsis !important;
   }
+
+
 </style>