From 6bdcbec0912e79e21b66e68bc1c1876e32e18d04 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Fri, 9 Apr 2021 00:15:36 +0300
Subject: [PATCH] upload adjustments

---
 .../breadcrumbs/admin-breadcrumbs.component.html     |  6 +++---
 .../modules/admin/components/tabs/tabs.component.ts  |  2 +-
 .../file-attributes-csv-import-dialog.component.html |  2 +-
 .../file-attributes-csv-import-dialog.component.ts   | 12 +++++++++++-
 apps/red-ui/src/app/utils/file-drop-utils.ts         | 10 +++++++++-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
index 1062de200..cfdf1bf81 100644
--- a/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
+++ b/apps/red-ui/src/app/modules/admin/components/breadcrumbs/admin-breadcrumbs.component.html
@@ -32,7 +32,7 @@
         [routerLinkActiveOptions]="{ exact: true }"
         routerLinkActive="active"
         translate="audit"
-        *ngIf="root && permissionService.isAdmin() && userPreferenceService.areDevFeaturesEnabled"
+        *ngIf="root && permissionService.isAdmin()"
     ></a>
 
     <a
@@ -41,7 +41,7 @@
         [routerLinkActiveOptions]="{ exact: true }"
         routerLinkActive="active"
         translate="user-management"
-        *ngIf="root && permissionService.canManageUsers() && userPreferenceService.areDevFeaturesEnabled"
+        *ngIf="root && permissionService.canManageUsers()"
     ></a>
 
     <a
@@ -50,7 +50,7 @@
         [routerLinkActiveOptions]="{ exact: true }"
         routerLinkActive="active"
         translate="configurations"
-        *ngIf="root && userPreferenceService.areDevFeaturesEnabled"
+        *ngIf="root && permissionService.isAdmin()"
     ></a>
 
     <ng-container *ngIf="appStateService.activeRuleSet">
diff --git a/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.ts b/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.ts
index a461ecbfc..d7e5da509 100644
--- a/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.ts
+++ b/apps/red-ui/src/app/modules/admin/components/tabs/tabs.component.ts
@@ -17,7 +17,7 @@ export class TabsComponent implements OnInit {
         { screen: 'rules', onlyDevMode: true, label: 'rule-editor' },
         { screen: 'default-colors' },
         { screen: 'watermark' },
-        { screen: 'file-attributes', onlyAdmin: true, onlyDevMode: true }
+        { screen: 'file-attributes', onlyAdmin: true }
     ];
 
     constructor(
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
index f6168e147..f6601cfbd 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.html
@@ -65,7 +65,7 @@
                 <div class="csv-header-pill-content">
                     <div
                         class="csv-header-pill"
-                        *ngFor="let field of parseResult?.fields"
+                        *ngFor="let field of relevantFields"
                         (mouseenter)="hoveredColumn = field.csvColumn"
                         (mouseleave)="hoveredColumn = undefined"
                         (click)="toggleFieldActive(field)"
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts b/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
index 0502a37a2..f0fefb272 100644
--- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component.ts
@@ -57,6 +57,10 @@ export class FileAttributesCsvImportDialogComponent implements OnInit {
         this._readFile();
     }
 
+    get relevantFields() {
+        return this.parseResult?.fields.filter((f) => this.getEntries(f.csvColumn) > 0);
+    }
+
     ngOnInit(): void {
         setTimeout(() => {
             this.cdkVirtualScrollViewport.checkViewportSize();
@@ -190,7 +194,13 @@ export class FileAttributesCsvImportDialogComponent implements OnInit {
                     .toPromise()
             );
         }
-        await Promise.all(promises);
+        await this.resolveInSequence(promises);
         this.dialogRef.close(true);
     }
+
+    async resolveInSequence(requests) {
+        for (const request of requests) {
+            await request;
+        }
+    }
 }
diff --git a/apps/red-ui/src/app/utils/file-drop-utils.ts b/apps/red-ui/src/app/utils/file-drop-utils.ts
index 93ff1f26d..c00a605bf 100644
--- a/apps/red-ui/src/app/utils/file-drop-utils.ts
+++ b/apps/red-ui/src/app/utils/file-drop-utils.ts
@@ -43,7 +43,15 @@ export function convertFiles(files: FileList | File[], project: ProjectWrapper):
         });
     }
 
-    uploadFiles = uploadFiles.filter((file) => file.file.type?.toLowerCase() === 'application/pdf' || file.file.name.toLowerCase().endsWith('.pdf'));
+    uploadFiles = uploadFiles.filter(
+        (file) =>
+            file.file.type?.toLowerCase() === 'application/pdf' ||
+            file.file.name.toLowerCase().endsWith('.pdf') ||
+            file.file.type?.toLowerCase() === 'application/zip' ||
+            file.file.name.toLowerCase().endsWith('.zip') ||
+            file.file.type?.toLowerCase() === 'text/csv' ||
+            file.file.name.toLowerCase().endsWith('.csv')
+    );
     uploadFiles.sort((a, b) => a.size - b.size);
     return uploadFiles;
 }