cell updates reverted, 'readonly' removed, tests are enriched

Author: Öner Zafer

packages/core/src/util/cell.ts

@@ -24,12 +24,12 @@
 */
 import isEmpty from 'lodash/isEmpty';
 import union from 'lodash/union';
-import { getAjv, getConfig, getData, getErrorAt, getSchema } from '../reducers';
+import { getConfig, getData, getErrorAt, getSchema, getAjv } from '../reducers';
 import {
   AnyAction,
   Dispatch,
   formatErrorMessage,
-  isInherentlyEnabled,
+  isEnabled,
   isVisible,
   OwnPropsOfControl,
   OwnPropsOfEnum,
@@ -82,7 +82,6 @@ export type DispatchPropsOfCell = DispatchPropsOfControl;
  * Props of a cell.
  */
 export interface CellProps extends StatePropsOfCell, DispatchPropsOfCell {}
-
 /**
  * Registers the given cell renderer when a JSON Forms store is created.
  * @param {RankedTester} tester
@@ -110,22 +109,18 @@ export const mapStateToCellProps = (
     ownProps.visible !== undefined
       ? ownProps.visible
       : isVisible(uischema, rootData, undefined, getAjv(state));
+  const readonly = state.jsonforms.readonly;
+  const enabled =
+    !readonly &&
+    (ownProps.enabled !== undefined
+      ? ownProps.enabled
+      : isEnabled(uischema, rootData, undefined, getAjv(state)));
   const errors = formatErrorMessage(
     union(getErrorAt(path, schema)(state).map(error => error.message))
   );
   const isValid = isEmpty(errors);
   const rootSchema = getSchema(state);
 
-  const config = getConfig(state);
-  const enabled: boolean = isInherentlyEnabled(
-    state,
-    ownProps,
-    uischema,
-    schema || rootSchema,
-    rootData,
-    config
-  );
-
   return {
     data: Resolve.data(rootData, path),
     visible,
@@ -136,7 +131,7 @@ export const mapStateToCellProps = (
     isValid,
     schema,
     uischema,
-    config,
+    config: getConfig(state),
     rootSchema,
     renderers,
     cells

packages/core/src/util/runtime.ts

@@ -185,7 +185,7 @@ export const isInherentlyEnabled = (
   state: JsonFormsState,
   ownProps: any,
   uischema: UISchemaElement,
-  schema: JsonSchema & { readonly?: boolean; readOnly?: boolean },
+  schema: JsonSchema & { readOnly?: boolean },
   rootData: any,
   config: any
 ) => {
@@ -210,9 +210,6 @@ export const isInherentlyEnabled = (
   if (typeof schema?.readOnly === 'boolean') {
     return !schema.readOnly;
   }
-  if (typeof schema?.readonly === 'boolean') {
-    return !schema.readonly;
-  }
   if (typeof ownProps?.enabled === 'boolean') {
     return ownProps.enabled;
   }

packages/core/test/util/cell.test.ts

@@ -152,10 +152,10 @@ test('mapStateToCellProps - visible via state ', t => {
   t.true(props.visible);
 });
 
-test('mapStateToCellProps - enabled via rule ', t => {
+test('mapStateToCellProps - enabled via ownProps ', t => {
   const uischema = {
     ...coreUISchema,
-    rule: enableRule
+    rule: disableRule
   };
   const ownProps = {
     enabled: true,
@@ -166,27 +166,39 @@ test('mapStateToCellProps - enabled via rule ', t => {
 });
 
 test('mapStateToCellProps - disabled via ownProps ', t => {
+  const uischema = {
+    ...coreUISchema,
+    rule: disableRule
+  };
   const ownProps = {
     enabled: false,
-    uischema: coreUISchema
+    uischema
   };
-  const props = mapStateToCellProps(createState(coreUISchema), ownProps);
+  const props = mapStateToCellProps(createState(uischema), ownProps);
   t.false(props.enabled);
 });
 
 test('mapStateToCellProps - disabled via state ', t => {
+  const uischema = {
+    ...coreUISchema,
+    rule: disableRule
+  };
   const ownProps = {
-    uischema: coreUISchema
+    uischema
   };
-  const props = mapStateToCellProps(createState(coreUISchema), ownProps);
+  const props = mapStateToCellProps(createState(uischema), ownProps);
   t.false(props.enabled);
 });
 
 test('mapStateToCellProps - enabled via state ', t => {
+  const uischema = {
+    ...coreUISchema,
+    rule: disableRule
+  };
   const ownProps = {
-    uischema: coreUISchema
+    uischema
   };
-  const clonedState = _.cloneDeep(createState(coreUISchema));
+  const clonedState = _.cloneDeep(createState(uischema));
   clonedState.jsonforms.core.data.firstName = 'Lisa';
   const props = mapStateToCellProps(clonedState, ownProps);
   t.true(props.enabled);

packages/core/test/util/runtime.test.ts

@@ -28,6 +28,7 @@ import {
   ControlElement,
   createAjv,
   isInherentlyEnabled,
+  JsonFormsCore,
   LeafCondition,
   OrCondition,
   RuleEffect,
@@ -587,17 +588,55 @@ test('isInherentlyEnabled disabled by uischema', t => {
   );
 });
 
+test('isInherentlyEnabled disabled by uischema over ownProps', t => {
+  t.false(
+    isInherentlyEnabled(
+      null,
+      { enabled: false },
+      ({ options: { readonly: true } } as unknown) as ControlElement,
+      null,
+      null,
+      null
+    )
+  );
+});
+
+test('isInherentlyEnabled disabled by uischema over schema', t => {
+  t.false(
+    isInherentlyEnabled(
+      null,
+      null,
+      ({ options: { readonly: true } } as unknown) as ControlElement,
+      { readOnly: false },
+      null,
+      null
+    )
+  );
+});
+
 test('isInherentlyEnabled disabled by schema', t => {
   t.false(
-    isInherentlyEnabled(null, null, null, { readonly: true }, null, null)
+    isInherentlyEnabled(null, null, null, { readOnly: true }, null, null)
+  );
+});
+
+test('isInherentlyEnabled disabled by schema over ownProps', t => {
+  t.false(
+    isInherentlyEnabled(
+      null,
+      { enabled: true },
+      null,
+      { readOnly: true },
+      null,
+      null
+    )
   );
 });
 
 test('isInherentlyEnabled disabled by rule', t => {
-  const leafCondition: LeafCondition = {
-    type: 'LEAF',
+  const leafCondition: SchemaBasedCondition = {
     scope: '#/properties/ruleValue',
-    expectedValue: 'bar'
+    schema: { type: 'string', pattern: 'bar' }
   };
   const uischema: ControlElement = {
     type: 'Control',
@@ -612,7 +651,51 @@ test('isInherentlyEnabled disabled by rule', t => {
     ruleValue: 'bar'
   };
 
-  t.false(isInherentlyEnabled(null, null, uischema, null, data, null));
+  t.false(
+    isInherentlyEnabled(
+      { jsonforms: { core: { ajv: createAjv() } as JsonFormsCore } },
+      null,
+      uischema,
+      null,
+      data,
+      null
+    )
+  );
+});
+
+test('isInherentlyEnabled disabled by global over rule ', t => {
+  const leafCondition: SchemaBasedCondition = {
+    scope: '#/properties/ruleValue',
+    schema: { type: 'string', pattern: 'bar' }
+  };
+  const uischema: ControlElement = {
+    type: 'Control',
+    scope: '#/properties/value',
+    rule: {
+      effect: RuleEffect.ENABLE,
+      condition: leafCondition
+    }
+  };
+  const data = {
+    value: 'foo',
+    ruleValue: 'bar'
+  };
+
+  t.false(
+    isInherentlyEnabled(
+      {
+        jsonforms: {
+          readonly: true,
+          core: { ajv: createAjv() } as JsonFormsCore
+        }
+      },
+      null,
+      uischema,
+      null,
+      data,
+      null
+    )
+  );
 });
 
 test('isInherentlyEnabled disabled by config', t => {
@@ -621,6 +704,14 @@ test('isInherentlyEnabled disabled by config', t => {
   );
 });
 
+test('isInherentlyEnabled enabled by config over ownProps', t => {
+  t.true(
+    isInherentlyEnabled(null, { enabled: false }, null, null, null, {
+      readonly: false
+    })
+  );
+});
+
 test('isInherentlyEnabled enabled', t => {
   t.true(isInherentlyEnabled(null, null, null, null, null, null));
 });

packages/examples/src/readonly.ts

@@ -29,7 +29,7 @@ export const schema = {
   properties: {
     readonly: {
       type: 'string',
-      readonly: true
+      readOnly: true
     },
     readonlyByUISchema: {
       type: 'string'