Review Fixes

Author: eneufeld

…/controls/MaterialSimpleAnyOfControl.tsx …ols/MaterialAnyOfStringOrEnumControl.tsxpackages/material/src/controls/MaterialSimpleAnyOfControl.tsx renamed to packages/material/src/controls/MaterialAnyOfStringOrEnumControl.tsx packages/material/src/controls/MaterialSimpleAnyOfControl.tsx renamed to packages/material/src/controls/MaterialAnyOfStringOrEnumControl.tsx

@@ -44,6 +44,13 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { MaterialInputControl } from './MaterialInputControl';
 
+const findEnumSchema = (schemas: JsonSchema[]) =>
+    schemas.find(
+      s => s.enum !== undefined && (s.type === 'string' || s.type === undefined)
+    );
+  const findTextSchema = (schemas: JsonSchema[]) =>
+    schemas.find(s => s.type === 'string' && s.enum === undefined);
+
 const MuiAutocompleteInputText = (props: EnumCellProps & WithClassname) => {
   const {
     data,
@@ -57,16 +64,9 @@ const MuiAutocompleteInputText = (props: EnumCellProps & WithClassname) => {
     handleChange,
     schema
   } = props;
-
-  const findEnumSchema = (schemas: JsonSchema[]) =>
-    schemas.find(
-      s => s.enum !== undefined && (s.type === 'string' || s.type === undefined)
-    );
-  const findTextSchema = (schemas: JsonSchema[]) =>
-    schemas.find(s => s.type === 'string' && s.enum === undefined);
   const enumSchema = findEnumSchema(schema.anyOf);
-  const textSchema = findTextSchema(schema.anyOf);
-  const maxLength = textSchema.maxLength;
+  const stringSchema = findTextSchema(schema.anyOf);
+  const maxLength = stringSchema.maxLength;
   const mergedConfig = merge({}, config, uischema.options);
   let inputProps: InputBaseComponentProps = {};
   if (mergedConfig.restrict) {
@@ -102,7 +102,7 @@ const MuiAutocompleteInputText = (props: EnumCellProps & WithClassname) => {
   );
 };
 
-export class MaterialSimpleAnyOfControl extends Control<ControlProps, ControlState> {
+export class MaterialAnyOfStringOrEnumControl extends Control<ControlProps, ControlState> {
   render() {
     return (
       <MaterialInputControl {...this.props} input={MuiAutocompleteInputText} />
@@ -111,29 +111,25 @@ export class MaterialSimpleAnyOfControl extends Control<ControlProps, ControlSta
 }
 const hasEnumAndText = (schemas: JsonSchema[]) => {
   // idea: map to type,enum and check that all types are string and at least one item is of type enum,
-  const enumSchema = schemas.find(
-    s => s.enum !== undefined && (s.type === 'string' || s.type === undefined)
-  );
-  const textSchema = schemas.find(
-    s => s.type === 'string' && s.enum === undefined
-  );
+  const enumSchema = findEnumSchema(schemas);
+  const stringSchema = findTextSchema(schemas);
   const remainingSchemas = schemas.filter(
-    s => s !== enumSchema || s !== textSchema
+    s => s !== enumSchema || s !== stringSchema
   );
   const wrongType = remainingSchemas.find(s => s.type && s.type !== 'string');
-  return enumSchema && textSchema && !wrongType;
+  return enumSchema && stringSchema && !wrongType;
 };
 const simpleAnyOf = and(
   uiTypeIs('Control'),
   schemaMatches(
     schema => schema.hasOwnProperty('anyOf') && hasEnumAndText(schema.anyOf)
   )
 );
-export const materialSimpleAnyOfControlTester: RankedTester = rankWith(
+export const materialAnyOfStringOrEnumControlTester: RankedTester = rankWith(
   5,
   simpleAnyOf
 );
 export default connect(
   mapStateToControlProps,
   mapDispatchToControlProps
-)(MaterialSimpleAnyOfControl);
+)(MaterialAnyOfStringOrEnumControl);

packages/material/src/controls/index.ts

@@ -53,9 +53,9 @@ import MaterialTextControl, {
   materialTextControlTester
 } from './MaterialTextControl';
 
-import MaterialSimpleAnyOfControl, {
-  materialSimpleAnyOfControlTester
-} from './MaterialSimpleAnyOfControl';
+import MaterialAnyOfStringOrEnumControl, {
+  materialAnyOfStringOrEnumControlTester
+} from './MaterialAnyOfStringOrEnumControl';
 
 export {
   MaterialBooleanControl,
@@ -78,6 +78,6 @@ export {
   materialNumberControlTester,
   MaterialTextControl,
   materialTextControlTester,
-  MaterialSimpleAnyOfControl,
-  materialSimpleAnyOfControlTester
+  MaterialAnyOfStringOrEnumControl,
+  materialAnyOfStringOrEnumControlTester
 };

packages/material/src/index.ts

@@ -45,6 +45,8 @@ import {
   materialListWithDetailTester
 } from './additional';
 import {
+  MaterialAnyOfStringOrEnumControl,
+  materialAnyOfStringOrEnumControlTester,
   MaterialBooleanControl,
   materialBooleanControlTester,
   MaterialDateControl,
@@ -61,8 +63,6 @@ import {
   materialNumberControlTester,
   MaterialRadioGroupControl,
   materialRadioGroupControlTester,
-  MaterialSimpleAnyOfControl,
-  materialSimpleAnyOfControlTester,
   MaterialSliderControl,
   materialSliderControlTester,
   MaterialTextControl,
@@ -155,8 +155,8 @@ export const materialRenderers: JsonFormsRendererRegistryEntry[] = [
     renderer: MaterialListWithDetailRenderer
   },
   {
-    tester: materialSimpleAnyOfControlTester,
-    renderer: MaterialSimpleAnyOfControl
+    tester: materialAnyOfStringOrEnumControlTester,
+    renderer: MaterialAnyOfStringOrEnumControl
   }
 ];
 

…ers/MaterialSimpleAnyOfRenderer.test.tsx …aterialAnyOfStringOrEnumControl.test.tsxpackages/material/test/renderers/MaterialSimpleAnyOfRenderer.test.tsx renamed to packages/material/test/renderers/MaterialAnyOfStringOrEnumControl.test.tsx packages/material/test/renderers/MaterialSimpleAnyOfRenderer.test.tsx renamed to packages/material/test/renderers/MaterialAnyOfStringOrEnumControl.test.tsx

@@ -36,7 +36,7 @@ import {
   UISchemaElement
 } from '@jsonforms/core';
 import {
-  materialRenderers, MaterialSimpleAnyOfControl, materialSimpleAnyOfControlTester
+  MaterialAnyOfStringOrEnumControl, materialAnyOfStringOrEnumControlTester, materialRenderers
 } from '../../src';
 import { combineReducers, createStore, Store } from 'redux';
 
@@ -53,8 +53,8 @@ const uischema: ControlElement = {
 
 describe('Material simple any of control tester', () => {
   it('should only be applicable for simple any of cases', () => {
-    expect(materialSimpleAnyOfControlTester({ type: 'Foo' }, schema)).toBe(-1);
-    expect(materialSimpleAnyOfControlTester(uischema, schema)).toBe(5);
+    expect(materialAnyOfStringOrEnumControlTester({ type: 'Foo' }, schema)).toBe(-1);
+    expect(materialAnyOfStringOrEnumControlTester(uischema, schema)).toBe(5);
 
     const nestedSchema: JsonSchema = {
       properties: {
@@ -65,7 +65,7 @@ describe('Material simple any of control tester', () => {
       type: 'Control',
       scope: '#/properties/foo'
     };
-    expect(materialSimpleAnyOfControlTester(nestedUischema, nestedSchema)).toBe(
+    expect(materialAnyOfStringOrEnumControlTester(nestedUischema, nestedSchema)).toBe(
       5
     );
     const schemaNoEnum: JsonSchema = {
@@ -80,14 +80,14 @@ describe('Material simple any of control tester', () => {
     const schemaNoString: JsonSchema = {
       anyOf: [{ type: 'integer' }, { enum: [1, 2] }]
     };
-    expect(materialSimpleAnyOfControlTester(uischema, schemaNoEnum)).toBe(-1);
+    expect(materialAnyOfStringOrEnumControlTester(uischema, schemaNoEnum)).toBe(-1);
     expect(
-      materialSimpleAnyOfControlTester(uischema, schemaConflictTypes)
+      materialAnyOfStringOrEnumControlTester(uischema, schemaConflictTypes)
     ).toBe(-1);
     expect(
-      materialSimpleAnyOfControlTester(uischema, schemaAdditionalProps)
+      materialAnyOfStringOrEnumControlTester(uischema, schemaAdditionalProps)
     ).toBe(5);
-    expect(materialSimpleAnyOfControlTester(uischema, schemaNoString)).toBe(-1);
+    expect(materialAnyOfStringOrEnumControlTester(uischema, schemaNoString)).toBe(-1);
   });
 });
 
@@ -109,7 +109,7 @@ const initJsonFormsStore = (
     return store;
   };
 
-describe('Material input control', () => {
+describe('Material any of string or enum control', () => {
     let wrapper: ReactWrapper;
 
     afterEach(() => {
@@ -120,7 +120,7 @@ describe('Material input control', () => {
       const store = initJsonFormsStore('foo', schema, uischema);
       wrapper = mount(
         <Provider store={store}>
-          <MaterialSimpleAnyOfControl schema={schema} uischema={uischema} />
+          <MaterialAnyOfStringOrEnumControl schema={schema} uischema={uischema} />
         </Provider>
       );
       const inputs = wrapper.find('input');