RED-6830: show storage usage details

apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.html

@@ -61,6 +61,31 @@
                         <div>{{ licenseService.totalLicensedNumberOfPages }}</div>
                     </div>
 
+                    <!---------- STORAGE DETAILS -->
+
+                    <div class="section-title all-caps-label" translate="license-info-screen.storage-details"></div>
+
+                    <div class="row">
+                        <div translate="license-info-screen.storage.active-documents"></div>
+                        <div>{{ licenseService.currentLicenseInfo.activeFilesUploadedBytes | size }}</div>
+                    </div>
+
+                    <div class="row">
+                        <div translate="license-info-screen.storage.archived-documents"></div>
+                        <div>{{ licenseService.currentLicenseInfo.archivedFilesUploadedBytes | size }}</div>
+                    </div>
+                    <div class="row">
+                        <div translate="license-info-screen.storage.trash-documents"></div>
+                        <div>{{ licenseService.currentLicenseInfo.trashFilesUploadedBytes | size }}</div>
+                    </div>
+
+                    <div class="row">
+                        <div translate="license-info-screen.storage.all-documents"></div>
+                        <div>{{ licenseService.currentLicenseInfo.totalFilesUploadedBytes | size }}</div>
+                    </div>
+
+                    <!---------- USAGE DETAILS -->
+
                     <div class="section-title all-caps-label" translate="license-info-screen.usage-details"></div>
 
                     <div class="row">
@@ -91,9 +116,11 @@
                         <div [innerHTML]="'license-info-screen.total-ocr-analyzed' | translate"></div>
                         <div>{{ licenseService.allLicensesInfo.numberOfOcrPages }}</div>
                     </div>
-                </div>
 
-                <redaction-license-chart></redaction-license-chart>
+                    <div class="row">
+                        <redaction-license-chart></redaction-license-chart>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

apps/red-ui/src/app/modules/admin/screens/license/license-screen/license-screen.component.scss

@@ -12,7 +12,7 @@
         width: calc(100% - 40px);
         display: grid;
         grid-template-columns: 1fr 2fr;
-        margin: 20px 20px 50px 20px;
+        margin: 20px;
 
         .row {
             display: contents;
@@ -41,6 +41,7 @@
     }
 
     redaction-license-chart {
-        margin-bottom: 50px;
+        margin: 50px 0;
+        grid-column: span 2;
     }
 }

apps/red-ui/src/app/modules/admin/screens/license/license.module.ts

@@ -5,7 +5,7 @@ import { LicenseChartComponent } from './license-chart/license-chart.component';
 import { RouterModule, Routes } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatSelectModule } from '@angular/material/select';
-import { IqserHelpModeModule, IqserListingModule } from '@iqser/common-ui';
+import { IqserHelpModeModule, IqserListingModule, SizePipe } from '@iqser/common-ui';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { ComboChartComponent, ComboSeriesVerticalComponent, YAxisComponent } from './combo-chart';
 import { FormsModule } from '@angular/forms';
@@ -40,6 +40,7 @@ const routes: Routes = [
         NgxChartsModule,
         IqserListingModule,
         IqserHelpModeModule,
+        SizePipe,
     ],
 })
 export class LicenseModule {}

apps/red-ui/src/assets/i18n/redact/de.json

@@ -1676,6 +1676,13 @@
       "active": "Aktiv",
       "inactive": ""
     },
+    "storage-details": "",
+    "storage": {
+      "active-documents": "",
+      "all-documents": "",
+      "archived-documents": "",
+      "trash-documents": ""
+    },
     "total-analyzed": "Seit {date} insgesamt analysierte Seiten",
     "total-ocr-analyzed": "",
     "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten",

apps/red-ui/src/assets/i18n/redact/en.json

@@ -1676,10 +1676,17 @@
       "active": "Active",
       "inactive": "Inactive"
     },
+    "storage-details": "Storage Details",
+    "storage": {
+      "active-documents": "Active Documents",
+      "all-documents": "All Documents",
+      "archived-documents": "Archived Documents",
+      "trash-documents": "Documents in Trash"
+    },
     "total-analyzed": "Total Analyzed Pages",
     "total-ocr-analyzed": "Total OCR Processed Pages",
     "unlicensed-analyzed": "Unlicensed Analyzed Pages",
-    "usage-details": "Usage Details"
+    "usage-details": "Page Usage Details"
   },
   "license-information": "License Information",
   "load-all-annotations-success": "All annotations were loaded and are now visible in the document thumbnails",

apps/red-ui/src/assets/i18n/scm/de.json

@@ -1676,6 +1676,13 @@
       "active": "Aktiv",
       "inactive": ""
     },
+    "storage-details": "",
+    "storage": {
+      "active-documents": "",
+      "all-documents": "",
+      "archived-documents": "",
+      "trash-documents": ""
+    },
     "total-analyzed": "Seit {date} insgesamt analysierte Seiten",
     "total-ocr-analyzed": "",
     "unlicensed-analyzed": "Über Lizenz hinaus analysierte Seiten",

apps/red-ui/src/assets/i18n/scm/en.json

@@ -1676,10 +1676,17 @@
       "active": "Active",
       "inactive": "Inactive"
     },
+    "storage-details": "Storage Details",
+    "storage": {
+      "active-documents": "Active Documents",
+      "all-documents": "All Documents",
+      "archived-documents": "Archived Documents",
+      "trash-documents": "Documents in Trash"
+    },
     "total-analyzed": "Total Analyzed Pages Since {date}",
     "total-ocr-analyzed": "Total OCR Processed Pages Since {date}",
     "unlicensed-analyzed": "Unlicensed Analyzed Pages",
-    "usage-details": "Usage Details"
+    "usage-details": "Page Usage Details"
   },
   "license-information": "License Information",
   "load-all-annotations-success": "All annotations were loaded and are now visible in the document thumbnails",

libs/common-ui

@@ -1 +1 @@
-Subproject commit 02d0089d0d7e81b3ff445534ecfee007f9aef309
+Subproject commit aa4516286eeeaab7e69adadb4f58193e8f2b64ed

libs/red-domain/src/lib/reports/license-report.ts

@@ -1,16 +1,21 @@
-import { IReportData } from './report-data';
+interface ILicenseData {
-
+    activeFilesUploadedBytes?: number;
-export interface ILicenseReport {
+    archivedFilesUploadedBytes?: number;
-    data?: IReportData[];
+    totalFilesUploadedBytes?: number;
+    trashFilesUploadedBytes?: number;
+    numberOfAnalyzedPages?: number;
+    numberOfOcrPages?: number;
+    startDate?: Date;
     endDate?: Date;
+}
+
+export interface ILicenseReport extends ILicenseData {
     limit?: number;
     numberOfAnalyses?: number;
     numberOfAnalyzedFiles?: number;
-    numberOfAnalyzedPages?: number;
     numberOfDossiers?: number;
     numberOfOcrFiles?: number;
-    numberOfOcrPages?: number;
     offset?: number;
     requestId?: string;
-    startDate?: Date;
+    monthlyData?: ILicenseData[];
 }