Update ContextToProps to handle enums correctly

* Update withContextToEnumCellProps to handle const case * Add test case * Extend example Fixes #1548

Author: eneufeld

packages/examples/src/arrays.ts

@@ -39,6 +39,10 @@ export const schema = {
  message: {
  type: 'string',
  maxLength: 5
+ },
+ enum: {
+ type: 'string',
+ const: 'foo'
  }
  }
  }

packages/react/src/JsonFormsContext.tsx

@@ -341,8 +341,7 @@ const withContextToEnumCellProps =
  ({ ctx, props }: JsonFormsStateContext & EnumCellProps) => {
  const cellProps = ctxToCellProps(ctx, props);
  const dispatchProps = ctxDispatchToControlProps(ctx.dispatch);
- const options =
- props.options !== undefined ? props.options : props.schema.enum;
+ const options = props.options !== undefined ? props.options : props.schema.enum || [props.schema.const];
 
  return (<Component {...props} {...dispatchProps} {...cellProps} options={options} />);
  };

packages/react/test/JsonFormsContext.test.tsx

@@ -2,13 +2,14 @@ import React from 'react';
 import Enzyme, { mount } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import {
+ CellProps,
  ControlProps,
  OwnPropsOfEnum,
  rankWith
 } from '@jsonforms/core';
 
 import { JsonForms } from '../src/JsonForms';
-import { withJsonFormsEnumProps } from '../src/JsonFormsContext';
+import { withJsonFormsEnumCellProps, withJsonFormsEnumProps } from '../src/JsonFormsContext';
 
 Enzyme.configure({ adapter: new Adapter() });
 
@@ -110,3 +111,86 @@ test('withJsonFormsEnumProps - enum: should supply control and enum props', () =
  null
  ]);
 });
+
+test('withJsonFormsEnumCellProps - constant: should supply control and enum props', () => {
+ const MockEnumCellUnwrapped = (_: CellProps & OwnPropsOfEnum) => {
+ return <></>;
+ };
+
+ const MockEnumControl = withJsonFormsEnumCellProps(MockEnumCellUnwrapped);
+
+ const schema = {
+ const: 'Cambodia'
+ };
+
+ const renderers = [
+ {
+ tester: rankWith(1, () => true),
+ renderer: MockEnumControl
+ }
+ ];
+
+ const uischema = {
+ type: 'Control',
+ scope: '#/properties/name'
+ };
+
+ const wrapper = mount(
+ <JsonForms
+ data={{}}
+ schema={schema}
+ uischema={uischema}
+ renderers={renderers}
+ />
+ );
+ const mockEnumControlUnwrappedProps = wrapper
+ .find(MockEnumCellUnwrapped)
+ .props();
+
+ expect(mockEnumControlUnwrappedProps.uischema).toEqual(uischema);
+ expect(mockEnumControlUnwrappedProps.schema).toEqual(schema);
+ expect(mockEnumControlUnwrappedProps.options).toEqual(['Cambodia']);
+});
+
+test('withJsonFormsEnumCellProps - enum: should supply control and enum props', () => {
+ const MockEnumCellUnwrapped = (_: CellProps & OwnPropsOfEnum) => {
+ return <></>;
+ };
+
+ const MockEnumControl = withJsonFormsEnumCellProps(MockEnumCellUnwrapped);
+
+ const schema = {
+ type: 'string',
+ enum: ['red', 'amber', 'green', null]
+ };
+
+ const renderers = [
+ {
+ tester: rankWith(1, () => true),
+ renderer: MockEnumControl
+ }
+ ];
+
+ const uischema = {
+ type: 'Control',
+ scope: '#/properties/color'
+ };
+
+ const wrapper = mount(
+ <JsonForms
+ data={{}}
+ schema={schema}
+ uischema={uischema}
+ renderers={renderers}
+ />
+ );
+ const mockEnumControlUnwrappedProps = wrapper.find(MockEnumCellUnwrapped).props();
+ expect(mockEnumControlUnwrappedProps.uischema).toEqual(uischema);
+ expect(mockEnumControlUnwrappedProps.schema).toEqual(schema);
+ expect(mockEnumControlUnwrappedProps.options).toEqual([
+ 'red',
+ 'amber',
+ 'green',
+ null
+ ]);
+});