Fix client-side validation of sample/analysis names #1419

archesproject · Nov 6, 2023 · 1ff7173 · 1ff7173
1 parent 64adb50
commit 1ff7173
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...a/js/views/components/workflows/analysis-areas-workflow/analysis-areas-annotation-step.js b/...a/js/views/components/workflows/analysis-areas-workflow/analysis-areas-annotation-step.js
@@ -448,7 +448,7 @@ define([
             const annotationLabelNodeid = "3e541cc6-859b-11ea-97eb-acde48001122";
             const annotationPolygonIdentifierNodeid = "97c30c42-8594-11ea-97eb-acde48001122";
 
-            if (!ko.unwrap(self.selectedAnalysisAreaInstance().data[annotationLabelNodeid])) {
+            if (!ko.unwrap(self.selectedAnalysisAreaInstance().data[annotationLabelNodeid]?.[arches.activeLanguage]?.value)) {
                 params.pageVm.alert(new params.form.AlertViewModel('ep-alert-red', "Name required", "Providing a name is required"));
                 return;
             }

diff --git a/...s/views/components/workflows/sample-taking-workflow/sample-taking-sample-location-step.js b/...s/views/components/workflows/sample-taking-workflow/sample-taking-sample-location-step.js
@@ -562,8 +562,9 @@ define([
             var partIdentifierAssignmentLabelNodeId = '3e541cc6-859b-11ea-97eb-acde48001122';
             var partIdentifierAssignmentPolygonIdentifierNodeId = "97c30c42-8594-11ea-97eb-acde48001122"
             const featureCollection = ko.unwrap(self.selectedSampleLocationInstance().data[partIdentifierAssignmentPolygonIdentifierNodeId])
-            if (!ko.unwrap(featureCollection?.features)?.length ||
-                (!ko.unwrap(ko.unwrap(self.selectedSampleLocationInstance().data[partIdentifierAssignmentLabelNodeId])?.[arches.activeLanguage]?.value) && !ko.unwrap(self.selectedSampleLocationInstance().data[partIdentifierAssignmentLabelNodeId])) ) { //Sample Name Node
+            if (!ko.unwrap(featureCollection?.features)?.length ||  // Sample location
+                !ko.unwrap(ko.unwrap(self.selectedSampleLocationInstance().data[partIdentifierAssignmentLabelNodeId])?.[arches.activeLanguage]?.value)  // Sample name
+            ) {
                 params.pageVm.alert(new params.form.AlertViewModel(
                     "ep-alert-red",
                     "Missing Values",