Identifier segment (#1591)

src/client/cypress/e2e/detailPage/boreholeform.cy.js

@@ -7,22 +7,7 @@ describe("Test for the borehole form.", () => {
     // create boreholes
     newEditableBorehole().as("borehole_id");
 
-    // fill all legacy dropdowns on location tab
-    cy.get('[data-cy="domain-dropdown"]')
-      .should("have.length", 1)
-      .each(el => cy.wrap(el).click().find('[role="option"]').last().click());
-
-    const locationDropdownValues = [];
-    cy.get('[data-cy="domain-dropdown"]')
-      .each(el => {
-        const value = el[0].children[1].firstChild.data;
-        locationDropdownValues.push(value);
-      })
-      .then(() => {
-        expect(locationDropdownValues).to.deep.eq(["ID Kernlager"]);
-      });
-
-    // fills and evaluates all mui dropdowns on location tab
+    // fills and evaluates all mui dropdowns on location tab (identifiers are tested separately)
     setSelect("restriction", 2);
     isDisabled("restriction_until", true);
     setSelect("restriction", 3);

src/client/cypress/e2e/detailPage/location.cy.js

@@ -1,4 +1,5 @@
 import { checkRowWithText, showTableAndWaitForData } from "../helpers/dataGridHelpers";
+import { setInput, setSelect } from "../helpers/formHelpers";
 import {
   createBorehole,
   goToRouteAndAcceptTerms,
@@ -69,30 +70,28 @@ describe("Tests for 'Location' edit page.", () => {
     });
   });
 
-  it("removes error highlight of identifier fields if at least one identifier is present.", () => {
+  it("adds and removes identifiers.", () => {
     newEditableBorehole().as("borehole_id");
 
     // initial state
-    cy.get('[data-cy="identifier-dropdown"]').should("have.class", "error");
-    cy.get('[data-cy="identifier-value"]').should("have.class", "error");
+    cy.get('[data-cy="identifier-add"]').should("be.disabled");
 
     // add identifier
-    cy.get('[data-cy="identifier-dropdown"]').click();
-    cy.get('[data-cy="identifier-dropdown"]').find("div[role='option']").contains("ID Canton").click();
-    cy.get('[data-cy="identifier-dropdown"]').should("not.have.class", "error");
-    cy.get('[data-cy="identifier-value"]').should("have.class", "error");
+    setSelect("borehole_identifier", 5);
+    cy.get('[data-cy="identifier-add"]').should("be.disabled");
 
-    cy.get('[data-cy="identifier-value"]').type("ECKLERTA");
-    cy.get('[data-cy="identifier-dropdown"]').should("not.have.class", "error");
-    cy.get('[data-cy="identifier-value"]').should("not.have.class", "error");
+    setInput("borehole_identifier_value", "ECKLERTA");
+    cy.get('[data-cy="identifier-add"]').should("not.be.disabled");
 
     cy.get('[data-cy="identifier-add"]').click();
-    cy.get('[data-cy="identifier-dropdown"]').should("not.have.class", "error");
-    cy.get('[data-cy="identifier-value"]').should("not.have.class", "error");
+    cy.contains("ID Canton").should("exist");
+    cy.contains("ECKLERTA").should("exist");
+
+    cy.get('[data-cy="identifier-add"]').should("be.disabled");
 
     // delete identifier
-    cy.get('[data-cy="identifier"]').contains("Delete").click();
-    cy.get('[data-cy="identifier-dropdown"]').should("have.class", "error");
-    cy.get('[data-cy="identifier-value"]').should("have.class", "error");
+    cy.get('[data-cy="identifier-delete"]').click();
+    cy.contains("ID Canton").should("not.exist");
+    cy.get('[data-cy="identifier-add"]').should("be.disabled");
   });
 });

src/client/cypress/e2e/filters/identifierFilter.cy.js

@@ -1,16 +1,13 @@
 import { checkAllVisibleRows, verifyPaginationText } from "../helpers/dataGridHelpers";
+import { setInput, setSelect } from "../helpers/formHelpers";
 import { newEditableBorehole, returnToOverview, stopBoreholeEditing } from "../helpers/testHelpers.js";
 
 describe("Tests for filtering data by identifier.", () => {
   it("can filter by identifier", () => {
     newEditableBorehole().as("borehole_id");
-    let identifierDropdown = cy.get('[data-cy="identifier-dropdown"]');
 
-    identifierDropdown.each(el =>
-      cy.wrap(el).click({ force: true }).find('[role="option"]').eq(1).click({ force: true }),
-    );
-
-    cy.get('[data-cy="identifier-value"] input').type(819544732);
+    setSelect("borehole_identifier", 1);
+    setInput("borehole_identifier_value", 819544732);
     cy.get('[data-cy="identifier-add"]').click();
 
     stopBoreholeEditing();
@@ -38,26 +35,19 @@ describe("Tests for filtering data by identifier.", () => {
 
   it("can bulk edit boreholes while filter by identifier is set", () => {
     newEditableBorehole().as("borehole_id");
-    let identifierDropdown = cy.get('[data-cy="identifier-dropdown"]');
-
-    identifierDropdown.each(el =>
-      cy.wrap(el).click({ force: true }).find('[role="option"]').eq(1).click({ force: true }),
-    );
+    setSelect("borehole_identifier", 1);
 
-    cy.get('[data-cy="identifier-value"] input').type(64531274);
+    setInput("borehole_identifier_value", 64531274);
     cy.get('[data-cy="identifier-add"]').click();
 
     stopBoreholeEditing();
     returnToOverview();
 
     newEditableBorehole().as("borehole_id_2");
-    identifierDropdown = cy.get('[data-cy="identifier-dropdown"]');
 
-    identifierDropdown.each(el =>
-      cy.wrap(el).click({ force: true }).find('[role="option"]').eq(1).click({ force: true }),
-    );
+    setSelect("borehole_identifier", 1);
 
-    cy.get('[data-cy="identifier-value"] input').type(436584127);
+    setInput("borehole_identifier_value", 436584127);
     cy.get('[data-cy="identifier-add"]').click();
 
     stopBoreholeEditing();

src/client/cypress/e2e/mainPage/bulkedit.cy.js

@@ -44,15 +44,15 @@ function giveAdminUser2workgroups() {
 }
 
 describe("Test the borehole bulk edit feature.", () => {
-  it.skip("opens the bulk edit dialog with all boreholes selected", () => {
+  it("opens the bulk edit dialog with all boreholes selected", () => {
     giveAdminUser1workgroup();
     showTableAndWaitForData();
     checkAllVisibleRows();
     cy.contains("button", "Bulk editing").click({ force: true });
     cy.get("h1").should("have.text", "Bulk editing");
   });
 
-  it.skip("displays workgroup accordion only if user has permission for more than one workgroup", () => {
+  it("displays workgroup accordion only if user has permission for more than one workgroup", () => {
     giveAdminUser1workgroup();
     checkAllVisibleRows();
     cy.contains("button", "Bulk editing").click({ force: true });
@@ -77,7 +77,6 @@ describe("Test the borehole bulk edit feature.", () => {
 
   it("fills all bulkedit fields and saves.", () => {
     createBoreholes();
-    giveAdminUser1workgroup();
     goToRouteAndAcceptTerms(`/`);
     showTableAndWaitForData();
     cy.wait("@borehole");
@@ -110,12 +109,10 @@ describe("Test the borehole bulk edit feature.", () => {
         cy.wrap($input).scrollIntoView().clear().type(`${index}`);
       });
 
-    cy.get('[role="combobox"]')
-      .should("have.length", 14)
-      .each(el => {
-        cy.wrap(el).click();
-        cy.get('li[role="option"]').last().click();
-      });
+    cy.get('[role="combobox"]').each(el => {
+      cy.wrap(el).click();
+      cy.get('li[role="option"]').last().click();
+    });
 
     // save
     cy.contains("button", "Save").click();

src/client/src/api-lib/ReduxStateInterfaces.ts

@@ -57,7 +57,13 @@ interface Workflow {
   workflow: number;
 }
 
-interface BoreholeAttributes {
+export interface Identifier {
+  id: number;
+  identifier: string;
+  value: string;
+}
+
+export interface BoreholeAttributes {
   national_interest: boolean;
   restriction_until: Date;
   restriction: number;
@@ -85,6 +91,7 @@ interface BoreholeAttributes {
   precision_location_x_lv03: number;
   precision_location_y_lv03: number;
   custom: {
+    identifiers: Identifier[];
     country: string;
     canton: string;
     municipality: string;

src/client/src/components/form/simpleDomainSelect.tsx

@@ -20,7 +20,7 @@ interface SimpleDomainSelectProps {
   selected?: number | boolean | null;
   sx?: SxProps;
   className?: string;
-  onUpdate?: (value: number | boolean | string | null) => void;
+  onUpdate?: (value: number | null) => void;
 }
 
 export const SimpleDomainSelect: FC<SimpleDomainSelectProps> = ({
@@ -63,7 +63,7 @@ export const SimpleDomainSelect: FC<SimpleDomainSelectProps> = ({
       name={fieldName}
       onChange={e => {
         if (onUpdate) {
-          onUpdate(e.target.value);
+          onUpdate(parseInt(e.target.value));
         }
       }}
       value={selected}

src/client/src/pages/detail/detailPageContent.jsx

@@ -16,7 +16,7 @@ import FieldMeasurement from "./form/hydrogeology/fieldMeasurement.jsx";
 import GroundwaterLevelMeasurement from "./form/hydrogeology/groundwaterLevelMeasurement.jsx";
 import Hydrotest from "./form/hydrogeology/hydrotest.jsx";
 import WaterIngress from "./form/hydrogeology/waterIngress.jsx";
-import IdentifierSegment from "./form/location/indentifierSegment.jsx";
+import IdentifierSegment from "./form/location/identifierSegment.tsx";
 import LocationSegment from "./form/location/locationSegment.tsx";
 import NameSegment from "./form/location/nameSegment.tsx";
 import RestrictionSegment from "./form/location/restrictionSegment.tsx";
@@ -55,7 +55,6 @@ class DetailPageContent extends React.Component {
     this.updateNumber = this.updateNumber.bind(this);
     this.updateChange = this.updateChange.bind(this);
     this.patch = this.patch.bind(this);
-    this.setStateBound = this.setState.bind(this);
   }
 
   componentDidMount() {
@@ -226,7 +225,7 @@ class DetailPageContent extends React.Component {
   }
 
   render() {
-    const { t, borehole, user, editingEnabled } = this.props;
+    const { t, borehole, editingEnabled } = this.props;
     if (borehole.error !== null) {
       return <div>{t(borehole.error, borehole.data)}</div>;
     }
@@ -280,11 +279,8 @@ class DetailPageContent extends React.Component {
                     <Stack gap={3} mr={2}>
                       <IdentifierSegment
                         borehole={borehole}
-                        identifier={this.state.identifier}
-                        identifierValue={this.state.identifierValue}
-                        setState={this.setStateBound}
                         updateBorehole={this.props.updateBorehole}
-                        user={user}></IdentifierSegment>
+                        editingEnabled={editingEnabled}></IdentifierSegment>
                       <NameSegment
                         borehole={borehole}
                         updateChange={this.updateChange}
@@ -423,7 +419,6 @@ const mapStateToProps = state => {
     borehole: state.core_borehole,
     workflow: state.core_workflow,
     domains: state.core_domain_list,
-    user: state.core_user,
   };
 };