Custom filters done.

CI/e2e/frontend.config.e2e.json

@@ -129,7 +129,7 @@
         "name": "pid",
         "order": 1,
         "type": "standard",
-        "enabled": true
+        "enabled": false
       },
       {
         "name": "datasetName",

cypress/e2e/datasets/datasets-datafiles.cy.js

@@ -44,7 +44,7 @@ describe("Dataset datafiles", () => {
 
       cy.isLoading();
 
-      cy.contains("mat-row", "Cypress Dataset").first().click();
+      cy.get("mat-row").contains("Cypress Dataset").first().click();
 
       cy.wait("@fetch");
 
@@ -101,7 +101,7 @@ describe("Dataset datafiles", () => {
 
       cy.isLoading();
 
-      cy.contains("mat-row", "Cypress Dataset").first().click();
+      cy.get("mat-row").contains("Cypress Dataset").first().click();
 
       cy.wait("@fetch");
 

cypress/e2e/datasets/datasets-publish.cy.js

@@ -23,7 +23,7 @@ describe("Datasets", () => {
 
       cy.isLoading();
 
-      cy.get("[data-cy=checkboxInput]").first().click();
+      cy.get(".dataset-table input[type='checkbox']").first().click();
 
       cy.get("#addToBatchButton").click();
 

cypress/e2e/datasets/datasets-share.cy.js

@@ -23,7 +23,7 @@ describe("Datasets", () => {
 
       cy.isLoading();
 
-      cy.get("[data-cy=checkboxInput]").first().click();
+      cy.get(".dataset-table input[type='checkbox']").first().click();
 
       cy.get("#addToBatchButton").click();
 

package.json

@@ -37,7 +37,7 @@
     "@ngrx/store": "^19.1.0",
     "@ngx-translate/core": "^16.0.4",
     "@ngxmc/datetime-picker": "^19.3.1",
-    "@scicatproject/scicat-sdk-ts-angular": "^4.17.0",
+    "@scicatproject/scicat-sdk-ts-angular": "^4.17.1",
     "autolinker": "^4.0.0",
     "deep-equal": "^2.0.5",
     "exceljs": "^4.3.0",
@@ -76,7 +76,7 @@
     "@types/jasmine": "^5.1.0",
     "@types/lodash-es": "^4.17.12",
     "@types/luxon": "^3.3.0",
-    "@types/node": "^22.0.0",
+    "@types/node": "^24.0.3",
     "@types/shortid": "2.2.0",
     "@types/source-map-support": "^0.5.3",
     "@typescript-eslint/eslint-plugin": "^8.32.0",

src/app/_layout/app-header/app-header.component.ts

@@ -47,9 +47,9 @@ export class AppHeaderComponent implements OnInit {
 
   login(): void {
     if (this.config.skipSciCatLoginPageEnabled) {
-      const returnURL = encodeURIComponent(this.router.url);
+      const returnUrl = encodeURIComponent(this.router.url);
       for (const endpoint of this.oAuth2Endpoints) {
-        this.document.location.href = `${this.config.lbBaseURL}/${endpoint.authURL}?returnURL=${returnURL}`;
+        this.document.location.href = `${this.config.lbBaseURL}/${endpoint.authURL}?returnUrl=${returnUrl}`;
       }
     } else {
       this.router.navigateByUrl("/login");

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

@@ -1,10 +1,14 @@
 import { HttpClient } from "@angular/common/http";
 import { TestBed } from "@angular/core/testing";
-import { AppConfig, AppConfigService, HelpMessages } from "app-config.service";
+import {
+  AppConfigInterface,
+  AppConfigService,
+  HelpMessages,
+} from "app-config.service";
 import { of } from "rxjs";
 import { MockHttp } from "shared/MockStubs";
 
-const appConfig: AppConfig = {
+const appConfig: AppConfigInterface = {
   skipSciCatLoginPageEnabled: false,
   accessTokenPrefix: "",
   addDatasetEnabled: true,
@@ -128,7 +132,7 @@ const appConfig: AppConfig = {
         name: "select",
         order: 0,
         type: "standard",
-        enabled: true,
+        enabled: false,
       },
       {
         name: "pid",

src/app/app-config.service.ts

@@ -35,7 +35,7 @@ export class HelpMessages {
   }
 }
 
-export interface AppConfig {
+export interface AppConfigInterface {
   skipSciCatLoginPageEnabled?: boolean;
   accessTokenPrefix: string;
   addDatasetEnabled: boolean;
@@ -108,7 +108,9 @@ export interface AppConfig {
   dateFormat?: string;
 }
 
-@Injectable()
+@Injectable({
+  providedIn: "root",
+})
 export class AppConfigService {
   private appConfig: object = {};
 
@@ -132,11 +134,11 @@ export class AppConfigService {
     }
   }
 
-  getConfig(): AppConfig {
+  getConfig(): AppConfigInterface {
     if (!this.appConfig) {
       console.error("AppConfigService: Configuration not loaded!");
     }
 
-    return this.appConfig as AppConfig;
+    return this.appConfig as AppConfigInterface;
   }
 }

src/app/app.component.ts

@@ -23,7 +23,7 @@ import {
   selectUserMessage,
 } from "state-management/selectors/user.selectors";
 import { MessageType } from "state-management/models";
-import { AppConfigService, AppConfig as Config } from "app-config.service";
+import { AppConfigService, AppConfigInterface } from "app-config.service";
 import { Configuration } from "@scicatproject/scicat-sdk-ts-angular";
 
 @Component({
@@ -36,7 +36,7 @@ import { Configuration } from "@scicatproject/scicat-sdk-ts-angular";
 export class AppComponent implements OnDestroy, OnInit, AfterViewChecked {
   loading$ = this.store.select(selectIsLoading);
 
-  config: Config;
+  config: AppConfigInterface;
 
   title: string;
   facility: string;

src/app/datasets/dashboard/dashboard.component.html

@@ -1,21 +1,15 @@
 <breadcrumb></breadcrumb>
-  <full-text-search-bar
-    #searchBar
-    data-cy="text-search"
-    [placeholder]="'Text Search'"
-  >
-  </full-text-search-bar>
+<full-text-search-bar #searchBar data-cy="text-search"
+  [placeholder]="'Text Search'">
+</full-text-search-bar>
 <mat-sidenav-container [hasBackdrop]="false">
   <mat-sidenav-content>
     <div fxLayout="row" fxLayout.xs="column">
       <div class="action-column" fxFlex="14" fxFlex.lt-xl="20">
         <datasets-filter></datasets-filter>
         <ng-template [ngIf]="this.loggedIn$ | async">
-          <mat-card
-            *ngIf="appConfig.addDatasetEnabled"
-            class="add-card"
-            (click)="openDialog()"
-          >
+          <mat-card *ngIf="appConfig.addDatasetEnabled" class="add-card"
+            (click)="openDialog()">
             <mat-card-content>
               <mat-icon> add_circle </mat-icon>
               Create Dataset
@@ -31,27 +25,13 @@
       <div class="table-column" fxFlex="85" fxFlex.lt-xl="80">
         <ng-template [ngIf]="this.loggedIn$ | async">
           <dataset-table-actions
-            [selectedSets]="selectedSets$ | async"
-          ></dataset-table-actions>
+            [selectedSets]="selectedSets$ | async"></dataset-table-actions>
         </ng-template>
 
-        <dataset-table
-          [tableColumns]="tableColumns$ | async"
-          [selectedSets]="selectedSets$ | async"
-          (settingsClick)="onSettingsClick()"
+        <dataset-table [selectedSets]="selectedSets$ | async"
           (rowClick)="onRowClick($event)"
-          (pageChange)="onPageChange($event)"
-        ></dataset-table>
+          (pageChange)="onPageChange($event)"></dataset-table>
       </div>
     </div>
   </mat-sidenav-content>
-
-  <mat-sidenav #settings position="end" mode="push">
-    <dataset-table-settings
-      [selectableColumns]="selectableColumns$ | async"
-      [clearSearchBar]="clearColumnSearch"
-      (closeClick)="onCloseClick()"
-      (selectColumn)="onSelectColumn($event)"
-    ></dataset-table-settings>
-  </mat-sidenav>
-</mat-sidenav-container>
+</mat-sidenav-container>

src/app/datasets/dashboard/dashboard.component.spec.ts

@@ -20,22 +20,15 @@ import {
   addDatasetAction,
   changePageAction,
 } from "state-management/actions/datasets.actions";
-import {
-  selectColumnAction,
-  deselectColumnAction,
-} from "state-management/actions/user.actions";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import { SelectColumnEvent } from "datasets/dataset-table-settings/dataset-table-settings.component";
 import { provideMockStore } from "@ngrx/store/testing";
 import { selectSelectedDatasets } from "state-management/selectors/datasets.selectors";
-import { TableColumn } from "state-management/models";
 import {
   selectColumns,
   selectIsLoggedIn,
 } from "state-management/selectors/user.selectors";
 import { MatDialog, MatDialogModule } from "@angular/material/dialog";
-import { MatSidenav, MatSidenavModule } from "@angular/material/sidenav";
-import { MatCheckboxChange } from "@angular/material/checkbox";
+import { MatSidenavModule } from "@angular/material/sidenav";
 import { MatCardModule } from "@angular/material/card";
 import { MatIconModule } from "@angular/material/icon";
 import { AppConfigService } from "app-config.service";
@@ -129,91 +122,6 @@ describe("DashboardComponent", () => {
     expect(component).toBeTruthy();
   });
 
-  describe("#onSettingsClick()", () => {
-    it("should toggle the sideNav", () => {
-      const toggleSpy = spyOn(component.sideNav, "toggle");
-
-      component.onSettingsClick();
-
-      expect(toggleSpy).toHaveBeenCalled();
-    });
-
-    it("should not clear the search column if sidenav is open", () => {
-      component.sideNav.opened = false;
-      // The opened status is toggled when onSettingsClick is called
-      component.onSettingsClick();
-
-      expect(component.clearColumnSearch).toEqual(false);
-    });
-
-    it("should clear the search column if sidenav is closed", () => {
-      component.sideNav.opened = true;
-      // The opened status is toggled when onSettingsClick is called
-      component.onSettingsClick();
-
-      expect(component.clearColumnSearch).toEqual(true);
-    });
-  });
-
-  describe("#onCloseClick()", () => {
-    it("should close the sideNav", () => {
-      const closeSpy = spyOn(component.sideNav, "close");
-
-      component.onCloseClick();
-
-      expect(closeSpy).toHaveBeenCalled();
-    });
-  });
-
-  describe("#onSelectColumn()", () => {
-    const column: TableColumn = {
-      name: "test",
-      order: 0,
-      type: "standard",
-      enabled: false,
-    };
-
-    it("should dispatch a selectColumnAction if checkBoxChange.checked is true", () => {
-      dispatchSpy = spyOn(store, "dispatch");
-
-      const checkBoxChange = {
-        checked: true,
-      } as MatCheckboxChange;
-
-      const event: SelectColumnEvent = {
-        checkBoxChange,
-        column,
-      };
-
-      component.onSelectColumn(event);
-
-      expect(dispatchSpy).toHaveBeenCalledTimes(1);
-      expect(dispatchSpy).toHaveBeenCalledWith(
-        selectColumnAction({ name: column.name, columnType: column.type }),
-      );
-    });
-
-    it("should dispatch a deselectColumnAction if checkBoxChange.checked is false", () => {
-      dispatchSpy = spyOn(store, "dispatch");
-
-      const checkBoxChange = {
-        checked: false,
-      } as MatCheckboxChange;
-
-      const event: SelectColumnEvent = {
-        checkBoxChange,
-        column,
-      };
-
-      component.onSelectColumn(event);
-
-      expect(dispatchSpy).toHaveBeenCalledTimes(1);
-      expect(dispatchSpy).toHaveBeenCalledWith(
-        deselectColumnAction({ name: column.name, columnType: column.type }),
-      );
-    });
-  });
-
   describe("#onRowClick()", () => {
     it("should navigate to a dataset", () => {
       component.onRowClick(dataset);
@@ -296,32 +204,4 @@ describe("DashboardComponent", () => {
       );
     });
   });
-
-  describe("#tableColumn$ observable", () => {
-    it("should show 'select' column when user is logged in", () => {
-      const testColumn: TableColumn = {
-        name: "test",
-        order: 0,
-        type: "standard",
-        enabled: false,
-      };
-      const selectColumn: TableColumn = {
-        name: "select",
-        order: 1,
-        type: "standard",
-        enabled: true,
-      };
-      selectColumns.setResult([testColumn, selectColumn]);
-      selectIsLoggedIn.setResult(true);
-
-      component.tableColumns$.subscribe((result) => {
-        expect(result.length).toEqual(2);
-      });
-
-      selectIsLoggedIn.setResult(false);
-      component.tableColumns$.subscribe((result) =>
-        expect(result).toEqual([testColumn]),
-      );
-    });
-  });
 });