Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
491 changes: 250 additions & 241 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion packages/angular-material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
"@jsonforms/core": "^3.0.0-alpha.1",
"@jsonforms/examples": "^3.0.0-alpha.1",
"@types/node": "^10.10.0",
"@types/redux-logger": "3.0.6",
"angular2-template-loader": "^0.6.2",
"copy-webpack-plugin": "^5.0.5",
"core-js": "^2.5.3",
Expand Down
3 changes: 1 addition & 2 deletions packages/angular-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"main": "./lib/index.js",
"dependencies": {
"@jsonforms/angular": "^3.0.0-alpha.1",
"@jsonforms/core": "^3.0.0-alpha.1",
"redux": "^4.0.4"
"@jsonforms/core": "^3.0.0-alpha.1"
},
"devDependencies": {
"jasmine": "^3.2.0",
Expand Down
1 change: 0 additions & 1 deletion packages/vanilla/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"jsdom-global": "^3.0.2",
"nyc": "^14.1.1",
"react-dom": "^16.12.0",
"react-redux": "^7.1.3",
"rimraf": "^3.0.2",
"source-map-loader": "^0.2.4",
"source-map-support": "0.5.16",
Expand Down
12 changes: 8 additions & 4 deletions packages/vanilla/src/styles/styles.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
The MIT License

Copyright (c) 2017-2021 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
Expand Down Expand Up @@ -77,6 +77,10 @@ export const vanillaStyles: StyleDef[] = [
name: 'category.group',
classNames: ['category-group']
},
{
name: 'category.subcategories',
classNames: ['category-subcategories']
},
{
name: 'array.layout',
classNames: ['array-layout']
Expand Down
40 changes: 14 additions & 26 deletions packages/vanilla/test/renderers/ArrayControl.test.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
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
Expand All @@ -22,12 +22,11 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import { JsonFormsReduxContext } from '@jsonforms/react/lib/redux';
import * as React from 'react';
import { Provider } from 'react-redux';
import { JsonFormsStateProvider } from '@jsonforms/react';
import ArrayControl from '../../src/complex/array/ArrayControlRenderer';
import { vanillaRenderers } from '../../src/index';
import { initJsonFormsVanillaStore } from '../vanillaStore';
import { initCore } from '../util';
import IntegerCell, { integerCellTester } from '../../src/cells/IntegerCell';

import Adapter from 'enzyme-adapter-react-16';
Expand Down Expand Up @@ -62,26 +61,15 @@ const fixture = {

describe('Array control renderer', () => {
test('render two children', () => {
const store = initJsonFormsVanillaStore({
data: fixture.data,
schema: fixture.schema,
uischema: fixture.uischema,
renderers: vanillaRenderers,
cells: [
{
tester: integerCellTester, cell: IntegerCell
}
]
});
const core = initCore(fixture.schema, fixture.uischema, fixture.data);
const cells = [{ tester: integerCellTester, cell: IntegerCell }];
const wrapper = mount(
<Provider store={store}>
<JsonFormsReduxContext>
<ArrayControl
schema={fixture.schema}
uischema={fixture.uischema}
/>
</JsonFormsReduxContext>
</Provider>
<JsonFormsStateProvider initState={{ renderers: vanillaRenderers, cells, core }}>
<ArrayControl
schema={fixture.schema}
uischema={fixture.uischema}
/>
</JsonFormsStateProvider>
);

const controls = wrapper.find('.control');
Expand Down
Loading