Add disclaimer with new style

swisstopo · Aug 15, 2024 · dff8a64 · dff8a64
1 parent 5f9f866
commit dff8a64
Show file tree

Hide file tree

Showing 60 changed files with 1,334 additions and 1,936 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Removed unused `IsViewer` flag from user.
 - Removed unused `UserEvent` from user.
 - Migrated `User` API endpoints to .NET API.
+- Disclaimer is now displayed at every login.
 - Changed boreholes table design.
 - Migrated `Workgroup` API endpoints to .NET API.
 - Use `filled` style for form components.

diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ Requests and das Legacy API werden mit dem [YARP Reverse Proxy](https://microsof
 
 - Das UI-Design ist in [Figma](https://www.figma.com/design/cEiOoOazAQZqpRY92ZhBeO/SwissGeol?node-id=7390-40928&t=DemUCUzYlysJ5lB4-0) definiert. Unter Pages/Screens sind die definitiven Designs zu finden.
 - Standardmässig werden die [Lucid Icons](https://lucide.dev/icons/) verwendet. Custom-Icons können aus [Figma](https://www.figma.com/design/cEiOoOazAQZqpRY92ZhBeO/SwissGeol?node-id=7390-40928&t=DemUCUzYlysJ5lB4-0) kopiert und als SVG eingebunden werden. Um die Icons farblich stylen zu können, müssen `fill` und `stroke` wie folgt angepasst werden `fill="currentColor" stroke="currentColor"`.
-- [MUI](https://mui.com/) wird als UI-Component library verwendet. Allgemeine Styles werden im [AppTheme.ts](./src/client/src/AppTheme.ts) definiert und diese Styles wo immer möglich verwendet. [MUI Styled Components](https://mui.com/system/styled/) im gleichen File mit der Komponente definieren, sobald die Styles mehrfach gebraucht werden. Übergreifende Styled Components werden in [styledComponents.js](./src/client/src/components/styledComponents.js) definiert. 
+- [MUI](https://mui.com/) wird als UI-Component library verwendet. Allgemeine Styles werden im [AppTheme.ts](./src/client/src/AppTheme.ts) definiert und diese Styles wo immer möglich verwendet. [MUI Styled Components](https://mui.com/system/styled/) im gleichen File mit der Komponente definieren, sobald die Styles mehrfach gebraucht werden. Übergreifende Styled Components werden in [styledComponents.ts](./src/client/src/components/styledComponents.ts) definiert. 
 
 #### Typescript
 

diff --git a/src/client/cypress/e2e/admin/aboutSettings.cy.js b/src/client/cypress/e2e/admin/aboutSettings.cy.js
@@ -3,8 +3,7 @@ import license from "../../fixtures/license.json";
 
 describe("Admin about page tests", () => {
   it("shows version information linking the corresponding release on GitHub.", () => {
-    loginAsAdmin();
-    cy.visit("/setting/about");
+    loginAsAdmin("/setting/about");
 
     cy.get('[data-cy="version"]')
       .should("contain", "0.0.99+dev")
@@ -13,17 +12,15 @@ describe("Admin about page tests", () => {
 
   it("shows license information (with fixtures)", () => {
     cy.intercept("/license.json", license);
-    loginAsAdmin();
-    cy.visit("/setting/about");
+    loginAsAdmin("/setting/about");
 
     cy.get('[data-cy^="credits-"]').should("have.length", 2);
     cy.get('[data-cy="[email protected]"]').should("contain", "example-js (Version 0.0.999)");
     cy.get('[data-cy="[email protected]"]').should("contain", "example-react (Version 0.0.111)");
   });
 
   it("shows license information (without fixtures)", () => {
-    loginAsAdmin();
-    cy.visit("/setting/about");
+    loginAsAdmin("/setting/about");
     cy.get('[data-cy^="credits-"]').should("have.length.above", 0);
   });
 });
diff --git a/src/client/cypress/e2e/admin/userAdministration.cy.js b/src/client/cypress/e2e/admin/userAdministration.cy.js
@@ -2,9 +2,7 @@ import { loginAsAdmin } from "../helpers/testHelpers";
 
 describe("Admin settings test", () => {
   beforeEach(() => {
-    loginAsAdmin();
-    cy.visit("/setting/admin");
-
+    loginAsAdmin("/setting/admin");
     cy.get('[data-cy="user-list-table-body"]').children().should("have.length", 8);
   });
 

diff --git a/src/client/cypress/e2e/editor/backfill.cy.js b/src/client/cypress/e2e/editor/backfill.cy.js
@@ -31,8 +31,7 @@ describe("Backfill crud tests", () => {
 
   it("adds, edits and deletes backfills", () => {
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/completion`);
+      loginAsAdmin(`/${id}/completion`);
     });
     cy.wait("@get-completions-by-boreholeId");
 
@@ -102,8 +101,7 @@ describe("Backfill crud tests", () => {
     });
 
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/completion`);
+      loginAsAdmin(`/${id}/completion`);
       startBoreholeEditing();
     });
     cy.get("[data-cy=completion-content-tab-backfill]").click();

diff --git a/src/client/cypress/e2e/editor/boreholeEditorTable.cy.js b/src/client/cypress/e2e/editor/boreholeEditorTable.cy.js
diff --git a/src/client/cypress/e2e/editor/casing.cy.js b/src/client/cypress/e2e/editor/casing.cy.js
@@ -21,8 +21,7 @@ describe("Casing crud tests", () => {
 
     // open completion editor
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/completion`);
+      loginAsAdmin(`/${id}/completion`);
     });
 
     cy.wait("@get-completions-by-boreholeId");
@@ -131,8 +130,7 @@ describe("Casing crud tests", () => {
           { fromDepth: 0, toDepth: 12, kindId: 25000103 },
         ]);
       });
-      loginAsAdmin();
-      cy.visit(`/${id}/completion`);
+      loginAsAdmin(`/${id}/completion`);
     });
 
     // casing 1

diff --git a/src/client/cypress/e2e/editor/chronostratigraphy.cy.js b/src/client/cypress/e2e/editor/chronostratigraphy.cy.js
@@ -75,8 +75,7 @@ describe("Tests for the chronostratigraphy editor.", () => {
 
     // open chronostratigraphy editor
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/stratigraphy/chronostratigraphy`);
+      loginAsAdmin(`/${id}/stratigraphy/chronostratigraphy`);
     });
     cy.wait("@get-layers-by-profileId");
 

diff --git a/src/client/cypress/e2e/editor/completion.cy.js b/src/client/cypress/e2e/editor/completion.cy.js
@@ -84,8 +84,7 @@ describe("completion crud tests", () => {
   it("adds, edits, copies and deletes completions", () => {
     createBorehole({ "extended.original_name": "INTEADAL" }).as("borehole_id");
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/completion`);
+      loginAsAdmin(`/${id}/completion`);
     });
     cy.wait("@get-completions-by-boreholeId");
     cy.contains("No completion available");
@@ -157,8 +156,7 @@ describe("completion crud tests", () => {
     createBorehole({ "extended.original_name": "INTEADAL" }).as("borehole_id");
     cy.get("@borehole_id").then(id => {
       boreholeId = id;
-      loginAsAdmin();
-      cy.visit(`/${id}/completion`);
+      loginAsAdmin(`/${id}/completion`);
     });
     cy.wait("@get-completions-by-boreholeId");
     cy.contains("No completion available");
@@ -403,8 +401,7 @@ describe("completion crud tests", () => {
 
     // open completion editor
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/completion`);
+      loginAsAdmin(`/${id}/completion`);
     });
     cy.wait("@get-completions-by-boreholeId");
 

diff --git a/src/client/cypress/e2e/editor/dataCards.cy.js b/src/client/cypress/e2e/editor/dataCards.cy.js
@@ -6,8 +6,7 @@ describe("Tests for the data cards in the editor.", () => {
   it("resets datacards when stop editing", () => {
     createBorehole({ "extended.original_name": "INTEADAL" }).as("borehole_id");
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/hydrogeology/wateringress`);
+      loginAsAdmin(`/${id}/hydrogeology/wateringress`);
     });
 
     startBoreholeEditing();
@@ -35,8 +34,7 @@ describe("Tests for the data cards in the editor.", () => {
   it("checks for unsaved changes when switching between cards", () => {
     createBorehole({ "extended.original_name": "INTEADAL" }).as("borehole_id");
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/hydrogeology/wateringress`);
+      loginAsAdmin(`/${id}/hydrogeology/wateringress`);
     });
     startBoreholeEditing();
 

diff --git a/src/client/cypress/e2e/editor/fieldMeasurement.cy.js b/src/client/cypress/e2e/editor/fieldMeasurement.cy.js
@@ -28,8 +28,7 @@ beforeEach(() => {
 describe("Tests for the field measurement editor.", () => {
   it("Creates, updates and deletes field measurement", () => {
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/hydrogeology/fieldmeasurement`);
+      loginAsAdmin(`/${id}/hydrogeology/fieldmeasurement`);
 
       startBoreholeEditing();
       selectLanguage("de");
@@ -92,6 +91,7 @@ describe("Tests for the field measurement editor.", () => {
       createFieldMeasurement(id, "2012-11-14T12:06Z", 15203157, 15203209, 15203219, 10, null, 0, 10);
       createFieldMeasurement(id, "2012-11-14T12:07Z", 15203157, 15203209, 15203219, 10, null, 0, 12);
       cy.visit(`/${id}/hydrogeology/fieldmeasurement`);
+      cy.get('[data-cy="accept-button"]').click();
 
       startBoreholeEditing();
       cy.get('[data-cy="fieldMeasurement-card.0"] [data-cy="todepth-formDisplay"]').contains("10");

diff --git a/src/client/cypress/e2e/editor/groundwaterLevelMeasurement.cy.js b/src/client/cypress/e2e/editor/groundwaterLevelMeasurement.cy.js
@@ -27,8 +27,7 @@ describe("Tests for the groundwater level measurement editor.", () => {
       );
 
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}`);
+      loginAsAdmin(`/${id}`);
     });
     startBoreholeEditing();
 
@@ -74,8 +73,7 @@ describe("Tests for the groundwater level measurement editor.", () => {
     cy.get("@borehole_id").then(id => {
       createGroundwaterLevelMeasurement(id, "2012-11-14T12:06Z", 15203157, 15203208, null, 0, 10);
       createGroundwaterLevelMeasurement(id, "2012-11-14T12:07Z", 15203157, 15203207, null, 0, 12);
-      loginAsAdmin();
-      cy.visit(`/${id}/hydrogeology/groundwaterlevelmeasurement`);
+      loginAsAdmin(`/${id}/hydrogeology/groundwaterlevelmeasurement`);
     });
     startBoreholeEditing();
 

diff --git a/src/client/cypress/e2e/editor/hydrotest.cy.js b/src/client/cypress/e2e/editor/hydrotest.cy.js
@@ -34,8 +34,7 @@ describe("Tests for the hydrotest editor.", () => {
       );
 
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}`);
+      loginAsAdmin(`/${id}`);
     });
     startBoreholeEditing();
 
@@ -112,8 +111,7 @@ describe("Tests for the hydrotest editor.", () => {
       .then(id => {
         createHydrotest(id, "2012-11-14T12:06Z", 15203157, [15203175], null, 0, 10);
         createHydrotest(id, "2012-11-14T12:07Z", 15203157, [15203174], null, 0, 12);
-        loginAsAdmin();
-        cy.visit(`/${id}/hydrogeology/hydrotest`);
+        loginAsAdmin(`/${id}/hydrogeology/hydrotest`);
       });
     startBoreholeEditing();
 
@@ -142,8 +140,7 @@ describe("Tests for the hydrotest editor.", () => {
   it("checks for unsaved changes when switching between cards", () => {
     createBorehole({ "extended.original_name": "INTEADAL" }).as("borehole_id");
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/hydrogeology/hydrotest`);
+      loginAsAdmin(`/${id}/hydrogeology/hydrotest`);
     });
     startBoreholeEditing();
 

diff --git a/src/client/cypress/e2e/editor/import.cy.js b/src/client/cypress/e2e/editor/import.cy.js
@@ -1,9 +1,8 @@
-import { loginAsAdmin, getImportFileFromFixtures } from "../../e2e/helpers/testHelpers";
+import { getImportFileFromFixtures, loginAsAdmin } from "../../e2e/helpers/testHelpers";
 
 describe("Test for importing boreholes.", () => {
   it("Successfully imports multiple boreholes.", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="import-borehole-button"]').click();
 
     // Select borehole csv file
@@ -71,7 +70,6 @@ describe("Test for importing boreholes.", () => {
 
   it("Displays borehole validation errors.", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="import-borehole-button"]').click();
 
     // Select borehole csv file
@@ -111,7 +109,6 @@ describe("Test for importing boreholes.", () => {
 
   it("Displays lithology validation errors.", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="import-borehole-button"]').click();
 
     // Select borehole csv file

diff --git a/src/client/cypress/e2e/editor/instrumentation.cy.js b/src/client/cypress/e2e/editor/instrumentation.cy.js
@@ -27,8 +27,7 @@ describe("Instrumentation crud tests", () => {
 
     // open completion editor
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/completion`);
+      loginAsAdmin(`/${id}/completion`);
     });
 
     cy.wait("@get-completions-by-boreholeId");

diff --git a/src/client/cypress/e2e/editor/lithostratigraphy.cy.js b/src/client/cypress/e2e/editor/lithostratigraphy.cy.js
@@ -60,8 +60,7 @@ describe("Tests for the lithostratigraphy editor.", () => {
 
     // open lithostratigraphy editor
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/stratigraphy/lithostratigraphy`);
+      loginAsAdmin(`/${id}/stratigraphy/lithostratigraphy`);
     });
     cy.wait("@get-layers-by-profileId");
 

diff --git a/src/client/cypress/e2e/editor/publicationWorkflow.cy.js b/src/client/cypress/e2e/editor/publicationWorkflow.cy.js
@@ -29,8 +29,7 @@ describe("Tests the publication workflow.", () => {
   it("Publishes a borehole without rejections", () => {
     createBorehole({ "extended.original_name": "Borehole to publish" }).as("borehole_id");
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}/status`);
+      loginAsAdmin(`/${id}/status`);
     });
 
     startEditing();

diff --git a/src/client/cypress/e2e/editor/waterIngress.cy.js b/src/client/cypress/e2e/editor/waterIngress.cy.js
@@ -28,8 +28,7 @@ describe("Tests for the wateringress editor.", () => {
 
     // open completion editor
     cy.get("@borehole_id").then(id => {
-      loginAsAdmin();
-      cy.visit(`/${id}`);
+      loginAsAdmin(`/${id}`);
     });
 
     // start editing session
@@ -79,8 +78,7 @@ describe("Tests for the wateringress editor.", () => {
     cy.get("@borehole_id").then(id => {
       createWateringress(id, "2012-11-14T12:06Z", 15203157, 15203161, null, 0, 10);
       createWateringress(id, "2012-11-14T12:07Z", 15203157, 15203162, null, 0, 12);
-      loginAsAdmin();
-      cy.visit(`/${id}/hydrogeology/wateringress`);
+      loginAsAdmin(`/${id}/hydrogeology/wateringress`);
     });
     startBoreholeEditing();
 

diff --git a/src/client/cypress/e2e/filters/filter.cy.js b/src/client/cypress/e2e/filters/filter.cy.js
@@ -4,14 +4,12 @@ import { showTableAndWaitForData, verifyPaginationText } from "../helpers/dataGr
 describe("Search filter tests", () => {
   it("has search filters", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("Filters");
   });
 
   it("shows the correct dropdowns", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("h6", "Location").click();
     cy.contains("Show all fields").children().eq(0).click();
@@ -48,7 +46,6 @@ describe("Search filter tests", () => {
   it("checks that the registration filter settings control the filter visibility.", () => {
     // precondition filters not visible
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("Registration").click();
     cy.contains("Show all fields")
@@ -80,7 +77,6 @@ describe("Search filter tests", () => {
 
   it("filters boreholes by creator name", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("Registration").click();
     cy.contains("Show all fields").children(".checkbox").click();
@@ -96,7 +92,6 @@ describe("Search filter tests", () => {
 
   it("filters boreholes by color and uscs3", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("Lithology").click();
     cy.contains("Show all fields").children(".checkbox").click();
@@ -147,7 +142,6 @@ describe("Search filter tests", () => {
 
   it("filters boreholes by original lithology in editor mode", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     filterByOriginalLithology();
     cy.wait("@edit_list");
@@ -156,7 +150,6 @@ describe("Search filter tests", () => {
   });
   it("filters boreholes by creation date", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("Registration").click();
     cy.contains("Show all fields").children(".checkbox").click();
@@ -185,7 +178,6 @@ describe("Search filter tests", () => {
 
   it("filters boreholes by workgroup", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     showTableAndWaitForData();
     cy.contains("Workgroup").click();

diff --git a/src/client/cypress/e2e/filters/hierarchicalDataFilter.cy.js b/src/client/cypress/e2e/filters/hierarchicalDataFilter.cy.js
@@ -3,7 +3,6 @@ import { loginAsAdmin } from "../helpers/testHelpers.js";
 describe("Hierachical data filter tests", () => {
   it("check visible filters", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("h6", "Chronostratigraphy").click();
     cy.get("Show all fields").should("not.exist");
@@ -15,7 +14,6 @@ describe("Hierachical data filter tests", () => {
 
   it("check sorting of filter values", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("h6", "Chronostratigraphy").click();
     let periodsDropdown = cy.contains("label", "Period").next();
@@ -51,7 +49,6 @@ describe("Hierachical data filter tests", () => {
       "late Burdigalian",
     ];
     loginAsAdmin();
-    cy.visit("/");
     cy.get('[data-cy="show-filter-button"]').click();
     cy.contains("h6", "Chronostratigraphy").click();
     cy.get('[data-cy="hierarchical-data-search"]')

diff --git a/src/client/cypress/e2e/filters/polygonFilter.cy.js b/src/client/cypress/e2e/filters/polygonFilter.cy.js
@@ -33,7 +33,6 @@ function assertPolygonFilterActive() {
 describe("Polygon filter tests", () => {
   it("draws polygon and asserts filtering", () => {
     loginAsAdmin();
-    cy.visit("/");
     cy.wait(5000);
     cy.wait("@borehole_geojson");
     cy.get('[data-cy="show-filter-button"]').click();