@mikezimm/fps-library-v2 1.0.89 → 1.0.91
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.
- package/CHANGELOG.md +15 -4
- package/lib/banner/FPSWebPartClass/runOnPropPaneCompleted.d.ts.map +1 -1
- package/lib/banner/FPSWebPartClass/runOnPropPaneCompleted.js +4 -3
- package/lib/banner/FPSWebPartClass/runOnPropPaneCompleted.js.map +1 -1
- package/lib/banner/components/VisitorPanel/FPSOptionsGroupVisHelp.d.ts +1 -1
- package/lib/banner/components/VisitorPanel/FPSOptionsGroupVisHelp.js +1 -1
- package/lib/banner/features/ImportExport/IgnoreBlockProps.js +1 -1
- package/lib/banner/features/ImportExport/IgnoreBlockProps.js.map +1 -1
- package/lib/logic/Errors/friendly.d.ts.map +1 -1
- package/lib/logic/Errors/friendly.js +4 -0
- package/lib/logic/Errors/friendly.js.map +1 -1
- package/lib/logic/Objects/deep.d.ts +2 -1
- package/lib/logic/Objects/deep.d.ts.map +1 -1
- package/lib/logic/Objects/deep.js +6 -3
- package/lib/logic/Objects/deep.js.map +1 -1
- package/lib/logic/Strings/drillParse/createItemFunctionProp.js +1 -1
- package/lib/logic/Strings/drillParse/createItemFunctionProp.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -5,21 +5,32 @@ npm run build
|
|
|
5
5
|
npm version major/minor/patch
|
|
6
6
|
npm publish --access=public
|
|
7
7
|
|
|
8
|
-
npm install @mikezimm/fps-library-v2@1.0.
|
|
8
|
+
npm install @mikezimm/fps-library-v2@1.0.90
|
|
9
9
|
|
|
10
10
|
# Changelog
|
|
11
11
|
|
|
12
12
|
NOTE: TURN BACK ON STRICT NULL CHECKS - turned off for PropPaneCols
|
|
13
13
|
|
|
14
|
-
## 1.0.
|
|
14
|
+
## 1.0.91 - 2023-Jan-10: SecureScript supportedContacts
|
|
15
|
+
- updated importBlockPropsFPS: added 'supportContacts', 'documentationLinkDesc', 'documentationLinkUrl',
|
|
16
|
+
- so that if you export/import, it updates the SupportContact to current user and makes them update docs info.
|
|
17
|
+
- updated download error due to unmanaged device to friendly errors: https://github.com/mikezimm/SecureScript7/issues/67
|
|
18
|
+
- updated checkDeepProperty to allow suppressing console on errors. https://github.com/mikezimm/drilldown7/issues/316
|
|
19
|
+
|
|
20
|
+
## 1.0.90 - 2023-Jan-10: Drilldown Prop Pane Help supportedContacts
|
|
21
|
+
- added console.log whenever onFPSPropPaneClosed automatically updates supportContacts
|
|
22
|
+
- updated onFPSPropPaneClosed to put correct email, name and imageUrl in the prop pane props
|
|
23
|
+
|
|
24
|
+
## 1.0.89 - 2023-Jan-10: Drilldown Prop Pane Help supportedContacts
|
|
25
|
+
- https://github.com/mikezimm/SecureScript7/issues/98
|
|
15
26
|
- add onPropertyPaneConfigurationComplete to Class
|
|
16
27
|
- create onFPSPropPaneClosed which could be called at any time from web part
|
|
17
28
|
|
|
18
29
|
|
|
19
|
-
## 1.0.87 - 2023-Jan-
|
|
30
|
+
## 1.0.87 - 2023-Jan-10: Drilldown Prop Pane Help escape fixes
|
|
20
31
|
- numerous places: replaced escape() with string literals.
|
|
21
32
|
|
|
22
|
-
## 1.0.86 - 2023-Jan-
|
|
33
|
+
## 1.0.86 - 2023-Jan-07: Drilldown Various updates
|
|
23
34
|
- update PinMeGroup to not expand: https://github.com/mikezimm/drilldown7/issues/304
|
|
24
35
|
- add spHttpClient?: any; to WebPartContextCopy_15_2 for typing in SecureScript7 for prop pane calls
|
|
25
36
|
- update npm install @mikezimm/fps-styles@1.0.13 for drilldown styles
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runOnPropPaneCompleted.d.ts","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/runOnPropPaneCompleted.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,wBAAgB,mBAAmB,CAAG,WAAW,EAAE,oBAAoB,GAAM,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"runOnPropPaneCompleted.d.ts","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/runOnPropPaneCompleted.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,wBAAgB,mBAAmB,CAAG,WAAW,EAAE,oBAAoB,GAAM,OAAO,CAAC,IAAI,CAAC,CAkBzF"}
|
|
@@ -7,11 +7,12 @@ export function onFPSPropPaneClosed(thisWPClass) {
|
|
|
7
7
|
{
|
|
8
8
|
fullName: thisWPClass._FPSUser.Title,
|
|
9
9
|
id: thisWPClass._FPSUser.id,
|
|
10
|
-
email: thisWPClass._FPSUser.
|
|
11
|
-
login: thisWPClass._FPSUser.
|
|
12
|
-
imageUrl: thisWPClass.
|
|
10
|
+
email: thisWPClass._FPSUser.email,
|
|
11
|
+
login: thisWPClass._FPSUser.name,
|
|
12
|
+
imageUrl: thisWPClass.context.pageContext.user.imageUrl, // Verified context.pageContext.user.imageUrl was valid as of 2023-01-09 - SPFx v1.15.2
|
|
13
13
|
}
|
|
14
14
|
];
|
|
15
|
+
console.log('FPS-onFPSPropPaneClosed... We ADDED you to supportContacts because it can not be left empty:', thisWPClass.properties.supportContacts);
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
//# sourceMappingURL=runOnPropPaneCompleted.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runOnPropPaneCompleted.js","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/runOnPropPaneCompleted.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,mBAAmB,CAAG,WAAiC;IAErE,IAAK,WAAW,CAAC,UAAU,CAAC,eAAe,KAAK,IAAI;QAAG,OAAO;IAE9D,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAC/D,IAAK,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAG;QACtD,WAAW,CAAC,UAAU,CAAC,eAAe,GAAG;YACvC;gBACE,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK;gBACpC,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE;gBAC3B,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK;gBACjC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"runOnPropPaneCompleted.js","sourceRoot":"","sources":["../../../src/banner/FPSWebPartClass/runOnPropPaneCompleted.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,mBAAmB,CAAG,WAAiC;IAErE,IAAK,WAAW,CAAC,UAAU,CAAC,eAAe,KAAK,IAAI;QAAG,OAAO;IAE9D,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC;IAC/D,IAAK,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAG;QACtD,WAAW,CAAC,UAAU,CAAC,eAAe,GAAG;YACvC;gBACE,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK;gBACpC,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE;gBAC3B,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK;gBACjC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;gBAChC,QAAQ,EAAE,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAG,uFAAuF;aAClJ;SACF,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,8FAA8F,EAAE,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;KACrJ;AAEH,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { IMinCustomHelpProps } from './Interfaces';
|
|
|
3
3
|
/**
|
|
4
4
|
* FPSBanner3VisHelpGroup - Builds FPS Banner Visitor Help Group:
|
|
5
5
|
* fullPanelAudience, panelMessageDescription1, panelMessageSupport,
|
|
6
|
-
* panelMessageDocumentation, documentationLinkUrl, documentationLinkDesc,
|
|
6
|
+
* panelMessageDocumentation, documentationLinkUrl, supportContacts, documentationLinkDesc,
|
|
7
7
|
* panelMessageIfYouStill, supportContacts
|
|
8
8
|
*
|
|
9
9
|
*/
|
|
@@ -5,7 +5,7 @@ import { EveryoneAudienceChoices } from '../../propPane/Audiences/Interfaces';
|
|
|
5
5
|
/**
|
|
6
6
|
* FPSBanner3VisHelpGroup - Builds FPS Banner Visitor Help Group:
|
|
7
7
|
* fullPanelAudience, panelMessageDescription1, panelMessageSupport,
|
|
8
|
-
* panelMessageDocumentation, documentationLinkUrl, documentationLinkDesc,
|
|
8
|
+
* panelMessageDocumentation, documentationLinkUrl, supportContacts, documentationLinkDesc,
|
|
9
9
|
* panelMessageIfYouStill, supportContacts
|
|
10
10
|
*
|
|
11
11
|
*/
|
|
@@ -4,6 +4,6 @@ export const exportIgnorePropsFPS = ['analyticsList', 'analyticsWeb', ...changes
|
|
|
4
4
|
//Common props to block import
|
|
5
5
|
export const importBlockPropsFPS = ['scenario', 'analyticsList', 'analyticsWeb', 'lastPropDetailChange', 'showBanner',
|
|
6
6
|
'showTricks', 'showRepoLinks', 'showExport', 'fpsImportProps', 'fullPanelAudience',
|
|
7
|
-
'documentationIsValid', 'requireDocumentation', 'requireContacts',
|
|
7
|
+
'documentationIsValid', 'requireDocumentation', 'requireContacts', 'supportContacts', 'documentationLinkDesc', 'documentationLinkUrl',
|
|
8
8
|
'currentWeb', 'loadPerformance', 'webpartHistory', 'pageLayout'];
|
|
9
9
|
//# sourceMappingURL=IgnoreBlockProps.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IgnoreBlockProps.js","sourceRoot":"","sources":["../../../../src/banner/features/ImportExport/IgnoreBlockProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2EAA2E,CAAC;AAE9G,+BAA+B;AAC/B,MAAM,CAAC,MAAM,oBAAoB,GAAc,CAAE,eAAe,EAAE,cAAc,EAAE,GAAG,iBAAiB,CAAE,CAAC;AAEzG,8BAA8B;AAC9B,MAAM,CAAC,MAAM,mBAAmB,GAAc,CAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,sBAAsB,EAAE,YAAY;IAC/H,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,mBAAmB;IAClF,sBAAsB,EAAE,sBAAsB,EAAE,iBAAiB;
|
|
1
|
+
{"version":3,"file":"IgnoreBlockProps.js","sourceRoot":"","sources":["../../../../src/banner/features/ImportExport/IgnoreBlockProps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2EAA2E,CAAC;AAE9G,+BAA+B;AAC/B,MAAM,CAAC,MAAM,oBAAoB,GAAc,CAAE,eAAe,EAAE,cAAc,EAAE,GAAG,iBAAiB,CAAE,CAAC;AAEzG,8BAA8B;AAC9B,MAAM,CAAC,MAAM,mBAAmB,GAAc,CAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,sBAAsB,EAAE,YAAY;IAC/H,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,mBAAmB;IAClF,sBAAsB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,sBAAsB;IACrI,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,CAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendly.d.ts","sourceRoot":"","sources":["../../../src/logic/Errors/friendly.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;GAWG;AAEH;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAG,GAAG,EAAE,OAAO,SAAO,EAAE,UAAU,SAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,GAAE,OAAc,GAAK,eAAe,CAKhJ;AAED,wBAAgB,gBAAgB,CAAE,CAAC,EAAG,GAAG,EAAE,OAAO,UAAO,EAAE,UAAU,UAAO,EAAE,SAAS,GAAE,OAAc,GAAI,eAAe,CAKzH;AAQD,MAAM,WAAW,cAAc;IAC7B,CAAC,EAAG,GAAG,CAAC;IACR,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CAEpB;AAED,wBAAgB,oBAAoB,CAAE,MAAM,EAAE,cAAc,GAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"friendly.d.ts","sourceRoot":"","sources":["../../../src/logic/Errors/friendly.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;GAWG;AAEH;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAG,GAAG,EAAE,OAAO,SAAO,EAAE,UAAU,SAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,GAAE,OAAc,GAAK,eAAe,CAKhJ;AAED,wBAAgB,gBAAgB,CAAE,CAAC,EAAG,GAAG,EAAE,OAAO,UAAO,EAAE,UAAU,UAAO,EAAE,SAAS,GAAE,OAAc,GAAI,eAAe,CAKzH;AAQD,MAAM,WAAW,cAAc;IAC7B,CAAC,EAAG,GAAG,CAAC;IACR,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CAEpB;AAED,wBAAgB,oBAAoB,CAAE,MAAM,EAAE,cAAc,GAAK,eAAe,CAoL/E"}
|
|
@@ -74,6 +74,10 @@ export function convertHelpfullError(inputs) {
|
|
|
74
74
|
if (result.indexOf('Failed to fetch') > -1) {
|
|
75
75
|
friendlyMessage = 'This can happen if the web url is not valid.';
|
|
76
76
|
}
|
|
77
|
+
// Due to organizational policies: Added for https://github.com/mikezimm/SecureScript7/issues/67
|
|
78
|
+
if (result.indexOf('Due to organizational policies') > -1 && result.indexOf('download these resources from this device."') > -1) {
|
|
79
|
+
friendlyMessage = 'Tenant Policy prevents downloads to an unmanaged device.';
|
|
80
|
+
}
|
|
77
81
|
if (result.indexOf('A null value was detected in the items of a collection property value') > -1) {
|
|
78
82
|
friendlyMessage = 'This can happen if you are saving a null value where an array is expected... Maybe try saving an empty array instead :).';
|
|
79
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"friendly.js","sourceRoot":"","sources":["../../../src/logic/Errors/friendly.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"friendly.js","sourceRoot":"","sources":["../../../src/logic/Errors/friendly.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export type IReturnErrorType = 'Actual' | 'FullError' | 'ShortError' | 'EmptyStr
|
|
|
6
6
|
* @param obj - parent object you want to check
|
|
7
7
|
* @param keys - key array to check (parent.check.this keys are ['check','this'] )
|
|
8
8
|
* @param errReturnType - what to do when there is an error
|
|
9
|
+
* @param consoleLog - true is default due to being used before. Set to false to not show in console if it is not neccessary.
|
|
9
10
|
*/
|
|
10
|
-
export declare function checkDeepProperty(obj: any, keys: string[], errReturnType: IReturnErrorType): any;
|
|
11
|
+
export declare function checkDeepProperty(obj: any, keys: string[], errReturnType: IReturnErrorType, consoleLog?: boolean): any;
|
|
11
12
|
//# sourceMappingURL=deep.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deep.d.ts","sourceRoot":"","sources":["../../../src/logic/Objects/deep.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,GAAG,aAAa,CAAC;AAErF
|
|
1
|
+
{"version":3,"file":"deep.d.ts","sourceRoot":"","sources":["../../../src/logic/Objects/deep.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,GAAG,aAAa,CAAC;AAErF;;;;;;;;GAQG;AAEH,wBAAgB,iBAAiB,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,EAAG,aAAa,EAAE,gBAAgB,EAAE,UAAU,GAAE,OAAc,GAAK,GAAG,CA+ChI"}
|
|
@@ -5,8 +5,9 @@
|
|
|
5
5
|
* @param obj - parent object you want to check
|
|
6
6
|
* @param keys - key array to check (parent.check.this keys are ['check','this'] )
|
|
7
7
|
* @param errReturnType - what to do when there is an error
|
|
8
|
+
* @param consoleLog - true is default due to being used before. Set to false to not show in console if it is not neccessary.
|
|
8
9
|
*/
|
|
9
|
-
export function checkDeepProperty(obj, keys, errReturnType) {
|
|
10
|
+
export function checkDeepProperty(obj, keys, errReturnType, consoleLog = true) {
|
|
10
11
|
if (!keys || keys.length === 0) {
|
|
11
12
|
return obj;
|
|
12
13
|
}
|
|
@@ -34,7 +35,8 @@ export function checkDeepProperty(obj, keys, errReturnType) {
|
|
|
34
35
|
else if (errReturnType === 'ShortError') {
|
|
35
36
|
returnValue = `...${key} = undef`;
|
|
36
37
|
}
|
|
37
|
-
|
|
38
|
+
if (consoleLog === true)
|
|
39
|
+
console.log('Object Error: checkDeepProperty ~ 39: ', `${lastTestedKey} = undef`);
|
|
38
40
|
}
|
|
39
41
|
else if (subObject === null) {
|
|
40
42
|
isUndefined = true;
|
|
@@ -50,7 +52,8 @@ export function checkDeepProperty(obj, keys, errReturnType) {
|
|
|
50
52
|
else if (errReturnType === 'ShortError') {
|
|
51
53
|
returnValue = `...${key} = undef`;
|
|
52
54
|
}
|
|
53
|
-
|
|
55
|
+
if (consoleLog === true)
|
|
56
|
+
console.log('Object Error: checkDeepProperty ~ 48: ', `${lastTestedKey} = null`);
|
|
54
57
|
}
|
|
55
58
|
else {
|
|
56
59
|
if (isLastKey) { //This is the actual value to test.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deep.js","sourceRoot":"","sources":["../../../src/logic/Objects/deep.ts"],"names":[],"mappings":"AAIA
|
|
1
|
+
{"version":3,"file":"deep.js","sourceRoot":"","sources":["../../../src/logic/Objects/deep.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,MAAM,UAAU,iBAAiB,CAAE,GAAQ,EAAE,IAAc,EAAG,aAA+B,EAAE,aAAsB,IAAI;IAEvH,IAAK,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAG;QAAE,OAAO,GAAG,CAAC;KAAE;SAC5C;QACH,IAAI,WAAW,GAAQ,IAAI,CAAC;QAC5B,IAAI,WAAW,GAAY,KAAK,CAAC;QACjC,IAAI,aAAa,GAAW,KAAK,CAAC;QAClC,IAAI,SAAS,GAAQ,GAAG,CAAC;QAEzB,IAAI,CAAC,GAAG,CAAG,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;YAExB,IAAI,SAAS,GAAG,KAAK,KAAK,IAAI,CAAC,MAAM,GAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;YAExD,IAAK,WAAW,KAAK,KAAK,EAAG;gBAC3B,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;gBAE3B,aAAa,IAAI,GAAG,GAAG,GAAG,CAAE;gBAE5B,IAAK,SAAS,KAAK,SAAS,EAAG;oBAC7B,WAAW,GAAG,IAAI,CAAC;oBACnB,IAAK,aAAa,KAAK,QAAQ,EAAG;wBAAE,WAAW,GAAG,SAAS,CAAE;qBAAE;yBAC1D,IAAK,aAAa,KAAK,aAAa,EAAG;wBAAE,WAAW,GAAG,EAAE,CAAE;qBAAE;yBAC7D,IAAK,aAAa,KAAK,WAAW,EAAG;wBAAE,WAAW,GAAG,GAAG,aAAa,UAAU,CAAE;qBAAE;yBACnF,IAAK,aAAa,KAAK,YAAY,EAAG;wBAAE,WAAW,GAAG,MAAM,GAAG,UAAU,CAAE;qBAAE;oBAClF,IAAK,UAAU,KAAK,IAAI;wBAAG,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,GAAG,aAAa,UAAU,CAAE,CAAC;iBAE/G;qBAAM,IAAK,SAAS,KAAK,IAAI,EAAG;oBAC/B,WAAW,GAAG,IAAI,CAAC;oBAEnB,IAAK,aAAa,KAAK,QAAQ,EAAG;wBAAE,WAAW,GAAG,IAAI,CAAE;qBAAE;yBACrD,IAAK,aAAa,KAAK,aAAa,EAAG;wBAAE,WAAW,GAAG,EAAE,CAAE;qBAAE;yBAC7D,IAAK,aAAa,KAAK,WAAW,EAAG;wBAAE,WAAW,GAAG,GAAG,aAAa,UAAU,CAAE;qBAAE;yBACnF,IAAK,aAAa,KAAK,YAAY,EAAG;wBAAE,WAAW,GAAG,MAAM,GAAG,UAAU,CAAE;qBAAE;oBAClF,IAAK,UAAU,KAAK,IAAI;wBAAG,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,GAAG,aAAa,SAAS,CAAE,CAAC;iBAE9G;qBAAM;oBAEL,IAAK,SAAS,EAAG,EAAC,mCAAmC;wBACnD,WAAW,GAAG,SAAS,CAAC;qBACzB;iBACF;aACF;QAEH,CAAC,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;KACpB;AACH,CAAC"}
|
|
@@ -262,7 +262,7 @@ export function createItemFunctionProp(staticColumn, item, defaultValue) {
|
|
|
262
262
|
trimmedItem = replaceHTMLEntities(trimmedItem);
|
|
263
263
|
}
|
|
264
264
|
let obj = JSON.parse(trimmedItem);
|
|
265
|
-
singleItemValue = checkDeepProperty(obj, objKeys, 'Actual');
|
|
265
|
+
singleItemValue = checkDeepProperty(obj, objKeys, 'Actual', false);
|
|
266
266
|
}
|
|
267
267
|
catch (e) {
|
|
268
268
|
// singleItemValue = `${}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createItemFunctionProp.js","sourceRoot":"","sources":["../../../../src/logic/Strings/drillParse/createItemFunctionProp.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"createItemFunctionProp.js","sourceRoot":"","sources":["../../../../src/logic/Strings/drillParse/createItemFunctionProp.ts"],"names":[],"mappings":"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"}
|