@claspo/renderer 18.3.4 → 18.4.0
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/action/ActionRegister.d.ts +0 -4
- package/action/ActionRegister.js +1 -1
- package/action/actions/BaseRequestAction.d.ts +1 -1
- package/action/actions/BaseRequestAction.js +1 -1
- package/action/actions/GoToNextViewAction.js +1 -1
- package/action/actions/GoToViewAction.js +1 -1
- package/common/SysEventTypes.d.ts +0 -1
- package/common/SysEventTypes.js +1 -1
- package/form/FormGroup.d.ts +1 -0
- package/form/FormGroup.js +1 -1
- package/package.json +2 -2
|
@@ -11,10 +11,6 @@ export interface ActionRegisterServicesI {
|
|
|
11
11
|
[key: string]: any;
|
|
12
12
|
}
|
|
13
13
|
export type GetServicesT = () => ActionRegisterServicesI;
|
|
14
|
-
export interface ExecuteActionByPredicateParamsI {
|
|
15
|
-
predicate: (action: RegisteredActionI) => boolean;
|
|
16
|
-
overrideParams?: Record<string, any>;
|
|
17
|
-
}
|
|
18
14
|
export declare class ActionRegister {
|
|
19
15
|
eventEmitter: DefaultEventEmitter;
|
|
20
16
|
getServices: GetServicesT;
|
package/action/ActionRegister.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
export class ActionRegister{constructor(e,t){this.eventEmitter=e,this.getServices=t,this.registeredActions=[]}register(e){this.getServices().viewRouter&&(e.registeredAtViewIndex=this.getServices().viewRouter.currentViewIndex,this.registeredActions.push(e))}getRegisteredActions(){return this.registeredActions}}
|
|
@@ -21,7 +21,7 @@ export default class BaseRequestAction {
|
|
|
21
21
|
skipHttpRequest: boolean;
|
|
22
22
|
getTrackingMessageBeforeSentData(): string;
|
|
23
23
|
getTrackingMessageByStatus(_: any): string;
|
|
24
|
-
execute(
|
|
24
|
+
execute(_state: any, _event: any, force: any, overrideParams: any): Promise<unknown>;
|
|
25
25
|
submit(resolve: any, force: any, overrideParams: any): void;
|
|
26
26
|
getContextValue(nextParams: any): any;
|
|
27
27
|
constructDataToSent({ contextValue, formValue, utmParams }: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import SysActionTypes from"../SysActionTypes";import SysEventTypes from"../../common/SysEventTypes";import{HttpStatus}from"@claspo/common/network/HttpStatus";import ActionCategory from"./ActionCategory";import systemResultStateNames from"../../document-model/systemResultStateNames";import DocumentUtils from"@claspo/common/document/DocumentUtils";import getComponentCountOnView from"../../sdk/getComponentCountOnView";import UTMParamsExtractor from"../UTMParamsExtractor";import isDictionary from"@claspo/common/object/isDictionary";function componentModelHasSubmitAction(t){var e,s;try{return!!(null===(s=null===(e=t.props)||void 0===e?void 0:e.handlers)||void 0===s?void 0:s.find(t=>{var e;return null===(e=null==t?void 0:t.actions)||void 0===e?void 0:e.find(t=>[SysActionTypes.REQUEST,SysActionTypes.SUBSCRIBE_CONTACT].includes(t.type))}))}catch(t){return!1}}function viewHasControls(t){if(!t)return!1;let e=0;return DocumentUtils.iterateDepthFirst(t,t=>{(["INPUT","MULTIPLE_INPUT","PRIZE_BASED_GAMING"].includes(t.type)||componentModelHasSubmitAction(t))&&e++}),e>0}function isSystemView(t){return t&&systemResultStateNames.includes(t.label)}export const RequestStatus={SUCCESS:"SUCCESS",ALREADY_SUBSCRIBED:"ALREADY_SUBSCRIBED",ERROR:"ERROR",TOO_MANY_REQUESTS:"TOO_MANY_REQUESTS"};export default class BaseRequestAction{constructor(t,e,s,i,n,o,r,a,c){this.skipHttpRequest=!0,this.id=s.id,this.params=s.params,this.form=e,this.eventEmitter=t,this.httpClient=i,this.configService=n,this.formEventsListener=null,this.tracking=o,this.stateService=r,this.context=a,this.getServices=c,this.category=ActionCategory.SUBMIT}getTrackingMessageBeforeSentData(){return""}getTrackingMessageByStatus(t){return""}execute(t,e,s,i){var n;if(this.formEventsListener&&this.formEventsListener.off(),this.form.submitQueuedAfterPending
|
|
1
|
+
import SysActionTypes from"../SysActionTypes";import SysEventTypes from"../../common/SysEventTypes";import{HttpStatus}from"@claspo/common/network/HttpStatus";import ActionCategory from"./ActionCategory";import systemResultStateNames from"../../document-model/systemResultStateNames";import DocumentUtils from"@claspo/common/document/DocumentUtils";import getComponentCountOnView from"../../sdk/getComponentCountOnView";import UTMParamsExtractor from"../UTMParamsExtractor";import isDictionary from"@claspo/common/object/isDictionary";function componentModelHasSubmitAction(t){var e,s;try{return!!(null===(s=null===(e=t.props)||void 0===e?void 0:e.handlers)||void 0===s?void 0:s.find(t=>{var e;return null===(e=null==t?void 0:t.actions)||void 0===e?void 0:e.find(t=>[SysActionTypes.REQUEST,SysActionTypes.SUBSCRIBE_CONTACT].includes(t.type))}))}catch(t){return!1}}function viewHasControls(t){if(!t)return!1;let e=0;return DocumentUtils.iterateDepthFirst(t,t=>{(["INPUT","MULTIPLE_INPUT","PRIZE_BASED_GAMING"].includes(t.type)||componentModelHasSubmitAction(t))&&e++}),e>0}function isSystemView(t){return t&&systemResultStateNames.includes(t.label)}export const RequestStatus={SUCCESS:"SUCCESS",ALREADY_SUBSCRIBED:"ALREADY_SUBSCRIBED",ERROR:"ERROR",TOO_MANY_REQUESTS:"TOO_MANY_REQUESTS"};export default class BaseRequestAction{constructor(t,e,s,i,n,o,r,a,c){this.skipHttpRequest=!0,this.id=s.id,this.params=s.params,this.form=e,this.eventEmitter=t,this.httpClient=i,this.configService=n,this.formEventsListener=null,this.tracking=o,this.stateService=r,this.context=a,this.getServices=c,this.category=ActionCategory.SUBMIT}getTrackingMessageBeforeSentData(){return""}getTrackingMessageByStatus(t){return""}async execute(t,e,s,i){var n;if(this.formEventsListener&&this.formEventsListener.off(),this.form.submitQueuedAfterPending)return;if(this.form.preventSubmit)return void(this.form.submitQueuedAfterPending=!1);if(this.form.isPending()&&(this.form.submitQueuedAfterPending=!0,await this.form.waitForPendingValidationAndCheckIfValid()),this.form.submitQueuedAfterPending=!1,this.form.preventSubmit)return;const o=new Promise(t=>{this.submit(t,s,i)});return null===(n=this.getServices().submitState)||void 0===n||n.trackSubmission(o),o}submit(t,e,s){var i;const n=this.getServices().viewRouter.getCurrentViewIndex(),o=this.getServices().documentModel.getViews().slice(n+1).filter(t=>!systemResultStateNames.includes(t.label)).length>0,r=Object.assign(Object.assign({},this.params),s);if(this.form.markAsTouched(),this.stateService.getState().emitActionOnSubmit&&this.eventEmitter.emit(this.stateService.getState().emitActionOnSubmit.eventName),this.stateService.getState().interceptSubmitActions&&!e)return;if(!this.form.isValid()&&!r.skipValidation)return this.eventEmitter.emit("INVALID_CONTACT_DATA_SUBMIT_ATTEMPT"),void t(!1);const a=this.stateService,c=a.getState().conditionalRedirectViewId,u=r.conditionalRedirectViewId||c;c&&(r.conditionalRedirectViewId=c,a.setState({conditionalRedirectViewId:null}));let S=this.getServices().documentModel.getViews()[n+1];const m=this.getServices().documentModel.getViews()[n];if(!r.skipNavigation&&u&&getComponentCountOnView(m,"SysNetPromoterScoreComponent")+getComponentCountOnView(m,"SysFeedbackComponent")===1&&(S=this.getServices().documentModel.getViews().find(t=>t.id===r.conditionalRedirectViewId),viewHasControls(S)||isSystemView(S)))return this.goToView(S.path[0],r),void t(!0);const E=null!==(i=r.formValue)&&void 0!==i?i:this.form.getControlsMap(),d=this.getContextValue(r);if(!r.skipNavigation&&o&&(viewHasControls(S)||!Object.keys(E).length&&!Object.keys(d).length))return this.goToView(n+1,r),void t(!0);if(!Object.keys(E).length&&!Object.keys(d).length)return void t(!0);const l=UTMParamsExtractor.extractTrackingParams(this.context),g=this.constructRequestPayload({contextValue:d,formValue:E,utmParams:l});this.eventEmitter.emit(SysEventTypes.SUBMIT_REQUEST_STARTED,g),this.eventEmitter.emit("CONTACT_DATA_SUBMIT",g);if(this.getTrackingMessageBeforeSentData()&&this.tracking.send("FormFinish_[Name]"),this.configService.getConfig("isBot"))return this.eventEmitter.emit(SysEventTypes.SUBMIT_REQUEST_FINISHED,{state:RequestStatus.SUCCESS,success:!0,skipped:!0}),void t();this.sendRequest(g).then(t=>t.json().then(e=>t.status===HttpStatus.TOO_MANY_REQUESTS?{state:RequestStatus.TOO_MANY_REQUESTS}:{contactId:e.contactId,state:e&&e.next&&e.next.type}),()=>({state:RequestStatus.ERROR})).then(e=>{const s=this.getTrackingMessageByStatus(e.state);if(s&&this.tracking.send(s),r.skipNavigation)return e.state===RequestStatus.TOO_MANY_REQUESTS&&this.eventEmitter.emit(SysEventTypes.TOO_MANY_REQUESTS),e.contactId&&"0"!==e.contactId&&this.eventEmitter.emit("CONTACT_ID_WAS_RECEIVED",e.contactId),this.eventEmitter.emit(SysEventTypes.SUBMIT_REQUEST_FINISHED,Object.assign(Object.assign({},e),{success:e.state===RequestStatus.SUCCESS||e.state===RequestStatus.ALREADY_SUBSCRIBED})),void t(e.state===RequestStatus.SUCCESS||e.state===RequestStatus.ALREADY_SUBSCRIBED);switch(e.state){case RequestStatus.SUCCESS:this.goToView(o&&S?S.path[0]:this.getServices().documentModel.getViews().findIndex(t=>"DOCUMENT_VIEW_TYPE_SUCCESS"===t.label||"DOCUMENT_VIEW_TYPE_SUCCESSFUL_REQUEST"===t.label||"REQUEST_FORM_VIEW_TYPE_SUCCESS"===t.label));break;case RequestStatus.ALREADY_SUBSCRIBED:this.goToView(u&&S?S.path[0]:this.getServices().documentModel.getViews().findIndex(t=>"DOCUMENT_VIEW_TYPE_SUBSCRIBED"===t.label));break;case RequestStatus.ERROR:this.goToView(u&&S?S.path[0]:this.getServices().documentModel.getViews().findIndex(t=>"DOCUMENT_VIEW_TYPE_ERROR"===t.label));break;case RequestStatus.TOO_MANY_REQUESTS:this.goToView(u&&S?S.path[0]:this.getServices().documentModel.getViews().findIndex(t=>"DOCUMENT_VIEW_TYPE_ERROR"===t.label)),this.eventEmitter.emit(SysEventTypes.TOO_MANY_REQUESTS)}e.contactId&&"0"!==e.contactId&&this.eventEmitter.emit("CONTACT_ID_WAS_RECEIVED",e.contactId),this.eventEmitter.emit(SysEventTypes.SUBMIT_REQUEST_FINISHED,Object.assign(Object.assign({},e),{success:e.state===RequestStatus.SUCCESS||e.state===RequestStatus.ALREADY_SUBSCRIBED})),t(e.state===RequestStatus.SUCCESS||e.state===RequestStatus.ALREADY_SUBSCRIBED)}).catch(()=>{this.eventEmitter.emit(SysEventTypes.SUBMIT_REQUEST_FINISHED,{state:RequestStatus.ERROR,success:!1}),r.skipNavigation||this.goToView(this.getServices().documentModel.getViews().findIndex(t=>"DOCUMENT_VIEW_TYPE_ERROR"===t.label)),t(!1)})}getContextValue(t){var e,s;if(!t.excludeFormContext)return this.context.getKVMap();const i=(null===(s=(e=this.context).getRecordsMap)||void 0===s?void 0:s.call(e))||{};return Object.values(i).reduce((t,e)=>{var s;const i=null===(s=null==e?void 0:e.getValue)||void 0===s?void 0:s.call(e);return i&&"FORM"!==i.sourceId?(t[i.id]=i.value,t):t},{})}constructDataToSent({contextValue:t,formValue:e,utmParams:s}){const i=Object.assign({},t);return i.tracking=s,Object.keys(e).forEach(t=>{if(t.startsWith("clConsentId")){if(t.endsWith("_label"))return;const s={value:e[t]};e[`${t}_label`]&&(s.text=e[`${t}_label`]),i.consents?i.consents[t]=s:i.consents={[t]:s}}else{const s=e[t];i[t]=isDictionary(s)||Array.isArray(s)?JSON.stringify(s):s}}),i}constructRequestPayload({contextValue:t,formValue:e,utmParams:s}){let i={data:this.constructDataToSent({contextValue:t,formValue:e,utmParams:s}),referrer:window.location.href,triggeredBy:this.configService.getConfig("triggeredBy")};return this.configService.getConfig("widgetDebugMode")&&(i.ignoreTracking=!0),i}constructRequestHeaders(){const t={},e=this.configService.getConfig("clCustomerId");return e&&Object.assign(t,{"cl-customer-id":e}),t}goToView(t,e){this.eventEmitter.emit(SysActionTypes.GO_TO_VIEW,t,e)}sendRequest(t){return this.skipHttpRequest?Promise.resolve({status:200,json:()=>Promise.resolve({next:{type:RequestStatus.SUCCESS}})}):this.httpClient.execute(this.configService.getConfig("subscribeContactUrl"),"POST",t,this.constructRequestHeaders())}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import SysActionTypes from"../SysActionTypes";export default class GoToNextViewAction{constructor(t,e,
|
|
1
|
+
import SysActionTypes from"../SysActionTypes";export default class GoToNextViewAction{constructor(t,i,e,s){this.type=SysActionTypes.GO_TO_NEXT_VIEW,this.eventEmitter=t,this.form=i,this.config=e,this.tracking=s}async execute(){if(this.form.markAsTouched(),this.form.getControlsAsArray().length){if(!await this.form.waitForPendingValidationAndCheckIfValid())return this.eventEmitter.emit("INVALID_CONTACT_DATA_SUBMIT_ATTEMPT"),!1}return this.eventEmitter.emit(this.type),!0}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import SysActionTypes from"../SysActionTypes";export default class GoToViewAction{constructor(t,i,e,s,
|
|
1
|
+
import SysActionTypes from"../SysActionTypes";export default class GoToViewAction{constructor(t,i,e,s,n,r,a){this.type=SysActionTypes.GO_TO_VIEW,this.eventEmitter=t,this.config=i,this.form=s,this.viewRouter=n,this.documentModel=r,this.tracking=a}async execute(){this.form.markAsTouched();let t=!1;const i=this.viewRouter.getCurrentViewIndex();if(this.config.params.viewId){t=i<this.documentModel.getViews().findIndex(t=>t.id===this.config.params.viewId)}else t=i<this.config.params.viewIndex;if(t){if(!await this.form.waitForPendingValidationAndCheckIfValid())return this.eventEmitter.emit("INVALID_CONTACT_DATA_SUBMIT_ATTEMPT"),!1}return this.eventEmitter.emit(this.type,this.config.params.viewId||this.config.params.viewIndex),this.config.params.trackClick&&this.tracking.trackClick({params:this.config.params.trackClickParams,countAsTargetAction:this.config.params.countAsTargetAction}),!0}}
|
|
@@ -2,7 +2,6 @@ declare enum SysEventTypes {
|
|
|
2
2
|
TOO_MANY_REQUESTS = "TOO_MANY_REQUESTS",
|
|
3
3
|
COMPONENT_RESOURCES_LOADED = "COMPONENT_RESOURCES_LOADED",
|
|
4
4
|
FAILED_TO_LOAD_COMPONENT_RESOURCE = "FAILED_TO_LOAD_COMPONENT_RESOURCE",
|
|
5
|
-
EXECUTE_ACTION_BY_PREDICATE = "EXECUTE_ACTION_BY_PREDICATE",
|
|
6
5
|
SUBMIT_REQUEST_STARTED = "SUBMIT_REQUEST_STARTED",
|
|
7
6
|
SUBMIT_REQUEST_FINISHED = "SUBMIT_REQUEST_FINISHED"
|
|
8
7
|
}
|
package/common/SysEventTypes.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
var SysEventTypes;!function(E){E.TOO_MANY_REQUESTS="TOO_MANY_REQUESTS",E.COMPONENT_RESOURCES_LOADED="COMPONENT_RESOURCES_LOADED",E.FAILED_TO_LOAD_COMPONENT_RESOURCE="FAILED_TO_LOAD_COMPONENT_RESOURCE",E.
|
|
1
|
+
var SysEventTypes;!function(E){E.TOO_MANY_REQUESTS="TOO_MANY_REQUESTS",E.COMPONENT_RESOURCES_LOADED="COMPONENT_RESOURCES_LOADED",E.FAILED_TO_LOAD_COMPONENT_RESOURCE="FAILED_TO_LOAD_COMPONENT_RESOURCE",E.SUBMIT_REQUEST_STARTED="SUBMIT_REQUEST_STARTED",E.SUBMIT_REQUEST_FINISHED="SUBMIT_REQUEST_FINISHED"}(SysEventTypes||(SysEventTypes={}));export default SysEventTypes;
|
package/form/FormGroup.d.ts
CHANGED
|
@@ -18,6 +18,7 @@ export default class FormGroup extends DefaultEventEmitter {
|
|
|
18
18
|
setPreventSubmit(value: boolean): void;
|
|
19
19
|
destroy(): void;
|
|
20
20
|
isValid(): boolean;
|
|
21
|
+
waitForPendingValidationAndCheckIfValid(): Promise<boolean>;
|
|
21
22
|
isPending(): boolean;
|
|
22
23
|
getControlsMap(): FormValuesMapI;
|
|
23
24
|
getControlsAsArray(): FormControl[];
|
package/form/FormGroup.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
import{FormControl}from"./FormControl";import DefaultEventEmitter from"@claspo/common/DefaultEventEmitter";import FormGroupEvents from"./FormGroupEvents";import FormControlEvents from"./FormControlEvents";export default class FormGroup extends DefaultEventEmitter{constructor(t){super(),this.controls={},this.tracking=t,this.submitQueuedAfterPending=!1,this.preventSubmit=!1}registerControl(t,e,o,r){const s=new FormControl(t,e,o,r,this.tracking);return this.controls[t.name]=s,s.on("*",(t,e)=>{if(e===FormControlEvents.valueChanged)this.emit(FormGroupEvents.valueChanged,s);else this.emit(e,t),e===FormControlEvents.validationStatusChanged&&this.emit(FormGroupEvents.validationChecked,this.isValid())}),this.emit(FormGroupEvents.controlRegistered,s),this.getControl(t.name)}updateControl(t,e,o,r){const s=this.getControl(t.name);return this.registerControl(Object.assign(Object.assign({},t),{defaultValue:s.getValue()||""}),e,o,r)}getControl(t){return this.controls[t]}hasControl(t){return!!this.getControl(t)}removeControl(t){const e=this.getControl(t);e&&(e.destroy(),delete this.controls[t])}setControlValue(t,e){this.controls[t].setValue(e)}setPreventSubmit(t){this.preventSubmit=t}destroy(){super.destroy()}isValid(){return Object.values(this.controls).every(t=>t.isValid())}isPending(){return!!Object.values(this.controls).filter(t=>t.isPending()).length}getControlsMap(){return Object.values(this.controls).reduce((t,e)=>Object.assign(Object.assign({},t),{[e.getName()]:e.getValue()}),{})}getControlsAsArray(){return Object.values(this.controls)}setDisabledAll(){this.getControlsAsArray().forEach(t=>t.setDisabled())}setEnabledAll(){this.getControlsAsArray().forEach(t=>t.setEnabled())}markAsTouched(){Object.values(this.controls).forEach(t=>t.markAsTouched())}isTouched(){return Object.values(this.controls).every(t=>t.isTouched())}}
|
|
1
|
+
import{FormControl}from"./FormControl";import DefaultEventEmitter from"@claspo/common/DefaultEventEmitter";import FormGroupEvents from"./FormGroupEvents";import FormControlEvents from"./FormControlEvents";export default class FormGroup extends DefaultEventEmitter{constructor(t){super(),this.controls={},this.tracking=t,this.submitQueuedAfterPending=!1,this.preventSubmit=!1}registerControl(t,e,o,r){const s=new FormControl(t,e,o,r,this.tracking);return this.controls[t.name]=s,s.on("*",(t,e)=>{if(e===FormControlEvents.valueChanged)this.emit(FormGroupEvents.valueChanged,s);else this.emit(e,t),e===FormControlEvents.validationStatusChanged&&this.emit(FormGroupEvents.validationChecked,this.isValid())}),this.emit(FormGroupEvents.controlRegistered,s),this.getControl(t.name)}updateControl(t,e,o,r){const s=this.getControl(t.name);return this.registerControl(Object.assign(Object.assign({},t),{defaultValue:s.getValue()||""}),e,o,r)}getControl(t){return this.controls[t]}hasControl(t){return!!this.getControl(t)}removeControl(t){const e=this.getControl(t);e&&(e.destroy(),delete this.controls[t])}setControlValue(t,e){this.controls[t].setValue(e)}setPreventSubmit(t){this.preventSubmit=t}destroy(){super.destroy()}isValid(){return Object.values(this.controls).every(t=>t.isValid())}waitForPendingValidationAndCheckIfValid(){return this.isPending()?new Promise(t=>{const e=this.on(FormGroupEvents.validationChecked,o=>{e.off(),t(o)})}):Promise.resolve(this.isValid())}isPending(){return!!Object.values(this.controls).filter(t=>t.isPending()).length}getControlsMap(){return Object.values(this.controls).reduce((t,e)=>Object.assign(Object.assign({},t),{[e.getName()]:e.getValue()}),{})}getControlsAsArray(){return Object.values(this.controls)}setDisabledAll(){this.getControlsAsArray().forEach(t=>t.setDisabled())}setEnabledAll(){this.getControlsAsArray().forEach(t=>t.setEnabled())}markAsTouched(){Object.values(this.controls).forEach(t=>t.markAsTouched())}isTouched(){return Object.values(this.controls).every(t=>t.isTouched())}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@claspo/renderer",
|
|
3
|
-
"version": "18.
|
|
3
|
+
"version": "18.4.0",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"dev": " tsc --project tsconfig.json --watch",
|
|
6
6
|
"build": "rm -rf out && tsc --project tsconfig.json && npm run minify",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"node": ">=18.16.0"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@claspo/common": "7.1.
|
|
18
|
+
"@claspo/common": "7.1.4",
|
|
19
19
|
"@testing-library/dom": "^10.4.0"
|
|
20
20
|
},
|
|
21
21
|
"devDependencies": {
|