Merge branch 'master' into SWAP-4587-scicat-fe-add-testing-for-datafiles-actions

Author: nitrosx

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-lock.json

@@ -1,10 +1,10 @@
 <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">
@@ -36,22 +36,11 @@
         </ng-template>
 
         <dataset-table
-          [tableColumns]="tableColumns$ | async"
           [selectedSets]="selectedSets$ | async"
-          (settingsClick)="onSettingsClick()"
           (rowClick)="onRowClick($event)"
           (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>

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

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

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

@@ -28,23 +28,19 @@ import { distinctUntilChanged, filter, map, take } from "rxjs/operators";
 import { MatDialog } from "@angular/material/dialog";
 import { MatSidenav } from "@angular/material/sidenav";
 import { AddDatasetDialogComponent } from "datasets/add-dataset-dialog/add-dataset-dialog.component";
-import { combineLatest, Subscription } from "rxjs";
+import { combineLatest, Subscription, lastValueFrom } from "rxjs";
 import {
   selectProfile,
   selectCurrentUser,
   selectColumns,
   selectIsLoggedIn,
+  selectHasFetchedSettings,
 } from "state-management/selectors/user.selectors";
 import {
   OutputDatasetObsoleteDto,
   ReturnedUserDto,
 } from "@scicatproject/scicat-sdk-ts-angular";
-import {
-  selectColumnAction,
-  deselectColumnAction,
-  loadDefaultSettings,
-} from "state-management/actions/user.actions";
-import { SelectColumnEvent } from "datasets/dataset-table-settings/dataset-table-settings.component";
+import { loadDefaultSettings } from "state-management/actions/user.actions";
 import { AppConfigService } from "app-config.service";
 
 @Component({
@@ -61,15 +57,8 @@ export class DashboardComponent implements OnInit, OnDestroy {
   loggedIn$ = this.store.select(selectIsLoggedIn);
   selectedSets$ = this.store.select(selectSelectedDatasets);
   selectColumns$ = this.store.select(selectColumns);
+  selectHasFetchedSettings$ = this.store.select(selectHasFetchedSettings);
 
-  tableColumns$ = combineLatest([this.selectColumns$, this.loggedIn$]).pipe(
-    map(([columns, loggedIn]) =>
-      columns.filter((column) => loggedIn || column.name !== "select"),
-    ),
-  );
-  selectableColumns$ = this.selectColumns$.pipe(
-    map((columns) => columns.filter((column) => column.name !== "select")),
-  );
   public nonEmpty$ = this.store.select(selectIsBatchNonEmpty);
 
   subscriptions: Subscription[] = [];
@@ -97,33 +86,6 @@ export class DashboardComponent implements OnInit, OnDestroy {
     );
   }
 
-  onSettingsClick(): void {
-    this.sideNav.toggle();
-    if (this.sideNav.opened) {
-      this.clearColumnSearch = false;
-    } else {
-      this.clearColumnSearch = true;
-    }
-  }
-
-  onCloseClick(): void {
-    this.clearColumnSearch = true;
-    this.sideNav.close();
-  }
-
-  onSelectColumn(event: SelectColumnEvent): void {
-    const { checkBoxChange, column } = event;
-    if (checkBoxChange.checked) {
-      this.store.dispatch(
-        selectColumnAction({ name: column.name, columnType: column.type }),
-      );
-    } else if (!checkBoxChange.checked) {
-      this.store.dispatch(
-        deselectColumnAction({ name: column.name, columnType: column.type }),
-      );
-    }
-  }
-
   onRowClick(dataset: OutputDatasetObsoleteDto): void {
     const pid = encodeURIComponent(dataset.pid);
     this.router.navigateByUrl("/datasets/" + pid);
@@ -178,12 +140,29 @@ export class DashboardComponent implements OnInit, OnDestroy {
     this.store.dispatch(fetchMetadataKeysAction());
 
     this.subscriptions.push(
-      combineLatest([this.pagination$, this.readyToFetch$, this.loggedIn$])
+      combineLatest([
+        this.pagination$,
+        this.readyToFetch$,
+        this.loggedIn$,
+        this.selectHasFetchedSettings$,
+      ])
         .pipe(
-          map(([pagination, , loggedIn]) => [pagination, loggedIn]),
+          map(([pagination, , loggedIn, hasFetchedSettings]) => [
+            pagination,
+            loggedIn,
+            hasFetchedSettings,
+          ]),
           distinctUntilChanged(deepEqual),
         )
-        .subscribe(([pagination, loggedIn]) => {
+        .subscribe(async ([pagination, loggedIn]) => {
+          const hasFetchedSettings = await lastValueFrom(
+            this.selectHasFetchedSettings$.pipe(take(1)),
+          );
+
+          if (!hasFetchedSettings) {
+            return;
+          }
+
           this.store.dispatch(fetchDatasetsAction());
           this.store.dispatch(fetchFacetCountsAction());
           this.router.navigate(["/datasets"], {