@claspo/renderer 18.5.0 → 18.5.1

package/CompositionRoot.js

@@ -1 +1 @@
-import DefaultState from"./common/DefaultState";import FormGroup from"./form/FormGroup";import DefaultEventEmitter from"@claspo/common/DefaultEventEmitter";import DocumentModelService from"./document-model/DocumentModelService";import ConfigService from"./common/ConfigService";import ClDocumentResizeListener from"./renderer/style/ClDocumentResizeListener";import MobileDeviceOrientationListener from"./renderer/style/MobileDeviceOrientationListener";import DefaultMediaQueryListener from"./renderer/style/DefaultMediaQueryListener";import DocumentService from"./document-model/DocumentService";import CommonStylesService from"./renderer/style/CommonStylesService";import WcFactory from"./wc-renderer/WcFactory";import WcViewRenderer from"./wc-renderer/WcViewRenderer";import ActionFactory from"./action/ActionFactory";import PrizePoolFactory from"./prize-pool/PrizePoolFactory";import httpClient from"@claspo/common/network/HttpClient";import{ActionRegister}from"./action/ActionRegister";import ContextSDK from"./sdk/context/ContextSDK";import{MergeTagsProcessorFactory}from"./sdk/merge-tags/MergeTagsProcessorFactory";import SourceRegistry from"./sdk/source/SourceRegistry";import ContextData from"./sdk/context/ContextData";import SubmitStateService from"./submit-state/SubmitStateService";import HiddenFieldsContextHydrator from"./sdk/hidden-fields/HiddenFieldsContextHydrator";export default class CompositionRoot{constructor(e,t,r,o,i,n,c,s,m,a){var l;const d=new DocumentModelService(e),y=!o,f=y?new DefaultMediaQueryListener(d,t):new ClDocumentResizeListener(d,o),u=new DefaultState,S=new ConfigService(t),v=new MobileDeviceOrientationListener(d,S),p=new CommonStylesService;p.setStyles(i);const D=new DefaultEventEmitter,g=new FormGroup(r),w=new SubmitStateService(g,D,a),F=new SourceRegistry(g,t),C=new ContextData,R=new ContextSDK(F,C,y);new HiddenFieldsContextHydrator(R,d.getShared().hiddenFields).hydrate();const h=new(null!==(l=t.actionFactoryClass)&&void 0!==l?l:ActionFactory)(D,g,S,r,u,R,()=>this.services),x=new ActionRegister(D,()=>this.services),M=new PrizePoolFactory(httpClient,S),L=new MergeTagsProcessorFactory(y,R,S),P=new WcFactory({state:u,eventEmitter:D,form:g,documentModel:d,resizeListener:f,config:S,commonStylesService:p,trackingService:r,layoutType:n,actionFactory:h,actionRegister:x,prizePoolFactory:M,context:R,mergeTagsProcessorFactory:L,mobileDeviceOrientationListener:v,componentRegister:s,htmlDocumentObject:m}),b=new WcViewRenderer(d,f,t,P,D),z=new DocumentService(d,b,c);this.services={documentService:z,documentModel:d,state:u,form:g,eventEmitter:D,config:S,resizeListener:f,mobileDeviceOrientationListener:v,componentFactory:P,viewRenderer:b,commonStylesService:p,tracking:r,actionFactory:h,actionRegister:x,submitState:w,prizePoolFactory:M,context:R,mergeTagsProcessorFactory:L}}destroy(){Object.keys(this.services).filter(e=>"viewRenderer"!==e).forEach(e=>this.services[e]&&this.services[e].destroy&&this.services[e].destroy())}}
+import DefaultState from"./common/DefaultState";import FormGroup from"./form/FormGroup";import DefaultEventEmitter from"@claspo/common/DefaultEventEmitter";import DocumentModelService from"./document-model/DocumentModelService";import ConfigService from"./common/ConfigService";import ClDocumentResizeListener from"./renderer/style/ClDocumentResizeListener";import MobileDeviceOrientationListener from"./renderer/style/MobileDeviceOrientationListener";import DefaultMediaQueryListener from"./renderer/style/DefaultMediaQueryListener";import DocumentService from"./document-model/DocumentService";import CommonStylesService from"./renderer/style/CommonStylesService";import WcFactory from"./wc-renderer/WcFactory";import WcViewRenderer from"./wc-renderer/WcViewRenderer";import ActionFactory from"./action/ActionFactory";import PrizePoolFactory from"./prize-pool/PrizePoolFactory";import httpClient from"@claspo/common/network/HttpClient";import{ActionRegister}from"./action/ActionRegister";import ContextSDK from"./sdk/context/ContextSDK";import{MergeTagsProcessorFactory}from"./sdk/merge-tags/MergeTagsProcessorFactory";import SourceRegistry from"./sdk/source/SourceRegistry";import ContextData from"./sdk/context/ContextData";import SubmitStateService from"./submit-state/SubmitStateService";import HiddenFieldsContextHydrator from"./sdk/hidden-fields/HiddenFieldsContextHydrator";export default class CompositionRoot{constructor(e,t,r,o,i,n,c,s,m,a){var l;const d=new DocumentModelService(e),y=!o,f=y?new DefaultMediaQueryListener(d,t):new ClDocumentResizeListener(d,o),u=new DefaultState,S=new ConfigService(t),v=new MobileDeviceOrientationListener(d,S),p=new CommonStylesService;p.setStyles(i);const D=new DefaultEventEmitter,g=new FormGroup(r),w=new SubmitStateService(g,D,a,d),F=new SourceRegistry(g,t),C=new ContextData,R=new ContextSDK(F,C,y);new HiddenFieldsContextHydrator(R,d.getShared().hiddenFields).hydrate();const h=new(null!==(l=t.actionFactoryClass)&&void 0!==l?l:ActionFactory)(D,g,S,r,u,R,()=>this.services),x=new ActionRegister(D,()=>this.services),M=new PrizePoolFactory(httpClient,S),L=new MergeTagsProcessorFactory(y,R,S),P=new WcFactory({state:u,eventEmitter:D,form:g,documentModel:d,resizeListener:f,config:S,commonStylesService:p,trackingService:r,layoutType:n,actionFactory:h,actionRegister:x,prizePoolFactory:M,context:R,mergeTagsProcessorFactory:L,mobileDeviceOrientationListener:v,componentRegister:s,htmlDocumentObject:m}),b=new WcViewRenderer(d,f,t,P,D),z=new DocumentService(d,b,c);this.services={documentService:z,documentModel:d,state:u,form:g,eventEmitter:D,config:S,resizeListener:f,mobileDeviceOrientationListener:v,componentFactory:P,viewRenderer:b,commonStylesService:p,tracking:r,actionFactory:h,actionRegister:x,submitState:w,prizePoolFactory:M,context:R,mergeTagsProcessorFactory:L}}destroy(){Object.keys(this.services).filter(e=>"viewRenderer"!==e).forEach(e=>this.services[e]&&this.services[e].destroy&&this.services[e].destroy())}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claspo/renderer",
-  "version": "18.5.0",
+  "version": "18.5.1",
   "scripts": {
     "dev": " tsc --project tsconfig.json --watch",
     "build": "rm -rf out && tsc --project tsconfig.json && npm run minify",

package/submit-state/SubmitStateService.d.ts

@@ -1,6 +1,7 @@
 import DefaultEventEmitter from '@claspo/common/DefaultEventEmitter';
 import FormGroup from '../form/FormGroup';
 import WcResolver from "../wc-renderer/WcResolver";
+import DocumentModelService from '../document-model/DocumentModelService';
 export declare const SubmitState: {
     readonly IDLE: "idle";
     readonly DIRTY: "dirty";
@@ -13,17 +14,20 @@ export default class SubmitStateService {
     form: FormGroup;
     eventEmitter: DefaultEventEmitter;
     componentResolver: WcResolver;
+    documentModel?: DocumentModelService;
     state: SubmitStateValue;
     currentSubmission: Promise<boolean> | null;
     subscriptions: Array<{
         off: () => void;
     }>;
-    constructor(form: FormGroup, eventEmitter: DefaultEventEmitter, componentResolver: WcResolver);
+    constructor(form: FormGroup, eventEmitter: DefaultEventEmitter, componentResolver: WcResolver, documentModel?: DocumentModelService);
     getState(): SubmitStateValue;
     hasDirtyFormData(): boolean;
     hasSubmitAttemptSinceLastChange(): boolean;
     trackSubmission(promise: Promise<boolean>): void;
     waitForCurrentSubmission(): Promise<boolean>;
+    getRequiredControlNames(): string[];
+    allRequiredControlsAreValid(): Promise<boolean>;
     prepareAutoSubmitFormValue(): Promise<Record<string, any>>;
     destroy(): void;
 }

package/submit-state/SubmitStateService.js

@@ -1 +1 @@
-import FormGroupEvents from"../form/FormGroupEvents";import SysEventTypes from"../common/SysEventTypes";function hasMeaningfulValue(t){return null!=t&&("string"==typeof t?""!==t.trim():Array.isArray(t)?t.length>0:"object"!=typeof t||Object.keys(t).length>0)}export const SubmitState={IDLE:"idle",DIRTY:"dirty",SUBMITTING:"submitting",SUBMITTED:"submitted",FAILED:"failed"};export default class SubmitStateService{constructor(t,e,s){this.form=t,this.eventEmitter=e,this.componentResolver=s,this.state=SubmitState.IDLE,this.currentSubmission=null,this.subscriptions=[this.form.on(FormGroupEvents.valueChanged,()=>{this.state=SubmitState.DIRTY}),this.eventEmitter.on(SysEventTypes.SUBMIT_REQUEST_STARTED,()=>{this.state=SubmitState.SUBMITTING}),this.eventEmitter.on(SysEventTypes.SUBMIT_REQUEST_FINISHED,t=>{this.currentSubmission=null,this.state=(null==t?void 0:t.success)?SubmitState.SUBMITTED:SubmitState.FAILED})]}getState(){return this.state}hasDirtyFormData(){return this.form.getControlsAsArray().some(t=>t.isTouched())}hasSubmitAttemptSinceLastChange(){return[SubmitState.SUBMITTING,SubmitState.SUBMITTED,SubmitState.FAILED].includes(this.state)}trackSubmission(t){this.currentSubmission=t}waitForCurrentSubmission(){return this.currentSubmission||Promise.resolve(!1)}async prepareAutoSubmitFormValue(){const t=this.form.getControlsAsArray(),e=t.find(t=>t.getName().includes("clConsentId")&&!t.getName().includes("label"));if(e){if(!e.isValid())return{}}else if(this.componentResolver.presentComponentManifests.find(t=>"SysConsentComponent"===t.name))return{};const s=t.filter(t=>hasMeaningfulValue(t.getValue()));return(await Promise.all(s.map(async t=>({control:t,isValid:await t.validate({silent:!0})})))).reduce((t,{control:e,isValid:s})=>{const i=e.getValue();return s&&hasMeaningfulValue(i)?(t[e.getName()]=i,t):(t[e.getName()]=void 0,t)},{})}destroy(){this.subscriptions.forEach(t=>t.off()),this.subscriptions=[],this.currentSubmission=null}}
+import FormGroupEvents from"../form/FormGroupEvents";import SysEventTypes from"../common/SysEventTypes";import DocumentUtils from"@claspo/common/document/DocumentUtils";function hasMeaningfulValue(t){return null!=t&&("string"==typeof t?""!==t.trim():Array.isArray(t)?t.length>0:"object"!=typeof t||Object.keys(t).length>0)}export const SubmitState={IDLE:"idle",DIRTY:"dirty",SUBMITTING:"submitting",SUBMITTED:"submitted",FAILED:"failed"};export default class SubmitStateService{constructor(t,e,i,s){this.form=t,this.eventEmitter=e,this.componentResolver=i,this.documentModel=s,this.state=SubmitState.IDLE,this.currentSubmission=null,this.subscriptions=[this.form.on(FormGroupEvents.valueChanged,()=>{this.state=SubmitState.DIRTY}),this.eventEmitter.on(SysEventTypes.SUBMIT_REQUEST_STARTED,()=>{this.state=SubmitState.SUBMITTING}),this.eventEmitter.on(SysEventTypes.SUBMIT_REQUEST_FINISHED,t=>{this.currentSubmission=null,this.state=(null==t?void 0:t.success)?SubmitState.SUBMITTED:SubmitState.FAILED})]}getState(){return this.state}hasDirtyFormData(){return this.form.getControlsAsArray().some(t=>t.isTouched())}hasSubmitAttemptSinceLastChange(){return[SubmitState.SUBMITTING,SubmitState.SUBMITTED,SubmitState.FAILED].includes(this.state)}trackSubmission(t){this.currentSubmission=t}waitForCurrentSubmission(){return this.currentSubmission||Promise.resolve(!1)}getRequiredControlNames(){var t;const e=new Set;return null===(t=this.documentModel)||void 0===t||t.getViews().forEach(t=>{DocumentUtils.iterateDepthFirst(t,t=>{var i,s,o,n,r;const a=null===(s=null===(i=t.props)||void 0===i?void 0:i.control)||void 0===s?void 0:s.name;a&&(null===(r=null===(n=null===(o=t.props)||void 0===o?void 0:o.control)||void 0===n?void 0:n.validation)||void 0===r?void 0:r.required)&&e.add(a)})}),[...e]}async allRequiredControlsAreValid(){const t=this.getRequiredControlNames();if(!t.length)return!0;const e=this.form.getControlsMap(),i=t.map(t=>this.form.getControl(t));if(console.log("requiredControlNames",t),t.some(t=>!hasMeaningfulValue(e[t])))return!1;return(await Promise.all(i.map(t=>t.validate({silent:!0})))).every(Boolean)}async prepareAutoSubmitFormValue(){const t=this.form.getControlsAsArray(),e=t.find(t=>t.getName().includes("clConsentId")&&!t.getName().includes("label"));if(e){if(!e.isValid())return{}}else if(this.componentResolver.presentComponentManifests.find(t=>"SysConsentComponent"===t.name))return{};if(!await this.allRequiredControlsAreValid())return{};const i=t.filter(t=>hasMeaningfulValue(t.getValue()));return(await Promise.all(i.map(async t=>({control:t,isValid:await t.validate({silent:!0})})))).reduce((t,{control:e,isValid:i})=>{const s=e.getValue();return i&&hasMeaningfulValue(s)?(t[e.getName()]=s,t):(t[e.getName()]=void 0,t)},{})}destroy(){this.subscriptions.forEach(t=>t.off()),this.subscriptions=[],this.currentSubmission=null}}