Merge branch 'master' into 2164-fix-renderinfo-labels-for-anyOf-refs

eclipsesource · Aug 9, 2023 · 7ccdfb9 · 7ccdfb9
2 parents 4226acf + 22d14d3
commit 7ccdfb9
Show file tree

Hide file tree

Showing 17 changed files with 12,151 additions and 4,247 deletions.
diff --git a/README.md b/README.md
@@ -15,19 +15,17 @@ Please see the official JSON Forms website, [jsonforms.io](https://jsonforms.io)
 For more info about the seed app, please see the corresponding README file of the [seed repo](https://github.com/eclipsesource/jsonforms-react-seed).
 For a more detailed tutorial about the usage of JSON Forms, please see [this tutorial](http://jsonforms.io/docs/tutorial).
 
-## Upgrading to JSON Forms 3.0
-
-With version 3.0 of JSON Forms we removed `json-schema-ref-parser` from the core package.
-This change only affects users of the React variant (Vue and Angular are not affected) and even for React only a few users will need to adjust their code.
-To avoid issues and for more information, please have a look at our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master/MIGRATION.md).
-
 ## Feedback, Help and Support
 
 If you encounter any problems feel free to [open an issue](https://github.com/eclipsesource/jsonforms/issues/new/choose) on the repo.
 For questions and discussions please use the [JSON Forms board](https://jsonforms.discourse.group).
 You can also reach us via [email](mailto:jsonforms@eclipsesource.com?subject=JSON%20Forms).
 In addition, EclipseSource also offers [professional support](https://jsonforms.io/support) for JSON Forms.
 
+## Migration
+
+See our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master/MIGRATION.md) when updating JSON Forms.
+
 ## Developers Documentation
 
 ### First time setup
@@ -69,7 +67,3 @@ Current status: ![Build status](https://github.com/eclipsesource/jsonforms/actio
 ## License
 
 The JSON Forms project is licensed under the MIT License. See the [LICENSE file](https://github.com/eclipsesource/jsonforms/blob/master/LICENSE) for more information.
-
-## Migration
-
-See our [migration guide](https://github.com/eclipsesource/jsonforms/blob/master/MIGRATION.md) when updating JSON Forms.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "npmClient": "pnpm",
   "useWorkspaces": true
 }
diff --git a/packages/angular-material/package.json b/packages/angular-material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular-material",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "Material Renderer Set for Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -69,8 +69,8 @@
     "@angular/material": "^12.0.0 || ^13.0.0 || ^14.0.0",
     "@angular/platform-browser": "^12.0.0 || ^13.0.0 || ^14.0.0",
     "@angular/router": "^12.0.0 || ^13.0.0 || ^14.0.0",
-    "@jsonforms/angular": "3.1.0",
-    "@jsonforms/core": "3.1.0",
+    "@jsonforms/angular": "3.1.1-alpha.0",
+    "@jsonforms/core": "3.1.1-alpha.0",
     "core-js": "^2.5.3",
     "rxjs": "^6.5.3 || ^7.4.0"
   },

diff --git a/packages/angular-material/src/controls/number.renderer.ts b/packages/angular-material/src/controls/number.renderer.ts
@@ -51,7 +51,7 @@ import merge from 'lodash/merge';
         (focus)="focused = true"
         (focusout)="focused = false"
       />
-      <mat-hint *ngIf="shouldShowUnfocusedDescription()" || focused>{{
+      <mat-hint *ngIf="shouldShowUnfocusedDescription() || focused">{{
         description
       }}</mat-hint>
       <mat-error>{{ error }}</mat-error>

diff --git a/packages/angular-material/src/other/object.renderer.ts b/packages/angular-material/src/other/object.renderer.ts
@@ -32,13 +32,15 @@ import {
 import {
   ControlWithDetailProps,
   findUISchema,
+  Generate,
   GroupLayout,
   isObjectControl,
   RankedTester,
   rankWith,
   setReadonly,
   UISchemaElement,
 } from '@jsonforms/core';
+import { cloneDeep } from 'lodash';
 
 @Component({
   selector: 'ObjectRenderer',
@@ -65,7 +67,14 @@ export class ObjectControlRenderer extends JsonFormsControlWithDetail {
       props.schema,
       props.uischema.scope,
       props.path,
-      'Group',
+      () => {
+        const newSchema = cloneDeep(props.schema);
+        // delete unsupported operators
+        delete newSchema.oneOf;
+        delete newSchema.anyOf;
+        delete newSchema.allOf;
+        return Generate.uiSchema(newSchema, 'Group');
+      },
       props.uischema,
       props.rootSchema
     );

diff --git a/packages/angular-test/package.json b/packages/angular-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular-test",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "private": true,
   "main": "./lib/index.js",
   "dependencies": {

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/angular",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "Angular module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -71,7 +71,7 @@
   "peerDependencies": {
     "@angular/core": "^12.0.0 || ^13.0.0 || ^14.0.0",
     "@angular/forms": "^12.0.0 || ^13.0.0 || ^14.0.0",
-    "@jsonforms/core": "3.1.0",
+    "@jsonforms/core": "3.1.1-alpha.0",
     "rxjs": "^6.5.3 || ^7.4.0"
   },
   "devDependencies": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",

diff --git a/packages/examples-app/package.json b/packages/examples-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples-app",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "private": true,
   "license": "MIT",
   "type": "module",

diff --git a/packages/examples-react/package.json b/packages/examples-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples-react",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "private": true,
   "dependencies": {
     "@jsonforms/core": "workspace:*",

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/examples",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "JSON Forms Example Data",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -47,7 +47,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.1.0"
+    "@jsonforms/core": "3.1.1-alpha.0"
   },
   "devDependencies": {
     "@jsonforms/core": "workspace:*",

diff --git a/packages/material-renderers/package.json b/packages/material-renderers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/material-renderers",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "Material Renderer Set for JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -85,8 +85,8 @@
   "peerDependencies": {
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@jsonforms/core": "3.1.0",
-    "@jsonforms/react": "3.1.0",
+    "@jsonforms/core": "3.1.1-alpha.0",
+    "@jsonforms/react": "3.1.1-alpha.0",
     "@mui/icons-material": "~5.11.16",
     "@mui/material": "~5.13.0",
     "@mui/x-date-pickers": "^6.0.0",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/react",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "React module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -86,7 +86,7 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.1.0",
+    "@jsonforms/core": "3.1.1-alpha.0",
     "react": "^16.12.0 || ^17.0.0 || ^18.0.0"
   },
   "optionalPeerDependencies": {

diff --git a/packages/vanilla-renderers/package.json b/packages/vanilla-renderers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/vanilla-renderers",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "Default Renderer Set for JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -47,8 +47,8 @@
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.1.0",
-    "@jsonforms/react": "3.1.0",
+    "@jsonforms/core": "3.1.1-alpha.0",
+    "@jsonforms/react": "3.1.1-alpha.0",
     "react": "^16.12.0 || ^17.0.0 || ^18.0.0"
   },
   "devDependencies": {

diff --git a/packages/vue/vue-vanilla/package.json b/packages/vue/vue-vanilla/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/vue-vanilla",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "Vue 3 Vanilla renderers for JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -62,8 +62,8 @@
     "@jsonforms/vue": "workspace:*",
     "@types/chai": "^4.2.11",
     "@types/jest": "^27.4.1",
-    "@types/node": "^16.18.34",
     "@types/mocha": "^5.2.4",
+    "@types/node": "^16.18.34",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "@vue/cli-plugin-babel": "~4.5.19",
@@ -97,8 +97,8 @@
     "vue-jest": "^5.0.0-0"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.1.0",
-    "@jsonforms/vue": "3.1.0",
+    "@jsonforms/core": "3.1.1-alpha.0",
+    "@jsonforms/vue": "3.1.1-alpha.0",
     "vue": "^3.2.26"
   }
 }
diff --git a/packages/vue/vue/package.json b/packages/vue/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/vue",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha.0",
   "description": "Vue 3 module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -61,8 +61,8 @@
     "@vue/cli-service": "~4.5.19",
     "@vue/compiler-sfc": "^3.2.26",
     "@vue/eslint-config-typescript": "^11.0.2",
-    "@vue/vue3-jest": "^27.0.0",
     "@vue/test-utils": "^2.0.2",
+    "@vue/vue3-jest": "^27.0.0",
     "core-js": "^3.9.1",
     "cross-env": "^7.0.2",
     "eslint": "^7.32.0",
@@ -86,7 +86,7 @@
     "vue": "^3.2.26"
   },
   "peerDependencies": {
-    "@jsonforms/core": "3.1.0",
+    "@jsonforms/core": "3.1.1-alpha.0",
     "vue": "^3.2.26"
   }
 }