@zohodesk/library-platform 1.1.8 → 1.1.9-alpha.1
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/es/bc/zdata-source/Constants.js +6 -11
- package/es/bc/zfield/FieldApiTypes.js +20 -0
- package/es/bc/zform/Properties.js +9 -0
- package/es/bc/zform/Symbol.js +6 -0
- package/es/bc/zlist/Properties.js +3 -0
- package/es/bc/zrecord/Constants.js +10 -17
- package/es/cc/action-icon/Constants.js +3 -5
- package/es/cc/action-location/Constants.js +5 -9
- package/es/cc/avatar/Constants.js +3 -5
- package/es/cc/breadcrumb/Constants.js +3 -5
- package/es/cc/button/Constants.js +3 -5
- package/es/cc/checkbox/Constants.js +5 -9
- package/es/cc/date/Constants.js +5 -9
- package/es/cc/date/Properties.js +9 -0
- package/es/cc/email/Constants.js +3 -5
- package/es/cc/fields/field/Constants.js +9 -13
- package/es/cc/fields/field/FormDefaultUIType.js +1 -1
- package/es/cc/fields/field/Properties.js +63 -0
- package/es/cc/fields/multi-select/Properties.js +9 -0
- package/es/cc/fields/pick-list/Properties.js +9 -0
- package/es/cc/fields/text/Properties.js +9 -0
- package/es/cc/form/Constants.js +6 -11
- package/es/cc/form/Properties.js +17 -0
- package/es/cc/form-connected/Constants.js +10 -19
- package/es/cc/form-connected/Properties.js +35 -0
- package/es/cc/form-connected/SdkContract.js +61 -0
- package/es/cc/form-connected/index.js +2 -0
- package/es/cc/highlighted-value/Constants.js +3 -5
- package/es/cc/highlighted-value/Properties.js +10 -0
- package/es/cc/icon-button/Constants.js +3 -5
- package/es/cc/index.js +1 -1
- package/es/cc/link/Constants.js +3 -5
- package/es/cc/list-item/Constants.js +3 -5
- package/es/cc/more-dropdown/Constants.js +3 -5
- package/es/cc/multi-select/Constants.js +5 -9
- package/es/cc/multi-select/Properties.js +9 -0
- package/es/cc/section/Constants.js +5 -9
- package/es/cc/select/Constants.js +6 -11
- package/es/cc/select/Properties.js +12 -0
- package/es/cc/switch/Constants.js +3 -5
- package/es/cc/table-column-filter/Constants.js +5 -9
- package/es/cc/table-list/Constants.js +14 -27
- package/es/cc/table-list/model/index.js +5 -9
- package/es/cc/table-list/row/Constants.js +5 -9
- package/es/cc/tags/Constants.js +3 -5
- package/es/cc/tags/model/index.js +4 -7
- package/es/cc/text/Constants.js +3 -5
- package/es/cc/textarea/Constants.js +5 -9
- package/es/cc/textarea/Properties.js +11 -0
- package/es/cc/textbox/Constants.js +6 -11
- package/es/cc/textbox/Properties.js +11 -0
- package/es/index.js +4 -2
- package/es/library/behaviours/field-focus/frameworks/ui/EventHandlersFactory.js +24 -0
- package/es/library/behaviours/field-focus/frameworks/ui/FocusFieldBehaviourFactory.js +20 -0
- package/es/library/behaviours/keyboard-controls/adapters/gateways/KeyboardHandler.js +0 -4
- package/es/library/behaviours/keyboard-controls/adapters/gateways/Repository.js +2 -10
- package/es/library/behaviours/keyboard-controls/adapters/gateways/Service.js +0 -14
- package/es/library/behaviours/keyboard-controls/adapters/presenters/Presenter.js +2 -11
- package/es/library/behaviours/list-selection/adapters/gateways/Repository.js +2 -8
- package/es/library/behaviours/list-selection/adapters/gateways/Service.js +0 -16
- package/es/library/behaviours/list-selection/adapters/presenters/Presenter.js +0 -8
- package/es/library/behaviours/local-storage/adapters/gateways/LocalStorageRepository.js +0 -6
- package/es/library/behaviours/local-storage/adapters/gateways/Service.js +0 -4
- package/es/library/behaviours/local-storage/adapters/presenters/Presenter.js +0 -8
- package/es/library/behaviours/local-storage/domain/entities/Storage.js +0 -4
- package/es/library/behaviours/sort-by/adapters/gateway/Repository.js +0 -6
- package/es/library/behaviours/sort-by/adapters/gateway/Service.js +0 -4
- package/es/library/behaviours/sort-by/adapters/presenter/Presenter.js +0 -8
- package/es/library/behaviours/table-column-resizer/adapters/gateways/Repository.js +0 -6
- package/es/library/behaviours/table-column-resizer/adapters/gateways/Service.js +0 -10
- package/es/library/behaviours/table-column-resizer/adapters/gateways/TableElementService.js +0 -8
- package/es/library/behaviours/table-column-resizer/adapters/presenters/AutoScroll.js +0 -12
- package/es/library/behaviours/table-column-resizer/adapters/presenters/Presenter.js +0 -8
- package/es/library/behaviours/table-column-resizer/domain/entities/ColumnResizer.js +0 -12
- package/es/library/behaviours/table-column-resizer/domain/entities/Mouse.js +0 -6
- package/es/library/behaviours/table-column-resizer/domain/entities/ResizeColumnCalculator.js +0 -12
- package/es/library/behaviours/table-column-resizer/domain/entities/ResizerAutoScrollCalculator.js +0 -6
- package/es/library/behaviours/table-column-resizer/domain/entities/ResizingColumn.js +0 -13
- package/es/library/behaviours/table-column-resizer/domain/entities/Table.js +0 -11
- package/es/library/behaviours/text-to-field-click/adapters/gateway/Repository.js +0 -6
- package/es/library/custom-component/adapters/gateways/event-manager/EventManager.js +2 -7
- package/es/library/custom-component/adapters/gateways/repository/Repository.js +1 -5
- package/es/library/custom-component/adapters/gateways/service/Service.js +0 -14
- package/es/library/custom-component/adapters/presenters/Presenter.js +0 -5
- package/es/library/custom-component/domain/entities/Behaviour.js +0 -11
- package/es/library/custom-component/domain/entities/Component.js +0 -24
- package/es/library/custom-component/domain/entities/Event.js +0 -7
- package/es/library/custom-component/domain/entities/EventHandler.js +0 -6
- package/es/library/custom-component/domain/entities/LifeCycleAction.js +0 -10
- package/es/library/custom-component/domain/entities/Payload.js +0 -6
- package/es/library/custom-component/domain/entities/Properties.js +0 -5
- package/es/library/custom-component/domain/entities/Property.js +0 -13
- package/es/library/custom-component/domain/entities/Schema.js +1 -5
- package/es/library/custom-component/domain/entities/State.js +0 -4
- package/es/library/custom-component/domain/entities/Style.js +0 -14
- package/es/library/custom-component/frameworks/ui/ComponentRegistry.js +3 -7
- package/es/library/custom-component/frameworks/ui/CreateCustomComponent.js +9 -26
- package/es/library/custom-component/frameworks/ui/CreateSlotComponent.js +4 -2
- package/es/library/custom-component/frameworks/ui/CustomComponentFactory.js +1 -1
- package/es/library/dot/components/action-location/adapters/gateway/Repository.js +0 -8
- package/es/library/dot/components/action-location/adapters/presenters/Presenter.js +0 -8
- package/es/library/dot/components/action-location/entities/ActionLocationEntity.js +2 -6
- package/es/library/dot/components/action-location/frameworks/ui/ActionComponentMapping.js +3 -1
- package/es/library/dot/components/actions-renderer/frameworks/ui/ActionsRendererView.js +6 -4
- package/es/library/dot/components/form/adapters/presenter/TransformState.js +5 -58
- package/es/library/dot/components/form/frameworks/ui/DefaultComponentRegister.js +2 -5
- package/es/library/dot/components/form/frameworks/ui/FormView.js +18 -42
- package/es/library/dot/components/form/frameworks/ui/__test__/Form.test.js +14 -20
- package/es/library/dot/components/form/frameworks/ui/css/Form.module.css +29 -4
- package/es/library/dot/components/form/frameworks/ui/sub-components/Footer.js +27 -0
- package/es/library/dot/components/form/frameworks/ui/sub-components/Header.js +24 -0
- package/es/library/dot/components/form/frameworks/ui/sub-components/MiddleSection.js +24 -0
- package/es/library/dot/components/form/frameworks/ui/sub-components/Sections.js +7 -2
- package/es/library/dot/components/form/frameworks/ui/sub-components/SectionsLayout.js +20 -0
- package/es/library/dot/components/form/frameworks/ui/sub-components/SectionsWithRightPanelLayout.js +41 -0
- package/es/library/dot/components/form-fields/checkbox/frameworks/ui/Checkbox.js +4 -3
- package/es/library/dot/components/form-fields/checkbox/frameworks/ui/CheckboxView.js +19 -17
- package/es/library/dot/components/form-fields/currency/frameworks/ui/Currency.js +3 -3
- package/es/library/dot/components/form-fields/currency/frameworks/ui/CurrencyView.js +20 -17
- package/es/library/dot/components/form-fields/date/frameworks/ui/Date.js +2 -3
- package/es/library/dot/components/form-fields/date/frameworks/ui/DateView.js +22 -19
- package/es/library/dot/components/form-fields/datetime/frameworks/ui/DateTime.js +2 -3
- package/es/library/dot/components/form-fields/datetime/frameworks/ui/DateTimeView.js +21 -18
- package/es/library/dot/components/form-fields/decimal/frameworks/ui/Decimal.js +2 -3
- package/es/library/dot/components/form-fields/decimal/frameworks/ui/DecimalView.js +22 -19
- package/es/library/dot/components/form-fields/email/frameworks/ui/Email.js +2 -3
- package/es/library/dot/components/form-fields/email/frameworks/ui/EmailView.js +22 -19
- package/es/library/dot/components/form-fields/field/FieldItem.js +36 -0
- package/es/library/dot/components/form-fields/field/__test__/common.js +18 -16
- package/es/library/dot/components/form-fields/field/css/FieldItem.module.css +13 -0
- package/es/library/dot/components/form-fields/index.js +2 -1
- package/es/library/dot/components/form-fields/lookup/frameworks/ui/EventHandlerFactory.js +70 -0
- package/es/library/dot/components/form-fields/lookup/frameworks/ui/Lookup.js +13 -0
- package/es/library/dot/components/form-fields/lookup/frameworks/ui/LookupView.js +51 -0
- package/es/library/dot/components/form-fields/multi-select/frameworks/ui/MultiSelect.js +2 -3
- package/es/library/dot/components/form-fields/multi-select/frameworks/ui/MultiSelectView.js +21 -18
- package/es/library/dot/components/form-fields/number/frameworks/ui/Number.js +2 -3
- package/es/library/dot/components/form-fields/number/frameworks/ui/NumberView.js +22 -19
- package/es/library/dot/components/form-fields/percentage/frameworks/ui/Percentage.js +2 -3
- package/es/library/dot/components/form-fields/percentage/frameworks/ui/PercentageView.js +22 -19
- package/es/library/dot/components/form-fields/phone/frameworks/ui/Phone.js +2 -3
- package/es/library/dot/components/form-fields/phone/frameworks/ui/PhoneView.js +22 -19
- package/es/library/dot/components/form-fields/pick-list/frameworks/ui/PickList.js +2 -3
- package/es/library/dot/components/form-fields/pick-list/frameworks/ui/PickListView.js +21 -18
- package/es/library/dot/components/form-fields/textarea/frameworks/ui/TextArea.js +4 -3
- package/es/library/dot/components/form-fields/textarea/frameworks/ui/TextAreaView.js +21 -18
- package/es/library/dot/components/form-fields/textbox/frameworks/ui/TextBox.js +2 -3
- package/es/library/dot/components/form-fields/textbox/frameworks/ui/TextBoxView.js +21 -18
- package/es/library/dot/components/form-fields/url/frameworks/ui/Url.js +2 -3
- package/es/library/dot/components/form-fields/url/frameworks/ui/UrlView.js +22 -19
- package/es/library/dot/components/section/frameworks/ui/RenderField.js +5 -4
- package/es/library/dot/components/table-list/adapters/controllers/KeyboardRowClickController.js +1 -1
- package/es/library/dot/components/table-list/adapters/controllers/KeyboardRowSelectController.js +1 -1
- package/es/library/dot/components/table-list/adapters/presenters/TableTranslator.js +1 -1
- package/es/library/dot/components/table-list/frameworks/ui/sub-components/ErrorState.js +3 -3
- package/es/library/dot/components/table-list/frameworks/ui/sub-components/Rows.js +6 -6
- package/es/library/dot/components/table-list/frameworks/ui/sub-components/field/FieldComponent.js +1 -2
- package/es/library/dot/components/table-list/frameworks/ui/sub-components/header/HeaderData.js +1 -1
- package/es/library/dot/components/table-list/frameworks/ui/sub-components/row/RowData.js +1 -1
- package/es/library/dot/legacy-to-new-arch/action-icon/frameworks/ui/ActionIconView.js +1 -1
- package/es/library/dot/legacy-to-new-arch/date/frameworks/ui/DateView.js +18 -1
- package/es/library/dot/legacy-to-new-arch/date/frameworks/ui/css/DateView.module.css +3 -0
- package/es/library/dot/legacy-to-new-arch/highlighted-value/frameworks/ui/HighlightedValueView.js +6 -1
- package/es/library/dot/{components/form-fields/ephi-tag/frameworks/ui/css/EPHITag.module.css → legacy-to-new-arch/highlighted-value/frameworks/ui/css/HighlightedValue.module.css} +1 -1
- package/es/library/dot/legacy-to-new-arch/label/frameworks/ui/LabelView.js +16 -12
- package/es/library/dot/legacy-to-new-arch/label/frameworks/ui/css/Label.module.css +3 -5
- package/es/library/dot/legacy-to-new-arch/multi-select/frameworks/ui/MultiSelectView.js +23 -3
- package/es/library/dot/legacy-to-new-arch/multi-select/frameworks/ui/css/MultiSelectView.module.css +37 -0
- package/es/library/dot/legacy-to-new-arch/select/frameworks/ui/SelectView.js +16 -4
- package/es/library/dot/legacy-to-new-arch/table-column-filter/frameworks/ui/TableColumnFilterView.js +5 -3
- package/es/library/dot/legacy-to-new-arch/text-area/frameworks/ui/TextAreaView.js +23 -5
- package/es/library/dot/legacy-to-new-arch/text-area/frameworks/ui/css/TextAreaView.module.css +40 -0
- package/es/library/dot/legacy-to-new-arch/textbox/frameworks/ui/TextBoxView.js +13 -3
- package/es/library/slot/frameworks/ui/ConvertSlotToComponent.js +5 -4
- package/es/platform/client-actions/behaviour/zclient-actions/adapters/controllers/MountController.js +15 -18
- package/es/platform/client-actions/behaviour/zclient-actions/adapters/gateways/Repository.js +0 -6
- package/es/platform/client-actions/behaviour/zclient-actions/adapters/gateways/Service.js +0 -16
- package/es/platform/client-actions/behaviour/zclient-actions/adapters/presenters/Presenter.js +0 -8
- package/es/platform/client-actions/behaviour/zclient-actions/adapters/resources/ClientActionResource.js +2 -4
- package/es/platform/client-actions/behaviour/zclient-actions/applications/usecases/GetClientActionLocationUseCase.js +1 -1
- package/es/platform/client-actions/behaviour/zclient-actions/applications/usecases/GetClientActionUIComponentPropertiesUseCase.js +1 -1
- package/es/platform/client-actions/behaviour/zclient-actions/applications/usecases/GetClientActionsUseCase.js +1 -1
- package/es/platform/client-actions/behaviour/zclient-actions/applications/usecases/UpdateClientActionUIComponentPropertiesUseCase.js +1 -1
- package/es/platform/client-actions/behaviour/zclient-actions/domain/entities/ClientAction.js +0 -26
- package/es/platform/client-actions/behaviour/zclient-actions/domain/entities/ClientActions.js +0 -9
- package/es/platform/client-actions/behaviour/zclient-actions/domain/entities/EventMapping.js +0 -12
- package/es/platform/client-actions/behaviour/zclient-actions/domain/entities/EventMappings.js +0 -4
- package/es/platform/client-actions/behaviour/zclient-actions/domain/entities/UIComponentMapping.js +0 -14
- package/es/platform/client-actions/behaviour/zclient-actions/frameworks/sdk/ClientActionsSDKFactory.js +2 -2
- package/es/platform/client-actions/cc/dynamic-action-component/Properties.js +1 -1
- package/es/platform/client-actions/components/action-event-mediator/adapters/gateway/Repository.js +0 -8
- package/es/platform/client-actions/components/action-event-mediator/adapters/presenters/Presenter.js +0 -8
- package/es/platform/client-actions/components/action-event-mediator/domain/entities/ActionEventMediatorEntity.js +2 -10
- package/es/platform/client-actions/components/dynamic-component/frameworks/ui/DynamicActionComponentView.js +6 -4
- package/es/platform/client-actions/components/interfaces/ActionViewModel.js +1 -0
- package/es/platform/client-actions/components/row-actions-renderer/frameworks/ui/RowActionsRenderer.module.css +5 -1
- package/es/platform/column-chooser/adapters/gateways/Repository.js +0 -6
- package/es/platform/column-chooser/adapters/gateways/Service.js +0 -14
- package/es/platform/column-chooser/adapters/presenters/Presenter.js +0 -8
- package/es/platform/column-chooser/domain/entities/SelectEntityImp.js +0 -5
- package/es/platform/components/app/adapters/resources/AppResource.js +15 -0
- package/es/platform/components/form-connected/adapters/resources/SmartFormResources.js +90 -10
- package/es/platform/components/form-connected/frameworks/EventHandlersFactory.js +30 -58
- package/es/platform/components/form-connected/frameworks/FormConnectedFactory.js +2 -6
- package/es/platform/components/form-connected/frameworks/FormConnectedView.js +3 -1
- package/es/platform/components/form-connected/frameworks/FormSdkFactory.js +2 -2
- package/es/platform/components/table-connected/adapters/controllers/ResizeFinishController.js +3 -5
- package/es/platform/components/table-connected/adapters/resources/SmartTableResource.js +2 -4
- package/es/platform/components/table-connected/frameworks/EventHandlersFactory.js +2 -2
- package/es/platform/components/table-connected/frameworks/ListSdkFactory.js +2 -2
- package/es/platform/components/table-connected/frameworks/TableConnectedFactory.js +1 -1
- package/es/platform/data-source/http-template/deleteRecords.js +1 -1
- package/es/platform/data-source/http-template/fetchLookupFields.js +24 -0
- package/es/platform/data-source/http-template/fetchValidationRules.js +2 -1
- package/es/platform/data-source/http-template/moveToTrash.js +28 -0
- package/es/platform/data-source/index.js +5 -1
- package/es/platform/data-source/utils/validation-rules/FieldConditions.js +167 -0
- package/es/platform/data-source/utils/validation-rules/TransFormValidationRules.js +98 -0
- package/es/platform/sdk/adapters/gateways/Repository.js +5 -9
- package/es/platform/sdk/adapters/gateways/Service.js +2 -12
- package/es/platform/sdk/adapters/presenters/Presenter.js +0 -6
- package/es/platform/sdk/application/interfaces/gateways/AbstractResource.js +0 -6
- package/es/platform/sdk/application/usecases/GetResourcesUseCase.js +12 -0
- package/es/platform/sdk/domain/entities/ResourceManager.js +24 -20
- package/es/platform/sdk/frameworks/Sdk.js +23 -2
- package/es/platform/sdk/frameworks/SdkRegistry.js +11 -8
- package/es/platform/sdk-behaviour/adapters/controllers/AbstractController.js +0 -4
- package/es/platform/sdk-behaviour/adapters/gateways/Repository.js +0 -8
- package/es/platform/sdk-behaviour/adapters/gateways/ResourceManagerGateWay.js +0 -6
- package/es/platform/sdk-behaviour/adapters/gateways/Service.js +0 -8
- package/es/platform/zdata-source/adapters/controllers/FailureController.js +26 -29
- package/es/platform/zdata-source/adapters/controllers/NoContentController.js +21 -24
- package/es/platform/zdata-source/adapters/controllers/RegisterController.js +17 -20
- package/es/platform/zdata-source/adapters/controllers/SuccessController.js +26 -29
- package/es/platform/zdata-source/adapters/gateways/Repository.js +0 -6
- package/es/platform/zdata-source/adapters/gateways/Service.js +0 -12
- package/es/platform/zdata-source/adapters/presenters/Presenter.js +1 -9
- package/es/platform/zdata-source/applications/usecases/SuccessUseCase.js +1 -1
- package/es/platform/zdata-source/domain/entities/APITemplate.js +0 -16
- package/es/platform/zfield/adapters/gateways/Repository.js +0 -6
- package/es/platform/zfield/adapters/gateways/Service.js +0 -14
- package/es/platform/zfield/adapters/presenters/Presenter.js +0 -8
- package/es/platform/zfield/applications/entities-factory/FieldBuilder.js +0 -30
- package/es/platform/zfield/applications/entities-factory/FieldsManagerBuilder.js +0 -12
- package/es/platform/zform/adapters/controllers/FieldBlurController.js +26 -0
- package/es/platform/zform/adapters/controllers/LookupFieldController.js +23 -0
- package/es/platform/zform/adapters/controllers/MyFromSuccessController.js +8 -2
- package/es/platform/zform/adapters/controllers/SubmitValidationCompletedController.js +21 -0
- package/es/platform/zform/adapters/controllers/ValidateFieldRequestController.js +10 -5
- package/es/platform/zform/adapters/controllers/ValidationRulesExecutionResultController.js +23 -0
- package/es/platform/zform/adapters/controllers/ValidationRulesRequestController.js +2 -4
- package/es/platform/zform/adapters/controllers/ValidationRulesSuccessController.js +2 -4
- package/es/platform/zform/adapters/gateway/FormRepository.js +0 -6
- package/es/platform/zform/adapters/gateway/Service.js +10 -36
- package/es/platform/zform/adapters/presenter/FormPresenter.js +0 -8
- package/es/platform/zform/adapters/presenter/FormTranslator.js +28 -3
- package/es/platform/zform/adapters/presenter/translators/SectionTranslator.js +70 -10
- package/es/platform/zform/adapters/presenter/translators/fields/BooleanFieldTranslator.js +7 -3
- package/es/platform/zform/adapters/presenter/translators/fields/CurrencyFieldTranslator.js +5 -9
- package/es/platform/zform/adapters/presenter/translators/fields/DateFieldTranslator.js +7 -3
- package/es/platform/zform/adapters/presenter/translators/fields/DateTimeFieldTranslator.js +7 -3
- package/es/platform/zform/adapters/presenter/translators/fields/DecimalFieldTranslator.js +6 -9
- package/es/platform/zform/adapters/presenter/translators/fields/EmailFieldTranslator.js +6 -9
- package/es/platform/zform/adapters/presenter/translators/fields/LookUpFieldTranslator.js +7 -10
- package/es/platform/zform/adapters/presenter/translators/fields/MultiselectFieldTranslator.js +6 -3
- package/es/platform/zform/adapters/presenter/translators/fields/NumberFieldTranslator.js +6 -9
- package/es/platform/zform/adapters/presenter/translators/fields/PercentageFieldTranslator.js +6 -9
- package/es/platform/zform/adapters/presenter/translators/fields/PhoneFieldTranslator.js +6 -9
- package/es/platform/zform/adapters/presenter/translators/fields/PicklistFieldTranslator.js +6 -3
- package/es/platform/zform/adapters/presenter/translators/fields/TextAreaFieldTranslator.js +5 -9
- package/es/platform/zform/adapters/presenter/translators/fields/TextFieldTranslator.js +8 -8
- package/es/platform/zform/adapters/presenter/translators/fields/URLFieldTranslator.js +6 -9
- package/es/platform/zform/adapters/presenter/utils/DefaultClientActions.js +114 -36
- package/es/platform/zform/applications/usecases/AbstractUseCase.js +3 -1
- package/es/platform/zform/applications/usecases/FieldBlurUseCase.js +39 -0
- package/es/platform/zform/applications/usecases/FieldValueChangeRequestUseCase.js +9 -13
- package/es/platform/zform/applications/usecases/FocusFieldUseCase.js +19 -0
- package/es/platform/zform/applications/usecases/FormSubmitUseCase.js +19 -38
- package/es/platform/zform/applications/usecases/GetFieldErrorMessageUseCase.js +16 -0
- package/es/platform/zform/applications/usecases/GetFieldValueUseCase.js +1 -1
- package/es/platform/zform/applications/usecases/InsertValidationRuleSuccessUseCase.js +22 -0
- package/es/platform/zform/applications/usecases/LookupFieldSuccessUseCase.js +33 -0
- package/es/platform/zform/applications/usecases/MyFormSuccessUseCase.js +97 -13
- package/es/platform/zform/applications/usecases/MyLayoutSuccessUseCase.js +4 -33
- package/es/platform/zform/applications/usecases/SetFieldErrorMessageUseCase.js +4 -4
- package/es/platform/zform/applications/usecases/SetFieldValueUseCase.js +4 -21
- package/es/platform/zform/applications/usecases/SetFieldsValuesUseCase.js +4 -26
- package/es/platform/zform/applications/usecases/SubmitValidationCompletedUseCase.js +62 -0
- package/es/platform/zform/applications/usecases/ValidateFieldUseCase.js +33 -0
- package/es/platform/zform/applications/usecases/ValidationRulesExecutionResultUseCase.js +23 -0
- package/es/platform/zform/domain/ZDependencyMapping.js +0 -17
- package/es/platform/zform/domain/ZField.js +26 -54
- package/es/platform/zform/domain/ZForm.js +110 -82
- package/es/platform/zform/domain/ZLayout.js +0 -14
- package/es/platform/zform/domain/ZLayoutRule.js +0 -31
- package/es/platform/zform/domain/ZSection.js +0 -19
- package/es/platform/zform/domain/ZValidationRule.js +0 -28
- package/es/platform/zform/domain/interfaces/IZForm.js +5 -1
- package/es/platform/zform/domain/interfaces/ValidationConditions.js +142 -0
- package/es/platform/zform/frameworks/ui/EventHandlerFactory.js +27 -145
- package/es/platform/zform/frameworks/ui/ZFormBehaviourFactory.js +4 -9
- package/es/platform/zform/frameworks/validation-rules/DefaultCustomValidators.js +340 -0
- package/es/platform/zform/frameworks/validation-rules/Validator.js +94 -16
- package/es/platform/zform/frameworks/validation-rules/formUtils.js +7 -0
- package/es/platform/zform/frameworks/validation-rules/localization_utils.js +15 -0
- package/es/platform/zform/frameworks/validation-rules/utils.js +402 -351
- package/es/platform/zform/frameworks/validation-rules/validationRules.js +80 -79
- package/es/platform/zlist/adapters/gateways/Repository.js +0 -6
- package/es/platform/zlist/adapters/gateways/Service.js +0 -33
- package/es/platform/zlist/adapters/presenters/Presenters.js +0 -8
- package/es/platform/zlist/adapters/presenters/SelectionTranslator.js +1 -3
- package/es/platform/zlist/adapters/presenters/TableTranslator.js +4 -6
- package/es/platform/zlist/adapters/presenters/translators/ColumnTranslator.js +2 -6
- package/es/platform/zlist/adapters/presenters/translators/actions/ActionsTranslator.js +4 -15
- package/es/platform/zlist/adapters/presenters/utils/calculateFieldWidths.js +1 -3
- package/es/platform/zlist/applications/usecases/DeleteMultipleRecordUseCase.js +1 -3
- package/es/platform/zlist/applications/usecases/DeleteSingleRecordUseCase.js +1 -3
- package/es/platform/zlist/applications/usecases/GetContextUseCase.js +1 -1
- package/es/platform/zlist/applications/usecases/RecordSuccessCallbackUsecase.js +1 -3
- package/es/platform/zlist/applications/usecases/RecordUpdateUseCase.js +1 -3
- package/es/platform/zlist/applications/usecases/UpdateMultipleRecordUseCase.js +1 -3
- package/es/platform/zlist/domain/entities/List.js +3 -2
- package/es/platform/zrecord/adapters/controllers/AppendRecordsController.js +20 -23
- package/es/platform/zrecord/adapters/controllers/DeleteMultipleRecordLocalController.js +20 -23
- package/es/platform/zrecord/adapters/controllers/FailureController.js +26 -29
- package/es/platform/zrecord/adapters/controllers/FetchStateStopController.js +17 -20
- package/es/platform/zrecord/adapters/controllers/MountController.js +15 -18
- package/es/platform/zrecord/adapters/controllers/NoContentController.js +21 -24
- package/es/platform/zrecord/adapters/controllers/RefetchController.js +26 -29
- package/es/platform/zrecord/adapters/controllers/SetRecordsController.js +24 -27
- package/es/platform/zrecord/adapters/controllers/SuccessController.js +26 -29
- package/es/platform/zrecord/adapters/gateways/Repository.js +0 -6
- package/es/platform/zrecord/adapters/gateways/Service.js +0 -30
- package/es/platform/zrecord/adapters/presenters/Presenter.js +0 -8
- package/es/platform/zrecord/applications/usecases/GetMultipleRecordUseCase.js +1 -1
- package/es/platform/zrecord/applications/usecases/GetSingleRecordUseCase.js +1 -1
- package/es/platform/zrecord/domain/entities/CustomFieldValues.js +0 -4
- package/es/platform/zrecord/domain/entities/Record.js +0 -22
- package/es/platform/zrecord/domain/entities/Records.js +0 -11
- package/package.json +12 -17
- package/es/bc/field-validation/Constants.js +0 -4
- package/es/bc/field-validation/EventHandlers.js +0 -1
- package/es/bc/field-validation/Events.js +0 -106
- package/es/bc/field-validation/FieldTypes.js +0 -20
- package/es/bc/field-validation/Properties.js +0 -11
- package/es/bc/field-validation/index.js +0 -5
- package/es/cc/ephi-tag/Properties.js +0 -1
- package/es/cc/ephi-tag/index.js +0 -1
- package/es/cc/info-icon/Properties.js +0 -10
- package/es/cc/info-icon/index.js +0 -1
- package/es/library/behaviours/field-validation/adapters/controllers/AbstractController.js +0 -9
- package/es/library/behaviours/field-validation/adapters/controllers/ValidateFieldController.js +0 -32
- package/es/library/behaviours/field-validation/adapters/controllers/ValidateFieldsController.js +0 -31
- package/es/library/behaviours/field-validation/adapters/gateway/Repository.js +0 -23
- package/es/library/behaviours/field-validation/adapters/gateway/Service.js +0 -18
- package/es/library/behaviours/field-validation/applications/interfaces/input/FieldData.js +0 -17
- package/es/library/behaviours/field-validation/applications/usecases/AbstractUseCase.js +0 -15
- package/es/library/behaviours/field-validation/applications/usecases/ValidateField.js +0 -29
- package/es/library/behaviours/field-validation/applications/usecases/ValidateFields.js +0 -28
- package/es/library/behaviours/field-validation/domain/FieldValidation.js +0 -94
- package/es/library/behaviours/field-validation/domain/field-vise-validations/BooleanValidation.js +0 -28
- package/es/library/behaviours/field-validation/domain/field-vise-validations/CurrencyValidation.js +0 -49
- package/es/library/behaviours/field-validation/domain/field-vise-validations/DateTimeValidation.js +0 -24
- package/es/library/behaviours/field-validation/domain/field-vise-validations/DateValidation.js +0 -24
- package/es/library/behaviours/field-validation/domain/field-vise-validations/DecimalValidation.js +0 -49
- package/es/library/behaviours/field-validation/domain/field-vise-validations/EmailValidation.js +0 -28
- package/es/library/behaviours/field-validation/domain/field-vise-validations/IntegerValidation.js +0 -39
- package/es/library/behaviours/field-validation/domain/field-vise-validations/LookUpValidation.js +0 -24
- package/es/library/behaviours/field-validation/domain/field-vise-validations/MultiSelectValidation.js +0 -26
- package/es/library/behaviours/field-validation/domain/field-vise-validations/PercentValidation.js +0 -28
- package/es/library/behaviours/field-validation/domain/field-vise-validations/PhoneValidation.js +0 -39
- package/es/library/behaviours/field-validation/domain/field-vise-validations/PicklistValidation.js +0 -24
- package/es/library/behaviours/field-validation/domain/field-vise-validations/TextAreaValidation.js +0 -39
- package/es/library/behaviours/field-validation/domain/field-vise-validations/TextBoxValidation.js +0 -39
- package/es/library/behaviours/field-validation/domain/field-vise-validations/URLValidation.js +0 -28
- package/es/library/behaviours/field-validation/domain/interfaces/FieldTypes.js +0 -20
- package/es/library/behaviours/field-validation/domain/interfaces/IFieldViseValidation.js +0 -1
- package/es/library/behaviours/field-validation/domain/interfaces/ValidationResult.js +0 -1
- package/es/library/behaviours/field-validation/domain/interfaces/ValidationsArray.js +0 -1
- package/es/library/behaviours/field-validation/domain/interfaces/ValidationsEnum.js +0 -22
- package/es/library/behaviours/field-validation/domain/interfaces/ValidationsMap.js +0 -1
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IBooleanField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/ICurrencyField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IDateField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IDateTimeField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IDecimalField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IEmailField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IIntegerField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/ILookUpField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IMultiSelectField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IPercentField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IPhoneField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IPicklistField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/ITextAreaField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/ITextBoxField.js +0 -0
- package/es/library/behaviours/field-validation/domain/interfaces/fields/IURLField.js +0 -0
- package/es/library/behaviours/field-validation/frameworks/ui/EventHandlerFactory.js +0 -23
- package/es/library/behaviours/field-validation/frameworks/ui/FieldValidationBehaviourFactory.js +0 -27
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/BooleanFieldValidation.test.js +0 -137
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/CurrencyFieldValidation.test.js +0 -228
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/DateFieldValidation.test.js +0 -108
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/DateTimeFieldValidation.test.js +0 -108
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/DecimalFieldValidation.test.js +0 -257
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/EmailFieldValidation.test.js +0 -139
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/FieldValidationBehaviour.test.js +0 -171
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/IntegerFieldValidation.test.js +0 -168
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/LookUpFieldValidation.test.js +0 -108
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/MultiSelectFieldValidation.test.js +0 -79
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/PercentFieldValidation.test.js +0 -108
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/PhoneFieldValidation.test.js +0 -168
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/PicklistFieldValidation.test.js +0 -79
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/TextAreaFieldValidation.test.js +0 -170
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/TextBoxFieldValidation.test.js +0 -170
- package/es/library/behaviours/field-validation/frameworks/ui/__tests__/URLFieldValidation.test.js +0 -108
- package/es/library/behaviours/field-validation/frameworks/utils/FormBasicValidationAdaptor.js +0 -228
- package/es/library/behaviours/field-validation/frameworks/utils/__tests__/formValidate.test.js +0 -284
- package/es/library/behaviours/field-validation/frameworks/utils/formValidate.js +0 -334
- package/es/library/dot/components/form-fields/checkbox/adapters/presenter/TransformState.js +0 -22
- package/es/library/dot/components/form-fields/currency/adapters/presenter/TransformState.js +0 -81
- package/es/library/dot/components/form-fields/date/adapters/presenter/TransformState.js +0 -22
- package/es/library/dot/components/form-fields/datetime/adapters/presenter/TransformState.js +0 -22
- package/es/library/dot/components/form-fields/decimal/adapters/presenter/TransformState.js +0 -31
- package/es/library/dot/components/form-fields/email/adapters/presenter/TransformState.js +0 -23
- package/es/library/dot/components/form-fields/ephi-tag/frameworks/ui/EPHITag.js +0 -10
- package/es/library/dot/components/form-fields/ephi-tag/frameworks/ui/EPHITagView.js +0 -21
- package/es/library/dot/components/form-fields/info-icon/frameworks/ui/InfoIcon.js +0 -10
- package/es/library/dot/components/form-fields/info-icon/frameworks/ui/InfoIconView.js +0 -21
- package/es/library/dot/components/form-fields/info-icon/frameworks/ui/css/InfoIcon.module.css +0 -3
- package/es/library/dot/components/form-fields/multi-select/adapters/presenter/TransformState.js +0 -31
- package/es/library/dot/components/form-fields/number/adapters/presenter/TransformState.js +0 -31
- package/es/library/dot/components/form-fields/percentage/adapters/presenter/TransformState.js +0 -31
- package/es/library/dot/components/form-fields/phone/adapters/presenter/TransformState.js +0 -31
- package/es/library/dot/components/form-fields/pick-list/adapters/presenter/TransformState.js +0 -23
- package/es/library/dot/components/form-fields/textarea/adapters/presenter/TransformState.js +0 -23
- package/es/library/dot/components/form-fields/textbox/adapters/presenter/TransformState.js +0 -32
- package/es/library/dot/components/form-fields/url/adapters/presenter/TransformState.js +0 -31
- package/es/library/dot/legacy-to-new-arch/label/frameworks/ui/sub-components/ui/LabelAction.js +0 -9
- package/es/library/dot/legacy-to-new-arch/label/frameworks/ui/sub-components/ui/LabelActionView.js +0 -38
- package/es/library/dot/legacy-to-new-arch/label/frameworks/ui/sub-components/ui/css/LabelAction.module.css +0 -4
- package/es/platform/zform/adapters/controllers/ValidateErrorMessageController.js +0 -22
- package/es/platform/zform/applications/interfaces/input/ValidateErrorMessageInputModel.js +0 -1
- package/es/platform/zform/applications/usecases/ValidateErrorMessageUseCase.js +0 -33
- package/es/platform/zform/applications/usecases/ValidateFieldRequestUseCase.js +0 -56
- /package/es/{library/behaviours/field-validation/applications/interfaces/UseCaseDependencies.js → platform/zform/applications/interfaces/input/FieldBlurUsecaseInputModel.js} +0 -0
- /package/es/{library/behaviours/field-validation/applications/interfaces/gateways/IRepository.js → platform/zform/applications/interfaces/input/FocusFieldUseCaseInputModel.js} +0 -0
- /package/es/{library/behaviours/field-validation/applications/interfaces/gateways/IService.js → platform/zform/applications/interfaces/input/GetFieldErrorMessageInputModel.js} +0 -0
- /package/es/{library/behaviours/field-validation/applications/interfaces/input/FieldValidationInputModel.js → platform/zform/applications/interfaces/input/InsertValidationRuleInputModel.js} +0 -0
- /package/es/{library/behaviours/field-validation/applications/interfaces/input/ValidateFieldsInputModel.js → platform/zform/applications/interfaces/input/LookUpFieldSuccessUseCaseInputModel.js} +0 -0
- /package/es/{library/behaviours/field-validation/domain/interfaces/IField.js → platform/zform/applications/interfaces/input/SubmitValidationCompletedUsecaseInputModel.js} +0 -0
- /package/es/{library/behaviours/field-validation/domain/interfaces/IFieldValidation.js → platform/zform/applications/interfaces/input/ValidateFieldUseCaseInputModel.js} +0 -0
|
@@ -27,7 +27,7 @@ export default function getValidationRuleActionsData() {
|
|
|
27
27
|
let validationRules = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
28
28
|
let fieldUIStates = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
29
29
|
let formFields = arguments.length > 2 ? arguments[2] : undefined;
|
|
30
|
-
let
|
|
30
|
+
let customValidationRunner = arguments.length > 3 ? arguments[3] : undefined;
|
|
31
31
|
let statusMapping = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
|
|
32
32
|
let moduleEntityObj = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
|
|
33
33
|
let validateOnlyShowedFields = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : true;
|
|
@@ -36,91 +36,92 @@ export default function getValidationRuleActionsData() {
|
|
|
36
36
|
fieldMapper
|
|
37
37
|
} = formFields;
|
|
38
38
|
const validValidationRules = getValidRules(validationRules, fieldMapper, fieldUIStates, validateOnlyShowedFields);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
39
|
+
return Promise.all(getPassedFormRules(validValidationRules, fieldUIStates, fieldMapper, fieldDetails, statusMapping, moduleEntityObj, customValidationRunner)).then(passedRules => passedRules.filter(rule => rule !== null)).then(passedRules => {
|
|
40
|
+
const validationRuleActionsData = {};
|
|
41
|
+
let errorFieldId = '';
|
|
42
|
+
let isError = false;
|
|
43
|
+
let removeOldMessages = [];
|
|
44
|
+
const errorObj = {};
|
|
45
|
+
let hasErrorInHiddenFields = false;
|
|
46
|
+
let hasErrorInDisplayFields = false;
|
|
47
|
+
let errorFields = []; // Revamp the logic
|
|
48
48
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (message && fieldId) {
|
|
63
|
-
validationRuleActionsData[fieldId] = {
|
|
64
|
-
validationRuleMessage: ''
|
|
65
|
-
};
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
removeOldMessages = { ...validationRuleActionsData
|
|
69
|
-
};
|
|
70
|
-
let firstFieldId = '';
|
|
71
|
-
let firstDisplayedErrorFieldId = '';
|
|
72
|
-
passedRules.forEach(data => {
|
|
73
|
-
const {
|
|
74
|
-
actions = {},
|
|
75
|
-
fieldName
|
|
76
|
-
} = data || {};
|
|
77
|
-
const fieldId = fieldMapper[fieldName];
|
|
78
|
-
const {
|
|
79
|
-
alert = ''
|
|
80
|
-
} = actions;
|
|
81
|
-
firstFieldId = fieldMapper[passedRules[0].fieldName]; // let { messageObj } = fieldUIStates[fieldId] || {};
|
|
82
|
-
// let { validationRuleMessage: message } = messageObj || {};
|
|
83
|
-
// same field possible to throw 2 message.That case should be show 1st error msg
|
|
49
|
+
validValidationRules.forEach(rule => {
|
|
50
|
+
// clear old validation rule message
|
|
51
|
+
const {
|
|
52
|
+
fieldName
|
|
53
|
+
} = rule;
|
|
54
|
+
const fieldId = fieldMapper[fieldName];
|
|
55
|
+
const {
|
|
56
|
+
messageObj
|
|
57
|
+
} = fieldUIStates[fieldId] || {};
|
|
58
|
+
const {
|
|
59
|
+
validationRuleMessage: message
|
|
60
|
+
} = messageObj || {};
|
|
84
61
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
62
|
+
if (message && fieldId) {
|
|
63
|
+
validationRuleActionsData[fieldId] = {
|
|
64
|
+
validationRuleMessage: ''
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
removeOldMessages = { ...validationRuleActionsData
|
|
69
|
+
};
|
|
70
|
+
let firstFieldId = '';
|
|
71
|
+
let firstDisplayedErrorFieldId = '';
|
|
72
|
+
passedRules.forEach(data => {
|
|
73
|
+
const {
|
|
74
|
+
actions = {},
|
|
75
|
+
fieldName
|
|
76
|
+
} = data || {};
|
|
77
|
+
const fieldId = fieldMapper[fieldName];
|
|
78
|
+
const {
|
|
79
|
+
alert = ''
|
|
80
|
+
} = actions;
|
|
81
|
+
firstFieldId = fieldMapper[passedRules[0].fieldName]; // let { messageObj } = fieldUIStates[fieldId] || {};
|
|
82
|
+
// let { validationRuleMessage: message } = messageObj || {};
|
|
83
|
+
// same field possible to throw 2 message.That case should be show 1st error msg
|
|
88
84
|
|
|
89
|
-
if (fieldId && !validationRuleMessage) {
|
|
90
|
-
validationRuleActionsData[fieldId] = {
|
|
91
|
-
validationRuleMessage: alert
|
|
92
|
-
};
|
|
93
|
-
errorObj[fieldId] = {
|
|
94
|
-
validationRuleMessage: alert
|
|
95
|
-
};
|
|
96
85
|
const {
|
|
97
|
-
|
|
98
|
-
} =
|
|
86
|
+
validationRuleMessage = ''
|
|
87
|
+
} = validationRuleActionsData[fieldId] || {};
|
|
99
88
|
|
|
100
|
-
if (
|
|
101
|
-
|
|
89
|
+
if (fieldId && !validationRuleMessage) {
|
|
90
|
+
validationRuleActionsData[fieldId] = {
|
|
91
|
+
validationRuleMessage: alert
|
|
92
|
+
};
|
|
93
|
+
errorObj[fieldId] = {
|
|
94
|
+
validationRuleMessage: alert
|
|
95
|
+
};
|
|
96
|
+
const {
|
|
97
|
+
isShowOnLayoutRuleApplied: isShow
|
|
98
|
+
} = fieldUIStates[fieldId];
|
|
102
99
|
|
|
103
|
-
if (
|
|
104
|
-
|
|
105
|
-
}
|
|
100
|
+
if (isShow) {
|
|
101
|
+
hasErrorInDisplayFields = true;
|
|
106
102
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
103
|
+
if (!firstDisplayedErrorFieldId) {
|
|
104
|
+
firstDisplayedErrorFieldId = fieldId;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
errorFields.push(fieldId);
|
|
108
|
+
} else {
|
|
109
|
+
hasErrorInHiddenFields = true;
|
|
110
|
+
}
|
|
110
111
|
}
|
|
111
|
-
}
|
|
112
|
+
});
|
|
113
|
+
errorFieldId = firstFieldId;
|
|
114
|
+
isError = !!passedRules.length;
|
|
115
|
+
return {
|
|
116
|
+
data: validationRuleActionsData,
|
|
117
|
+
errorFieldId,
|
|
118
|
+
isError,
|
|
119
|
+
removeOldMessages,
|
|
120
|
+
errorObj,
|
|
121
|
+
hasErrorInDisplayFields,
|
|
122
|
+
hasErrorInHiddenFields,
|
|
123
|
+
firstDisplayedErrorFieldId,
|
|
124
|
+
errorFields
|
|
125
|
+
};
|
|
112
126
|
});
|
|
113
|
-
errorFieldId = firstFieldId;
|
|
114
|
-
isError = !!passedRules.length;
|
|
115
|
-
return {
|
|
116
|
-
data: validationRuleActionsData,
|
|
117
|
-
errorFieldId,
|
|
118
|
-
isError,
|
|
119
|
-
removeOldMessages,
|
|
120
|
-
errorObj,
|
|
121
|
-
hasErrorInDisplayFields,
|
|
122
|
-
hasErrorInHiddenFields,
|
|
123
|
-
firstDisplayedErrorFieldId,
|
|
124
|
-
errorFields
|
|
125
|
-
};
|
|
126
127
|
}
|
|
@@ -1,14 +1,8 @@
|
|
|
1
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
2
|
-
|
|
3
1
|
import ListErrorState from "../../domain/entities/ListErrorState";
|
|
4
2
|
import ListFactory from "../../applications/entities-factory/ListFactory";
|
|
5
3
|
import SortBy from "../../domain/entities/SortBy";
|
|
6
4
|
|
|
7
5
|
class Repository {
|
|
8
|
-
constructor() {
|
|
9
|
-
_defineProperty(this, "state", void 0);
|
|
10
|
-
}
|
|
11
|
-
|
|
12
6
|
init(state) {
|
|
13
7
|
this.state = state;
|
|
14
8
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
2
|
-
|
|
3
1
|
import InitializeUseCase from "../../applications/usecases/InitializeUseCase";
|
|
4
2
|
import PropertiesChangeUseCase from "../../applications/usecases/PropertiesChangeUseCase";
|
|
5
3
|
import FetchMoreUseCase from "../../applications/usecases/FetchMoreUseCase";
|
|
@@ -19,37 +17,6 @@ import ReOrderFailedUseCase from "../../applications/usecases/ReOrderFailedUseCa
|
|
|
19
17
|
class Service {
|
|
20
18
|
constructor(dependencies) {
|
|
21
19
|
this.dependencies = dependencies;
|
|
22
|
-
|
|
23
|
-
_defineProperty(this, "initializeUseCase", void 0);
|
|
24
|
-
|
|
25
|
-
_defineProperty(this, "propertiesChangeUseCase", void 0);
|
|
26
|
-
|
|
27
|
-
_defineProperty(this, "fieldChangeUseCase", void 0);
|
|
28
|
-
|
|
29
|
-
_defineProperty(this, "fetchMoreUseCase", void 0);
|
|
30
|
-
|
|
31
|
-
_defineProperty(this, "deleteMultipleRecordUseCase", void 0);
|
|
32
|
-
|
|
33
|
-
_defineProperty(this, "deleteSingleRecordUseCase", void 0);
|
|
34
|
-
|
|
35
|
-
_defineProperty(this, "recordExecuteSucceededUseCase", void 0);
|
|
36
|
-
|
|
37
|
-
_defineProperty(this, "recordSuccessCallbackUseCase", void 0);
|
|
38
|
-
|
|
39
|
-
_defineProperty(this, "recordExecuteFailedUseCase", void 0);
|
|
40
|
-
|
|
41
|
-
_defineProperty(this, "sortUseCase", void 0);
|
|
42
|
-
|
|
43
|
-
_defineProperty(this, "recordUpdateUseCase", void 0);
|
|
44
|
-
|
|
45
|
-
_defineProperty(this, "updateSuccessUseCase", void 0);
|
|
46
|
-
|
|
47
|
-
_defineProperty(this, "deleteSuccessUseCase", void 0);
|
|
48
|
-
|
|
49
|
-
_defineProperty(this, "reOrderUseCase", void 0);
|
|
50
|
-
|
|
51
|
-
_defineProperty(this, "reOrderFailedUseCase", void 0);
|
|
52
|
-
|
|
53
20
|
this.initializeUseCase = new InitializeUseCase(this.dependencies);
|
|
54
21
|
this.propertiesChangeUseCase = new PropertiesChangeUseCase(this.dependencies);
|
|
55
22
|
this.fetchMoreUseCase = new FetchMoreUseCase(this.dependencies);
|
|
@@ -1,12 +1,4 @@
|
|
|
1
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
2
|
-
|
|
3
1
|
class Presenter {
|
|
4
|
-
constructor() {
|
|
5
|
-
_defineProperty(this, "updateState", void 0);
|
|
6
|
-
|
|
7
|
-
_defineProperty(this, "state", void 0);
|
|
8
|
-
}
|
|
9
|
-
|
|
10
2
|
updateDependencies(state, updateState) {
|
|
11
3
|
this.updateState = updateState;
|
|
12
4
|
this.state = state;
|
|
@@ -52,8 +52,6 @@ function generateClientActions(selectionConfig, columnChooserConfig, hasAllSelec
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
function getColumnChooserProps(columnChooser) {
|
|
55
|
-
var _context$modules, _context$modules$find;
|
|
56
|
-
|
|
57
55
|
let availableFields = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
|
|
58
56
|
let context = arguments.length > 2 ? arguments[2] : undefined;
|
|
59
57
|
let moduleName = arguments.length > 3 ? arguments[3] : undefined;
|
|
@@ -64,7 +62,7 @@ function getColumnChooserProps(columnChooser) {
|
|
|
64
62
|
isMaxSelectionReached
|
|
65
63
|
} = columnChooser;
|
|
66
64
|
const fieldMap = mapFieldsToObject(availableFields);
|
|
67
|
-
const disabledFieldName =
|
|
65
|
+
const disabledFieldName = context.modules?.find(module => module.apiKey === moduleName)?.nameField;
|
|
68
66
|
const columnChooserOptions = fieldsOrder.map(fieldName => getOption(fieldMap[fieldName], !!selected[fieldName], disabledFieldName === fieldName));
|
|
69
67
|
return {
|
|
70
68
|
options: columnChooserOptions,
|
|
@@ -18,8 +18,6 @@ const fallbackToDefault = (value, defaultValue) => [undefined, null].includes(va
|
|
|
18
18
|
|
|
19
19
|
export default class TableTranslator {
|
|
20
20
|
static transformState(state) {
|
|
21
|
-
var _preferences$rowActio, _localStorageBehaviou, _localStorageBehaviou2;
|
|
22
|
-
|
|
23
21
|
const {
|
|
24
22
|
behaviours,
|
|
25
23
|
properties
|
|
@@ -82,7 +80,7 @@ export default class TableTranslator {
|
|
|
82
80
|
} = fallbackToDefault(zfield, {}); // FIX: zfield should be available by default
|
|
83
81
|
|
|
84
82
|
const isLoading = !!(isRecordsFetching || isAvailableFieldsFetching || isSelectedFieldsFetching);
|
|
85
|
-
const fields = selectedFields
|
|
83
|
+
const fields = selectedFields?.map(selectedField => availableFields?.find(availableField => availableField.name === selectedField)).filter(f => f != undefined);
|
|
86
84
|
const newClientActions = DefaultClientActions.createSortActions(fields, clientActions || EMPTY_ARRAY);
|
|
87
85
|
const {
|
|
88
86
|
headerActions,
|
|
@@ -92,13 +90,13 @@ export default class TableTranslator {
|
|
|
92
90
|
} = mapClientActions(newClientActions || EMPTY_ARRAY);
|
|
93
91
|
const isRowClickable = noLocation.some(action => action.uiComponentMapping.eventMappings.some(mapping => mapping.sourceEvent === TableListConstants.TABLE_LIST_ROW_CLICKED));
|
|
94
92
|
const rowCursor = isRowClickable ? RowCursor.Pointer : RowCursor.Default;
|
|
95
|
-
const rowActionsWidth = preferences
|
|
93
|
+
const rowActionsWidth = preferences?.rowActions?.width;
|
|
96
94
|
const {
|
|
97
95
|
moduleName,
|
|
98
96
|
viewId
|
|
99
97
|
} = properties; // TODO: move this to a separate file as selector
|
|
100
98
|
|
|
101
|
-
const localStorageFieldWidths = fallbackToDefault(localStorageBehaviour
|
|
99
|
+
const localStorageFieldWidths = fallbackToDefault(localStorageBehaviour?.[moduleName]?.[viewId]?.modifiedWidths, EMPTY_OBJECT);
|
|
102
100
|
const modifiedWidths = calculateFieldWidths(fields, localStorageFieldWidths, preferences);
|
|
103
101
|
const recordsForDisplay = isRecordsShouldBeEmptied ? EMPTY_ARRAY : records;
|
|
104
102
|
const headersTranslator = new HeadersTranslator(fields, headerActions, context, modifiedWidths, sortBy, records);
|
|
@@ -125,7 +123,7 @@ export default class TableTranslator {
|
|
|
125
123
|
modifiedWidths
|
|
126
124
|
}),
|
|
127
125
|
rowActionsConfig: {
|
|
128
|
-
hasActions: Boolean(rowActions
|
|
126
|
+
hasActions: Boolean(rowActions?.length),
|
|
129
127
|
// Boolean(newRowActions?.length),
|
|
130
128
|
columnWidth: typeof rowActionsWidth === 'number' ? rowActionsWidth : ColumnWidth.XSmall
|
|
131
129
|
},
|
|
@@ -4,8 +4,6 @@ import ClientActionsTranslator from "../../../../client-actions/translators/clie
|
|
|
4
4
|
|
|
5
5
|
//hacking temp url construction for lookup
|
|
6
6
|
function getLookupUrlConstructions(_ref) {
|
|
7
|
-
var _field$lookup, _field$lookup$module;
|
|
8
|
-
|
|
9
7
|
let {
|
|
10
8
|
field,
|
|
11
9
|
value,
|
|
@@ -15,13 +13,11 @@ function getLookupUrlConstructions(_ref) {
|
|
|
15
13
|
orgName,
|
|
16
14
|
departmentName
|
|
17
15
|
} = context;
|
|
18
|
-
let lookupModuleName = field
|
|
16
|
+
let lookupModuleName = field?.lookup?.module?.apiName;
|
|
19
17
|
return `/agent/${orgName}/${departmentName}/${lookupModuleName}/details/${value.id}`;
|
|
20
18
|
}
|
|
21
19
|
|
|
22
20
|
function ColumnTranslator(field, record, fieldComponentMapping, fieldActions, context) {
|
|
23
|
-
var _record$cf;
|
|
24
|
-
|
|
25
21
|
const {
|
|
26
22
|
isCustomField,
|
|
27
23
|
name,
|
|
@@ -35,7 +31,7 @@ function ColumnTranslator(field, record, fieldComponentMapping, fieldActions, co
|
|
|
35
31
|
}
|
|
36
32
|
|
|
37
33
|
let tempValue = undefined;
|
|
38
|
-
let value = isCustomField ?
|
|
34
|
+
let value = isCustomField ? record.cf?.[name] : record[name];
|
|
39
35
|
const actions = ClientActionsTranslator.transform(fieldActions, {
|
|
40
36
|
field,
|
|
41
37
|
record
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
2
|
-
|
|
3
1
|
import ClientActionsTranslator from "../../../../../client-actions/translators/client-actions-translator";
|
|
4
2
|
|
|
5
3
|
class ActionsTranslator {
|
|
@@ -11,20 +9,11 @@ class ActionsTranslator {
|
|
|
11
9
|
this.records = records;
|
|
12
10
|
this.fields = fields;
|
|
13
11
|
this.context = context;
|
|
14
|
-
|
|
15
|
-
_defineProperty(this, "headerActions", void 0);
|
|
16
|
-
|
|
17
|
-
_defineProperty(this, "fieldActions", void 0);
|
|
18
|
-
|
|
19
|
-
_defineProperty(this, "rowActions", void 0);
|
|
20
|
-
|
|
21
|
-
_defineProperty(this, "noLocation", void 0);
|
|
22
|
-
|
|
23
12
|
this.pipe = this.pipe.bind(this);
|
|
24
|
-
this.headerActions = actions.filter(action =>
|
|
25
|
-
this.fieldActions = actions.filter(action =>
|
|
26
|
-
this.rowActions = actions.filter(action =>
|
|
27
|
-
this.noLocation = actions.filter(action => !
|
|
13
|
+
this.headerActions = actions.filter(action => action?.location === 'header_actions');
|
|
14
|
+
this.fieldActions = actions.filter(action => action?.location === 'field_actions');
|
|
15
|
+
this.rowActions = actions.filter(action => action?.location === 'row_actions');
|
|
16
|
+
this.noLocation = actions.filter(action => !action?.location);
|
|
28
17
|
}
|
|
29
18
|
|
|
30
19
|
getTranslator() {
|
|
@@ -7,13 +7,11 @@ export function calculateFieldWidths(fields, modifiedFieldWidths, preferences) {
|
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
function decideWidth(width, fieldName, type) {
|
|
10
|
-
var _preferences$fields, _preferences$fields$f;
|
|
11
|
-
|
|
12
10
|
if (width !== undefined && width !== null) {
|
|
13
11
|
return width;
|
|
14
12
|
}
|
|
15
13
|
|
|
16
|
-
const initialWidth =
|
|
14
|
+
const initialWidth = preferences.fields?.[fieldName]?.initialWidth;
|
|
17
15
|
|
|
18
16
|
if (initialWidth !== undefined && initialWidth !== null) {
|
|
19
17
|
return initialWidth;
|
|
@@ -3,8 +3,6 @@ import AbstractUseCase from "./AbstractUseCase";
|
|
|
3
3
|
|
|
4
4
|
class DeleteMultipleRecordUseCase extends AbstractUseCase {
|
|
5
5
|
execute(input) {
|
|
6
|
-
var _input$callback;
|
|
7
|
-
|
|
8
6
|
const {
|
|
9
7
|
dispatch,
|
|
10
8
|
recordIds
|
|
@@ -26,7 +24,7 @@ class DeleteMultipleRecordUseCase extends AbstractUseCase {
|
|
|
26
24
|
});
|
|
27
25
|
}
|
|
28
26
|
|
|
29
|
-
|
|
27
|
+
input.callback?.({
|
|
30
28
|
data: recordIds.map(id => ({
|
|
31
29
|
id,
|
|
32
30
|
Success: true,
|
|
@@ -2,8 +2,6 @@ import AbstractUseCase from "./AbstractUseCase";
|
|
|
2
2
|
|
|
3
3
|
class DeleteSingleRecordUseCase extends AbstractUseCase {
|
|
4
4
|
execute(input) {
|
|
5
|
-
var _input$callback;
|
|
6
|
-
|
|
7
5
|
const {
|
|
8
6
|
dispatch,
|
|
9
7
|
recordId
|
|
@@ -14,7 +12,7 @@ class DeleteSingleRecordUseCase extends AbstractUseCase {
|
|
|
14
12
|
const list = repository.getList();
|
|
15
13
|
const action = list.getDeleteSingleRecordAction(recordId);
|
|
16
14
|
dispatch(action);
|
|
17
|
-
|
|
15
|
+
input.callback?.({
|
|
18
16
|
data: [{
|
|
19
17
|
id: recordId,
|
|
20
18
|
Success: true,
|
|
@@ -10,7 +10,7 @@ class GetContextUseCase extends AbstractUseCase {
|
|
|
10
10
|
repository
|
|
11
11
|
} = this.dependencies;
|
|
12
12
|
const list = repository.getList();
|
|
13
|
-
callback
|
|
13
|
+
callback?.(list.getContext(variableName));
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
}
|
|
@@ -3,8 +3,6 @@ import AbstractUseCase from "./AbstractUseCase";
|
|
|
3
3
|
|
|
4
4
|
class RecordSuccessCallbackUsecase extends AbstractUseCase {
|
|
5
5
|
execute(_ref) {
|
|
6
|
-
var _metaData$sourceMetaD;
|
|
7
|
-
|
|
8
6
|
let {
|
|
9
7
|
dispatch,
|
|
10
8
|
payload,
|
|
@@ -16,7 +14,7 @@ class RecordSuccessCallbackUsecase extends AbstractUseCase {
|
|
|
16
14
|
} = this.dependencies;
|
|
17
15
|
const list = repository.getList();
|
|
18
16
|
|
|
19
|
-
if (
|
|
17
|
+
if (metaData.sourceMetaData?.isReOrder) {
|
|
20
18
|
list.reOrderEnded();
|
|
21
19
|
presenter.updateView(list.toObject()); // convert to separate use-case
|
|
22
20
|
|
|
@@ -2,8 +2,6 @@ import AbstractUseCase from "./AbstractUseCase";
|
|
|
2
2
|
|
|
3
3
|
class RecordUpdateUseCase extends AbstractUseCase {
|
|
4
4
|
execute(input) {
|
|
5
|
-
var _input$callback;
|
|
6
|
-
|
|
7
5
|
const {
|
|
8
6
|
dispatch,
|
|
9
7
|
recordId,
|
|
@@ -15,7 +13,7 @@ class RecordUpdateUseCase extends AbstractUseCase {
|
|
|
15
13
|
const list = repository.getList();
|
|
16
14
|
const action = list.getUpdateRecordFetchActions(recordId, record);
|
|
17
15
|
dispatch(action);
|
|
18
|
-
|
|
16
|
+
input.callback?.({
|
|
19
17
|
data: [{
|
|
20
18
|
id: recordId,
|
|
21
19
|
Success: true,
|
|
@@ -4,8 +4,6 @@ import { ZLIST_RECORD_UPDATE } from "../../../../bc/zlist/Constants";
|
|
|
4
4
|
|
|
5
5
|
class UpdateMultipleRecordUseCase extends AbstractUseCase {
|
|
6
6
|
execute(input) {
|
|
7
|
-
var _input$callback;
|
|
8
|
-
|
|
9
7
|
const {
|
|
10
8
|
dispatch,
|
|
11
9
|
recordsMap,
|
|
@@ -20,7 +18,7 @@ class UpdateMultipleRecordUseCase extends AbstractUseCase {
|
|
|
20
18
|
}
|
|
21
19
|
});
|
|
22
20
|
});
|
|
23
|
-
|
|
21
|
+
input.callback?.({
|
|
24
22
|
results: recordsMap.map(record => ({
|
|
25
23
|
id: record.id,
|
|
26
24
|
Success: true,
|
|
@@ -56,7 +56,7 @@ class List {
|
|
|
56
56
|
moduleName: query.moduleName
|
|
57
57
|
};
|
|
58
58
|
delete computedContext['servicePrefix'];
|
|
59
|
-
return variableName ? computedContext
|
|
59
|
+
return variableName ? computedContext?.[variableName] : computedContext;
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
createApiProps() {
|
|
@@ -248,10 +248,11 @@ class List {
|
|
|
248
248
|
|
|
249
249
|
getDeleteMultipleRecordAction(recordIds) {
|
|
250
250
|
const props = this.createApiProps();
|
|
251
|
+
const hasRecycleBin = Array.isArray(this.context.modules) && this.context.modules.some(module => module.hasRecycleBin === true);
|
|
251
252
|
return {
|
|
252
253
|
type: RECORD_EXECUTE,
|
|
253
254
|
payload: {
|
|
254
|
-
actionName: RecordApiActionName.DELETE_RECORDS,
|
|
255
|
+
actionName: hasRecycleBin ? RecordApiActionName.MOVE_TO_TRASH : RecordApiActionName.DELETE_RECORDS,
|
|
255
256
|
props: { ...props,
|
|
256
257
|
recordIds
|
|
257
258
|
},
|
|
@@ -1,29 +1,26 @@
|
|
|
1
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
2
|
-
|
|
3
1
|
export default class AppendRecordsController {
|
|
4
2
|
constructor(service) {
|
|
5
3
|
this.service = service;
|
|
6
|
-
|
|
7
|
-
_defineProperty(this, "handle", event => {
|
|
8
|
-
const {
|
|
9
|
-
state,
|
|
10
|
-
updateState,
|
|
11
|
-
action
|
|
12
|
-
} = event;
|
|
13
|
-
const {
|
|
14
|
-
payload
|
|
15
|
-
} = action;
|
|
16
|
-
const {
|
|
17
|
-
records
|
|
18
|
-
} = payload;
|
|
19
|
-
const {
|
|
20
|
-
appendRecordsUseCase
|
|
21
|
-
} = this.service;
|
|
22
|
-
appendRecordsUseCase.updateDependency(state, updateState);
|
|
23
|
-
appendRecordsUseCase.execute({
|
|
24
|
-
records
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
4
|
}
|
|
28
5
|
|
|
6
|
+
handle = event => {
|
|
7
|
+
const {
|
|
8
|
+
state,
|
|
9
|
+
updateState,
|
|
10
|
+
action
|
|
11
|
+
} = event;
|
|
12
|
+
const {
|
|
13
|
+
payload
|
|
14
|
+
} = action;
|
|
15
|
+
const {
|
|
16
|
+
records
|
|
17
|
+
} = payload;
|
|
18
|
+
const {
|
|
19
|
+
appendRecordsUseCase
|
|
20
|
+
} = this.service;
|
|
21
|
+
appendRecordsUseCase.updateDependency(state, updateState);
|
|
22
|
+
appendRecordsUseCase.execute({
|
|
23
|
+
records
|
|
24
|
+
});
|
|
25
|
+
};
|
|
29
26
|
}
|
|
@@ -1,29 +1,26 @@
|
|
|
1
|
-
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
2
|
-
|
|
3
1
|
export default class DeleteMultipleRecordLocalController {
|
|
4
2
|
constructor(service) {
|
|
5
3
|
this.service = service;
|
|
6
|
-
|
|
7
|
-
_defineProperty(this, "handle", event => {
|
|
8
|
-
const {
|
|
9
|
-
state,
|
|
10
|
-
updateState,
|
|
11
|
-
action
|
|
12
|
-
} = event;
|
|
13
|
-
const {
|
|
14
|
-
payload
|
|
15
|
-
} = action;
|
|
16
|
-
const {
|
|
17
|
-
recordIds
|
|
18
|
-
} = payload;
|
|
19
|
-
const {
|
|
20
|
-
deleteMultipleRecordUseCase
|
|
21
|
-
} = this.service;
|
|
22
|
-
deleteMultipleRecordUseCase.updateDependency(state, updateState);
|
|
23
|
-
deleteMultipleRecordUseCase.execute({
|
|
24
|
-
recordIds
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
4
|
}
|
|
28
5
|
|
|
6
|
+
handle = event => {
|
|
7
|
+
const {
|
|
8
|
+
state,
|
|
9
|
+
updateState,
|
|
10
|
+
action
|
|
11
|
+
} = event;
|
|
12
|
+
const {
|
|
13
|
+
payload
|
|
14
|
+
} = action;
|
|
15
|
+
const {
|
|
16
|
+
recordIds
|
|
17
|
+
} = payload;
|
|
18
|
+
const {
|
|
19
|
+
deleteMultipleRecordUseCase
|
|
20
|
+
} = this.service;
|
|
21
|
+
deleteMultipleRecordUseCase.updateDependency(state, updateState);
|
|
22
|
+
deleteMultipleRecordUseCase.execute({
|
|
23
|
+
recordIds
|
|
24
|
+
});
|
|
25
|
+
};
|
|
29
26
|
}
|