Merge pull request #4061 from rajeevsathish/release-3.0.0_2nd

SB--18335

src/app/client/src/app/modules/dashboard/components/usage-reports/usage-reports.component.html

@@ -38,15 +38,6 @@
             </div>
             <div class="ui bottom attached segment p-0 b-0 no-bg my-24" suiTabContent="files">
               <div class="sb-graph-section p-24 my-24">
-                <!-- <div *ngFor="let file of files; let i = index; let l = last;">
-                  <span>{{file.name}}</span>
-                  <span>
-                    <a type="button" class="ml-auto mr-8" appTelemetryInteract
-                      [telemetryInteractObject]="setTelemetryInteractObject(currentReport.id)"
-                      [telemetryInteractEdata]="setTelemetryInteractEdata('report-download')"
-                      (click)="downloadCSV(file.downloadUrl)"><i class="icon"></i> download file</a>
-                  </span>
-                </div> -->
                 <table *ngIf="isFileDataLoaded" id="downloadTable" class="sb-table sb-table-striped sb-table-sortable sb-table-fixed"
                 cellspacing="0">
                 <thead class="sb-table-header sb-table-thead-gray">
@@ -61,6 +52,16 @@
                         {{resourceService?.frmelmnts?.lbl?.dashboard?.description}}
                       </div>
                     </th>
+                    <th>
+                      <div class="cursor-pointer">
+                        {{resourceService?.frmelmnts?.lbl?.dashboard?.fileSize}}
+                      </div>
+                    </th>
+                    <th>
+                      <div class="cursor-pointer">
+                        {{resourceService?.frmelmnts?.lbl?.createdon}}
+                      </div>
+                    </th>
                     <th class="table-headerDashboard">
                       <div class="cursor-pointer" >
                         {{resourceService?.frmelmnts?.lbl?.dashboard?.action}}
@@ -82,6 +83,18 @@
                     <td *ngIf="!file.desc">
                       --
                     </td>
+                    <td *ngIf="file.size">
+                      {{file.size}}
+                    </td>
+                    <td *ngIf="!file.size">
+                      --
+                    </td>
+                    <td *ngIf="file.createdOn">
+                      {{file.createdOn}}
+                    </td>
+                    <td *ngIf="!file.createdOn">
+                      --
+                    </td>
                     <td >
                       <button type="button" class="sb-btn sb-btn-tertiary sb-btn-normal ml-auto mr-8" appTelemetryInteract
                       [telemetryInteractObject]="setTelemetryInteractObject(currentReport.id)"

src/app/client/src/app/modules/dashboard/components/usage-reports/usage-reports.component.ts

@@ -113,6 +113,8 @@ export class UsageReportsComponent implements OnInit, AfterViewInit {
       fileData.id = _.get(file, 'id');
       fileData.name = _.get(file, 'name');
       fileData.desc = _.get(file, 'description');
+      fileData.size = _.get(file, 'fileSize');
+      fileData.createdOn = _.get(file, 'createdOn');
       fileData.downloadUrl = _.get(file, 'downloadUrl');
       this.files.push(fileData);
     });

src/app/resourcebundles/data/consumption/en.properties

@@ -1072,6 +1072,9 @@ frmelmnts.lbl.other = Other
 frmelmnts.lbl.welcomeToInstance = Welcome to {instance}
 frmelmnts.lbl.youAre = You are a
 frmelmnts.lbl.joinTrainingToAcessContent = You must join Training to get complete access to content
+
+frmelmnts.lbl.dashboard.fileSize = File Size
+frmelmnts.lbl.sectionTitle = Courses
 frmelmnts.lbl.courses = Courses
 frmelmnts.lbl.oneCourse = Course
 frmelmnts.lbl.copyAsCourse = Copy as course