@jsonforms/core 3.0.0-beta.3 → 3.0.0-rc.0

package/test/testers.test.ts

@@ -46,7 +46,8 @@ import {
   scopeEndIs,
   scopeEndsWith,
   uiTypeIs,
-  isOneOfEnumControl
+  isOneOfEnumControl,
+  TesterContext
 } from '../src/testers';
 import {
   ControlElement,
@@ -57,6 +58,9 @@ import {
 
 const test = anyTest as TestInterface<{ uischema: ControlElement }>;
 
+const createTesterContext =
+  (rootSchema: JsonSchema, config?: any): TesterContext => ({ rootSchema, config });
+
 test.beforeEach(t => {
   t.context.uischema = {
     type: 'Control',
@@ -75,8 +79,9 @@ test('schemaTypeIs should check type sub-schema of control', t => {
     type: 'Control',
     scope: '#/properties/foo'
   };
-  t.true(schemaTypeIs('string')(uischema, schema, schema));
-  t.false(schemaTypeIs('integer')(uischema, schema, schema));
+  const testerContext = createTesterContext(schema);
+  t.true(schemaTypeIs('string')(uischema, schema, testerContext));
+  t.false(schemaTypeIs('integer')(uischema, schema, testerContext));
 });
 
 test('schemaTypeIs should return false for non-control UI schema elements', t => {
@@ -90,7 +95,8 @@ test('schemaTypeIs should return false for non-control UI schema elements', t =>
     type: 'Label',
     text: 'some text'
   };
-  t.false(schemaTypeIs('integer')(label, schema, schema));
+  const testerContext = createTesterContext(schema);
+  t.false(schemaTypeIs('integer')(label, schema, testerContext));
 });
 
 test('schemaTypeIs should return false for control pointing to invalid sub-schema', t => {
@@ -104,7 +110,8 @@ test('schemaTypeIs should return false for control pointing to invalid sub-schem
       foo: { type: 'string' }
     }
   };
-  t.false(schemaTypeIs('string')(uischema, schema, schema));
+  const testerContext = createTesterContext(schema);
+  t.false(schemaTypeIs('string')(uischema, schema, testerContext));
 });
 
 test('schemaTypeIs should return true for array type', t => {
@@ -118,8 +125,9 @@ test('schemaTypeIs should return true for array type', t => {
     type: 'Control',
     scope: '#/properties/foo'
   };
-  t.true(schemaTypeIs('string')(uischema, schema, schema));
-  t.true(schemaTypeIs('integer')(uischema, schema, schema));
+  const testerContext = createTesterContext(schema);
+  t.true(schemaTypeIs('string')(uischema, schema, testerContext));
+  t.true(schemaTypeIs('integer')(uischema, schema, testerContext));
 });
 
 test('formatIs should check the format of a resolved sub-schema', t => {
@@ -136,7 +144,8 @@ test('formatIs should check the format of a resolved sub-schema', t => {
       }
     }
   };
-  t.true(formatIs('date-time')(uischema, schema, schema));
+  const testerContext = createTesterContext(schema);
+  t.true(formatIs('date-time')(uischema, schema, testerContext));
 });
 
 test('uiTypeIs', t => {
@@ -183,8 +192,9 @@ test('schemaMatches should check type sub-schema of control via predicate', t =>
     type: 'Control',
     scope: '#/properties/foo'
   };
+  const testerContext = createTesterContext(schema);
   t.true(
-    schemaMatches(subSchema => subSchema.type === 'string')(uischema, schema, schema)
+    schemaMatches(subSchema => subSchema.type === 'string')(uischema, schema, testerContext)
   );
 });
 
@@ -198,8 +208,9 @@ test('schemaMatches should check type sub-schema of control via predicate also w
     type: 'Control',
     scope: '#/properties/foo'
   };
+  const testerContext = createTesterContext(schema);
   t.true(
-    schemaMatches(subSchema => subSchema.type === 'string')(uischema, schema, schema)
+    schemaMatches(subSchema => subSchema.type === 'string')(uischema, schema, testerContext)
   );
 });
 
@@ -214,7 +225,8 @@ test('schemaMatches should return false for non-control UI schema elements', t =
     type: 'Label',
     text: 'some text'
   };
-  t.false(schemaMatches(() => false)(label, schema, schema));
+  const testerContext = createTesterContext(schema);
+  t.false(schemaMatches(() => false)(label, schema, testerContext));
 });
 
 test('schemaMatches should return false for control pointing to invalid subschema', t => {
@@ -228,7 +240,8 @@ test('schemaMatches should return false for control pointing to invalid subschem
     type: 'Control',
     scope: '#/properties/bar'
   };
-  t.false(schemaMatches(() => false)(uischema, schema, schema));
+  const testerContext = createTesterContext(schema);
+  t.false(schemaMatches(() => false)(uischema, schema, testerContext));
 });
 
 test('scopeEndsWith checks whether the ref of a control ends with a certain string', t => {
@@ -274,7 +287,8 @@ test('and should allow to compose multiple testers', t => {
     type: 'Control',
     scope: '#/properties/foo'
   };
-  t.true(and(schemaTypeIs('string'), scopeEndIs('foo'))(uischema, schema, schema));
+  const testerContext = createTesterContext(schema);
+  t.true(and(schemaTypeIs('string'), scopeEndIs('foo'))(uischema, schema, testerContext));
 });
 
 test('or should allow to compose multiple testers', t => {
@@ -288,8 +302,9 @@ test('or should allow to compose multiple testers', t => {
     type: 'Control',
     scope: '#/properties/foo'
   };
+  const testerContext = createTesterContext(schema);
   t.true(
-    or(schemaTypeIs('integer'), optionIs('slider', true))(uischema, schema, schema)
+    or(schemaTypeIs('integer'), optionIs('slider', true))(uischema, schema, testerContext)
   );
 });
 
@@ -308,7 +323,7 @@ test('tester isPrimitiveArrayControl', t => {
     }
   };
   t.true(
-    isPrimitiveArrayControl(control, schema, schema),
+    isPrimitiveArrayControl(control, schema, createTesterContext(schema)),
     `Primitive array tester was not triggered for 'integer' schema type`
   );
   const schemaWithRefs = {
@@ -322,7 +337,7 @@ test('tester isPrimitiveArrayControl', t => {
     }
   };
   t.true(
-    isPrimitiveArrayControl(control, schemaWithRefs, schemaWithRefs),
+    isPrimitiveArrayControl(control, schemaWithRefs, createTesterContext(schemaWithRefs)),
     `Primitive array tester was not triggered for 'integer' schema type with refs`
   );
   const objectSchema = {
@@ -335,7 +350,7 @@ test('tester isPrimitiveArrayControl', t => {
     }
   };
   t.false(
-    isPrimitiveArrayControl(control, objectSchema, objectSchema),
+    isPrimitiveArrayControl(control, objectSchema, createTesterContext(objectSchema)),
     `Primitive array tester was not triggered for 'object' schema type`
   );
 });
@@ -401,7 +416,7 @@ test('tester isObjectArrayControl', t => {
       }
     }
   };
-  t.true(isObjectArrayControl(control, schema, schema));
+  t.true(isObjectArrayControl(control, schema, createTesterContext(schema)));
   const schema_noType: JsonSchema = {
     type: 'object',
     properties: {
@@ -416,7 +431,7 @@ test('tester isObjectArrayControl', t => {
       }
     }
   };
-  t.true(isObjectArrayControl(control, schema_noType, schema_noType));
+  t.true(isObjectArrayControl(control, schema_noType, createTesterContext(schema_noType)));
   const schema_innerAllOf: JsonSchema = {
     type: 'object',
     properties: {
@@ -439,7 +454,7 @@ test('tester isObjectArrayControl', t => {
       }
     }
   };
-  t.true(isObjectArrayControl(control, schema_innerAllOf, schema_innerAllOf));
+  t.true(isObjectArrayControl(control, schema_innerAllOf, createTesterContext(schema_innerAllOf)));
 
   const schemaWithRefs = {
     definitions: {
@@ -461,7 +476,8 @@ test('tester isObjectArrayControl', t => {
       }
     }
   }
-  t.true(isObjectArrayControl(control, schemaWithRefs, schemaWithRefs));
+  const testerContext = createTesterContext(schemaWithRefs);
+  t.true(isObjectArrayControl(control, schemaWithRefs, testerContext));
 });
 
 test('isBooleanControl', t => {
@@ -801,7 +817,7 @@ test('tester isObjectArrayWithNesting', t => {
   t.true(isObjectArrayWithNesting(uischema, nestedSchema, undefined));
   t.true(isObjectArrayWithNesting(uischema, nestedSchema2, undefined));
   t.true(isObjectArrayWithNesting(uischema, nestedSchema3, undefined));
-  t.true(isObjectArrayWithNesting(uischema, nestedSchemaWithRef, nestedSchemaWithRef));
+  t.true(isObjectArrayWithNesting(uischema, nestedSchemaWithRef, createTesterContext(nestedSchemaWithRef)));
 
   t.false(isObjectArrayWithNesting(uischemaOptions.default, schema, undefined));
   t.true(isObjectArrayWithNesting(uischemaOptions.generate, schema, undefined));
@@ -872,5 +888,6 @@ test('tester isOneOfEnumControl', t => {
       }
     }
   }
-  t.true(isOneOfEnumControl(control, schemaWithRefs, schemaWithRefs));
+  const testerContext = createTesterContext(schemaWithRefs);
+  t.true(isOneOfEnumControl(control, schemaWithRefs, testerContext));
 });

package/test/util/renderer.test.ts

@@ -32,10 +32,9 @@ import { JsonFormsState } from '../../src/store';
 import { coreReducer, JsonFormsCore } from '../../src/reducers/core';
 import { Dispatch } from '../../src/util/type';
 import { CoreActions, init, setValidationMode, update, UpdateAction, UPDATE_DATA } from '../../src/actions/actions';
-import { ControlElement, RuleEffect, UISchemaElement } from '../../src/models/uischema';
-import { computeLabel, createDefaultValue, mapDispatchToArrayControlProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAnyOfProps, mapStateToArrayLayoutProps, mapStateToControlProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLayoutProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, OwnPropsOfControl } from '../../src/util/renderer';
+import { ControlElement, LabelElement, RuleEffect, UISchemaElement } from '../../src/models/uischema';
+import { computeLabel, createDefaultValue, mapDispatchToArrayControlProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAnyOfProps, mapStateToArrayLayoutProps, mapStateToControlProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLabelProps, mapStateToLayoutProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, OwnPropsOfControl } from '../../src/util/renderer';
 import { clearAllIds } from '../../src/util/ids';
-import { generateDefaultUISchema } from '../../src/generators/uischema';
 import { JsonSchema } from '../../src/models/jsonSchema';
 import { rankWith } from '../../src/testers/testers';
 import { createAjv } from '../../src/util/validator';
@@ -495,7 +494,7 @@ test('createDefaultValue', t => {
   t.deepEqual(createDefaultValue({ type: 'something' }), {});
 });
 
-test(`mapStateToDispatchRendererProps should generate UI schema given ownProps schema`, t => {
+test(`mapStateToJsonFormsRendererProps should use registered UI schema given ownProps schema`, t => {
   const store = mockStore(createState(coreUISchema));
   const schema = {
     type: 'object',
@@ -507,16 +506,16 @@ test(`mapStateToDispatchRendererProps should generate UI schema given ownProps s
   };
 
   const props = mapStateToJsonFormsRendererProps(store.getState(), { schema });
-  t.deepEqual(props.uischema, generateDefaultUISchema(schema));
+  t.deepEqual(props.uischema, coreUISchema);
 });
 
-test(`mapStateToDispatchRendererProps should use registered UI schema given no ownProps`, t => {
+test(`mapStateToJsonFormsRendererProps should use registered UI schema given no ownProps`, t => {
   const store = mockStore(createState(coreUISchema));
   const props = mapStateToJsonFormsRendererProps(store.getState(), {});
   t.deepEqual(props.uischema, coreUISchema);
 });
 
-test(`mapStateToDispatchRendererProps should use UI schema if given via ownProps`, t => {
+test(`mapStateToJsonFormsRendererProps should use UI schema if given via ownProps`, t => {
   const store = mockStore(createState(coreUISchema));
   const schema = {
     type: 'object',
@@ -1344,7 +1343,7 @@ test('mapStateToControlProps - i18n - translation via UI Schema i18n key', t =>
   };
   const state: JsonFormsState = createState(coreUISchema);
   state.jsonforms.i18n = defaultJsonFormsI18nState;
-  ownProps.uischema = {...ownProps.uischema, options: {i18n: 'my-key'}};
+  ownProps.uischema = {...ownProps.uischema, i18n: 'my-key'};
   state.jsonforms.i18n.translate = (key: string, defaultMessage: string | undefined) => {
     switch(key){
       case 'my-key.label': return 'my label';
@@ -1730,3 +1729,102 @@ test('mapStateToOneOfEnumControlProps - i18n - i18n key translation', t => {
   const props = mapStateToOneOfEnumControlProps(state, ownProps);
   t.is(props.options[0].label, 'my message');
 });
+
+
+test('mapStateToLabelProps - i18n - should not crash without i18n', t => {
+  const labelUISchema : LabelElement = {
+    type: 'Label',
+    text: 'foo',
+    i18n: 'bar'
+  }
+  const ownProps = {
+    uischema: labelUISchema
+  };
+  const state: JsonFormsState = createState(labelUISchema);
+  state.jsonforms.i18n = undefined;
+
+  const props = mapStateToLabelProps(state, ownProps);
+  t.is(props.text, 'foo');
+});
+
+test('mapStateToLabelProps - i18n - default translation has no effect', t => {
+  const labelUISchema : LabelElement = {
+    type: 'Label',
+    text: 'foo',
+    i18n: 'bar'
+  }
+  const ownProps = {
+    uischema: labelUISchema
+  };
+  const state: JsonFormsState = createState(labelUISchema);
+  state.jsonforms.i18n = defaultJsonFormsI18nState;
+
+  const props = mapStateToLabelProps(state, ownProps);
+  t.is(props.text, 'foo');
+});
+
+test('mapStateToLabelProps - i18n - default key translation', t => {
+  const labelUISchema : LabelElement = {
+    type: 'Label',
+    text: 'foo'
+  }
+  const ownProps = {
+    uischema: labelUISchema
+  };
+  const state: JsonFormsState = createState(labelUISchema);
+  state.jsonforms.i18n = defaultJsonFormsI18nState;
+  state.jsonforms.i18n.translate = (key: string, defaultMessage: string | undefined) => {
+    switch(key){
+      case 'foo': return 'my message';
+      default: return defaultMessage;
+    }
+  }
+
+  const props = mapStateToLabelProps(state, ownProps);
+  t.is(props.text, 'my message');
+});
+
+
+test('mapStateToLabelProps - i18n - default message translation', t => {
+  const labelUISchema : LabelElement = {
+    type: 'Label',
+    text: 'foo',
+    i18n: 'bar'
+  }
+  const ownProps = {
+    uischema: labelUISchema
+  };
+  const state: JsonFormsState = createState(labelUISchema);
+  state.jsonforms.i18n = defaultJsonFormsI18nState;
+  state.jsonforms.i18n.translate = (_key: string, defaultMessage: string | undefined) => {
+    switch(defaultMessage){
+      case 'foo': return 'my message';
+      default: return defaultMessage;
+    }
+  }
+
+  const props = mapStateToLabelProps(state, ownProps);
+  t.is(props.text, 'my message');
+});
+
+test('mapStateToLabelProps - i18n - i18n key translation', t => {
+  const labelUISchema : LabelElement = {
+    type: 'Label',
+    text: 'foo',
+    i18n: 'bar'
+  }
+  const ownProps = {
+    uischema: labelUISchema
+  };
+  const state: JsonFormsState = createState(labelUISchema);
+  state.jsonforms.i18n = defaultJsonFormsI18nState;
+  state.jsonforms.i18n.translate = (key: string, defaultMessage: string | undefined): string | undefined => {
+    switch(key){
+      case 'bar.text': return 'my message';
+      default: return defaultMessage;
+    }
+  }
+
+  const props = mapStateToLabelProps(state, ownProps);
+  t.is(props.text, 'my message');
+});