From 3b854a300fce031b3eb53ac23889269feb1cc401 Mon Sep 17 00:00:00 2001 From: Hugo 07E8 Date: Mon, 30 Jun 2025 14:29:38 -0600 Subject: [PATCH 1/3] fix(EM-1799): drop just inactive enum choices --- src/v1/validateJsonSchema.ts | 3 +-- test/JsonFormatter.test.tsx | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/v1/validateJsonSchema.ts b/src/v1/validateJsonSchema.ts index f94dccc..9013545 100644 --- a/src/v1/validateJsonSchema.ts +++ b/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' }; } diff --git a/test/JsonFormatter.test.tsx b/test/JsonFormatter.test.tsx index abf6b77..c44d31e 100644 --- a/test/JsonFormatter.test.tsx +++ b/test/JsonFormatter.test.tsx @@ -78,6 +78,7 @@ 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"); expect(validSchema.schema.properties.invasivespecies_urgency.enum).not.toContain("test"); }); From c09be3bb8c53dc8a316a6088af971942cd28651a Mon Sep 17 00:00:00 2001 From: Hugo 07E8 Date: Wed, 2 Jul 2025 14:28:28 -0600 Subject: [PATCH 2/3] fix(EM-1799): drop just inactive enum choices --- test/JsonFormatter.test.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/JsonFormatter.test.tsx b/test/JsonFormatter.test.tsx index c44d31e..65cc1ea 100644 --- a/test/JsonFormatter.test.tsx +++ b/test/JsonFormatter.test.tsx @@ -79,7 +79,8 @@ 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"); - expect(validSchema.schema.properties.invasivespecies_urgency.enum).not.toContain("test"); + // 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"); }); it("Validate remove disabled titleMap choices", () => { From f44bfa7806dab3e46a35958ccfc5fe3137bf3d86 Mon Sep 17 00:00:00 2001 From: Hugo 07E8 Date: Thu, 3 Jul 2025 14:16:39 -0600 Subject: [PATCH 3/3] fix(EM-1799): drop just inactive enum choices --- test/JsonFormatter.test.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/JsonFormatter.test.tsx b/test/JsonFormatter.test.tsx index 65cc1ea..df338ce 100644 --- a/test/JsonFormatter.test.tsx +++ b/test/JsonFormatter.test.tsx @@ -81,6 +81,8 @@ describe("JSON Schema validation", () => { 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"); }); it("Validate remove disabled titleMap choices", () => {