feat: on list aip add possibility to sort and filter on org unit and simplify...

feat: on list aip add possibility to sort and filter on org unit and simplify the way to retrieve org unit name

src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts

@@ -13,13 +13,7 @@ import {
   Router,
 } from "@angular/router";
 import {AipExtended} from "@app/features/preservation/aip/models/aip-extended.model";
-import {
-  PreservationAipState,
-  PreservationAipStateModel,
-} from "@app/features/preservation/aip/stores/aip.state";
-import {PreservationAipOrgUnitAction} from "@app/features/preservation/aip/stores/organizational-unit/aip-organizational-unit.action";
-import {PreservationAipOrganizationalUnitState} from "@app/features/preservation/aip/stores/organizational-unit/aip-organizational-unit.state";
-import {AccessOrganizationalUnit} from "@app/generated-api";
+import {PreservationAipStateModel} from "@app/features/preservation/aip/stores/aip.state";
 import {SharedAbstractListRoutable} from "@app/shared/components/routables/shared-abstract-list/shared-abstract-list.routable";
 import {FieldTypeEnum} from "@app/shared/enums/field-type.enum";
 import {LocalStateEnum} from "@app/shared/enums/local-state.enum";
@@ -30,7 +24,6 @@ import {TranslateService} from "@ngx-translate/core";
 import {Navigate} from "@ngxs/router-plugin";
 import {
   Actions,
-  ofActionCompleted,
   Store,
 } from "@ngxs/store";
 import {
@@ -38,31 +31,26 @@ import {
   preservationAipActionNameSpace,
 } from "@preservation/aip/stores/aip.action";
 import {PackageStatusEnumHelper} from "@shared/enums/business/package-status.enum";
+import {DataTableComponentEnum} from "@shared/enums/data-table-component.enum";
 import {
   PreservationPlanningRoutesEnum,
   RoutesEnum,
   urlSeparator,
 } from "@shared/enums/routes.enum";
-import {
-  BehaviorSubject,
-  Observable,
-} from "rxjs";
+import {Observable} from "rxjs";
 import {
   distinctUntilChanged,
   filter,
   tap,
 } from "rxjs/operators";
 import {
-  ArrayUtil,
   isNullOrUndefined,
-  isTrue,
   MappingObjectUtil,
   OrderEnum,
   Override,
   OverrideProperty,
   QueryParameters,
   ResourceNameSpace,
-  ResourceState,
   TRANSLATE,
 } from "solidify-frontend";
 
@@ -81,12 +69,9 @@ export class AipListRoutable extends SharedAbstractListRoutable<AipExtended, Pre
   appAuthorizedOrganizationalUnitNameSpace: ResourceNameSpace = appAuthorizedOrganizationalUnitNameSpace;
   appAuthorizedOrganizationalUnitState: typeof AppAuthorizedOrganizationalUnitState = AppAuthorizedOrganizationalUnitState;
 
-  listAdaptedBS: BehaviorSubject<AipExtended[]> = new BehaviorSubject([]);
-  listObs: Observable<AipExtended[]> = this.listAdaptedBS.asObservable();
-  listOriginObs: Observable<AipExtended[]> = ResourceState.list(this.store, PreservationAipState);
-
   @OverrideProperty()
   skipInitialQuery: boolean = true;
+
   columnsSkippedToClear: string[] = [
     "archivalUnit",
   ];
@@ -122,39 +107,6 @@ export class AipListRoutable extends SharedAbstractListRoutable<AipExtended, Pre
     this.subscribe(this.observeRoutingUpdate());
 
     this.storagion_number = +this._route.snapshot.parent.parent.paramMap.get(PreservationPlanningRoutesEnum.storagionNumberWithoutPrefixParam);
-    this.subscribe(
-      this._actions$.pipe(
-        ofActionCompleted(PreservationAipOrgUnitAction.GetByListIdSuccess),
-        distinctUntilChanged(),
-        filter(r => isTrue(r.result.successful)),
-        tap((result) => {
-          const list = ResourceState.listSnapshot(this.store, PreservationAipState);
-          const listOrgUnit = ResourceState.listSnapshot(this.store, PreservationAipOrganizationalUnitState);
-
-          const newList: AipExtended[] = [];
-          list.forEach((archive: AipExtended) => {
-            newList.push({
-              ...archive,
-              organizationalUnit: this.getOrganizationalUnitNameFromId(archive.info.organizationalUnitId, listOrgUnit),
-            });
-          });
-          this.listAdaptedBS.next(newList);
-        }),
-      ),
-    );
-
-    this.subscribe(
-      this.listOriginObs.pipe(
-        distinctUntilChanged(),
-        filter(list => !isNullOrUndefined(list)),
-        tap(list => {
-          let listOfOrgId = list.map(aip => aip.info.organizationalUnitId);
-          listOfOrgId = ArrayUtil.distinct(listOfOrgId);
-          this.store.dispatch(new PreservationAipOrgUnitAction.GetByListId(listOfOrgId, true));
-          this.listAdaptedBS.next(list);
-        }),
-      ),
-    );
   }
 
   private observeRoutingUpdate(): Observable<any> {
@@ -208,11 +160,13 @@ export class AipListRoutable extends SharedAbstractListRoutable<AipExtended, Pre
         filterEnum: PackageStatusEnumHelper.getListKeyValue(),
       },
       {
-        field: "organizationalUnit" as any,
+        field: "info.organizationalUnitId" as any,
         header: TRANSLATE("aip.table.header.organizationalUnit"),
         type: FieldTypeEnum.searchableSingleSelect,
         order: OrderEnum.none,
-        isFilterable: false,
+        component: DataTableComponentEnum.organizationalUnitName,
+        isFilterable: true,
+        isSortable: true,
         resourceNameSpace: this.appAuthorizedOrganizationalUnitNameSpace,
         resourceState: this.appAuthorizedOrganizationalUnitState as any,
       },
@@ -235,16 +189,6 @@ export class AipListRoutable extends SharedAbstractListRoutable<AipExtended, Pre
     ];
   }
 
-  getOrganizationalUnitNameFromId(resId: string, listOrgUnits: AccessOrganizationalUnit[]): string {
-    if (!isNullOrUndefined(listOrgUnits)) {
-      const orgUnits = listOrgUnits.find(o => o.resId === resId);
-      if (orgUnits) {
-        return orgUnits.name;
-      }
-    }
-    return this.translate.instant("access.organizationalUnitNotFound");
-  }
-
   getAipListWithParameter(isArchivalUnit: boolean | undefined): void {
     const queryParameter = new QueryParameters(environment.defaultPageSize);
     if (!isNullOrUndefined(isArchivalUnit)) {