pict-section-form 1.0.157 → 1.0.158

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.0.157",
+    "version": "1.0.158",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {

package/source/views/Pict-View-Form-Metacontroller.js

@@ -473,9 +473,9 @@ class PictFormMetacontroller extends libPictViewClass
 							//FIXME: do we want to allow prefixing the data address? (ex. nesting it under a parent object) - caller can still do this themselves.
 							tmpRecordSetAddress = `${tmpGroup.RecordSetAddress}_${tmpUUID}`;
 						}
-						//TODO: does this need to go into the mappings?
-						tmpGroup.RecordSetAddress = tmpRecordSetAddress;
 					}
+					//TODO: does this need to go into the mappings if it isn't there?
+					tmpGroup.RecordSetAddress = tmpRecordSetAddress;
 
 				}
 				if (Array.isArray(tmpGroup.RecordSetSolvers) && tmpGroup.RecordSetSolvers.length > 0)

package/test/PictSectionForm-Basic_tests.js

@@ -692,6 +692,195 @@ suite
 							}
 						);
 					test(
+							'Distinct Array Test 4',
+							(fDone) =>
+							{
+								//NOTE: code is a clone of Pict.safeLoadPictApplication
+								let _Pict;
+								const tmpApplicationClass = OrderedSolverApplication;
+								if (tmpApplicationClass && ('default_configuration' in tmpApplicationClass) && ('pict_configuration' in tmpApplicationClass.default_configuration))
+								{
+									_Pict = new libPict(tmpApplicationClass.default_configuration.pict_configuration);
+								}
+								else
+								{
+									_Pict = new libPict();
+								}
+
+								//_Pict.LogNoisiness = 0;
+
+								let tmpApplicationHash = 'DefaultApplication';
+								let tmpDefaultConfiguration = {};
+
+								if ('default_configuration' in tmpApplicationClass)
+								{
+									tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+
+									if ('Hash' in tmpApplicationClass.default_configuration)
+									{
+										tmpDefaultConfiguration = tmpApplicationClass.default_configuration;
+										tmpApplicationHash = tmpApplicationClass.default_configuration.Hash;
+									}
+								}
+								_Pict.log.info(`Loading the pict application [${tmpApplicationHash}] and associated views.`);
+
+								_Pict.addApplication(tmpApplicationHash, tmpDefaultConfiguration, tmpApplicationClass);
+
+								// Add the pict form service
+								_Pict.addServiceType('PictSectionForm', libPictSectionForm);
+
+								// Add the pict form metacontroller service, which provides programmaatic view construction from manifests and render/marshal methods.
+								_Pict.addView('PictFormMetacontroller', {}, libPictSectionForm.PictFormMetacontroller);
+
+								const tmpManifest =
+								{
+									Scope: 'OrderedSolverApplicationForm',
+									Descriptors:
+									{
+										'LevelOfIndirection.DataTableAddress':
+										{
+											Hash: 'NestedDataTable',
+											Name: 'Nested Data Table',
+											DataAddress: 'LevelOfIndirection.DataTableAddress',
+											DataType: 'Array',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										'LevelOfIndirection.AggregateValueAddress':
+										{
+											Hash: 'IndirectAggregateValue',
+											Name: 'Indirect Aggregate Value',
+											DataAddress: 'LevelOfIndirection.AggregateValueAddress',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										'LevelOfIndirection.DataTableAddress[].ValueAddress':
+										{
+											Hash: 'ValueArray',
+											Name: 'Data Value',
+											DataAddress: 'LevelOfIndirection.DataTableAddress[].ValueAddress',
+											DataType: 'Array',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										AggregateValueAddress:
+										{
+											Hash: 'AggregateValue',
+											Name: 'Aggregate Value',
+											DataAddress: 'AggregateValueAddress',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+										AggregateValueAddress2:
+										{
+											Hash: 'AggregateValue2',
+											Name: 'Aggregate Value 2',
+											DataAddress: 'AggregateValueAddress2',
+											DataType: 'PreciseNumber',
+											FormGroup: 'DataTableGroup',
+											FormSection: 'DataTableSection',
+										},
+									},
+									Sections:
+									[
+										{
+											Name: 'Ordered Solver Section',
+											Hash: 'OrderedSolverSection',
+											Groups:
+											[
+												{
+													Name: 'Group Name',
+													Hash: 'GroupHash',
+													RecordSetAddress: 'LevelOfIndirection.DataTableAddress',
+												},
+											],
+											Solvers:
+											[
+												{ Ordinal: 5, Expression: 'AggregateValue = SUM(ValueArray)' },
+												{ Ordinal: 40, Expression: 'AggregateValue2 = SUM(LevelOfIndirection.DataTableAddress[].ValueAddress)' },
+												{ Ordinal: 60, Expression: 'IndirectAggregateValue = AggregateValue' },
+											],
+										},
+									],
+								};
+
+								let tmpHashedAggregateValue = null;
+								let tmpHashedAggregateValue2 = null;
+								let tmpHashedAggregateValue3 = null;
+								_Pict.PictApplication.initializeAsync(
+									function (pError)
+									{
+										if (pError)
+										{
+											_Pict.log.info('Error initializing the pict application: '+pError)
+										}
+
+										try
+										{
+											_Pict.log.info('Loading the Application and associated views.');
+											const tmpUUID = _Pict.getUUID().substring(0, 8);
+											const tmpDistinctManifest = _Pict.views.PictFormMetacontroller.createDistinctManifest(tmpManifest, tmpUUID);
+											_Pict.log.info('Distinct Manifest:', tmpDistinctManifest);
+											Expect(tmpDistinctManifest.Sections[0].Groups[0].RecordSetAddress).to.equal(`LevelOfIndirection_${tmpUUID}.DataTableAddress`, 'Group RecordSetAddress should be preserved in distinct manifest.');
+											tmpHashedAggregateValue = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue')[0];
+											tmpHashedAggregateValue2 = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'AggregateValue2')[0];
+											tmpHashedAggregateValue3 = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pValue]) => pValue.OriginalHash == 'IndirectAggregateValue')[0];
+											const tmpInjectedSecionViews = _Pict.views.PictFormMetacontroller.injectManifest(tmpDistinctManifest);
+											_Pict.log.info('Injected Section Views:', tmpInjectedSecionViews.length);
+											_Pict.views.PictFormMetacontroller.updateMetatemplateInDOM();
+											setTimeout(() =>
+											{
+												for (const tmpView of tmpInjectedSecionViews)
+												{
+													tmpView.render();
+												}
+												for (const tmpView of tmpInjectedSecionViews)
+												{
+													tmpView.marshalToView();
+												}
+												//TODO: do we need to trigger a solve here?
+											}, 0);
+											_Pict.PictApplication.testDone = () =>
+											{
+												try
+												{
+													_Pict.log.info(`AppData after`, { AppData: _Pict.AppData, tmpHashedAggregateValue, tmpHashedAggregateValue2, tmpHashedAggregateValue3 });
+													Expect(_Pict.AppData[tmpHashedAggregateValue]).to.equal('15', 'AggregateValue should equal 15 (SUM of ValueArray via hash)');
+													Expect(_Pict.AppData[tmpHashedAggregateValue2]).to.equal('15', 'AggregateValue should equal 15 (SUM of ValueArray via address)');
+													Expect(_Pict.manifest.getValueByHash(_Pict.AppData, tmpHashedAggregateValue3)).to.equal('15', 'IndirectAggregateValue should equal 15 (via indirection) using manifest method');
+												}
+												catch (pError)
+												{
+													return fDone(pError);
+												}
+												fDone();
+											};
+											const [ tmpValueArrayKey, tmpValueArrayDescriptor ] = Object.entries(tmpDistinctManifest.Descriptors).find(([pKey, pDescriptor]) => pDescriptor.OriginalHash == 'ValueArray');
+											const tmpAddress = tmpValueArrayDescriptor.DataAddress;
+											_Pict.log.info('Setting up Distinct Array Test with address:', { tmpValueArrayKey, tmpValueArrayDescriptor, tmpAddress });
+											const tmpArrayAddress = tmpAddress.substring(0, tmpAddress.indexOf('[]'));
+											const tmpPropertyAddress = tmpAddress.substring(tmpAddress.indexOf('[]') + 3);
+											_Pict.manifest.setValueByHash(_Pict.AppData, tmpArrayAddress,
+												[
+													{ [tmpPropertyAddress]: '1' },
+													{ [tmpPropertyAddress]: '2' },
+													{ [tmpPropertyAddress]: '3' },
+													{ [tmpPropertyAddress]: '4' },
+													{ [tmpPropertyAddress]: '5' },
+												]);
+											_Pict.PictApplication.solve();
+										}
+										catch (pError)
+										{
+											_Pict.log.error('Error during Distinct Array Test:', pError);
+											return fDone(pError);
+										}
+									});
+							}
+						);
+					test(
 							'Solve Ordinals',
 							(fDone) =>
 							{

package/types/source/views/Pict-View-Form-Metacontroller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pict-View-Form-Metacontroller.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-Form-Metacontroller.js"],"names":[],"mappings":";AAaA;;GAEG;AAEH;;;;;;GAMG;AACH;IAEC,2DAyBC;IAjBA,yBAA2B;IAE3B,wBAAsF;IAEtF,cAAkC;IAElC,gCAAkC;IAClC,8BAAiC;IAEjC;;;;;;MAOE;IAQH,wCAGC;IARD,kCAGC;IAOD;;;;OAIG;IACH,qBAFa,GAAG,CAaf;IAED;;;;OAIG;IACH,mBAFa,GAAG,CAaf;IAED,yCAYC;IAED;;;;;OAKG;IACH,kCAHW,aAAa,GACX,IAAI,CAsBhB;IA8BD;;;;OAIG;IACH,WAFa,GAAG,CAMf;IAED,kCAGC;IAED,gDAGC;IAED,+CAGC;IAED;;;;OAIG;IACH,2DAJW,MAAM,GAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAW9B;IAED;;;;;;OAMG;IACH,mCANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,UACN,MAAM,GAEL,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAwBtD;IAED;;;;;OAKG;IACH,0BALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,GAEL,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAgCtD;IAED;;;;;;;;;OASG;IACH,kCALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UACnB,MAAM,GAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CA8L9B;IAED;;;;OAIG;IACH,uCAJW,KAAK,CAAC,MAAM,CAAC,sBACb,MAAM,UACN,MAAM,QAuBhB;IAED;;;OAGG;IACH,6CAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,SAehB;IAED;;;;;;;;OAQG;IACH,wDAHW,YAAY,SAoHtB;IAED;;;;;;;OAOG;IACH,4CAHW,MAAM,GACJ,IAAI,CAShB;IAED;;;;OAIG;IACH,6BAFa,IAAI,CAQhB;IAED;;;;;;;OAOG;IACH,+DAFW,YAAY,QAatB;IAED;;;;;;;OAOG;IACH,gEAFW,YAAY,QAatB;IAED;;;;;OAKG;IACH,8EAFW,YAAY,QAmBtB;IAED;;;;;;OAMG;IACH,oEAHW,YAAY,GACV,IAAI,CAkDhB;IAED;;;;;;;OAOG;IACH,uEAJW,YAAY,GAEX,IAAI,CAsFf;IAED;;;;;OAKG;IACH,qCAHW,MAAM,GACJ,MAAM,GAAC,OAAO,CA2C1B;IAED,+CAeC;IAED;;;;;;;OAOG;IACH,kFAJW,MAAM,GAEJ,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAoLtC;IA5JC,gCAA0D;IAC1D,yBAAiD;IA6JnD;;;;OAIG;IACH,gCAHW,MAAM,qBACN,MAAM,QA0BhB;IAED;;;OAGG;IACH,yDAHW,MAAM,uBACN,MAAM,QAKhB;IAED;;;;;OAKG;IACH,yDALW,MAAM,uBACN,MAAM,GAEL,OAAO,CAoDlB;IAED;;;;OAIG;IACH,sCAJW,MAAM,GAEL,OAAO,CA0ClB;IAED;;;OAGG;IACH,wDAHW,MAAM,6BAuBhB;IAED,oCAgBC;IAED;;;;OAIG;IACH,4BAFa,OAAO,CAKnB;CACD;;;;;qCAGU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;oBA5zCjB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM"}
+{"version":3,"file":"Pict-View-Form-Metacontroller.d.ts","sourceRoot":"","sources":["../../../source/views/Pict-View-Form-Metacontroller.js"],"names":[],"mappings":";AAaA;;GAEG;AAEH;;;;;;GAMG;AACH;IAEC,2DAyBC;IAjBA,yBAA2B;IAE3B,wBAAsF;IAEtF,cAAkC;IAElC,gCAAkC;IAClC,8BAAiC;IAEjC;;;;;;MAOE;IAQH,wCAGC;IARD,kCAGC;IAOD;;;;OAIG;IACH,qBAFa,GAAG,CAaf;IAED;;;;OAIG;IACH,mBAFa,GAAG,CAaf;IAED,yCAYC;IAED;;;;;OAKG;IACH,kCAHW,aAAa,GACX,IAAI,CAsBhB;IA8BD;;;;OAIG;IACH,WAFa,GAAG,CAMf;IAED,kCAGC;IAED,gDAGC;IAED,+CAGC;IAED;;;;OAIG;IACH,2DAJW,MAAM,GAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAW9B;IAED;;;;;;OAMG;IACH,mCANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,UACN,MAAM,GAEL,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAwBtD;IAED;;;;;OAKG;IACH,0BALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,GAEL,KAAK,CAAC,OAAO,4BAA4B,CAAC,CAAC,CAgCtD;IAED;;;;;;;;;OASG;IACH,kCALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UACnB,MAAM,GAEL,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAqO9B;IAED;;;;OAIG;IACH,uCAJW,KAAK,CAAC,MAAM,CAAC,sBACb,MAAM,UACN,MAAM,QAuBhB;IAED;;;OAGG;IACH,6CAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,MAAM,SAehB;IAED;;;;;;;;OAQG;IACH,wDAHW,YAAY,SAoHtB;IAED;;;;;;;OAOG;IACH,4CAHW,MAAM,GACJ,IAAI,CAShB;IAED;;;;OAIG;IACH,6BAFa,IAAI,CAQhB;IAED;;;;;;;OAOG;IACH,+DAFW,YAAY,QAatB;IAED;;;;;;;OAOG;IACH,gEAFW,YAAY,QAatB;IAED;;;;;OAKG;IACH,8EAFW,YAAY,QAmBtB;IAED;;;;;;OAMG;IACH,oEAHW,YAAY,GACV,IAAI,CAkDhB;IAED;;;;;;;OAOG;IACH,uEAJW,YAAY,GAEX,IAAI,CAsFf;IAED;;;;;OAKG;IACH,qCAHW,MAAM,GACJ,MAAM,GAAC,OAAO,CA2C1B;IAED,+CAeC;IAED;;;;;;;OAOG;IACH,kFAJW,MAAM,GAEJ,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAoLtC;IA5JC,gCAA0D;IAC1D,yBAAiD;IA6JnD;;;;OAIG;IACH,gCAHW,MAAM,qBACN,MAAM,QA0BhB;IAED;;;OAGG;IACH,yDAHW,MAAM,uBACN,MAAM,QAKhB;IAED;;;;;OAKG;IACH,yDALW,MAAM,uBACN,MAAM,GAEL,OAAO,CAoDlB;IAED;;;;OAIG;IACH,sCAJW,MAAM,GAEL,OAAO,CA0ClB;IAED;;;OAGG;IACH,wDAHW,MAAM,6BAuBhB;IAED,oCAgBC;IAED;;;;OAIG;IACH,4BAFa,OAAO,CAKnB;CACD;;;;;qCAGU,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;oBAn2CjB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM"}