diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index c9f5d68e6..32cb58be2 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -96,5 +96,5 @@ - {{ option.fileName }} + {{ option.fileName }} {{ option.multiFileReport ? ('reports-screen.multi-file-report' | translate) : '' }} diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html index 95ddd0035..9cfb28039 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html @@ -15,5 +15,5 @@ - {{ option.fileName }} + {{ option.fileName }} {{ option.multiFileReport ? ('reports-screen.multi-file-report' | translate) : '' }} diff --git a/apps/red-ui/src/app/state/app-state.service.ts b/apps/red-ui/src/app/state/app-state.service.ts index b4a5138e2..1657d0ecd 100644 --- a/apps/red-ui/src/app/state/app-state.service.ts +++ b/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; } 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 eee385a4f..a2a02e397 100644 --- a/apps/red-ui/src/app/utils/file-drop-utils.ts +++ b/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; } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index 7131c849a..551c74563 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/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", diff --git a/package.json b/package.json index 1f6fefdfb..1e40f74ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "2.204.0", + "version": "2.206.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index e5c164d2f..8c217b9fb 100644 Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ