Merge pull request #179 from jimccfun/analysis

fixes issue#925
sodafoundation · Sep 25, 2019 · 11bb81e · 11bb81e
2 parents ee19ad3 + 5898a6c
commit 11bb81e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/app/business/block/file-share-detail/file-share-detail.component.ts b/src/app/business/block/file-share-detail/file-share-detail.component.ts
@@ -200,12 +200,14 @@ export class FileShareDetailComponent implements OnInit{
             str.forEach(item=>{
                 if(item.fileshareId == fileShareId){
                     item.createdAt = Utils.formatDate(item.createdAt);
-                    if(!item.description){
-                        item.description = "--";
-                    }
+                    item.date = new Date(Utils.formatDate(item.createdAt)).getTime();
+                    item.description = (!item.description || item.description == '') ? '--' : item.description;
                     this.snapshots.push(item); 
                 }
             })
+            this.snapshots.sort((previous,later)=>{
+                return later.date - previous.date;
+            })
             this.selectedSnapshots = [];
         })
     }
@@ -223,14 +225,18 @@ export class FileShareDetailComponent implements OnInit{
                         description: item.description? item.description: "--",
                         level: item.accessCapability,
                         createdAt: Utils.formatDate(item.createdAt),
-                        updatedAt: Utils.formatDate(item.updatedAt)
+                        updatedAt: Utils.formatDate(item.updatedAt),
+                        date: new Date(Utils.formatDate(item.updatedAt)).getTime()
                     }
                     this.acls.push(acl);
                     if(dialog){
                         this.checkAclsIp.push(item.accessTo);
                     }
                 }
             })
+            this.acls.sort((previous,later)=>{
+                return later.date - previous.date;
+            })
             this.selectedAcls = [];
         })
     }