@botonic/plugin-flow-builder 0.42.1 → 0.42.3
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/lib/cjs/content-fields/flow-channel-conditional.js.map +1 -1
- package/lib/cjs/content-fields/flow-country-conditional.js.map +1 -1
- package/lib/cjs/content-fields/flow-custom-conditional.d.ts +1 -0
- package/lib/cjs/content-fields/flow-custom-conditional.js +11 -1
- package/lib/cjs/content-fields/flow-custom-conditional.js.map +1 -1
- package/lib/cjs/content-fields/hubtype-fields/function.d.ts +1 -1
- package/lib/esm/content-fields/flow-channel-conditional.js.map +1 -1
- package/lib/esm/content-fields/flow-country-conditional.js.map +1 -1
- package/lib/esm/content-fields/flow-custom-conditional.d.ts +1 -0
- package/lib/esm/content-fields/flow-custom-conditional.js +11 -1
- package/lib/esm/content-fields/flow-custom-conditional.js.map +1 -1
- package/lib/esm/content-fields/hubtype-fields/function.d.ts +1 -1
- package/package.json +1 -1
- package/src/content-fields/flow-channel-conditional.tsx +1 -2
- package/src/content-fields/flow-country-conditional.tsx +1 -2
- package/src/content-fields/flow-custom-conditional.tsx +21 -2
- package/src/content-fields/hubtype-fields/function.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-channel-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-channel-conditional.tsx"],"names":[],"mappings":";;;;;AAAA,wCAAoE;
|
|
1
|
+
{"version":3,"file":"flow-channel-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-channel-conditional.tsx"],"names":[],"mappings":";;;;;AAAA,wCAAoE;AAGpE,0CAGoB;AACpB,+DAAyD;AAIzD,MAAa,sBAAuB,SAAQ,uCAAiB;IAA7D;;QACS,kBAAa,GAAuB,EAAE,CAAA;QACtC,sBAAiB,GAAsB,SAAS,CAAA;QAChD,kBAAa,GAAW,EAAE,CAAA;IAkDnC,CAAC;IAhDC,MAAM,CAAC,cAAc,CACnB,SAAmC,EACnC,OAAsB;QAEtB,MAAM,qBAAqB,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACtE,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;QAC3C,qBAAqB,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,cAAc,CAAA;QACtE,qBAAqB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;QAEnD,OAAO,qBAAqB,CAAA;IAC9B,CAAC;IAED,oBAAoB,CAAC,OAAsB;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAA;QAC9C,MAAM,iBAAiB,GACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC;YACzD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;QAC5D,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,IAAI,kBAAkB,QAAQ,EAAE,CAC9E,CAAA;SACF;QACD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC,MAAgB,CAAA;QACvD,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAA;IAC1C,CAAC;IAEK,SAAS,CAAC,OAAsB;;YACpC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GACrE,IAAA,oDAAyC,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;YAE7D,MAAM,uBAAuB,GAA4B;gBACvD,MAAM,EAAE,kBAAW,CAAC,kBAAkB;gBACtC,YAAY;gBACZ,MAAM;gBACN,QAAQ;gBACR,UAAU;gBACV,iBAAiB;gBACjB,oBAAoB,EAAE,KAAK;gBAC3B,OAAO,EAAE,IAAI,CAAC,aAAa;aAC5B,CAAA;YACD,MAAM,EAAE,MAAM,KAAmB,uBAAuB,EAArC,SAAS,kBAAK,uBAAuB,EAAlD,UAAwB,CAA0B,CAAA;YACxD,MAAM,IAAA,qBAAU,EAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;QAC9C,CAAC;KAAA;IAED,SAAS;QACP,OAAO,kDAAK,CAAA;IACd,CAAC;CACF;AArDD,wDAqDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-country-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-country-conditional.tsx"],"names":[],"mappings":";;;;;AAAA,wCAAoE;
|
|
1
|
+
{"version":3,"file":"flow-country-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-country-conditional.tsx"],"names":[],"mappings":";;;;;AAAA,wCAAoE;AAGpE,0CAGoB;AACpB,+DAAyD;AAIzD,MAAa,sBAAuB,SAAQ,uCAAiB;IAA7D;;QACS,kBAAa,GAAuB,EAAE,CAAA;QACtC,sBAAiB,GAAsB,SAAS,CAAA;IAqDzD,CAAC;IAnDC,MAAM,CAAC,cAAc,CACnB,SAAmC,EACnC,OAAsB;QAEtB,MAAM,qBAAqB,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACtE,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;QAC3C,qBAAqB,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,cAAc,CAAA;QACtE,qBAAqB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;QAEnD,OAAO,qBAAqB,CAAA;IAC9B,CAAC;IAED,oBAAoB,CAAC,OAAsB;QACzC,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAA;QACxC,MAAM,iBAAiB,GACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC;YACxD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;QAC5D,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,IAAI,kBAAkB,OAAO,EAAE,CAC7E,CAAA;SACF;QACD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAA;IAC1C,CAAC;IAEK,SAAS,CAAC,OAAsB;;;YACpC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GACrE,IAAA,oDAAyC,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;YAC7D,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,MAAM,CAAA,EAAE;gBACnC,OAAO,CAAC,IAAI,CACV,2BAA2B,IAAI,CAAC,IAAI,kCAAkC,CACvE,CAAA;aACF;YACD,MAAM,uBAAuB,GAA4B;gBACvD,MAAM,EAAE,kBAAW,CAAC,kBAAkB;gBACtC,YAAY;gBACZ,MAAM;gBACN,QAAQ;gBACR,UAAU;gBACV,iBAAiB;gBACjB,oBAAoB,EAAE,KAAK;gBAC3B,OAAO,EAAE,MAAC,MAAA,IAAI,CAAC,iBAAiB,0CAAE,MAAiB,mCAAI,EAAE;aAC1D,CAAA;YACD,MAAM,EAAE,MAAM,KAAmB,uBAAuB,EAArC,SAAS,kBAAK,uBAAuB,EAAlD,UAAwB,CAA0B,CAAA;YACxD,MAAM,IAAA,qBAAU,EAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;;KAC7C;IAED,SAAS;QACP,OAAO,kDAAK,CAAA;IACd,CAAC;CACF;AAvDD,wDAuDC"}
|
|
@@ -11,5 +11,6 @@ export declare class FlowCustomConditional extends ContentFieldsBase {
|
|
|
11
11
|
static fromHubtypeCMS(component: HtCustomConditionalNode, request: ActionRequest): FlowCustomConditional;
|
|
12
12
|
setConditionalResult(request: ActionRequest): void;
|
|
13
13
|
trackFlow(request: ActionRequest): Promise<void>;
|
|
14
|
+
private isBooleanConditional;
|
|
14
15
|
toBotonic(): import("react/jsx-runtime").JSX.Element;
|
|
15
16
|
}
|
|
@@ -39,8 +39,13 @@ class FlowCustomConditional extends content_fields_base_1.ContentFieldsBase {
|
|
|
39
39
|
throw new Error(`Key path not found for node ${this.code}`);
|
|
40
40
|
}
|
|
41
41
|
const botVariable = (0, utils_1.getValueFromKeyPath)(request, keyPath);
|
|
42
|
-
|
|
42
|
+
let conditionalResult = this.resultMapping.find(rMap => rMap.result === botVariable) ||
|
|
43
43
|
this.resultMapping.find(rMap => rMap.result === 'default');
|
|
44
|
+
if (this.isBooleanConditional(this.resultMapping) &&
|
|
45
|
+
typeof botVariable !== 'boolean') {
|
|
46
|
+
conditionalResult =
|
|
47
|
+
this.resultMapping.find(rMap => rMap.result === (botVariable !== undefined && botVariable !== null)) || this.resultMapping.find(rMap => rMap.result === 'default');
|
|
48
|
+
}
|
|
44
49
|
if (!conditionalResult) {
|
|
45
50
|
throw new Error(`No conditional result found for node ${this.code} with key path: ${keyPath}`);
|
|
46
51
|
}
|
|
@@ -70,6 +75,11 @@ class FlowCustomConditional extends content_fields_base_1.ContentFieldsBase {
|
|
|
70
75
|
yield (0, tracking_1.trackEvent)(request, action, eventArgs);
|
|
71
76
|
});
|
|
72
77
|
}
|
|
78
|
+
isBooleanConditional(resultMapping) {
|
|
79
|
+
return (resultMapping.some(rMap => rMap.result === true) &&
|
|
80
|
+
resultMapping.some(rMap => rMap.result === false) &&
|
|
81
|
+
resultMapping.some(rMap => rMap.result === 'default'));
|
|
82
|
+
}
|
|
73
83
|
toBotonic() {
|
|
74
84
|
return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, {});
|
|
75
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-custom-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-custom-conditional.tsx"],"names":[],"mappings":";;;;;AAAA,wCAAmE;
|
|
1
|
+
{"version":3,"file":"flow-custom-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-custom-conditional.tsx"],"names":[],"mappings":";;;;;AAAA,wCAAmE;AAGnE,0CAGoB;AACpB,oCAA8C;AAC9C,+DAAyD;AAQzD,MAAa,qBAAsB,SAAQ,uCAAiB;IAA5D;;QACS,cAAS,GAA0B,EAAE,CAAA;QAErC,sBAAiB,GAAsB,SAAS,CAAA;QAChD,iBAAY,GAAY,KAAK,CAAA;QAC7B,mBAAc,GAAW,EAAE,CAAA;IAgGpC,CAAC;IA9FC,MAAM,CAAC,cAAc,CACnB,SAAkC,EAClC,OAAsB;QAEtB,MAAM,oBAAoB,GAAG,IAAI,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACpE,oBAAoB,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;QAC1C,oBAAoB,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAA;QAC5D,oBAAoB,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,cAAc,CAAA;QACrE,oBAAoB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;QAClD,oBAAoB,CAAC,cAAc,GACjC,SAAS,CAAC,OAAO,CAAC,SACnB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAET,OAAO,oBAAoB,CAAA;IAC7B,CAAC;IAED,oBAAoB,CAAC,OAAsB;QACzC,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACjD,IAAI,MAAM,IAAI,GAAG,EAAE;gBACjB,OAAO,GAAG,CAAC,IAAI,KAAK,SAAS,CAAA;aAC9B;YACD,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAA;QAEF,IAAI,OAAO,GAAG,EAAE,CAAA;QAEhB,IAAI,gBAAgB,IAAI,OAAO,IAAI,gBAAgB,EAAE;YACnD,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAA;SACjC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;SAC5D;QAED,MAAM,WAAW,GAAG,IAAA,2BAAmB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAEzD,IAAI,iBAAiB,GACnB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC;YAC5D,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;QAE5D,IACE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC;YAC7C,OAAO,WAAW,KAAK,SAAS,EAChC;YACA,iBAAiB;gBACf,IAAI,CAAC,aAAa,CAAC,IAAI,CACrB,IAAI,CAAC,EAAE,CACL,IAAI,CAAC,MAAM,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,CAAC,CACtE,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;SAClE;QAED,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,IAAI,mBAAmB,OAAO,EAAE,CAC9E,CAAA;SACF;QAED,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,YAAY,GAAG,iBAAiB,CAAC,MAA4B,CAAA;QAClE,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAA;IAC1C,CAAC;IAEK,SAAS,CAAC,OAAsB;;;YACpC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GACrE,IAAA,oDAAyC,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;YAC7D,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,MAAM,CAAA,EAAE;gBACnC,OAAO,CAAC,IAAI,CACV,2BAA2B,IAAI,CAAC,IAAI,kCAAkC,CACvE,CAAA;aACF;YACD,MAAM,sBAAsB,GAA2B;gBACrD,MAAM,EAAE,kBAAW,CAAC,iBAAiB;gBACrC,YAAY;gBACZ,MAAM;gBACN,QAAQ;gBACR,UAAU;gBACV,iBAAiB;gBACjB,oBAAoB,EAAE,KAAK;gBAC3B,mBAAmB,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;gBACjD,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,CAAA;YACD,MAAM,EAAE,MAAM,KAAmB,sBAAsB,EAApC,SAAS,kBAAK,sBAAsB,EAAjD,UAAwB,CAAyB,CAAA;YACvD,MAAM,IAAA,qBAAU,EAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;;KAC7C;IAEO,oBAAoB,CAAC,aAAiC;QAC5D,OAAO,CACL,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;YAChD,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC;YACjD,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CACtD,CAAA;IACH,CAAC;IAED,SAAS;QACP,OAAO,kDAAK,CAAA;IACd,CAAC;CACF;AArGD,sDAqGC"}
|
|
@@ -16,7 +16,7 @@ export interface HtFunctionArgumentLocale {
|
|
|
16
16
|
values: HtFunctionArgument[];
|
|
17
17
|
}
|
|
18
18
|
export interface HtFunctionResult {
|
|
19
|
-
result: string;
|
|
19
|
+
result: string | boolean | number;
|
|
20
20
|
target?: HtNodeLink;
|
|
21
21
|
}
|
|
22
22
|
export type HtFunctionArguments = HtFunctionArgumentLocale | HtFunctionArgument;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-channel-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-channel-conditional.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,WAAW,EAA2B,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"flow-channel-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-channel-conditional.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,WAAW,EAA2B,MAAM,eAAe,CAAA;AAGpE,OAAO,EACL,yCAAyC,EACzC,UAAU,GACX,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAIzD,MAAM,OAAO,sBAAuB,SAAQ,iBAAiB;IAA7D;;QACS,kBAAa,GAAuB,EAAE,CAAA;QACtC,sBAAiB,GAAsB,SAAS,CAAA;QAChD,kBAAa,GAAW,EAAE,CAAA;IAkDnC,CAAC;IAhDC,MAAM,CAAC,cAAc,CACnB,SAAmC,EACnC,OAAsB;QAEtB,MAAM,qBAAqB,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACtE,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;QAC3C,qBAAqB,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,cAAc,CAAA;QACtE,qBAAqB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;QAEnD,OAAO,qBAAqB,CAAA;IAC9B,CAAC;IAED,oBAAoB,CAAC,OAAsB;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAA;QAC9C,MAAM,iBAAiB,GACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC;YACzD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;QAC5D,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,IAAI,kBAAkB,QAAQ,EAAE,CAC9E,CAAA;SACF;QACD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC,MAAgB,CAAA;QACvD,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAA;IAC1C,CAAC;IAEK,SAAS,CAAC,OAAsB;;YACpC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GACrE,yCAAyC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;YAE7D,MAAM,uBAAuB,GAA4B;gBACvD,MAAM,EAAE,WAAW,CAAC,kBAAkB;gBACtC,YAAY;gBACZ,MAAM;gBACN,QAAQ;gBACR,UAAU;gBACV,iBAAiB;gBACjB,oBAAoB,EAAE,KAAK;gBAC3B,OAAO,EAAE,IAAI,CAAC,aAAa;aAC5B,CAAA;YACD,MAAM,EAAE,MAAM,KAAmB,uBAAuB,EAArC,SAAS,UAAK,uBAAuB,EAAlD,UAAwB,CAA0B,CAAA;YACxD,MAAM,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;QAC9C,CAAC;KAAA;IAED,SAAS;QACP,OAAO,mBAAK,CAAA;IACd,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-country-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-country-conditional.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,WAAW,EAA2B,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"flow-country-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-country-conditional.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,WAAW,EAA2B,MAAM,eAAe,CAAA;AAGpE,OAAO,EACL,yCAAyC,EACzC,UAAU,GACX,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAIzD,MAAM,OAAO,sBAAuB,SAAQ,iBAAiB;IAA7D;;QACS,kBAAa,GAAuB,EAAE,CAAA;QACtC,sBAAiB,GAAsB,SAAS,CAAA;IAqDzD,CAAC;IAnDC,MAAM,CAAC,cAAc,CACnB,SAAmC,EACnC,OAAsB;QAEtB,MAAM,qBAAqB,GAAG,IAAI,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACtE,qBAAqB,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;QAC3C,qBAAqB,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,cAAc,CAAA;QACtE,qBAAqB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;QAEnD,OAAO,qBAAqB,CAAA;IAC9B,CAAC;IAED,oBAAoB,CAAC,OAAsB;QACzC,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAA;QACxC,MAAM,iBAAiB,GACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC;YACxD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;QAC5D,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,wCAAwC,IAAI,CAAC,IAAI,kBAAkB,OAAO,EAAE,CAC7E,CAAA;SACF;QACD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAA;IAC1C,CAAC;IAEK,SAAS,CAAC,OAAsB;;;YACpC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GACrE,yCAAyC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAA;YAC7D,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,iBAAiB,0CAAE,MAAM,CAAA,EAAE;gBACnC,OAAO,CAAC,IAAI,CACV,2BAA2B,IAAI,CAAC,IAAI,kCAAkC,CACvE,CAAA;aACF;YACD,MAAM,uBAAuB,GAA4B;gBACvD,MAAM,EAAE,WAAW,CAAC,kBAAkB;gBACtC,YAAY;gBACZ,MAAM;gBACN,QAAQ;gBACR,UAAU;gBACV,iBAAiB;gBACjB,oBAAoB,EAAE,KAAK;gBAC3B,OAAO,EAAE,MAAC,MAAA,IAAI,CAAC,iBAAiB,0CAAE,MAAiB,mCAAI,EAAE;aAC1D,CAAA;YACD,MAAM,EAAE,MAAM,KAAmB,uBAAuB,EAArC,SAAS,UAAK,uBAAuB,EAAlD,UAAwB,CAA0B,CAAA;YACxD,MAAM,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;;KAC7C;IAED,SAAS;QACP,OAAO,mBAAK,CAAA;IACd,CAAC;CACF"}
|
|
@@ -11,5 +11,6 @@ export declare class FlowCustomConditional extends ContentFieldsBase {
|
|
|
11
11
|
static fromHubtypeCMS(component: HtCustomConditionalNode, request: ActionRequest): FlowCustomConditional;
|
|
12
12
|
setConditionalResult(request: ActionRequest): void;
|
|
13
13
|
trackFlow(request: ActionRequest): Promise<void>;
|
|
14
|
+
private isBooleanConditional;
|
|
14
15
|
toBotonic(): import("react/jsx-runtime").JSX.Element;
|
|
15
16
|
}
|
|
@@ -36,8 +36,13 @@ export class FlowCustomConditional extends ContentFieldsBase {
|
|
|
36
36
|
throw new Error(`Key path not found for node ${this.code}`);
|
|
37
37
|
}
|
|
38
38
|
const botVariable = getValueFromKeyPath(request, keyPath);
|
|
39
|
-
|
|
39
|
+
let conditionalResult = this.resultMapping.find(rMap => rMap.result === botVariable) ||
|
|
40
40
|
this.resultMapping.find(rMap => rMap.result === 'default');
|
|
41
|
+
if (this.isBooleanConditional(this.resultMapping) &&
|
|
42
|
+
typeof botVariable !== 'boolean') {
|
|
43
|
+
conditionalResult =
|
|
44
|
+
this.resultMapping.find(rMap => rMap.result === (botVariable !== undefined && botVariable !== null)) || this.resultMapping.find(rMap => rMap.result === 'default');
|
|
45
|
+
}
|
|
41
46
|
if (!conditionalResult) {
|
|
42
47
|
throw new Error(`No conditional result found for node ${this.code} with key path: ${keyPath}`);
|
|
43
48
|
}
|
|
@@ -67,6 +72,11 @@ export class FlowCustomConditional extends ContentFieldsBase {
|
|
|
67
72
|
yield trackEvent(request, action, eventArgs);
|
|
68
73
|
});
|
|
69
74
|
}
|
|
75
|
+
isBooleanConditional(resultMapping) {
|
|
76
|
+
return (resultMapping.some(rMap => rMap.result === true) &&
|
|
77
|
+
resultMapping.some(rMap => rMap.result === false) &&
|
|
78
|
+
resultMapping.some(rMap => rMap.result === 'default'));
|
|
79
|
+
}
|
|
70
80
|
toBotonic() {
|
|
71
81
|
return _jsx(_Fragment, {});
|
|
72
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flow-custom-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-custom-conditional.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,WAAW,EAA0B,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"flow-custom-conditional.js","sourceRoot":"","sources":["../../../src/content-fields/flow-custom-conditional.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export interface HtFunctionArgumentLocale {
|
|
|
16
16
|
values: HtFunctionArgument[];
|
|
17
17
|
}
|
|
18
18
|
export interface HtFunctionResult {
|
|
19
|
-
result: string;
|
|
19
|
+
result: string | boolean | number;
|
|
20
20
|
target?: HtNodeLink;
|
|
21
21
|
}
|
|
22
22
|
export type HtFunctionArguments = HtFunctionArgumentLocale | HtFunctionArgument;
|
package/package.json
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { EventAction, EventConditionalChannel } from '@botonic/core'
|
|
2
2
|
import { ActionRequest } from '@botonic/react'
|
|
3
|
-
import React from 'react'
|
|
4
3
|
|
|
5
4
|
import {
|
|
6
5
|
getCommonFlowContentEventArgsForContentId,
|
|
@@ -38,7 +37,7 @@ export class FlowChannelConditional extends ContentFieldsBase {
|
|
|
38
37
|
)
|
|
39
38
|
}
|
|
40
39
|
this.conditionalResult = conditionalResult
|
|
41
|
-
this.channelResult = conditionalResult.result
|
|
40
|
+
this.channelResult = conditionalResult.result as string
|
|
42
41
|
this.followUp = conditionalResult.target
|
|
43
42
|
}
|
|
44
43
|
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { EventAction, EventConditionalCountry } from '@botonic/core'
|
|
2
2
|
import { ActionRequest } from '@botonic/react'
|
|
3
|
-
import React from 'react'
|
|
4
3
|
|
|
5
4
|
import {
|
|
6
5
|
getCommonFlowContentEventArgsForContentId,
|
|
@@ -56,7 +55,7 @@ export class FlowCountryConditional extends ContentFieldsBase {
|
|
|
56
55
|
flowNodeId,
|
|
57
56
|
flowNodeContentId,
|
|
58
57
|
flowNodeIsMeaningful: false,
|
|
59
|
-
country: this.conditionalResult?.result ?? '',
|
|
58
|
+
country: (this.conditionalResult?.result as string) ?? '',
|
|
60
59
|
}
|
|
61
60
|
const { action, ...eventArgs } = eventCountryConditional
|
|
62
61
|
await trackEvent(request, action, eventArgs)
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { EventAction, EventConditionalCustom } from '@botonic/core'
|
|
2
2
|
import { ActionRequest } from '@botonic/react'
|
|
3
|
-
import React from 'react'
|
|
4
3
|
|
|
5
4
|
import {
|
|
6
5
|
getCommonFlowContentEventArgsForContentId,
|
|
@@ -55,10 +54,22 @@ export class FlowCustomConditional extends ContentFieldsBase {
|
|
|
55
54
|
}
|
|
56
55
|
|
|
57
56
|
const botVariable = getValueFromKeyPath(request, keyPath)
|
|
58
|
-
|
|
57
|
+
|
|
58
|
+
let conditionalResult =
|
|
59
59
|
this.resultMapping.find(rMap => rMap.result === botVariable) ||
|
|
60
60
|
this.resultMapping.find(rMap => rMap.result === 'default')
|
|
61
61
|
|
|
62
|
+
if (
|
|
63
|
+
this.isBooleanConditional(this.resultMapping) &&
|
|
64
|
+
typeof botVariable !== 'boolean'
|
|
65
|
+
) {
|
|
66
|
+
conditionalResult =
|
|
67
|
+
this.resultMapping.find(
|
|
68
|
+
rMap =>
|
|
69
|
+
rMap.result === (botVariable !== undefined && botVariable !== null)
|
|
70
|
+
) || this.resultMapping.find(rMap => rMap.result === 'default')
|
|
71
|
+
}
|
|
72
|
+
|
|
62
73
|
if (!conditionalResult) {
|
|
63
74
|
throw new Error(
|
|
64
75
|
`No conditional result found for node ${this.code} with key path: ${keyPath}`
|
|
@@ -93,6 +104,14 @@ export class FlowCustomConditional extends ContentFieldsBase {
|
|
|
93
104
|
await trackEvent(request, action, eventArgs)
|
|
94
105
|
}
|
|
95
106
|
|
|
107
|
+
private isBooleanConditional(resultMapping: HtFunctionResult[]): boolean {
|
|
108
|
+
return (
|
|
109
|
+
resultMapping.some(rMap => rMap.result === true) &&
|
|
110
|
+
resultMapping.some(rMap => rMap.result === false) &&
|
|
111
|
+
resultMapping.some(rMap => rMap.result === 'default')
|
|
112
|
+
)
|
|
113
|
+
}
|
|
114
|
+
|
|
96
115
|
toBotonic() {
|
|
97
116
|
return <></>
|
|
98
117
|
}
|