Merge pull request guillotinaweb#2 in LFOR/lhncbc-ngx-schema-form fro…

…m upgrade-to-angular14 to master

* commit '3e264e578a104328c3137715e2c446077c99aff6': (38 commits)
  version 2.8.4
  Prevent multiple calls of _bindVisibility for the same elements when traversing the tree structure
  version 2.8.3
  Fixed Two-way data binding when using visibleIf
  Fixed typo in README and removed doubling of words
  version 2.8.2
  feat: Added chainable oneOf and allOf in visibleIf
  fix dep versions
  Bump minimist from 1.2.5 to 1.2.6
  Upgrade to Angular 14, fix guillotinaweb#443
  version 2.7.2
  Fix for  guillotinaweb#431
  Use DisableControlDirective for widgets to remove warnings for reactive forms.
  Changed cp command in build:lib to use ncp because there is no cp on windows machines.
  version 2.7.1
  Add nullable schema.title check
  Bump karma from 6.3.14 to 6.3.16
  Bump follow-redirects from 1.14.7 to 1.14.8
  Bump karma from 6.3.9 to 6.3.14
  Built-in ability to let compile the schema so defs and refs get resolved
  ...

.github/workflows/ci.yml

@@ -9,6 +9,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Test and build
         uses: actions/setup-node@v1
+        with:
+          node-version: 14.17
       - run: npm install
       - run: npm run test
         env:

.github/workflows/deploy.yml

@@ -13,6 +13,8 @@ jobs:
         uses: actions/checkout@v2
       - name: setup Node
         uses: actions/setup-node@v1
+        with:
+          node-version: 14.17
       - run: npm install
       - name: Github pages
         uses: sterlingwes/[email protected]

.gitignore

@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

CHANGELOG.md

@@ -1,3 +1,57 @@
+# 2.8.4-forked (2022-10-25)
+
+- Upgrade to angular 14 (Parent: 2.8.4)
+
+# 2.7.2-forked (2022-10-24)
+
+- Upgrade to angular 13 (Parent: 2.7.2)
+
+# 2.8.4 (2022-09-09)
+
+- Improved performance of visibility binding for nested objects (Kevin Broichhausen)
+
+# 2.8.3 (2022-08-24)
+
+- Two-way data binding fix (Kevin Broichhausen)
+
+# 2.8.2 (2022-07-26)
+
+- Added chainable oneOf and allOf in visibleIf (Kevin Broichhausen)
+
+# 2.8.1 (2022-07-20)
+
+- Fix dependencies version
+
+# 2.8.0 (2022-07-15)
+
+- Upgrade to Angular 14 (ebrehault)
+
+# 2.7.2 (2022-07-15)
+
+- Use DisableControlDirective for widgets to remove warnings for reactive forms (Kevin Broichhausen)
+- Changed cp command in build:lib (Kevin Broichhausen)
+- Fix zero value checking (Kevin Broichhausen)
+
+# 2.7.1 (2022-06-02)
+
+- Do not display labels if no title (Anton)
+
+# 2.7.0 (2022-01-01)
+
+- Upgrade to Angular 13 (ebrehault)
+
+# 2.6.9 (2021-12-17)
+
+- Cherry pick #420 fixed visibileIf empty object check
+
+# 2.6.8 (2021-11-26)
+
+- Fix validation of ANY to validate more types of values (bennmapes)
+
+# 2.6.7 (2021-11-03)
+
+- Remove constraint of using nullable unions (iperevozchikov)
+
 # 2.6.6-forked (2022-08-26)
 
 - Customize creating of form property for FHIR Extension schema.

README.md

@@ -635,7 +635,21 @@ Where `oneOf` is handled as `OR` and `allOf` is handled as `AND`.
 The `oneOf` a is prioritized before the `allOf` and both are prioritized before the
 property binding.
 
-_`oneOf` and `allOf` oneOf and allOf are reserved keywords and not suitable as property names_
+Chaining of `oneOf` and `allOf` is possible like in the example below:
+```
+"visibleIf": {
+  "allOf": [
+    {
+      "oneOf": [{ "/demo/visibleIfBinding1/status1a": ["Pass"] }, { "/demo/visibleIfBinding1/status1b": ["Pass"] }]
+    },
+    {
+      "oneOf": [{ "/demo/visibleIfBinding1/status1c": ["Pass"] }, { "/demo/visibleIfBinding1/status1d": ["Pass"] }]
+    }
+  ]
+}
+```
+
+_`oneOf` and `allOf` are reserved keywords and not suitable as property names_
 
 **Arrays**
 

angular.json

@@ -13,7 +13,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "aot": true,
             "outputPath": "dist/ngx-schema-form",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -26,7 +25,13 @@
             "styles": [
               "src/styles.css"
             ],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -46,12 +51,12 @@
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -86,18 +91,6 @@
               "src/assets"
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -127,21 +120,8 @@
             "tsConfig": "projects/schema-form/tsconfig.spec.json",
             "karmaConfig": "projects/schema-form/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/schema-form/tsconfig.lib.json",
-              "projects/schema-form/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
-  },
-  "defaultProject": "ngx-schema-form"
+  }
 }