chore: update solidify to 1.5.8

package-lock.json

@@ -14924,9 +14924,9 @@
       }
     },
     "solidify-frontend": {
-      "version": "1.5.2",
-      "resolved": "https://nexus.unige.ch/repository/npm-all/solidify-frontend/-/solidify-frontend-1.5.2.tgz",
-      "integrity": "sha512-ToDXPXFwOlCUw3EaNkD37eo/u7Hb4J4ciK9vkoQlRS4yQCMjLpUI2GeJSxwx7/D7Nn4Rt0WSagbeT+TUciMEMw==",
+      "version": "1.5.8",
+      "resolved": "https://nexus.unige.ch/repository/npm-all/solidify-frontend/-/solidify-frontend-1.5.8.tgz",
+      "integrity": "sha512-l/cjOdal9X9GTnWPgZRkuUqDFp+h21BkKr+d3d801HrFH5TloOjESESlLUEzYGw3gD9oWUP2eoI5DCnOp7GFTA==",
       "requires": {
         "tslib": "^2.0.0"
       }

package.json

@@ -96,7 +96,7 @@
     "normalize.css": "8.0.1",
     "patch-package": "6.2.2",
     "rxjs": "6.6.0",
-    "solidify-frontend": "1.5.2",
+    "solidify-frontend": "1.5.8",
     "streamsaver": "2.0.4",
     "sync-pom-version-to-package": "1.5.0",
     "ts-key-enum": "2.0.3",

src/app/features/admin/metadata-type/components/routables/admin-metadata-type-detail-edit/admin-metadata-type-detail-edit.routable.ts

@@ -26,11 +26,11 @@ import {
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
 import {StateEnum} from "@shared/enums/state.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {sharedMetadataTypeActionNameSpace} from "@shared/stores/metadata-type/shared-metadata-type.action";
 import {Observable} from "rxjs";
 import {
   AbstractDetailEditCommonRoutable,
+  ExtraButtonToolbar,
   isNullOrUndefined,
   OverrideProperty,
   ResourceNameSpace,

src/app/features/admin/organizational-unit/components/routables/admin-organizational-unit-detail-edit/admin-organizational-unit-detail-edit.routable.ts

@@ -30,12 +30,11 @@ import {
 } from "@ngxs/store";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
-import {StateEnum} from "@shared/enums/state.enum";
 import {
   AdminRoutesEnum,
   AppRoutesEnum,
 } from "@shared/enums/routes.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
+import {StateEnum} from "@shared/enums/state.enum";
 import {sharedOrganizationalUnitActionNameSpace} from "@shared/stores/organizational-unit/shared-organizational-unit.action";
 import {SharedPreservationPolicyState} from "@shared/stores/preservation-policy/shared-preservation-policy.state";
 import {SharedResearchDomainAction} from "@shared/stores/research-domain/shared-research-domain.action";
@@ -44,6 +43,7 @@ import {SharedSubmissionPolicyState} from "@shared/stores/submission-policy/shar
 import {Observable} from "rxjs";
 import {
   AbstractDetailEditCommonRoutable,
+  ExtraButtonToolbar,
   MARK_AS_TRANSLATABLE,
   MemoizedUtil,
   Override,

src/app/features/deposit/components/routables/deposit-collection-detail/deposit-collection-detail.routable.ts

@@ -16,9 +16,9 @@ import {
   Store,
 } from "@ngxs/store";
 import {SharedAbstractFileAipDetailRoutable} from "@shared/components/routables/shared-abstract-file-aip-detail/shared-abstract-file-aip-detail.routable";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {Observable} from "rxjs";
 import {
+  ExtraButtonToolbar,
   MemoizedUtil,
   OverrideProperty,
 } from "solidify-frontend";
@@ -50,5 +50,3 @@ export class DepositCollectionDetailRoutable extends SharedAbstractFileAipDetail
       depositCollectionStatusHistoryNamespace);
   }
 }
-
-

src/app/features/deposit/components/routables/deposit-create/deposit-create.routable.ts

@@ -12,7 +12,6 @@ import {
   DepositState,
   DepositStateModel,
 } from "@app/features/deposit/stores/deposit.state";
-import {StateEnum} from "@shared/enums/state.enum";
 import {AppPersonState} from "@app/stores/person/app-person.state";
 import {AppSystemPropertyState} from "@app/stores/system-property/app-system-property.state";
 import {DepositFormPresentational} from "@deposit/components/presentationals/deposit-form/deposit-form.presentational";
@@ -37,7 +36,7 @@ import {
 import {DataTestEnum} from "@shared/enums/data-test.enum";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
+import {StateEnum} from "@shared/enums/state.enum";
 import {SharedLanguageState} from "@shared/stores/language/shared-language.state";
 import {SharedOrgUnitPreservationPolicyAction} from "@shared/stores/organizational-unit/preservation-policy/shared-organizational-unit-preservation-policy.action";
 import {SharedOrganizationalUnitPreservationPolicyState} from "@shared/stores/organizational-unit/preservation-policy/shared-organizational-unit-preservation-policy.state";
@@ -51,6 +50,7 @@ import {
 } from "rxjs/operators";
 import {
   AbstractCreateRoutable,
+  ExtraButtonToolbar,
   isNotNullNorUndefined,
   MemoizedUtil,
 } from "solidify-frontend";

src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts

@@ -21,7 +21,6 @@ import {
   DepositState,
   DepositStateModel,
 } from "@app/features/deposit/stores/deposit.state";
-import {StateEnum} from "@shared/enums/state.enum";
 import {AppState} from "@app/stores/app.state";
 import {AppBannerAction} from "@app/stores/banner/app-banner.action";
 import {AppBannerState} from "@app/stores/banner/app-banner.state";
@@ -58,8 +57,8 @@ import {
   DepositRoutesEnum,
   RoutesEnum,
 } from "@shared/enums/routes.enum";
+import {StateEnum} from "@shared/enums/state.enum";
 import {TourEnum} from "@shared/enums/tour.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {SecurityService} from "@shared/services/security.service";
 import {
   BehaviorSubject,
@@ -80,6 +79,7 @@ import {
   BannerColorEnum,
   ConfirmDialog,
   ConfirmDialogData,
+  ExtraButtonToolbar,
   isFalse,
   isNotNullNorUndefined,
   isNullOrUndefined,

src/app/features/deposit/components/routables/deposit-file-detail/deposit-file-detail.routable.ts

@@ -30,13 +30,13 @@ import {
 import {SharedAbstractFileAipDetailRoutable} from "@shared/components/routables/shared-abstract-file-aip-detail/shared-abstract-file-aip-detail.routable";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {Observable} from "rxjs";
 import {
   filter,
   tap,
 } from "rxjs/operators";
 import {
+  ExtraButtonToolbar,
   isTrue,
   MemoizedUtil,
   OverrideProperty,
@@ -110,5 +110,3 @@ export class DepositFileDetailRoutable extends SharedAbstractFileAipDetailRoutab
     this._store.dispatch(new DepositDataFileAction.Validate(this._parentId, this.data.dataFile));
   }
 }
-
-

src/app/features/order/features/all-order/components/routables/all-order-detail-edit/order-all-order-detail-edit.routable.ts

@@ -44,15 +44,14 @@ import {OrderAllOrderStatusHistoryAction} from "@order/features/all-order/stores
 import {OrderAllOrderStatusHistoryState} from "@order/features/all-order/stores/status-history/order-all-order-status-history.state";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
-import {StateEnum} from "@shared/enums/state.enum";
 import {
   AppRoutesEnum,
   PreservationPlanningRoutesEnum,
   RoutesEnum,
   SharedAipRoutesEnum,
 } from "@shared/enums/routes.enum";
+import {StateEnum} from "@shared/enums/state.enum";
 import {OrderArchive} from "@shared/models/business/order-archive.model";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {SecurityService} from "@shared/services/security.service";
 import {sharedOrderActionNameSpace} from "@shared/stores/order/shared-order.action";
 import {MetadataUtil} from "@shared/utils/metadata.util";
@@ -65,6 +64,7 @@ import {
   AbstractDetailEditCommonRoutable,
   AssociationState,
   EnumUtil,
+  ExtraButtonToolbar,
   isNullOrUndefined,
   MemoizedUtil,
   OverrideProperty,

src/app/features/order/features/my-order/components/routables/my-order-detail-edit/order-my-order-detail-edit.routable.ts

@@ -40,10 +40,9 @@ import {OrderMyOrderStatusHistoryAction} from "@order/features/my-order/stores/s
 import {OrderMyOrderStatusHistoryState} from "@order/features/my-order/stores/status-history/order-my-order-status-history.state";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
-import {StateEnum} from "@shared/enums/state.enum";
 import {RoutesEnum} from "@shared/enums/routes.enum";
 import {SessionStorageEnum} from "@shared/enums/session-storage.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
+import {StateEnum} from "@shared/enums/state.enum";
 import {SecurityService} from "@shared/services/security.service";
 import {SharedArchiveAction} from "@shared/stores/archive/shared-archive.action";
 import {sharedOrderActionNameSpace} from "@shared/stores/order/shared-order.action";
@@ -59,6 +58,7 @@ import {
   AssociationState,
   DateUtil,
   EnumUtil,
+  ExtraButtonToolbar,
   isNonEmptyArray,
   isNotNullNorUndefined,
   isNullOrUndefined,
@@ -154,9 +154,9 @@ export class OrderMyOrderDetailEditRoutable extends AbstractDetailEditCommonRout
     }));
 
     this.subscribe(this.currentObs.pipe(
-      distinctUntilChanged(),
-      filter(current => !isNullOrUndefined(current) && (this.current.status === Enums.Order.StatusEnum.READY || this.current.status === Enums.Order.StatusEnum.INERROR)),
-      take(1),
+        distinctUntilChanged(),
+        filter(current => !isNullOrUndefined(current) && (this.current.status === Enums.Order.StatusEnum.READY || this.current.status === Enums.Order.StatusEnum.INERROR)),
+        take(1),
       ),
       (current) => {
         this._store.dispatch(new OrderMyOrderDipAction.GetAll(this._resId));
@@ -165,9 +165,9 @@ export class OrderMyOrderDetailEditRoutable extends AbstractDetailEditCommonRout
       });
 
     this.subscribe(this.currentObs.pipe(
-      distinctUntilChanged(),
-      filter(current => !isNullOrUndefined(current)),
-      take(1),
+        distinctUntilChanged(),
+        filter(current => !isNullOrUndefined(current)),
+        take(1),
       ),
       (current) => {
         this._store.dispatch(new OrderMyOrderAipAction.GetAll(this._resId));

src/app/features/preservation-planning/dip/components/routables/dip-detail-edit/preservation-planning-dip-detail-edit.routable.ts

@@ -12,7 +12,6 @@ import {
   ActivatedRoute,
   Router,
 } from "@angular/router";
-import {StateEnum} from "@shared/enums/state.enum";
 import {Enums} from "@enums";
 import {environment} from "@environments/environment";
 import {Dip} from "@models";
@@ -35,11 +34,12 @@ import {
   PreservationPlanningRoutesEnum,
   RoutesEnum,
 } from "@shared/enums/routes.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
+import {StateEnum} from "@shared/enums/state.enum";
 import {SecurityService} from "@shared/services/security.service";
 import {Observable} from "rxjs";
 import {
   AbstractDetailEditRoutable,
+  ExtraButtonToolbar,
   isNotNullNorUndefined,
   MemoizedUtil,
   OverrideProperty,

src/app/features/preservation-planning/job/components/routables/job-detail-edit/preservation-planning-job-detail-edit.routable.ts

@@ -31,16 +31,16 @@ import {
 } from "@preservation-planning/job/stores/preservation-planning-job.state";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
-import {StateEnum} from "@shared/enums/state.enum";
 import {PreservationPlanningRoutesEnum} from "@shared/enums/routes.enum";
+import {StateEnum} from "@shared/enums/state.enum";
 import {JobExecution} from "@shared/models/business/job-execution.model";
 import {JobRecurrence} from "@shared/models/business/job-recurrence.model";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {LocalStateModel} from "@shared/models/local-state.model";
 import {Observable} from "rxjs";
 import {tap} from "rxjs/operators";
 import {
   AbstractDetailEditCommonRoutable,
+  ExtraButtonToolbar,
   isNullOrUndefined,
   MemoizedUtil,
   ScrollService,

src/app/features/preservation-planning/job/components/routables/job-execution-detail/preservation-planning-job-execution-detail.routable.ts

@@ -33,7 +33,6 @@ import {
 } from "@shared/enums/routes.enum";
 import {JobExecutionReport} from "@shared/models/business/job-execution-report.model";
 import {JobExecution} from "@shared/models/business/job-execution.model";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {LocalStateModel} from "@shared/models/local-state.model";
 import {Observable} from "rxjs";
 import {
@@ -45,6 +44,7 @@ import {
   CompositionState,
   DataTableColumns,
   DataTableFieldTypeEnum,
+  ExtraButtonToolbar,
   isNullOrUndefined,
   MARK_AS_TRANSLATABLE,
   MemoizedUtil,

src/app/features/preservation-planning/sip/components/routables/sip-detail-edit/preservation-planning-sip-detail-edit.routable.ts

@@ -12,7 +12,6 @@ import {
   ActivatedRoute,
   Router,
 } from "@angular/router";
-import {StateEnum} from "@shared/enums/state.enum";
 import {Enums} from "@enums";
 import {environment} from "@environments/environment";
 import {Sip} from "@models";
@@ -34,13 +33,14 @@ import {
   PreservationPlanningRoutesEnum,
   RoutesEnum,
 } from "@shared/enums/routes.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
+import {StateEnum} from "@shared/enums/state.enum";
 import {LocalStateModel} from "@shared/models/local-state.model";
 import {SecurityService} from "@shared/services/security.service";
 import {Observable} from "rxjs";
 import {map} from "rxjs/operators";
 import {
   AbstractDetailEditRoutable,
+  ExtraButtonToolbar,
   isNotNullNorUndefined,
   MARK_AS_TRANSLATABLE,
   MemoizedUtil,

src/app/features/preservation-space/notification/components/routables/preservation-space-notification-detail-edit/preservation-space-notification-detail-edit.routable.ts

@@ -29,19 +29,19 @@ import {
 } from "@ngxs/store";
 import {IconNameEnum} from "@shared/enums/icon-name.enum";
 import {LabelTranslateEnum} from "@shared/enums/label-translate.enum";
-import {StateEnum} from "@shared/enums/state.enum";
 import {
   PreservationSpaceRoutesEnum,
   RoutesEnum,
 } from "@shared/enums/routes.enum";
+import {StateEnum} from "@shared/enums/state.enum";
 import {ViewModeEnum} from "@shared/enums/view-mode.enum";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {sharedNotificationActionNameSpace} from "@shared/stores/notification/shared-notification.action";
 import {SharedRoleState} from "@shared/stores/role/shared-role.state";
 import {isNotNullOrUndefined} from "codelyzer/util/isNotNullOrUndefined";
 import {Observable} from "rxjs";
 import {
   AbstractDetailEditCommonRoutable,
+  ExtraButtonToolbar,
   isNullOrUndefined,
   MARK_AS_TRANSLATABLE,
   MemoizedUtil,

src/app/label-translate-solidify.ts

@@ -113,4 +113,7 @@ export const labelTranslateSolidify: LabelTranslateInterface = {
   notificationUploadFail: LabelTranslateEnum.notificationUploadFail,
   notificationUploadErrorDuplicateFileFail: LabelTranslateEnum.notificationUploadErrorDuplicateFileFail,
   notificationUploadCancelled: LabelTranslateEnum.notificationUploadCancelled,
+  semicolon: LabelTranslateEnum.semicolon,
+  underscore: LabelTranslateEnum.underscore,
+  dash: LabelTranslateEnum.dash,
 };

src/app/shared/components/containers/shared-file-and-aip-information/shared-file-and-aip-information.container.ts

@@ -30,7 +30,6 @@ import {
 } from "@shared/filevisualizer/services/abstract-file-visualizer.service";
 import {DataTableComponentHelper} from "@shared/helpers/data-table-component.helper";
 import {DataFile} from "@shared/models/business/data-file.model";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {LocalStateModel} from "@shared/models/local-state.model";
 import {StatusHistoryNamespace} from "@shared/stores/status-history/status-history-namespace.model";
 import {
@@ -48,6 +47,7 @@ import {
   DataTableColumns,
   DataTableFieldTypeEnum,
   DateUtil,
+  ExtraButtonToolbar,
   isNullOrUndefined,
   MARK_AS_TRANSLATABLE,
   MemoizedUtil,

src/app/shared/components/presentationals/shared-archive-tile/shared-archive-tile.presentational.ts

@@ -19,9 +19,9 @@ import {
   Observable,
 } from "rxjs";
 import {
+  ButtonThemeEnum,
   DateUtil,
   isNullOrUndefined,
-  MatButtonThemeClassName,
   ObservableUtil,
 } from "solidify-frontend";
 
@@ -96,11 +96,11 @@ export class SharedArchiveTilePresentational extends SharedAbstractPresentationa
     return DateUtil.convertDateToDateString(publicationDate);
   }
 
-  get downloadButtonTheme(): MatButtonThemeClassName {
+  get downloadButtonTheme(): ButtonThemeEnum {
     if (this._mode === "home-tiles") {
-      return "flat-button";
+      return ButtonThemeEnum.flatButton;
     }
-    return "button";
+    return ButtonThemeEnum.button;
   }
 
   constructor(readonly archiveAccessRightService: ArchiveAccessRightService) {

src/app/shared/components/routables/shared-abstract-file-aip-detail/shared-abstract-file-aip-detail.routable.ts

@@ -27,7 +27,6 @@ import {
   urlSeparator,
 } from "@shared/enums/routes.enum";
 import {DataFile} from "@shared/models/business/data-file.model";
-import {ExtraButtonToolbar} from "@shared/models/extra-button-toolbar.model";
 import {LocalStateModel} from "@shared/models/local-state.model";
 import {StatusHistoryNamespace} from "@shared/stores/status-history/status-history-namespace.model";
 import {
@@ -45,6 +44,7 @@ import {
   AssociationNameSpace,
   AssociationRemoteNameSpace,
   CompositionNameSpace,
+  ExtraButtonToolbar,
   isNotNullNorUndefined,
   MemoizedUtil,
   MemoizedUtilStateType,
@@ -187,5 +187,3 @@ export abstract class SharedAbstractFileAipDetailRoutable<TResource extends Data
     this._store.dispatch(new this._stateAction.Delete(this._parentId, objectToSend.resId));
   }
 }
-
-

src/app/shared/enums/label-translate.enum.ts

@@ -162,6 +162,9 @@ export class LabelTranslateEnum {
   static lineBreak: string = MARK_AS_TRANSLATABLE("general.label.lineBreak");
   static doNotSeparate: string = MARK_AS_TRANSLATABLE("general.label.doNotSeparate");
   static separate: string = MARK_AS_TRANSLATABLE("general.label.separate");
+  static semicolon: string = MARK_AS_TRANSLATABLE("general.label.semicolon");
+  static underscore: string = MARK_AS_TRANSLATABLE("general.label.underscore");
+  static dash: string = MARK_AS_TRANSLATABLE("general.label.dash");
   static user: string = MARK_AS_TRANSLATABLE("general.label.user");
   static users: string = MARK_AS_TRANSLATABLE("general.label.users");
   static role: string = MARK_AS_TRANSLATABLE("general.label.role");