Merge branch 'master' into VM/NotificationsPreferences

apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html

@@ -20,7 +20,7 @@
                 />
             </div>
 
-            <div class="iqser-input-group required w-300">
+            <div class="iqser-input-group w-300">
                 <label translate="add-edit-file-attribute.form.column-header"></label>
                 <input
                     [placeholder]="'add-edit-file-attribute.form.column-header-placeholder' | translate"

apps/red-ui/src/app/modules/admin/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts

@@ -31,7 +31,7 @@ export class AddEditFileAttributeDialogComponent extends BaseDialogComponent {
 
         this.form = this._formBuilder.group({
             label: [this.fileAttribute?.label, Validators.required],
-            csvColumnHeader: [this.fileAttribute?.csvColumnHeader, Validators.required],
+            csvColumnHeader: [this.fileAttribute?.csvColumnHeader],
             type: [this.fileAttribute?.type || FileAttributeConfigTypes.TEXT, Validators.required],
             readonly: [this.fileAttribute ? !this.fileAttribute.editable : false],
             primaryAttribute: [this.fileAttribute?.primaryAttribute],

apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html

@@ -43,6 +43,10 @@
         <mat-icon svgIcon="red:dictionary"></mat-icon>
         <span>{{ 'dossier-overview.dossier-details.dictionary' | translate }} </span>
     </div>
+    <div (click)="openEditDossierAttributesDialog(dossier, 'deletedDocuments')" class="link-property">
+        <mat-icon svgIcon="iqser:trash"></mat-icon>
+        <span>{{ 'dossier-overview.dossier-details.stats.deleted' | translate: { count: deletedFilesCount$ | async } }}</span>
+    </div>
 
     <ng-container *ngIf="dossierAttributes?.length">
         <div (click)="attributesExpanded = true" *ngIf="!attributesExpanded" class="all-caps-label show-attributes">
@@ -50,7 +54,11 @@
         </div>
 
         <ng-container *ngIf="attributesExpanded">
-            <div (click)="openEditDossierAttributesDialog(dossier)" *ngFor="let attr of dossierAttributes" class="link-property">
+            <div
+                (click)="openEditDossierAttributesDialog(dossier, 'dossierAttributes')"
+                *ngFor="let attr of dossierAttributes"
+                class="link-property"
+            >
                 <mat-icon svgIcon="red:attribute"></mat-icon>
                 <span *ngIf="!attr.value"> {{ attr.label + ': -' }}</span>
                 <span *ngIf="attr.value && attr.type === 'DATE'"> {{ attr.label + ': ' + (attr.value | date: 'd MMM. yyyy') }}</span>

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<number>;
     @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,
         });
     }
 }

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",

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",

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
+

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;

package.json

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