Merge remote-tracking branch 'origin/master' into RED-2045

apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html

@@ -96,5 +96,5 @@
 </section>
 
 <ng-template #reportTemplateOptionTemplate let-option="option">
-    {{ option.fileName }}
+    {{ option.fileName }} {{ option.multiFileReport ? ('reports-screen.multi-file-report' | translate) : '' }}
 </ng-template>

apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html

@@ -15,5 +15,5 @@
 </form>
 
 <ng-template #reportTemplateOptionTemplate let-option="option">
-    {{ option.fileName }}
+    {{ option.fileName }} {{ option.multiFileReport ? ('reports-screen.multi-file-report' | translate) : '' }}
 </ng-template>

apps/red-ui/src/app/state/app-state.service.ts

@@ -173,7 +173,6 @@ export class AppStateService {
     }
 
     getFileAttributeConfig(dossierTemplateId: string): FileAttributesConfig {
-        console.log(this.dossierTemplates);
         return this.dossierTemplates.find(d => d.dossierTemplateId === dossierTemplateId)?.fileAttributesConfig;
     }
 

apps/red-ui/src/app/utils/file-drop-utils.ts

@@ -55,7 +55,12 @@ export function convertFiles(files: FileList | File[], dossier: DossierWrapper):
             file.file.name.toLowerCase().endsWith('.zip') ||
             isCsv(file)
     );
-    uploadFiles.sort((a, b) => a.size - b.size);
-    uploadFiles.sort(a => (isCsv(a) ? 1 : 0));
-    return uploadFiles;
+
+    const pdfFiles = uploadFiles.filter(a => !isCsv(a)).sort((a, b) => a.size - b.size);
+    const csvFiles = uploadFiles.filter(a => isCsv(a));
+
+    const sortedFiles = [...pdfFiles, ...csvFiles];
+
+    console.log('[REDACTION] Uploading files: ', sortedFiles);
+    return sortedFiles;
 }

apps/red-ui/src/assets/config/config.json

@@ -1,6 +1,6 @@
 {
-  "OAUTH_URL": "https://dom1.iqser.cloud/auth/realms/redaction",
-  "API_URL": "https://dom1.iqser.cloud/redaction-gateway-v1",
+  "OAUTH_URL": "https://demo.redactmanager.com/auth/realms/redaction",
+  "API_URL": "https://demo.redactmanager.com/redaction-gateway-v1",
   "OAUTH_CLIENT_ID": "redaction",
   "BACKEND_APP_VERSION": "4.4.40",
   "FRONTEND_APP_VERSION": "1.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "2.204.0",
+  "version": "2.206.0",
   "private": true,
   "license": "MIT",
   "scripts": {