Merge pull request #3347 from LD4P/t3259-validation

Validate literals as literals, not URIs.
LD4P · Nov 17, 2021 · adecce1 · adecce1
2 parents 0247630 + f8392fc
commit adecce1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/__tests__/reducers/resourceValidationHelpers.test.js b/__tests__/reducers/resourceValidationHelpers.test.js
@@ -32,6 +32,7 @@ describe("new literal value with validationDataType of integer", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }
@@ -60,6 +61,7 @@ describe("new literal value with validationDataType of integer", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }
@@ -161,6 +163,7 @@ describe("new literal value with validationDataType of dateTime", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }
@@ -189,6 +192,7 @@ describe("new literal value with validationDataType of dateTime", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }
@@ -217,6 +221,7 @@ describe("new literal value with validationDataType of dateTime", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }
@@ -249,6 +254,7 @@ describe("new literal value with validationDataType of dateTimeStamp", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }
@@ -277,6 +283,7 @@ describe("new literal value with validationDataType of dateTimeStamp", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }
@@ -305,6 +312,7 @@ describe("new literal value with validationDataType of dateTimeStamp", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }

diff --git a/__tests__/reducers/resources.test.js b/__tests__/reducers/resources.test.js
@@ -532,6 +532,7 @@ describe("addValue()", () => {
             uri: null,
             label: null,
             valueSubjectKey: null,
+            component: "InputLiteralValue",
           },
         },
       }
@@ -549,6 +550,7 @@ describe("addValue()", () => {
         label: null,
         valueSubjectKey: null,
         errors: ["Literal required"],
+        component: "InputLiteralValue",
       })
       expect(newState.properties["JQEtq-vmq8"].valueKeys).toContain("DxGx7WMh3")
       expect(newState.properties["JQEtq-vmq8"].show).toBe(true)

diff --git a/src/reducers/resourceHelpers.js b/src/reducers/resourceHelpers.js
@@ -188,17 +188,15 @@ export const updateValueErrors = (state, valueKey) => {
   const propertyTemplate = state.propertyTemplates[property.propertyTemplateKey]
   // If this is first value, then must have a value.
   const errors = []
-  if (propertyTemplate.type === "literal") {
+  if (value.component === "InputLiteralValue") {
     errors.push(literalRequiredError(value, property, propertyTemplate))
     if (value.literal !== null && value.literal !== "") {
       errors.push(literalRegexValidationError(value, propertyTemplate))
       errors.push(literalIntegerValidationError(value, propertyTemplate))
       errors.push(literalDateTimeValidationError(value, propertyTemplate))
       errors.push(literalDateTimeStampValidationError(value, propertyTemplate))
     }
-  }
-
-  if (propertyTemplate.type === "uri") {
+  } else if (propertyTemplate.type === "uri") {
     errors.push(uriPropertiesAndValueErrors(value, property, propertyTemplate))
   }