11.0.3

udos86 · udos86 · commit 8ff9c596cb88 · 2020-04-30T11:51:52.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 11.0.2
+# 11.0.2 / 11.0.3
 
 ### **Bugfixes**
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-dynamic-forms",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "A rapid form development library for Angular",
   "repository": {
     "type": "git",
@@ -120,4 +120,4 @@
     "tslint": "~6.1.1",
     "typescript": "~3.8.3"
   }
-}
+}
diff --git a/projects/ng-dynamic-forms/core/package.json b/projects/ng-dynamic-forms/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/core",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "A rapid form development library for Angular",
   "keywords": [
     "angular",
diff --git a/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-component.service.ts b/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-component.service.ts
@@ -55,7 +55,7 @@ export class DynamicFormComponentService {
 
         if (isNumber(index)) { // threat model as array child
 
-            const arrayRef: DynamicFormControlRef[] = this.formControls[model.id] as DynamicFormControlRef[] ?? [];
+            const arrayRef: DynamicFormControlRef[] = this.formControls[model.id] as DynamicFormControlRef[] || [];
 
             if (Array.isArray(arrayRef)) {
 
diff --git a/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-layout.service.ts b/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-layout.service.ts
@@ -62,7 +62,7 @@ export class DynamicFormLayoutService {
     filterTemplatesByModel(model: DynamicFormControlModel, templates: DynamicFormControlTemplates): DynamicTemplateDirective[] {
 
         const filterCallback: (template: DynamicTemplateDirective) => boolean = (template: DynamicTemplateDirective) => {
-            return template.modelId === model.id ?? template.modelType === model.type;
+            return template.modelId === model.id || template.modelType === model.type;
         };
 
         if (templates instanceof QueryList) {
diff --git a/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.ts b/projects/ng-dynamic-forms/core/src/lib/service/dynamic-form-relation.service.ts
@@ -74,7 +74,7 @@ export class DynamicFormRelationService {
                     return true;
                 }
 
-                return condition.value === relatedFormControl.value ?? condition.status === relatedFormControl.status;
+                return condition.value === relatedFormControl.value || condition.status === relatedFormControl.status;
             }
 
             if (relatedFormControl && relation.match === matcher.opposingMatch) {
@@ -87,7 +87,7 @@ export class DynamicFormRelationService {
                     return false;
                 }
 
-                return !(condition.value === relatedFormControl.value ?? condition.status === relatedFormControl.status);
+                return !(condition.value === relatedFormControl.value || condition.status === relatedFormControl.status);
             }
 
             return false;
diff --git a/projects/ng-dynamic-forms/ui-basic/package.json b/projects/ng-dynamic-forms/ui-basic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-basic",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "Basic UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -28,7 +28,7 @@
     "url": "git+https://github.com/udos86/ng-dynamic-forms.git"
   },
   "peerDependencies": {
-    "@ng-dynamic-forms/core": "^11.0.2",
+    "@ng-dynamic-forms/core": "^11.0.3",
     "angular2-text-mask": "^9.0.0"
   },
   "es2015": "./fesm2015/ui-basic.js",
diff --git a/projects/ng-dynamic-forms/ui-bootstrap/package.json b/projects/ng-dynamic-forms/ui-bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-bootstrap",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "Bootstrap UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -30,7 +30,7 @@
     "url": "git+https://github.com/udos86/ng-dynamic-forms.git"
   },
   "peerDependencies": {
-    "@ng-dynamic-forms/core": "^11.0.2",
+    "@ng-dynamic-forms/core": "^11.0.3",
     "angular2-text-mask": "^9.0.0",
     "bootstrap": "^3.3.7",
     "ngx-bootstrap": "^5.0.0"
diff --git a/projects/ng-dynamic-forms/ui-foundation/package.json b/projects/ng-dynamic-forms/ui-foundation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-foundation",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "Foundation UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -29,7 +29,7 @@
     "url": "git+https://github.com/udos86/ng-dynamic-forms.git"
   },
   "peerDependencies": {
-    "@ng-dynamic-forms/core": "^11.0.2",
+    "@ng-dynamic-forms/core": "^11.0.3",
     "foundation-sites": "^6.3.1"
   },
   "es2015": "./fesm2015/ui-foundation.js",
diff --git a/projects/ng-dynamic-forms/ui-ionic/package.json b/projects/ng-dynamic-forms/ui-ionic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-ionic",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "Ionic UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -30,7 +30,7 @@
   },
   "peerDependencies": {
     "@ionic/angular": "^5.0.0",
-    "@ng-dynamic-forms/core": "^11.0.2"
+    "@ng-dynamic-forms/core": "^11.0.3"
   },
   "es2015": "./fesm2015/ui-ionic.js",
   "esm2015": "./esm2015/ui-ionic.js",
diff --git a/projects/ng-dynamic-forms/ui-kendo/package.json b/projects/ng-dynamic-forms/ui-kendo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-kendo",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "Kendo UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -29,7 +29,7 @@
     "url": "git+https://github.com/udos86/ng-dynamic-forms.git"
   },
   "peerDependencies": {
-    "@ng-dynamic-forms/core": "^11.0.2",
+    "@ng-dynamic-forms/core": "^11.0.3",
     "@progress/kendo-angular-dateinputs": "^4.2.2",
     "@progress/kendo-angular-dropdowns": "^4.2.6",
     "@progress/kendo-angular-inputs": "^6.5.0",
diff --git a/projects/ng-dynamic-forms/ui-material/package.json b/projects/ng-dynamic-forms/ui-material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-material",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "Material UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -30,7 +30,7 @@
   },
   "peerDependencies": {
     "@angular/material": "^9.0.0",
-    "@ng-dynamic-forms/core": "^11.0.2",
+    "@ng-dynamic-forms/core": "^11.0.3",
     "angular2-text-mask": "^9.0.0"
   },
   "es2015": "./fesm2015/ui-material.js",
diff --git a/projects/ng-dynamic-forms/ui-ng-bootstrap/package.json b/projects/ng-dynamic-forms/ui-ng-bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-ng-bootstrap",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "NG Bootstrap UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "@ng-bootstrap/ng-bootstrap": "^6.0.0",
-    "@ng-dynamic-forms/core": "^11.0.2",
+    "@ng-dynamic-forms/core": "^11.0.3",
     "angular2-text-mask": "^9.0.0",
     "bootstrap": "^4.0.0"
   },
diff --git a/projects/ng-dynamic-forms/ui-ngx-bootstrap/package.json b/projects/ng-dynamic-forms/ui-ngx-bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-ngx-bootstrap",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "ngx-bootstrap UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -30,7 +30,7 @@
     "url": "git+https://github.com/udos86/ng-dynamic-forms.git"
   },
   "peerDependencies": {
-    "@ng-dynamic-forms/core": "^11.0.2",
+    "@ng-dynamic-forms/core": "^11.0.3",
     "angular2-text-mask": "^9.0.0",
     "bootstrap": "^4.0.0",
     "ngx-bootstrap": "^5.6.0"
diff --git a/projects/ng-dynamic-forms/ui-primeng/package.json b/projects/ng-dynamic-forms/ui-primeng/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/ui-primeng",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "PrimeNG UI package for NG Dynamic Forms",
   "keywords": [
     "angular",
@@ -29,7 +29,7 @@
     "url": "git+https://github.com/udos86/ng-dynamic-forms.git"
   },
   "peerDependencies": {
-    "@ng-dynamic-forms/core": "^11.0.2",
+    "@ng-dynamic-forms/core": "^11.0.3",
     "primeng": "^9.0.0"
   },
   "optionalDependencies": {
diff --git a/schematics/package.json b/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ng-dynamic-forms/schematics",
-  "version": "11.0.2",
+  "version": "11.0.3",
   "description": "NG Dynamic Forms schematics",
   "scripts": {
     "build": "tsc -p tsconfig.json",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 11.0.2`
	`1`	`+# 11.0.2 / 11.0.3`
`2`	`2`
`3`	`3`	`### Bugfixes`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ng-dynamic-forms",`
`3`		`- "version": "11.0.2",`
	`3`	`+ "version": "11.0.3",`
`4`	`4`	`"description": "A rapid form development library for Angular",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
`@@ -120,4 +120,4 @@`
`120`	`120`	`"tslint": "~6.1.1",`
`121`	`121`	`"typescript": "~3.8.3"`
`122`	`122`	`}`
`123`		`-}`
	`123`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ng-dynamic-forms/core",`
`3`		`- "version": "11.0.2",`
	`3`	`+ "version": "11.0.3",`
`4`	`4`	`"description": "A rapid form development library for Angular",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"angular",`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ export class DynamicFormRelationService {`
`74`	`74`	`return true;`
`75`	`75`	`}`
`76`	`76`
`77`		`- return condition.value === relatedFormControl.value ?? condition.status === relatedFormControl.status;`
	`77`	`+ return condition.value === relatedFormControl.value \|\| condition.status === relatedFormControl.status;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if (relatedFormControl && relation.match === matcher.opposingMatch) {`
`@@ -87,7 +87,7 @@ export class DynamicFormRelationService {`
`87`	`87`	`return false;`
`88`	`88`	`}`
`89`	`89`
`90`		`- return !(condition.value === relatedFormControl.value ?? condition.status === relatedFormControl.status);`
	`90`	`+ return !(condition.value === relatedFormControl.value \|\| condition.status === relatedFormControl.status);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`return false;`