diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html index 3750e6f13..22dcf5751 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html @@ -20,7 +20,7 @@ /> -
+
{{ 'dossier-overview.dossier-details.dictionary' | translate }}
+
+ + {{ 'dossier-overview.dossier-details.stats.deleted' | translate: { count: deletedFilesCount$ | async } }} +
@@ -50,7 +54,11 @@
-
+
{{ attr.label + ': -' }} {{ attr.label + ': ' + (attr.value | date: 'd MMM. yyyy') }} diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts index ffc75ae44..d52811feb 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.ts @@ -4,6 +4,9 @@ import { Dossier, DossierAttributeWithValue, DossierTemplate } from '@red/domain import { DossiersDialogService } from '../../../../services/dossiers-dialog.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; +import { FilesService } from '../../../../../../services/entity-services/files.service'; +import { Observable } from 'rxjs'; +import { distinctUntilChanged, map, switchMap } from 'rxjs/operators'; @Component({ selector: 'redaction-dossier-details-stats', @@ -12,6 +15,7 @@ import { DossierTemplatesService } from '@services/entity-services/dossier-templ }) export class DossierDetailsStatsComponent { attributesExpanded = false; + deletedFilesCount$: Observable; @Input() dossierAttributes: DossierAttributeWithValue[]; @Output() readonly openDossierDictionaryDialog = new EventEmitter(); @@ -19,17 +23,24 @@ export class DossierDetailsStatsComponent { private readonly _appStateService: AppStateService, private readonly _dossierTemplatesService: DossierTemplatesService, private readonly _dialogService: DossiersDialogService, + private readonly _filesService: FilesService, readonly dossiersService: DossiersService, - ) {} + ) { + this.deletedFilesCount$ = dossiersService.activeDossier$.pipe( + switchMap(dossier => _filesService.getDeletedFilesFor(dossier.id)), + map(files => files.length), + distinctUntilChanged(), + ); + } dossierTemplate(dossier: Dossier): DossierTemplate { return this._dossierTemplatesService.find(dossier.dossierTemplateId); } - openEditDossierAttributesDialog(dossier: Dossier) { + openEditDossierAttributesDialog(dossier: Dossier, section: string) { this._dialogService.openDialog('editDossier', null, { dossier, - section: 'dossierAttributes', + section: section, }); } } diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 7a0edcc5f..2b78704fb 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -618,7 +618,8 @@ "created-on": "Erstellt am {date}", "documents": "{count} Dokumente", "due-date": "Geburtstermin", - "people": "{count} Benutzer" + "people": "{count} Benutzer", + "deleted": "{count} " } }, "download-file": "Herunterladen", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 2e0d25652..8036f1649 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -684,7 +684,8 @@ "created-on": "Created on {date}", "documents": "{count} {count, plural, one{document} other{documents}}", "due-date": "Due {date}", - "people": "{count} {count, plural, one{user} other{users}}" + "people": "{count} {count, plural, one{user} other{users}}", + "deleted": "{count} deleted files" } }, "download-file": "Download", diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 0f791311e..d145c55e2 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -52,6 +52,16 @@ then else echo "Not on a relevant branch $bamboo_planRepository_branchName ... skipping." - echo "APP_VERSION=BRANCH-$bamboo_planRepository_branchName-$bamboo_buildNumber" > version.properties + + if [[ ! -z "$bamboo_version_tag" ]] + then + echo "$BAMBOO_DOWNLOAD_PASS" | docker login -u "$BAMBOO_DOWNLOAD_USER" --password-stdin nexus.iqser.com:5001 + echo "Pushing custom tag: $bamboo_version_tag" + docker tag "$imageName:latest" "$imageName:$bamboo_version_tag" + docker push "$imageName:$bamboo_version_tag" + fi + + fi + diff --git a/docker/common/nginx/nginx.conf b/docker/common/nginx/nginx.conf index e8e4015e6..178d9e7f0 100644 --- a/docker/common/nginx/nginx.conf +++ b/docker/common/nginx/nginx.conf @@ -17,7 +17,7 @@ server { location /ui/ { proxy_hide_header WWW-Authenticate; - try_files $uri$args $uri$args/ $uri $uri/ /ui/index.html =404; + try_files $uri $uri/ /ui/index.html =404; } client_max_body_size 0; diff --git a/package.json b/package.json index 66d09bf81..168f47ea0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "2.332.0", + "version": "2.334.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index 54069efe4..555f94a8f 100644 Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ