Instrumentation input validation (#942)

swisstopo · Jan 15, 2024 · a6657ff · a6657ff
2 parents 420c8fb + 80d5d1e
commit a6657ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/src/client/cypress/e2e/viewer/displayLayer.cy.js b/src/client/cypress/e2e/viewer/displayLayer.cy.js
@@ -138,6 +138,7 @@ describe("Test for the borehole form.", () => {
 
     cy.wait("@borehole");
     cy.wait("@get-layers-by-profileId");
+    cy.wait(5000);
 
     // Click on layer
     cy.get('[data-cy="stratigraphy-layer-0"]').scrollIntoView().click();

diff --git a/src/client/src/commons/form/borehole/completion/instrumentation.js b/src/client/src/commons/form/borehole/completion/instrumentation.js
@@ -96,7 +96,7 @@ const Instrumentation = ({ isEditable, completionId }) => {
       {displayedInstrumentations?.length === 0 && (
         <Stack alignItems="center" justifyContent="center" sx={{ flexGrow: 1 }}>
           <Typography variant="fullPageMessage">
-            {t("msgInstrumentationEmpty")}
+            {t("msgInstrumentsEmpty")}
           </Typography>
         </Stack>
       )}

diff --git a/src/client/src/commons/form/borehole/completion/instrumentationInput.js b/src/client/src/commons/form/borehole/completion/instrumentationInput.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useContext } from "react";
+import React, { useEffect } from "react";
 import { useForm, Controller } from "react-hook-form";
 import {
   Box,
@@ -13,7 +13,6 @@ import {
 import CheckIcon from "@mui/icons-material/Check";
 import { useTranslation } from "react-i18next";
 import { useDomains } from "../../../../api/fetchApiV2";
-import { AlertContext } from "../../../alert/alertContext";
 import { completionSchemaConstants } from "./completionSchemaConstants";
 import {
   TextfieldWithMarginRight,
@@ -29,26 +28,15 @@ const InstrumentationInput = ({
 }) => {
   const domains = useDomains();
   const { t, i18n } = useTranslation();
-  const { handleSubmit, register, control, formState, getValues, trigger } =
-    useForm();
-  const alertContext = useContext(AlertContext);
+  const { handleSubmit, register, control, formState, trigger } = useForm();
 
   // trigger form validation on mount
   useEffect(() => {
     trigger();
   }, [trigger]);
 
   const closeFormIfCompleted = () => {
-    const formValues = getValues();
-    if (
-      !formValues.fromDepth ||
-      !formValues.toDepth ||
-      !formValues.kindId ||
-      !formValues.statusId ||
-      !formValues.name
-    ) {
-      alertContext.error(t("instrumentationRequiredFieldsAlert"));
-    } else {
+    if (formState.isValid) {
       handleSubmit(submitForm)();
       setSelectedInstrumentation(null);
     }