RELEASE 2025/28/10 (#2080)

## Description

RELEASE 2025/28/10

## Summary by Sourcery

Implement advanced filtering for proposals and datasets by introducing
NgRx-based add/remove filter actions, dynamic facet count selectors, and
configurable filter behaviors, refactor the AppConfigService to support
override merging, update filter components to simplify multiselect and
shared filters, and extend tests to cover the new filter logic.

New Features:
- Add NgRx actions and reducer handlers for adding, removing, and
clearing proposal filters with multiSelect, checkbox, and dateRange
support
- Introduce selectors for full facet parameters and per-key filter
state, and integrate dynamic facet count retrieval by key
- Update AppConfigService to support allowConfigOverrides flag and
custom merging of base and override configurations
- Enable default filter settings from app config and immediate filter
application for checkbox and multiselect in dataset filters

Enhancements:
- Refactor mergeConfig in AppConfigService to use mergeWith for array
replacement and remove deprecated loadAndMerge
- Simplify MultiSelectFilterComponent by managing id-label mapping
internally and removing external getFacetId util
- Improve SharedFilterComponent filtering logic to normalize labels and
faceted checkbox helper methods

Build:
- Bump @scicatproject/scicat-sdk-ts-angular, luxon, and mathjs
dependencies

Tests:
- Expand unit tests for AppConfigService to verify override behavior,
and add specs for proposal filter actions, reducers, selectors, and
side-bar filter component
- Update dataset and proposal effects and reducer tests to reflect new
filter actions and selectors

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Jay <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Omkar Zade <[email protected]>

Author: 6 people

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @SciCatProject/reviewers

package-lock.json

@@ -41,15 +41,15 @@
     "@ngrx/store": "^19.1.0",
     "@ngx-translate/core": "^17.0.0",
     "@ngxmc/datetime-picker": "^19.3.1",
-    "@scicatproject/scicat-sdk-ts-angular": "^4.24.0",
+    "@scicatproject/scicat-sdk-ts-angular": "^4.25.0",
     "autolinker": "^4.0.0",
     "deep-equal": "^2.0.5",
     "exceljs": "^4.4.0",
     "file-saver": "^2.0.5",
     "filesize": "^11.0.1",
     "lodash-es": "^4.17.21",
-    "luxon": "^3.3.0",
-    "mathjs": "^14.0.0",
+    "luxon": "^3.7.2",
+    "mathjs": "^15.0.0",
     "ngx-cookie-service": "^19.1.2",
     "ngx-json-viewer": "^3",
     "ngx-linky": "^4.0.0",

package.json

@@ -285,27 +285,45 @@ describe("AppConfigService", () => {
         accessTokenPrefix: "",
         lbBaseURL: "http://127.0.0.1:3000",
         gettingStarted: null,
+        defaultMainPage: {
+          nonAuthenticatedUser: "DATASETS",
+          authenticatedUser: "DATASETS",
+        },
         mainMenu: { nonAuthenticatedUser: { datasets: true } },
+        dateFormat: "yyyy-MM-dd HH:mm",
+        oAuth2Endpoints: [
+          {
+            authURL: "abcd",
+          },
+        ],
       },
-      "/assets/config.0.json": { accessTokenPrefix: "Bearer " },
       "/assets/config.override.json": {
+        accessTokenPrefix: "Bearer ",
         gettingStarted: "aGettingStarted",
         addDatasetEnabled: true,
         mainMenu: { nonAuthenticatedUser: { files: true } },
+        oAuth2Endpoints: [],
       },
-      "/assets/config.override.0.json": { siteTitle: "Test title" },
     };
 
     const mergedConfig = {
       accessTokenPrefix: "Bearer ",
       lbBaseURL: "http://127.0.0.1:3000",
       gettingStarted: "aGettingStarted",
       addDatasetEnabled: true,
-      siteTitle: "Test title",
+      defaultMainPage: {
+        nonAuthenticatedUser: "DATASETS",
+        authenticatedUser: "DATASETS",
+      },
       mainMenu: { nonAuthenticatedUser: { datasets: true, files: true } },
+      oAuth2Endpoints: [],
+      dateFormat: "yyyy-MM-dd HH:mm",
     };
 
-    const mockHttpGet = (backendError = false) => {
+    const mockHttpGet = (
+      configOverrideEnabled: boolean,
+      backendError = false,
+    ) => {
       spyOn(service["http"], "get").and.callFake(
         (url: string): Observable<any> => {
           if (url === "/api/v3/admin/config") {
@@ -316,6 +334,11 @@ describe("AppConfigService", () => {
             }
             return of(mergedConfig);
           }
+          if (url === "/assets/config.json")
+            return of({
+              ...(mockConfigResponses[url] || {}),
+              allowConfigOverrides: configOverrideEnabled,
+            });
           return of(mockConfigResponses[url] || {});
         },
       );
@@ -330,28 +353,42 @@ describe("AppConfigService", () => {
       expect(config).toEqual(appConfig);
     });
 
-    it("should merge multiple config JSONs", async () => {
-      mockHttpGet();
-      const config = await service["mergeConfig"]();
-      expect(config).toEqual(mergedConfig);
+    [true, false].forEach((configOverrideEnabled) => {
+      it(`should merge ${configOverrideEnabled} multiple config JSONs`, async () => {
+        mockHttpGet(configOverrideEnabled);
+        const config = await service["mergeConfig"]();
+        expect(config).toEqual({
+          ...(configOverrideEnabled
+            ? mergedConfig
+            : mockConfigResponses["/assets/config.json"]),
+          allowConfigOverrides: configOverrideEnabled,
+        });
+      });
     });
 
-    it("should return the merged appConfig", async () => {
-      mockHttpGet(true);
-      await service.loadAppConfig();
+    [true, false].forEach((configOverrideEnabled) => {
+      it(`should return the merged ${configOverrideEnabled} appConfig`, async () => {
+        mockHttpGet(configOverrideEnabled, true);
+        await service.loadAppConfig();
 
-      expect(service["appConfig"]).toEqual(
-        jasmine.objectContaining(mergedConfig),
-      );
-      expect(service["http"].get).toHaveBeenCalledWith("/api/v3/admin/config");
-      expect(service["http"].get).toHaveBeenCalledWith("/assets/config.json");
-      expect(service["http"].get).toHaveBeenCalledWith("/assets/config.0.json");
-      expect(service["http"].get).toHaveBeenCalledWith(
-        "/assets/config.override.json",
-      );
-      expect(service["http"].get).toHaveBeenCalledWith(
-        "/assets/config.override.0.json",
-      );
+        expect(service["appConfig"]).toEqual({
+          ...(configOverrideEnabled
+            ? mergedConfig
+            : mockConfigResponses["/assets/config.json"]),
+          allowConfigOverrides: configOverrideEnabled,
+        });
+        expect(service["http"].get).toHaveBeenCalledTimes(
+          configOverrideEnabled ? 3 : 2,
+        );
+        expect(service["http"].get).toHaveBeenCalledWith(
+          "/api/v3/admin/config",
+        );
+        expect(service["http"].get).toHaveBeenCalledWith("/assets/config.json");
+        if (configOverrideEnabled)
+          expect(service["http"].get).toHaveBeenCalledWith(
+            "/assets/config.override.json",
+          );
+      });
     });
   });
 });

src/app/app-config.service.spec.ts

@@ -1,7 +1,7 @@
 import { HttpClient } from "@angular/common/http";
 import { Injectable } from "@angular/core";
-import { merge } from "lodash-es";
-import { firstValueFrom, forkJoin, of } from "rxjs";
+import { mergeWith } from "lodash-es";
+import { firstValueFrom, of } from "rxjs";
 import { catchError, timeout } from "rxjs/operators";
 import {
   DatasetDetailComponentConfig,
@@ -65,6 +65,7 @@ export class MainMenuConfiguration {
 }
 
 export interface AppConfigInterface {
+  allowConfigOverrides?: boolean;
   skipSciCatLoginPageEnabled?: boolean;
   accessTokenPrefix: string;
   addDatasetEnabled: boolean;
@@ -160,33 +161,41 @@ function isMainPageConfiguration(obj: any): obj is MainPageConfiguration {
 })
 export class AppConfigService {
   private appConfig: object = {};
-  private configsSize = 4;
 
   constructor(private http: HttpClient) {}
 
-  private async loadAndMerge(files: string[]): Promise<object> {
-    const requests = files.map((f) =>
-      this.http.get(`/assets/${f}`).pipe(catchError(() => of({}))),
-    );
-    const configs = await firstValueFrom(forkJoin(requests));
-    return configs.reduce((acc, cfg) => merge(acc, cfg), {});
-  }
-
   private async mergeConfig(): Promise<object> {
-    const normalConfigFiles = Array.from(
-      { length: this.configsSize },
-      (_, i) => `config.${i}.json`,
+    const config = await firstValueFrom(
+      this.http.get<Partial<AppConfigInterface>>("/assets/config.json").pipe(
+        catchError(() => {
+          console.error("No config provided.");
+          return of({} as Partial<AppConfigInterface>);
+        }),
+      ),
     );
-    const overrideConfigFiles = Array.from(
-      { length: this.configsSize },
-      (_, i) => `config.override.${i}.json`,
+    let configOverrideRequest: Partial<AppConfigInterface> = {};
+    if (config?.allowConfigOverrides) {
+      configOverrideRequest = await firstValueFrom(
+        this.http
+          .get<Partial<AppConfigInterface>>("/assets/config.override.json")
+          .pipe(
+            catchError(() => {
+              console.error(
+                "allowConfigOverrides set to true but no config.override provided.",
+              );
+              return of({} as Partial<AppConfigInterface>);
+            }),
+          ),
+      );
+    }
+    // Custom merge to replace arrays instead of merging them
+    return mergeWith(
+      {},
+      config ?? {},
+      configOverrideRequest ?? {},
+      (objVal, srcVal) =>
+        Array.isArray(objVal) && Array.isArray(srcVal) ? srcVal : undefined,
     );
-    return await this.loadAndMerge([
-      "config.json",
-      ...normalConfigFiles,
-      "config.override.json",
-      ...overrideConfigFiles,
-    ]);
   }
 
   async loadAppConfig(): Promise<void> {
@@ -198,12 +207,8 @@ export class AppConfigService {
       this.appConfig = Object.assign({}, this.appConfig, config);
     } catch (err) {
       console.log("No config available in backend, trying with local config.");
-      try {
-        const config = await this.mergeConfig();
-        this.appConfig = Object.assign({}, this.appConfig, config);
-      } catch (err) {
-        console.error("No config provided.");
-      }
+      const config = await this.mergeConfig();
+      this.appConfig = Object.assign({}, this.appConfig, config);
     }
 
     const config: AppConfigInterface = this.appConfig as AppConfigInterface;

src/app/app-config.service.ts

@@ -5,7 +5,10 @@ import {
   waitForAsync,
 } from "@angular/core/testing";
 
-import { DatasetLifecycleComponent } from "./dataset-lifecycle.component";
+import {
+  DatasetLifecycleComponent,
+  HistoryWithProperties,
+} from "./dataset-lifecycle.component";
 
 import { NO_ERRORS_SCHEMA } from "@angular/core";
 import { PipesModule } from "shared/pipes/pipes.module";
@@ -121,31 +124,28 @@ describe("DatasetLifecycleComponent", () => {
       expect(parsedHistoryItems.length).toEqual(0);
     });
 
-    // it("should parse dataset.history into a HistoryItem array if dataset is defined", () => {
-    //   const keywords = ["test", "parse"];
-    //   const dataset = createMock<
-    //     OutputDatasetObsoleteDto & { history: HistoryClass[] }
-    //   >({ ...mockDataset });
-    //   // TODO: Check the types here and see if we need the keywords at all or not as it doesn't exist on the HistoryClass.
-    //   dataset.history = [
-    //     {
-    //       id: "testId",
-    //       keywords,
-    //       updatedBy: "Test User",
-    //       updatedAt: new Date().toISOString(),
-    //     },
-    //   ] as unknown as HistoryClass[];
-
-    //   component.dataset = dataset;
-    //   const parsedHistoryItems = component["parseHistoryItems"]();
-
-    //   expect(parsedHistoryItems.length).toEqual(1);
-    //   parsedHistoryItems.forEach((item) => {
-    //     expect(Object.keys(item).includes("id")).toEqual(false);
-    //     expect(item.property).toEqual("keywords");
-    //     expect(item.value).toEqual(keywords);
-    //   });
-    // });
+    it("should parse dataset.history into a HistoryItem array if dataset is defined", () => {
+      const keywords = ["test", "parse"];
+      const dataset = createMock<OutputDatasetObsoleteDto>({ ...mockDataset });
+      dataset.history = [
+        {
+          id: "testId",
+          keywords,
+          updatedBy: "Test User",
+          updatedAt: new Date().toISOString(),
+        },
+      ] as HistoryWithProperties[];
+
+      component.dataset = dataset;
+      const parsedHistoryItems = component["parseHistoryItems"]();
+
+      expect(parsedHistoryItems.length).toEqual(1);
+      parsedHistoryItems.forEach((item) => {
+        expect("id" in item).toBe(false);
+        expect(item.property).toEqual("keywords");
+        expect(item.value).toEqual(keywords);
+      });
+    });
   });
 
   describe("#downloadCsv()", () => {

src/app/datasets/dataset-lifecycle/dataset-lifecycle.component.spec.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, OnChanges, SimpleChange } from "@angular/core";
 import {
-  DatasetClass,
+  HistoryClass,
   OutputDatasetObsoleteDto,
 } from "@scicatproject/scicat-sdk-ts-angular";
 import {
@@ -25,6 +25,9 @@ export interface HistoryItem {
   [key: string]: any;
 }
 
+// unfortunately the index signature in HistoryClass is not exported by the openapi sdk generator
+export type HistoryWithProperties = HistoryClass & { [key: string]: unknown };
+
 @Component({
   selector: "dataset-lifecycle",
   templateUrl: "./dataset-lifecycle.component.html",
@@ -63,22 +66,20 @@ export class DatasetLifecycleComponent implements OnInit, OnChanges {
   ) {}
 
   private parseHistoryItems(): HistoryItem[] {
-    // TODO: This should be checked because something is wrong with the types
-    // TODO: The following code is commented out and should be refactored because the history is no longer part of the dataset object anymore due to this PR from Scicat BE: "feat: implements history for many entities #1939"
-    // const dataset = this.dataset as DatasetClass;
-    // if (dataset && dataset.history) {
-    //   const history = dataset.history.map(
-    //     ({ updatedAt, updatedBy, id, ...properties }) =>
-    //       Object.keys(properties).map((property) => ({
-    //         property,
-    //         value: properties[property],
-    //         updatedBy: updatedBy.replace("ldap.", ""),
-    //         updatedAt: this.datePipe.transform(updatedAt, "yyyy-MM-dd HH:mm"),
-    //       })),
-    //   );
-    //   // flatten and reverse array before return
-    //   return [].concat(...history).reverse();
-    // }
+    const dataset = this.dataset;
+    if (dataset && dataset.history) {
+      const history = (dataset.history as HistoryWithProperties[]).map(
+        ({ updatedAt, updatedBy, id, _id, ...properties }) =>
+          Object.keys(properties).map((property) => ({
+            property,
+            value: properties[property],
+            updatedBy: updatedBy.replace("ldap.", ""),
+            updatedAt: this.datePipe.transform(updatedAt),
+          })),
+      );
+      // flatten array before return
+      return [].concat(...history);
+    }
     return [];
   }
 

src/app/datasets/dataset-lifecycle/dataset-lifecycle.component.ts

@@ -28,6 +28,7 @@
         (textChange)="setFilter(filter.key, $event)"
         (dateRangeChange)="setDateFilter(filter.key, $event)"
         (selectionChange)="selectionChange($event)"
+        (checkBoxChange)="setFilter(filter.key, $event)"
         (numericRangeChange)="numericRangeChange(filter.key, $event)"
       ></shared-filter>
     </ng-container>
@@ -229,7 +230,10 @@
                   (input)="updateConditionUnit(i, $event)"
                   [matAutocomplete]="rhsUnits"
                 />
-                <mat-autocomplete #rhsUnits="matAutocomplete" (optionSelected)="updateConditionUnit(i, $event)">
+                <mat-autocomplete
+                  #rhsUnits="matAutocomplete"
+                  (optionSelected)="updateConditionUnit(i, $event)"
+                >
                   <mat-option
                     *ngFor="let unit of getUnits(conditionConfig.condition.lhs)"
                     [value]="unit"