Merge pull request #21 from PADAS/bug/EM-1799-fix-inactive-enum-choices

fix(EM-1799): drop just inactive enum choices

Author: hugo07E8

src/v1/validateJsonSchema.ts

@@ -262,8 +262,7 @@ const validateSchema = (validations: any, schema: any) => {
       // Clean up inactive choices
       if (isInactiveChoice(property)) {
         schema.schema.properties[key].enum = cleanUpInactiveEnumChoice(property);
-
-        if (isEmpty(schema.schema.properties[key].enum.length)) {
+        if (isEmpty(schema.schema.properties[key].enum)) {
           schema.schema.properties[key].enum = ['0'];
           schema.schema.properties[key].enumNames = { 0: 'No Options' };
         }

test/JsonFormatter.test.tsx

@@ -78,6 +78,10 @@ describe("JSON Schema validation", () => {
 
   it("Validate remove inactive enum choices", () => {
     const validSchema = validateJSONSchema(JSON_SCHEMA_INACTIVE_CHOICES_FAKE_DATA);
+    expect(validSchema.schema.properties.invasivespecies_urgency.enum).toContain("unknown");
+    // Before fixing this, it was generating the enum as ["0"]. This test makes sure that's not the case anymore.
+    expect(validSchema.schema.properties.invasivespecies_urgency.enum).not.toContain("0");
+    // Verify the inactive option is not in the enum anymore
     expect(validSchema.schema.properties.invasivespecies_urgency.enum).not.toContain("test");
   });