@jsonforms/core 3.1.0-alpha.2 → 3.1.0-alpha.3

package/lib/util/schema.d.ts

@@ -1 +1,6 @@
+import { JsonSchema } from '../models';
 export declare const getFirstPrimitiveProp: (schema: any) => string;
+/**
+ * Tests whether the schema has an enum based on oneOf.
+ */
+export declare const isOneOfEnumSchema: (schema: JsonSchema) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.1.0-alpha.2",
+  "version": "3.1.0-alpha.3",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -99,5 +99,5 @@
     "typedoc": "^0.19.2",
     "typescript": "4.2.3"
   },
-  "gitHead": "1e1ccad5f7ebfaf80412c8af3e422faebb12d0d5"
+  "gitHead": "f8ea38f9f9dd3d46cbfde269ec43e9eb1632e428"
 }

package/src/reducers/core.ts

@@ -45,7 +45,7 @@ import {
   UPDATE_CORE,
   UpdateCoreAction,
 } from '../actions';
-import { createAjv, Reducer } from '../util';
+import { createAjv, isOneOfEnumSchema, Reducer } from '../util';
 import type { JsonSchema, UISchemaElement } from '../models';
 
 export const validate = (
@@ -389,7 +389,11 @@ export const errorsAt =
 
     return filter(errors, (error) => {
       // Filter errors that match any keyword that we don't want to show in the UI
-      if (filteredErrorKeywords.indexOf(error.keyword) !== -1) {
+      // but keep the errors for oneOf enums
+      if (
+        filteredErrorKeywords.indexOf(error.keyword) !== -1 &&
+        !isOneOfEnumSchema(error.parentSchema)
+      ) {
         return false;
       }
       const controlPath = getControlPath(error);
@@ -400,12 +404,13 @@ export const errorsAt =
       // In the primitive case the error's data path is the same for all subschemas:
       // It directly points to the property defining the anyOf/oneOf.
       // The same holds true for errors on the array level (e.g. min item amount).
-      // In contrast, this comparison must not be done for errors whose parent schema defines an object
+      // In contrast, this comparison must not be done for errors whose parent schema defines an object or a oneOf enum,
       // because the parent schema can never match the property schema (e.g. for 'required' checks).
       const parentSchema: JsonSchema | undefined = error.parentSchema;
       if (
         result &&
         !isObjectSchema(parentSchema) &&
+        !isOneOfEnumSchema(parentSchema) &&
         combinatorPaths.findIndex((p) => instancePath.startsWith(p)) !== -1
       ) {
         result = result && isEqual(parentSchema, schema);

package/src/testers/testers.ts

@@ -37,7 +37,12 @@ import type {
   JsonSchema,
   UISchemaElement,
 } from '../models';
-import { deriveTypes, hasType, resolveSchema } from '../util';
+import {
+  deriveTypes,
+  hasType,
+  isOneOfEnumSchema,
+  resolveSchema,
+} from '../util';
 
 /**
  * Constant that indicates that a tester is not capable of handling
@@ -353,11 +358,7 @@ export const isEnumControl = and(
  */
 export const isOneOfEnumControl = and(
   uiTypeIs('Control'),
-  schemaMatches(
-    (schema) =>
-      schema.hasOwnProperty('oneOf') &&
-      (schema.oneOf as JsonSchema[]).every((s) => s.const !== undefined)
-  )
+  schemaMatches((schema) => isOneOfEnumSchema(schema))
 );
 
 /**
@@ -517,7 +518,7 @@ export const isObjectArrayWithNesting = (
           if (val.anyOf || val.allOf) {
             return true;
           }
-          if (val.oneOf && !isOneOfEnumControl(uischema, val, context)) {
+          if (val.oneOf && !isOneOfEnumSchema(val)) {
             return true;
           }
           if (hasType(val, 'object')) {

package/src/util/schema.ts

@@ -24,6 +24,7 @@
 */
 
 import find from 'lodash/find';
+import { JsonSchema } from '../models';
 
 export const getFirstPrimitiveProp = (schema: any) => {
   if (schema.properties) {
@@ -38,3 +39,11 @@ export const getFirstPrimitiveProp = (schema: any) => {
   }
   return undefined;
 };
+
+/**
+ * Tests whether the schema has an enum based on oneOf.
+ */
+export const isOneOfEnumSchema = (schema: JsonSchema) =>
+  schema?.hasOwnProperty('oneOf') &&
+  schema?.oneOf &&
+  (schema.oneOf as JsonSchema[]).every((s) => s.const !== undefined);