@ng-formworks/material 15.8.0 → 15.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/esm2020/lib/widgets/material-one-of.component.mjs +25 -9
  2. package/fesm2015/ng-formworks-material.mjs +24 -8
  3. package/fesm2015/ng-formworks-material.mjs.map +1 -1
  4. package/fesm2020/ng-formworks-material.mjs +24 -8
  5. package/fesm2020/ng-formworks-material.mjs.map +1 -1
  6. package/package.json +3 -3
package/esm2020/lib/widgets/material-one-of.component.mjs CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Component, Input, ViewChild } from '@angular/core';
2
2
  import { hasNonNullValue, hasOwn, JsonPointer, path2ControlKey } from '@ng-formworks/core';
3
- import { isEqual, isObject } from 'lodash';
3
+ import { isEqual, isObject, pick } from 'lodash';
4
4
  import { MaterialTabsComponent } from './material-tabs.component';
5
5
  import * as i0 from "@angular/core";
6
6
  import * as i1 from "@ng-formworks/core";
@@ -51,14 +51,30 @@ export class MaterialOneOfComponent {
51
51
  let parts = controlName.split('$');
52
52
  let fieldName = parts[parts.length - 1];
53
53
  let controlValue = this.jsf.formGroup.controls[controlName].value;
54
- if (isObject(formValue) && hasOwn(formValue, fieldName) &&
55
- formValue[fieldName] == controlValue
56
- //formValue[fieldName]||controlValue
57
- ) {
58
- foundInd = ind;
54
+ let controlSchema = JsonPointer.get(this.jsf.schema, parts.join("/"));
55
+ let schemaPointer = parts.join("/");
56
+ let dPointer = schemaPointer.replace(/(anyOf|allOf|oneOf|none)\/[\d]+\//g, '')
57
+ .replace(/(if|then|else|properties)\//g, '');
58
+ //JsonPointer.toDataPointer(parts.join("/"),this.jsf.schema);
59
+ let dVal = JsonPointer.get(this.jsf.formValues, dPointer);
60
+ let compareVal = dVal; //formValue;
61
+ //compare only values that are in the subschema properties
62
+ if (controlSchema && controlSchema.properties) {
63
+ compareVal = isObject(dVal) && hasOwn(dVal, fieldName) ?
64
+ pick(dVal[fieldName], Object.keys(controlSchema.properties))
65
+ : pick(dVal, Object.keys(controlSchema.properties));
66
+ }
67
+ /*
68
+ if(isObject(compareVal) && hasOwn(compareVal,fieldName) &&
69
+ isEqual(compareVal[fieldName],controlValue)
70
+ ){
71
+ foundInd=ind;
72
+ }else //if(formValue || controlValue){
73
+ if(isEqual(compareVal,controlValue)){
74
+ foundInd=ind;
59
75
  }
60
- else //if(formValue || controlValue){
61
- if (isEqual(formValue, controlValue)) {
76
+ */
77
+ if (isEqual(compareVal, controlValue)) {
62
78
  foundInd = ind;
63
79
  }
64
80
  });
@@ -103,4 +119,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
103
119
  }], dataIndex: [{
104
120
  type: Input
105
121
  }] } });
106
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"material-one-of.component.js","sourceRoot":"","sources":["../../../../../../projects/ng-formworks-material/src/lib/widgets/material-one-of.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';\r\nimport { AbstractControl } from '@angular/forms';\r\nimport { hasNonNullValue, hasOwn, JsonPointer, JsonSchemaFormService, path2ControlKey } from '@ng-formworks/core';\r\nimport { isEqual, isObject } from 'lodash';\r\nimport { MaterialTabsComponent } from './material-tabs.component';\r\n\r\n\r\n// TODO: Add this control\r\n\r\n@Component({\r\n    // tslint:disable-next-line:component-selector\r\n    selector: 'material-one-of-widget',\r\n    template: `<h4>{{this.options?.description}}</h4>\r\n    <material-tabs-widget #tabs [layoutNode]=\"layoutNode\" \r\n    [layoutIndex]=\"layoutIndex\" \r\n    [dataIndex]=\"dataIndex\" >\r\n    </material-tabs-widget>`,\r\n    standalone: false\r\n})\r\nexport class MaterialOneOfComponent implements OnInit {\r\n\r\n  @ViewChild('tabs', { read: MaterialTabsComponent })\r\n  tabs: ElementRef;\r\n\r\n  formControl: AbstractControl;\r\n  controlName: string;\r\n  controlValue: any;\r\n  controlDisabled = false;\r\n  boundControl = false;\r\n  options: any;\r\n  @Input() layoutNode: any;\r\n  @Input() layoutIndex: number[];\r\n  @Input() dataIndex: number[];\r\n\r\n  constructor(\r\n    private jsf: JsonSchemaFormService\r\n  ) { }\r\n\r\n  ngOnInit() {\r\n    this.options = this.layoutNode.options || {};\r\n    this.options.tabMode=\"oneOfMode\";\r\n    this.options.selectedTab=this.findSelectedTab();\r\n    //this.options.description=this.options.description||\"choose one of\";\r\n    this.jsf.initializeControl(this);\r\n    \r\n  }\r\n\r\n\r\n  findSelectedTab(){\r\n    //TODO test- this.jsf.formValues seems to be the initial data supplied to the form\r\n    //while the jsf.formGroup value is derived from the actual controls\r\n    //let formValue=this.jsf.getFormControlValue(this);\r\n    let foundInd=-1;\r\n    //seach for non null value\r\n    if(this.layoutNode.items){\r\n      this.layoutNode.items.forEach((layoutItem,ind)=>{\r\n        let formValue=JsonPointer.get(this.jsf.formValues,layoutItem.dataPointer);\r\n          if(layoutItem.oneOfPointer){\r\n            let controlKey=path2ControlKey(layoutItem.oneOfPointer);\r\n            let fname=layoutItem.name;\r\n            if(hasOwn(this.jsf.formGroup.controls,controlKey)&&\r\n              (formValue || hasNonNullValue(this.jsf.formGroup.controls[controlKey].value))\r\n              //hasOwn(formValue,fname) && hasOwn(this.jsf.formGroup.controls,controlKey) \r\n            // && (formValue[fname] || this.jsf.formGroup.controls[controlKey].value)\r\n              //&&isEqual(formValue[fname],this.jsf.formGroup.controls[controlKey].value)\r\n            ){\r\n                foundInd=ind;\r\n            }\r\n            //foundInd=formValue[controlKey]!=null?ind:foundInd;\r\n            //if no exact match found, then search in descendant values\r\n            //to see which one of item matches\r\n            if(foundInd==-1){\r\n              //find all descendant oneof paths\r\n              let descendantOneOfControlNames=Object.keys(this.jsf.formGroup.controls).filter(controlName=>{\r\n                return controlName.startsWith(controlKey);\r\n              })\r\n              descendantOneOfControlNames.forEach(controlName=>{\r\n                let parts=controlName.split('$');\r\n                let fieldName=parts[parts.length-1];\r\n                let controlValue=this.jsf.formGroup.controls[controlName].value;\r\n                if(isObject(formValue) && hasOwn(formValue,fieldName) && \r\n                formValue[fieldName]==controlValue\r\n               //formValue[fieldName]||controlValue\r\n              ){\r\n                  foundInd=ind;\r\n                }else //if(formValue || controlValue){\r\n                if(isEqual(formValue,controlValue)){\r\n                  foundInd=ind;\r\n                }\r\n              })\r\n              //now need to compare values\r\n            }\r\n          }\r\n      })\r\n    }\r\n    return Math.max(foundInd,0);\r\n  }\r\n\r\n  updateValue(event) {\r\n    this.jsf.updateValue(this, event.target.value);\r\n  }\r\n\r\n  ngOnDestroy () {\r\n    \r\n  }\r\n\r\n}\r\n"]}
122
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"material-one-of.component.js","sourceRoot":"","sources":["../../../../../../projects/ng-formworks-material/src/lib/widgets/material-one-of.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';\r\nimport { AbstractControl } from '@angular/forms';\r\nimport { hasNonNullValue, hasOwn, JsonPointer, JsonSchemaFormService, path2ControlKey } from '@ng-formworks/core';\r\nimport { isEqual, isObject, pick } from 'lodash';\r\nimport { MaterialTabsComponent } from './material-tabs.component';\r\n\r\n\r\n// TODO: Add this control\r\n\r\n@Component({\r\n    // tslint:disable-next-line:component-selector\r\n    selector: 'material-one-of-widget',\r\n    template: `<h4>{{this.options?.description}}</h4>\r\n    <material-tabs-widget #tabs [layoutNode]=\"layoutNode\" \r\n    [layoutIndex]=\"layoutIndex\" \r\n    [dataIndex]=\"dataIndex\" >\r\n    </material-tabs-widget>`,\r\n    standalone: false\r\n})\r\nexport class MaterialOneOfComponent implements OnInit {\r\n\r\n  @ViewChild('tabs', { read: MaterialTabsComponent })\r\n  tabs: ElementRef;\r\n\r\n  formControl: AbstractControl;\r\n  controlName: string;\r\n  controlValue: any;\r\n  controlDisabled = false;\r\n  boundControl = false;\r\n  options: any;\r\n  @Input() layoutNode: any;\r\n  @Input() layoutIndex: number[];\r\n  @Input() dataIndex: number[];\r\n\r\n  constructor(\r\n    private jsf: JsonSchemaFormService\r\n  ) { }\r\n\r\n  ngOnInit() {\r\n    this.options = this.layoutNode.options || {};\r\n    this.options.tabMode=\"oneOfMode\";\r\n    this.options.selectedTab=this.findSelectedTab();\r\n    //this.options.description=this.options.description||\"choose one of\";\r\n    this.jsf.initializeControl(this);\r\n    \r\n  }\r\n\r\n\r\n  findSelectedTab(){\r\n    //TODO test- this.jsf.formValues seems to be the initial data supplied to the form\r\n    //while the jsf.formGroup value is derived from the actual controls\r\n    //let formValue=this.jsf.getFormControlValue(this);\r\n    let foundInd=-1;\r\n    //seach for non null value\r\n    if(this.layoutNode.items){\r\n      this.layoutNode.items.forEach((layoutItem,ind)=>{\r\n        let formValue=JsonPointer.get(this.jsf.formValues,layoutItem.dataPointer);\r\n          if(layoutItem.oneOfPointer){\r\n            let controlKey=path2ControlKey(layoutItem.oneOfPointer);\r\n            let fname=layoutItem.name;\r\n            if(hasOwn(this.jsf.formGroup.controls,controlKey)&&\r\n              (formValue || hasNonNullValue(this.jsf.formGroup.controls[controlKey].value))\r\n              //hasOwn(formValue,fname) && hasOwn(this.jsf.formGroup.controls,controlKey) \r\n            // && (formValue[fname] || this.jsf.formGroup.controls[controlKey].value)\r\n              //&&isEqual(formValue[fname],this.jsf.formGroup.controls[controlKey].value)\r\n            ){\r\n                foundInd=ind;\r\n            }\r\n            //foundInd=formValue[controlKey]!=null?ind:foundInd;\r\n            //if no exact match found, then search in descendant values\r\n            //to see which one of item matches\r\n            if(foundInd==-1){\r\n              //find all descendant oneof paths\r\n              let descendantOneOfControlNames=Object.keys(this.jsf.formGroup.controls).filter(controlName=>{\r\n                return controlName.startsWith(controlKey);\r\n              })\r\n              descendantOneOfControlNames.forEach(controlName=>{\r\n                let parts=controlName.split('$');\r\n                let fieldName=parts[parts.length-1];\r\n                let controlValue=this.jsf.formGroup.controls[controlName].value;\r\n                let controlSchema=JsonPointer.get(this.jsf.schema,parts.join(\"/\"));\r\n                let schemaPointer=parts.join(\"/\");\r\n                let dPointer=schemaPointer.replace(/(anyOf|allOf|oneOf|none)\\/[\\d]+\\//g, '')\r\n                .replace(/(if|then|else|properties)\\//g, '');\r\n                //JsonPointer.toDataPointer(parts.join(\"/\"),this.jsf.schema);\r\n                let dVal=JsonPointer.get(this.jsf.formValues,dPointer);\r\n                let compareVal=dVal;//formValue;\r\n                //compare only values that are in the subschema properties\r\n                if(controlSchema && controlSchema.properties){\r\n                  compareVal=isObject(dVal) && hasOwn(dVal,fieldName)?\r\n                  pick(dVal[fieldName],Object.keys(controlSchema.properties))\r\n                  :pick(dVal,Object.keys(controlSchema.properties))\r\n                }\r\n                /*\r\n                if(isObject(compareVal) && hasOwn(compareVal,fieldName) && \r\n                isEqual(compareVal[fieldName],controlValue)\r\n              ){\r\n                  foundInd=ind;\r\n                }else //if(formValue || controlValue){\r\n                if(isEqual(compareVal,controlValue)){\r\n                  foundInd=ind;\r\n                }\r\n                */\r\n                if(isEqual(compareVal,controlValue)){\r\n                  foundInd=ind;\r\n                }\r\n              })\r\n              //now need to compare values\r\n            }\r\n          }\r\n      })\r\n    }\r\n    return Math.max(foundInd,0);\r\n  }\r\n\r\n  updateValue(event) {\r\n    this.jsf.updateValue(this, event.target.value);\r\n  }\r\n\r\n  ngOnDestroy () {\r\n    \r\n  }\r\n\r\n}\r\n"]}
package/fesm2015/ng-formworks-material.mjs CHANGED
@@ -50,7 +50,7 @@ import { MatToolbarModule } from '@angular/material/toolbar';
50
50
  import { MatTooltipModule } from '@angular/material/tooltip';
51
51
  import * as i21 from 'nxt-sortablejs';
52
52
  import { SortablejsModule } from 'nxt-sortablejs';
53
- import { isObject, isEqual } from 'lodash';
53
+ import { isObject, pick, isEqual } from 'lodash';
54
54
 
55
55
  const cssFrameworkCfgMaterialDesign = {
56
56
  "name": "material-design",
@@ -1932,14 +1932,30 @@ class MaterialOneOfComponent {
1932
1932
  let parts = controlName.split('$');
1933
1933
  let fieldName = parts[parts.length - 1];
1934
1934
  let controlValue = this.jsf.formGroup.controls[controlName].value;
1935
- if (isObject(formValue) && hasOwn(formValue, fieldName) &&
1936
- formValue[fieldName] == controlValue
1937
- //formValue[fieldName]||controlValue
1938
- ) {
1939
- foundInd = ind;
1935
+ let controlSchema = JsonPointer.get(this.jsf.schema, parts.join("/"));
1936
+ let schemaPointer = parts.join("/");
1937
+ let dPointer = schemaPointer.replace(/(anyOf|allOf|oneOf|none)\/[\d]+\//g, '')
1938
+ .replace(/(if|then|else|properties)\//g, '');
1939
+ //JsonPointer.toDataPointer(parts.join("/"),this.jsf.schema);
1940
+ let dVal = JsonPointer.get(this.jsf.formValues, dPointer);
1941
+ let compareVal = dVal; //formValue;
1942
+ //compare only values that are in the subschema properties
1943
+ if (controlSchema && controlSchema.properties) {
1944
+ compareVal = isObject(dVal) && hasOwn(dVal, fieldName) ?
1945
+ pick(dVal[fieldName], Object.keys(controlSchema.properties))
1946
+ : pick(dVal, Object.keys(controlSchema.properties));
1947
+ }
1948
+ /*
1949
+ if(isObject(compareVal) && hasOwn(compareVal,fieldName) &&
1950
+ isEqual(compareVal[fieldName],controlValue)
1951
+ ){
1952
+ foundInd=ind;
1953
+ }else //if(formValue || controlValue){
1954
+ if(isEqual(compareVal,controlValue)){
1955
+ foundInd=ind;
1940
1956
  }
1941
- else //if(formValue || controlValue){
1942
- if (isEqual(formValue, controlValue)) {
1957
+ */
1958
+ if (isEqual(compareVal, controlValue)) {
1943
1959
  foundInd = ind;
1944
1960
  }
1945
1961
  });