@jsonforms/material-renderers 3.0.0-alpha.3 → 3.0.0-beta.2

package/test/renderers/MaterialDateControl.test.tsx

@@ -57,14 +57,14 @@ const uischema: ControlElement = {
 
 describe('Material date control tester', () => {
   test('should fail', () => {
-    expect(materialDateControlTester(undefined, undefined)).toBe(
+    expect(materialDateControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialDateControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialDateControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialDateControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialDateControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
@@ -73,7 +73,8 @@ describe('Material date control tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialDateControlTester(uischema, {
@@ -85,7 +86,8 @@ describe('Material date control tester', () => {
             format: 'date'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -99,7 +101,8 @@ describe('Material date control tester', () => {
             format: 'date'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(4);
     expect(
       materialDateControlTester(
@@ -111,7 +114,8 @@ describe('Material date control tester', () => {
               type: 'string'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(4);
   });

package/test/renderers/MaterialDateTimeControl.test.tsx

@@ -58,14 +58,14 @@ const uischema: ControlElement = {
 
 describe('Material date time control tester', () => {
   it('should fail', () => {
-    expect(materialDateTimeControlTester(undefined, undefined)).toBe(
+    expect(materialDateTimeControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateTimeControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialDateTimeControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialDateTimeControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialDateTimeControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialDateTimeControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialDateTimeControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
@@ -74,7 +74,8 @@ describe('Material date time control tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialDateTimeControlTester(uischema, {
@@ -86,7 +87,8 @@ describe('Material date time control tester', () => {
             format: 'date-time'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -100,7 +102,8 @@ describe('Material date time control tester', () => {
             format: 'date-time'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(2);
     expect(
       materialDateTimeControlTester(
@@ -112,7 +115,8 @@ describe('Material date time control tester', () => {
               type: 'string'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(2);
   });

package/test/renderers/MaterialEnumArrayRenderer.test.tsx

@@ -51,7 +51,8 @@ describe('EnumArrayControl tester', () => {
       materialEnumArrayRendererTester(uischema, {
         type: 'array',
         items: {}
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialEnumArrayRendererTester(uischema, {
@@ -59,12 +60,13 @@ describe('EnumArrayControl tester', () => {
         items: {
           anyOf: []
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
   it('should succeed for schema with enum items', () => {
-    expect(materialEnumArrayRendererTester(uischema, enumSchema)).toBe(5);
+    expect(materialEnumArrayRendererTester(uischema, enumSchema, undefined)).toBe(5);
   });
 });
 
@@ -113,11 +115,11 @@ describe('EnumArrayControl', () => {
     );
     const labels = wrapper.find('label');
     expect(labels.first().text()).toBe('My Title');
-    expect(labels.last().text()).toBe('Bar');
+    expect(labels.last().text()).toBe('bar');
   });
 
-  test('oneOf items - updates data', () => {
-    let myData = undefined;
+  test('oneOf items - updates data', (done) => {
+    let myData: any = undefined;
     wrapper = mount(
       <JsonForms
         schema={oneOfSchema}
@@ -131,7 +133,11 @@ describe('EnumArrayControl', () => {
     );
     const input = wrapper.find('input').first();
     input.simulate('change', { target: { checked: true } });
-    expect(myData).toStrictEqual(['foo']);
+    // events are debounced for some time, so let's wait
+    setTimeout(() => {
+      expect(myData).toStrictEqual(['foo']);
+      done();
+    }, 50);
   });
 
   test('enum items - renders', () => {
@@ -172,13 +178,13 @@ describe('EnumArrayControl', () => {
       />
     );
     const labels = wrapper.find('label');
-    expect(labels.at(0).text()).toBe('A');
-    expect(labels.at(1).text()).toBe('B');
-    expect(labels.at(2).text()).toBe('C');
+    expect(labels.at(0).text()).toBe('a');
+    expect(labels.at(1).text()).toBe('b');
+    expect(labels.at(2).text()).toBe('c');
   });
 
-  test('enum items - updates data', () => {
-    let myData = undefined;
+  test('enum items - updates data', (done) => {
+    let myData: any = undefined;
     wrapper = mount(
       <JsonForms
         schema={enumSchema}
@@ -192,6 +198,10 @@ describe('EnumArrayControl', () => {
     );
     const input = wrapper.find('input').first();
     input.simulate('change', { target: { checked: true } });
-    expect(myData).toStrictEqual(['a']);
+    // events are debounced for some time, so let's wait
+    setTimeout(() => {
+      expect(myData).toStrictEqual(['a']);
+      done();
+    }, 50);
   });
 });

package/test/renderers/MaterialEnumCell.test.tsx

@@ -64,7 +64,8 @@ describe('Material enum cell tester', () => {
             enum: ['DE', 'IT', 'JP', 'US', 'RU', 'Other']
           }
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialEnumControl.test.tsx

@@ -0,0 +1,75 @@
+/*
+  The MIT License
+
+  Copyright (c) 2017-2019 EclipseSource Munich
+  https://github.com/eclipsesource/jsonforms
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+import './MatchMediaMock';
+import * as React from 'react';
+import {
+  ControlElement
+} from '@jsonforms/core';
+import { materialRenderers, MuiSelect } from '../../src';
+
+import Enzyme, { mount } from 'enzyme';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
+import { JsonFormsStateProvider } from '@jsonforms/react';
+import { initCore } from './util';
+import { MaterialEnumControl } from '../../src';
+
+Enzyme.configure({ adapter: new Adapter() });
+
+const data = { nationality: 'JP' };
+const schema = {
+  type: 'string',
+  enum: ['DE', 'IT', 'JP', 'US', 'RU', 'Other']
+};
+const uischema: ControlElement = {
+  type: 'Control',
+  scope: '#/properties/nationality',
+  options: {
+    autocomplete: false
+  }
+};
+
+describe('Material enum control', () => {
+  it('enum options should change when translation changes', () => {
+    const core = initCore(schema, uischema, data);
+    const translate = () => 'Translated';
+    const changedTranslate = () => 'OtherTranslation';
+    const wrapper = mount(
+      <JsonFormsStateProvider initState={{ renderers: materialRenderers, core, i18n: {translate} }}>
+        <MaterialEnumControl
+          schema={schema}
+          uischema={uischema}
+          path='nationality'
+        />
+      </JsonFormsStateProvider>
+    );
+
+    expect(wrapper.find(MuiSelect).props().options[0].label).toBe('Translated');
+
+    wrapper.setProps({ initState: { renderers: materialRenderers, core, i18n: {translate: changedTranslate} }} );
+    wrapper.update();
+
+    expect(wrapper.find(MuiSelect).props().options[0].label).toBe('OtherTranslation');
+  });
+});

package/test/renderers/MaterialIntegerCell.test.tsx

@@ -57,27 +57,29 @@ describe('Material integer cells tester', () => {
   };
 
   it('should fail', () => {
-    expect(materialIntegerCellTester(undefined, undefined)).toBe(
+    expect(materialIntegerCellTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialIntegerCellTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialIntegerCellTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialIntegerCellTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialIntegerCellTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialIntegerCellTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialIntegerCellTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
       materialIntegerCellTester(controlElement, {
         type: 'object',
         properties: { foo: { type: 'string' } }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialIntegerCellTester(controlElement, {
         type: 'object',
         properties: { foo: { type: 'string' }, bar: { type: 'integer' } }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -86,7 +88,8 @@ describe('Material integer cells tester', () => {
       materialIntegerCellTester(controlElement, {
         type: 'object',
         properties: { foo: { type: 'integer' } }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialLabelRenderer.test.tsx

@@ -51,14 +51,14 @@ const uischema = {
 
 describe('Material Label Renderer tester', () => {
   it('should fail', () => {
-    expect(materialLabelRendererTester(undefined, undefined)).toBe(
+    expect(materialLabelRendererTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialLabelRendererTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialLabelRendererTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialLabelRendererTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialLabelRendererTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialLabelRendererTester({ type: 'Label' }, undefined)).toBe(1);
+    expect(materialLabelRendererTester({ type: 'Label' }, undefined, undefined)).toBe(1);
   });
 });
 

package/test/renderers/MaterialListWithDetailRenderer.test.tsx

@@ -110,13 +110,13 @@ describe('Material list with detail tester', () => {
         type: 'string'
       }
     };
-    expect(materialListWithDetailTester(uischema, schema)).toBe(-1);
-    expect(materialListWithDetailTester(correctUISchema, wrongSchema)).toBe(-1);
-    expect(materialListWithDetailTester(correctUISchema, schema)).toBe(4);
-    expect(materialListWithDetailTester(correctUISchema, nestedSchema)).toBe(
+    expect(materialListWithDetailTester(uischema, schema, undefined)).toBe(-1);
+    expect(materialListWithDetailTester(correctUISchema, wrongSchema, undefined)).toBe(-1);
+    expect(materialListWithDetailTester(correctUISchema, schema, undefined)).toBe(4);
+    expect(materialListWithDetailTester(correctUISchema, nestedSchema, undefined)).toBe(
       -1
     );
-    expect(materialListWithDetailTester(correctUISchema, nestedSchema2)).toBe(
+    expect(materialListWithDetailTester(correctUISchema, nestedSchema2, undefined)).toBe(
       4
     );
   });

package/test/renderers/MaterialNumberCell.test.tsx

@@ -52,12 +52,12 @@ const uischema: ControlElement = {
 
 describe('Material number cells tester', () => {
   it('should fail', () => {
-    expect(materialNumberCellTester(undefined, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialNumberCellTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialNumberCellTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialNumberCellTester(undefined, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialNumberCellTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialNumberCellTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialNumberCellTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialNumberCellTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
   });
@@ -75,7 +75,8 @@ describe('Material number cells tester', () => {
             type: 'string'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -95,7 +96,8 @@ describe('Material number cells tester', () => {
             type: 'number'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -112,7 +114,8 @@ describe('Material number cells tester', () => {
             type: 'number'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialObjectControl.test.tsx

@@ -68,14 +68,14 @@ const uischema2: ControlElement = {
 
 describe('Material object renderer tester', () => {
   test('should fail', () => {
-    expect(materialObjectControlTester(undefined, undefined)).toBe(
+    expect(materialObjectControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialObjectControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialObjectControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialObjectControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialObjectControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialObjectControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialObjectControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
@@ -84,7 +84,8 @@ describe('Material object renderer tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialObjectControlTester(uischema2, {
@@ -93,7 +94,8 @@ describe('Material object renderer tester', () => {
           foo: { type: 'string' },
           bar: schema.properties.bar
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -104,7 +106,8 @@ describe('Material object renderer tester', () => {
         properties: {
           foo: schema.properties.foo
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialOneOfEnumCell.test.tsx

@@ -70,7 +70,8 @@ describe('Material one of enum cell tester', () => {
         properties: {
           country: schema
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialOneOfRadioGroupControl.test.tsx

@@ -63,7 +63,7 @@ const uischema: ControlElement = {
 
 describe('Material oneof radio group tester', () => {
   it('should return valid rank for oneof enums with radio format', () => {
-    const rank = materialOneOfRadioGroupControlTester(uischema, oneOfSchema);
+    const rank = materialOneOfRadioGroupControlTester(uischema, oneOfSchema, undefined);
     expect(rank).not.toBe(NOT_APPLICABLE);
   });
 
@@ -74,7 +74,8 @@ describe('Material oneof radio group tester', () => {
     };
     const rank = materialOneOfRadioGroupControlTester(
       uiSchemaNoRadio,
-      oneOfSchema
+      oneOfSchema,
+      undefined
     );
     expect(rank).toBe(NOT_APPLICABLE);
   });

package/test/renderers/MaterialOneOfRenderer.test.tsx

@@ -309,7 +309,7 @@ describe('Material oneOf renderer', () => {
     }, 1000);
   });
 
-  it.skip('should add an item within an array', async () => {
+  it('should add an item within an array', async () => {
     const schema = {
       type: 'object',
       properties: {
@@ -366,7 +366,7 @@ describe('Material oneOf renderer', () => {
     expect(nrOfRowsAfterAdd.length).toBe(3);
   });
 
-  it.skip('should add an object within an array', async () => {
+  it('should add an object within an array', async () => {
     const schema = {
       type: 'object',
       properties: {
@@ -424,7 +424,6 @@ describe('Material oneOf renderer', () => {
 
     await waitForAsync();
 
-    // expect(wrapper.state())
     wrapper.update();
 
     selectOneOfTab(wrapper, 1, false);
@@ -441,7 +440,7 @@ describe('Material oneOf renderer', () => {
     });
   });
 
-  it.skip('should switch to array based oneOf subschema, then switch back, then edit', async () => {
+  it('should switch to array based oneOf subschema, then switch back, then edit', async (done) => {
     const schema = {
       type: 'object',
       properties: {
@@ -511,9 +510,15 @@ describe('Material oneOf renderer', () => {
     const input = wrapper.find('input').first();
     input.simulate('change', { target: { value: 'test' } });
     wrapper.update();
-    expect(onChangeData.data).toEqual({
-      thingOrThings: { thing: 'test' }
-    });
+
+    setTimeout(() => {
+      expect(onChangeData.data).toEqual({
+        thingOrThings: { thing: 'test' }
+      });
+      done();
+    }, 1000);
+
+    
   });
 
   it('should show confirm dialog when data is not an empty object', async () => {

package/test/renderers/MaterialRadioGroupControl.test.tsx

@@ -56,7 +56,7 @@ const uischema: ControlElement = {
 
 describe('Material radio group tester', () => {
   it('should return valid rank for enums with radio format', () => {
-    const rank = materialRadioGroupControlTester(uischema, schema);
+    const rank = materialRadioGroupControlTester(uischema, schema, undefined);
     expect(rank).not.toBe(NOT_APPLICABLE);
   });
 
@@ -65,7 +65,7 @@ describe('Material radio group tester', () => {
       type: 'Control',
       scope: '#/properties/foo'
     };
-    const rank = materialRadioGroupControlTester(uiSchemaNoRadio, schema);
+    const rank = materialRadioGroupControlTester(uiSchemaNoRadio, schema, undefined);
     expect(rank).toBe(NOT_APPLICABLE);
   });
 });

package/test/renderers/MaterialSliderControl.test.tsx

@@ -64,14 +64,14 @@ const uischema: ControlElement = {
 
 describe('Material slider tester', () => {
   it('should fail', () => {
-    expect(materialSliderControlTester(undefined, undefined)).toBe(
+    expect(materialSliderControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialSliderControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialSliderControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialSliderControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialSliderControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialSliderControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialSliderControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
   });
@@ -83,7 +83,8 @@ describe('Material slider tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -95,7 +96,8 @@ describe('Material slider tester', () => {
           foo: { type: 'string' },
           bar: { type: 'number' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -106,7 +108,8 @@ describe('Material slider tester', () => {
         properties: {
           foo: { type: 'number' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -120,7 +123,8 @@ describe('Material slider tester', () => {
             minimum: 2
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -134,7 +138,8 @@ describe('Material slider tester', () => {
             maximum: 10
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -149,7 +154,8 @@ describe('Material slider tester', () => {
             minimum: 2
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -165,7 +171,8 @@ describe('Material slider tester', () => {
             default: 6
           }
         }
-      })
+      },
+      undefined)
     ).toBe(4);
   });
 
@@ -181,7 +188,8 @@ describe('Material slider tester', () => {
             default: 6
           }
         }
-      })
+      },
+      undefined)
     ).toBe(4);
   });
 });