Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b854a3
fix(EM-1799): drop just inactive enum choices
hugo07E8 Jun 30, 2025
c09be3b
fix(EM-1799): drop just inactive enum choices
hugo07E8 Jul 2, 2025
f44bfa7
fix(EM-1799): drop just inactive enum choices
hugo07E8 Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/v1/validateJsonSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' };
}
Expand Down
4 changes: 4 additions & 0 deletions test/JsonFormatter.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
});

Expand Down