@sapui5/sap.fe.core 1.102.2 → 1.104.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/package.json +6 -6
- package/src/sap/fe/core/.library +1 -1
- package/src/sap/fe/core/AppComponent.js +73 -30
- package/src/sap/fe/core/AppComponent.ts +65 -43
- package/src/sap/fe/core/AppStateHandler.js +82 -70
- package/src/sap/fe/core/AppStateHandler.ts +32 -37
- package/src/sap/fe/core/BaseController.js +11 -9
- package/src/sap/fe/core/BaseController.ts +15 -13
- package/src/sap/fe/core/CommonUtils.js +227 -126
- package/src/sap/fe/core/CommonUtils.ts +240 -163
- package/src/sap/fe/core/ExtensionAPI.js +24 -27
- package/src/sap/fe/core/ExtensionAPI.ts +36 -38
- package/src/sap/fe/core/PageController.js +4 -4
- package/src/sap/fe/core/PageController.ts +4 -5
- package/src/sap/fe/core/TemplateComponent.js +1 -1
- package/src/sap/fe/core/TemplateComponent.ts +6 -6
- package/src/sap/fe/core/TemplateModel.js +1 -1
- package/src/sap/fe/core/TemplateModel.ts +1 -1
- package/src/sap/fe/core/buildingBlocks/AttributeModel.js +1 -1
- package/src/sap/fe/core/buildingBlocks/AttributeModel.ts +1 -1
- package/src/sap/fe/core/buildingBlocks/BuildingBlock.js +181 -43
- package/src/sap/fe/core/buildingBlocks/BuildingBlock.ts +150 -24
- package/src/sap/fe/core/buildingBlocks/BuildingBlockRuntime.js +585 -210
- package/src/sap/fe/core/buildingBlocks/BuildingBlockRuntime.ts +246 -96
- package/src/sap/fe/core/buildingBlocks/TraceInfo.js +30 -30
- package/src/sap/fe/core/buildingBlocks/TraceInfo.ts +32 -29
- package/src/sap/fe/core/controllerextensions/EditFlow.js +379 -330
- package/src/sap/fe/core/controllerextensions/EditFlow.ts +253 -245
- package/src/sap/fe/core/controllerextensions/IntentBasedNavigation.js +9 -9
- package/src/sap/fe/core/controllerextensions/IntentBasedNavigation.ts +10 -10
- package/src/sap/fe/core/controllerextensions/InternalEditFlow.js +101 -74
- package/src/sap/fe/core/controllerextensions/InternalEditFlow.ts +69 -79
- package/src/sap/fe/core/controllerextensions/InternalIntentBasedNavigation.js +67 -67
- package/src/sap/fe/core/controllerextensions/InternalIntentBasedNavigation.ts +76 -76
- package/src/sap/fe/core/controllerextensions/InternalRouting.js +85 -77
- package/src/sap/fe/core/controllerextensions/InternalRouting.ts +103 -99
- package/src/sap/fe/core/controllerextensions/KPIManagement.js +66 -68
- package/src/sap/fe/core/controllerextensions/KPIManagement.ts +106 -123
- package/src/sap/fe/core/controllerextensions/MassEdit.js +9 -9
- package/src/sap/fe/core/controllerextensions/MassEdit.ts +20 -27
- package/src/sap/fe/core/controllerextensions/MessageHandler.js +20 -12
- package/src/sap/fe/core/controllerextensions/MessageHandler.ts +21 -14
- package/src/sap/fe/core/controllerextensions/PageReady.js +97 -25
- package/src/sap/fe/core/controllerextensions/PageReady.ts +98 -34
- package/src/sap/fe/core/controllerextensions/Paginator.js +21 -22
- package/src/sap/fe/core/controllerextensions/Paginator.ts +24 -25
- package/src/sap/fe/core/controllerextensions/Placeholder.js +4 -6
- package/src/sap/fe/core/controllerextensions/Placeholder.ts +12 -14
- package/src/sap/fe/core/controllerextensions/Routing.js +10 -11
- package/src/sap/fe/core/controllerextensions/Routing.ts +12 -13
- package/src/sap/fe/core/controllerextensions/Share.js +170 -139
- package/src/sap/fe/core/controllerextensions/Share.ts +117 -118
- package/src/sap/fe/core/controllerextensions/SideEffects.js +46 -50
- package/src/sap/fe/core/controllerextensions/SideEffects.ts +56 -60
- package/src/sap/fe/core/controllerextensions/ViewState.js +200 -131
- package/src/sap/fe/core/controllerextensions/ViewState.ts +141 -148
- package/src/sap/fe/core/controllerextensions/collaboration/ActivityBase.js +5 -5
- package/src/sap/fe/core/controllerextensions/collaboration/ActivityBase.ts +8 -7
- package/src/sap/fe/core/controllerextensions/collaboration/ActivitySync.js +11 -10
- package/src/sap/fe/core/controllerextensions/collaboration/ActivitySync.ts +17 -20
- package/src/sap/fe/core/controllerextensions/collaboration/CollaborationCommon.js +2 -2
- package/src/sap/fe/core/controllerextensions/collaboration/CollaborationCommon.ts +4 -4
- package/src/sap/fe/core/controllerextensions/collaboration/Manage.js +7 -9
- package/src/sap/fe/core/controllerextensions/collaboration/Manage.ts +18 -19
- package/src/sap/fe/core/controllerextensions/editFlow/TransactionHelper.js +190 -141
- package/src/sap/fe/core/controllerextensions/editFlow/TransactionHelper.ts +258 -210
- package/src/sap/fe/core/controllerextensions/editFlow/draft.js +183 -125
- package/src/sap/fe/core/controllerextensions/editFlow/draft.ts +213 -156
- package/src/sap/fe/core/controllerextensions/editFlow/operations.js +164 -140
- package/src/sap/fe/core/controllerextensions/editFlow/operations.ts +180 -150
- package/src/sap/fe/core/controllerextensions/editFlow/sticky.js +24 -26
- package/src/sap/fe/core/controllerextensions/editFlow/sticky.ts +35 -33
- package/src/sap/fe/core/controllerextensions/messageHandler/messageHandling.js +71 -41
- package/src/sap/fe/core/controllerextensions/messageHandler/messageHandling.ts +102 -82
- package/src/sap/fe/core/controllerextensions/routing/RouterProxy.js +61 -71
- package/src/sap/fe/core/controllerextensions/routing/RouterProxy.ts +56 -64
- package/src/sap/fe/core/controls/Any.js +9 -5
- package/src/sap/fe/core/controls/Any.ts +10 -4
- package/src/sap/fe/core/controls/CommandExecution.js +11 -25
- package/src/sap/fe/core/controls/CommandExecution.ts +11 -25
- package/src/sap/fe/core/controls/ConditionalWrapper.js +2 -2
- package/src/sap/fe/core/controls/ConditionalWrapper.ts +3 -3
- package/src/sap/fe/core/controls/CustomFilterFieldContentWrapper.js +22 -22
- package/src/sap/fe/core/controls/CustomFilterFieldContentWrapper.ts +25 -24
- package/src/sap/fe/core/controls/CustomQuickViewPage.js +2 -2
- package/src/sap/fe/core/controls/CustomQuickViewPage.ts +2 -2
- package/src/sap/fe/core/controls/DataLossOrDraftDiscard/DataLossOrDraftDiscardHandler.js +3 -3
- package/src/sap/fe/core/controls/DataLossOrDraftDiscard/DataLossOrDraftDiscardHandler.ts +5 -5
- package/src/sap/fe/core/controls/FieldWrapper.js +2 -2
- package/src/sap/fe/core/controls/FieldWrapper.ts +3 -3
- package/src/sap/fe/core/controls/FileWrapper.js +7 -2
- package/src/sap/fe/core/controls/FileWrapper.ts +15 -11
- package/src/sap/fe/core/controls/FilterBar.js +6 -2
- package/src/sap/fe/core/controls/FilterBar.ts +13 -9
- package/src/sap/fe/core/controls/FormElementWrapper.js +1 -1
- package/src/sap/fe/core/controls/FormElementWrapper.ts +2 -2
- package/src/sap/fe/core/controls/MassEditSelect.js +1 -1
- package/src/sap/fe/core/controls/MassEditSelect.ts +0 -4
- package/src/sap/fe/core/controls/NonComputedVisibleKeyFieldsDialog.fragment.xml +3 -3
- package/src/sap/fe/core/controls/filterbar/VisualFilter.js +16 -12
- package/src/sap/fe/core/controls/filterbar/VisualFilter.ts +20 -22
- package/src/sap/fe/core/controls/filterbar/VisualFilterContainer.js +3 -3
- package/src/sap/fe/core/controls/filterbar/VisualFilterContainer.ts +8 -8
- package/src/sap/fe/core/controls/filterbar/utils/VisualFilterUtils.js +49 -49
- package/src/sap/fe/core/controls/filterbar/utils/VisualFilterUtils.ts +54 -54
- package/src/sap/fe/core/controls/massEdit/MassEditDialog.fragment.xml +8 -2
- package/src/sap/fe/core/controls/massEdit/MassEditField.fragment.xml +22 -35
- package/src/sap/fe/core/controls/massEdit/MassEditHandlers.js +89 -88
- package/src/sap/fe/core/controls/massEdit/MassEditHandlers.ts +107 -106
- package/src/sap/fe/core/converters/ConverterContext.js +26 -33
- package/src/sap/fe/core/converters/ConverterContext.ts +52 -61
- package/src/sap/fe/core/converters/ManifestSettings.js +1 -1
- package/src/sap/fe/core/converters/ManifestSettings.ts +17 -15
- package/src/sap/fe/core/converters/ManifestWrapper.js +59 -45
- package/src/sap/fe/core/converters/ManifestWrapper.ts +55 -45
- package/src/sap/fe/core/converters/MetaModelConverter.js +64 -35
- package/src/sap/fe/core/converters/MetaModelConverter.ts +154 -129
- package/src/sap/fe/core/converters/TemplateConverter.js +21 -20
- package/src/sap/fe/core/converters/TemplateConverter.ts +27 -24
- package/src/sap/fe/core/converters/annotations/DataField.js +58 -35
- package/src/sap/fe/core/converters/annotations/DataField.ts +102 -76
- package/src/sap/fe/core/converters/common/AnnotationConverter.js +1911 -1495
- package/src/sap/fe/core/converters/controls/Common/Action.js +50 -41
- package/src/sap/fe/core/converters/controls/Common/Action.ts +56 -46
- package/src/sap/fe/core/converters/controls/Common/Chart.js +14 -14
- package/src/sap/fe/core/converters/controls/Common/Chart.ts +26 -33
- package/src/sap/fe/core/converters/controls/Common/Criticality.js +3 -3
- package/src/sap/fe/core/converters/controls/Common/Criticality.ts +4 -4
- package/src/sap/fe/core/converters/controls/Common/DataVisualization.js +30 -28
- package/src/sap/fe/core/converters/controls/Common/DataVisualization.ts +60 -61
- package/src/sap/fe/core/converters/controls/Common/Form.js +27 -28
- package/src/sap/fe/core/converters/controls/Common/Form.ts +44 -57
- package/src/sap/fe/core/converters/controls/Common/KPI.js +11 -11
- package/src/sap/fe/core/converters/controls/Common/KPI.ts +49 -52
- package/src/sap/fe/core/converters/controls/Common/Table.js +181 -197
- package/src/sap/fe/core/converters/controls/Common/Table.ts +251 -280
- package/src/sap/fe/core/converters/controls/Common/table/StandardActions.js +119 -119
- package/src/sap/fe/core/converters/controls/Common/table/StandardActions.ts +144 -141
- package/src/sap/fe/core/converters/controls/ListReport/FilterBar.js +45 -41
- package/src/sap/fe/core/converters/controls/ListReport/FilterBar.ts +65 -59
- package/src/sap/fe/core/converters/controls/ListReport/VisualFilters.js +28 -26
- package/src/sap/fe/core/converters/controls/ListReport/VisualFilters.ts +46 -43
- package/src/sap/fe/core/converters/controls/ObjectPage/Avatar.js +9 -9
- package/src/sap/fe/core/converters/controls/ObjectPage/Avatar.ts +14 -13
- package/src/sap/fe/core/converters/controls/ObjectPage/HeaderFacet.js +67 -64
- package/src/sap/fe/core/converters/controls/ObjectPage/HeaderFacet.ts +69 -66
- package/src/sap/fe/core/converters/controls/ObjectPage/SubSection.js +77 -73
- package/src/sap/fe/core/converters/controls/ObjectPage/SubSection.ts +101 -97
- package/src/sap/fe/core/converters/helpers/Aggregation.js +2 -4
- package/src/sap/fe/core/converters/helpers/Aggregation.ts +12 -15
- package/src/sap/fe/core/converters/helpers/BindingHelper.js +31 -31
- package/src/sap/fe/core/converters/helpers/BindingHelper.ts +30 -29
- package/src/sap/fe/core/converters/helpers/ConfigurableObject.js +4 -4
- package/src/sap/fe/core/converters/helpers/ConfigurableObject.ts +9 -9
- package/src/sap/fe/core/converters/helpers/ID.js +48 -46
- package/src/sap/fe/core/converters/helpers/ID.ts +26 -25
- package/src/sap/fe/core/converters/helpers/Key.js +7 -7
- package/src/sap/fe/core/converters/helpers/Key.ts +7 -7
- package/src/sap/fe/core/converters/helpers/SelectionVariantHelper.js +1 -1
- package/src/sap/fe/core/converters/helpers/SelectionVariantHelper.ts +4 -5
- package/src/sap/fe/core/converters/objectPage/FormMenuActions.js +6 -6
- package/src/sap/fe/core/converters/objectPage/FormMenuActions.ts +10 -10
- package/src/sap/fe/core/converters/objectPage/HeaderAndFooterAction.js +46 -62
- package/src/sap/fe/core/converters/objectPage/HeaderAndFooterAction.ts +54 -82
- package/src/sap/fe/core/converters/templates/ListReportConverter.js +55 -42
- package/src/sap/fe/core/converters/templates/ListReportConverter.ts +81 -66
- package/src/sap/fe/core/converters/templates/ObjectPageConverter.js +39 -38
- package/src/sap/fe/core/converters/templates/ObjectPageConverter.ts +52 -61
- package/src/sap/fe/core/designtime/AppComponent.designtime.js +4 -4
- package/src/sap/fe/core/designtime/AppComponent.designtime.ts +4 -4
- package/src/sap/fe/core/formatters/CollaborationFormatter.js +2 -2
- package/src/sap/fe/core/formatters/CollaborationFormatter.ts +3 -3
- package/src/sap/fe/core/formatters/FPMFormatter.js +5 -5
- package/src/sap/fe/core/formatters/FPMFormatter.ts +10 -10
- package/src/sap/fe/core/formatters/KPIFormatter.js +7 -7
- package/src/sap/fe/core/formatters/KPIFormatter.ts +10 -10
- package/src/sap/fe/core/formatters/StandardFormatter.js +96 -0
- package/src/sap/fe/core/formatters/StandardFormatter.ts +70 -0
- package/src/sap/fe/core/formatters/TableFormatter.js +11 -11
- package/src/sap/fe/core/formatters/TableFormatter.ts +12 -12
- package/src/sap/fe/core/formatters/ValueFormatter.js +8 -8
- package/src/sap/fe/core/formatters/ValueFormatter.ts +9 -9
- package/src/sap/fe/core/helpers/AppStartupHelper.js +15 -15
- package/src/sap/fe/core/helpers/AppStartupHelper.ts +37 -40
- package/src/sap/fe/core/helpers/BindingToolkit.js +1832 -0
- package/src/sap/fe/core/helpers/{BindingExpression.ts → BindingToolkit.ts} +396 -269
- package/src/sap/fe/core/helpers/ClassSupport.js +49 -12
- package/src/sap/fe/core/helpers/ClassSupport.ts +37 -10
- package/src/sap/fe/core/helpers/DynamicAnnotationPathHelper.js +2 -2
- package/src/sap/fe/core/helpers/DynamicAnnotationPathHelper.ts +1 -1
- package/src/sap/fe/core/helpers/EditState.js +1 -6
- package/src/sap/fe/core/helpers/EditState.ts +5 -10
- package/src/sap/fe/core/helpers/ExcelFormatHelper.js +2 -2
- package/src/sap/fe/core/helpers/ExcelFormatHelper.ts +4 -4
- package/src/sap/fe/core/helpers/FPMHelper.js +1 -1
- package/src/sap/fe/core/helpers/FPMHelper.ts +2 -2
- package/src/sap/fe/core/helpers/KeepAliveHelper.js +31 -31
- package/src/sap/fe/core/helpers/KeepAliveHelper.ts +52 -56
- package/src/sap/fe/core/helpers/MassEditHelper.js +306 -280
- package/src/sap/fe/core/helpers/MassEditHelper.ts +380 -360
- package/src/sap/fe/core/helpers/MessageStrip.js +81 -0
- package/src/sap/fe/core/helpers/MessageStrip.ts +79 -0
- package/src/sap/fe/core/helpers/ModelHelper.js +25 -25
- package/src/sap/fe/core/helpers/ModelHelper.ts +34 -32
- package/src/sap/fe/core/helpers/PasteHelper.js +3 -10
- package/src/sap/fe/core/helpers/PasteHelper.ts +20 -25
- package/src/sap/fe/core/helpers/SemanticDateOperators.js +1 -1
- package/src/sap/fe/core/helpers/SemanticDateOperators.ts +11 -11
- package/src/sap/fe/core/helpers/SemanticKeyHelper.js +3 -3
- package/src/sap/fe/core/helpers/SemanticKeyHelper.ts +8 -8
- package/src/sap/fe/core/helpers/StableIdHelper.js +12 -12
- package/src/sap/fe/core/helpers/StableIdHelper.ts +12 -12
- package/src/sap/fe/core/helpers/ToES6Promise.js +32 -0
- package/src/sap/fe/core/helpers/ToES6Promise.ts +19 -0
- package/src/sap/fe/core/jsx-runtime/Fragment.js +16 -0
- package/src/sap/fe/core/jsx-runtime/Fragment.ts +3 -0
- package/src/sap/fe/core/jsx-runtime/jsx-control.js +99 -0
- package/src/sap/fe/core/jsx-runtime/jsx-control.ts +82 -0
- package/src/sap/fe/core/jsx-runtime/jsx-xml.js +105 -0
- package/src/sap/fe/core/jsx-runtime/jsx-xml.ts +89 -0
- package/src/sap/fe/core/jsx-runtime/jsx.js +12 -90
- package/src/sap/fe/core/jsx-runtime/jsx.ts +24 -85
- package/src/sap/fe/core/library.js +42 -3
- package/src/sap/fe/core/library.ts +38 -0
- package/src/sap/fe/core/manifestMerger/ChangePageConfiguration.js +3 -3
- package/src/sap/fe/core/manifestMerger/ChangePageConfiguration.ts +2 -2
- package/src/sap/fe/core/messagebundle.properties +39 -63
- package/src/sap/fe/core/messagebundle_ar.properties +25 -39
- package/src/sap/fe/core/messagebundle_bg.properties +25 -39
- package/src/sap/fe/core/messagebundle_ca.properties +25 -39
- package/src/sap/fe/core/messagebundle_cs.properties +25 -39
- package/src/sap/fe/core/messagebundle_cy.properties +25 -39
- package/src/sap/fe/core/messagebundle_da.properties +25 -39
- package/src/sap/fe/core/messagebundle_de.properties +25 -39
- package/src/sap/fe/core/messagebundle_el.properties +26 -40
- package/src/sap/fe/core/messagebundle_en.properties +25 -39
- package/src/sap/fe/core/messagebundle_en_GB.properties +25 -39
- package/src/sap/fe/core/messagebundle_en_US_sappsd.properties +25 -39
- package/src/sap/fe/core/messagebundle_en_US_saprigi.properties +25 -39
- package/src/sap/fe/core/messagebundle_en_US_saptrc.properties +26 -18
- package/src/sap/fe/core/messagebundle_es.properties +27 -41
- package/src/sap/fe/core/messagebundle_es_MX.properties +25 -39
- package/src/sap/fe/core/messagebundle_et.properties +25 -39
- package/src/sap/fe/core/messagebundle_fi.properties +25 -39
- package/src/sap/fe/core/messagebundle_fr.properties +26 -40
- package/src/sap/fe/core/messagebundle_fr_CA.properties +25 -39
- package/src/sap/fe/core/messagebundle_hi.properties +25 -39
- package/src/sap/fe/core/messagebundle_hr.properties +25 -39
- package/src/sap/fe/core/messagebundle_hu.properties +25 -39
- package/src/sap/fe/core/messagebundle_id.properties +25 -39
- package/src/sap/fe/core/messagebundle_it.properties +41 -55
- package/src/sap/fe/core/messagebundle_iw.properties +25 -39
- package/src/sap/fe/core/messagebundle_ja.properties +25 -39
- package/src/sap/fe/core/messagebundle_kk.properties +25 -39
- package/src/sap/fe/core/messagebundle_ko.properties +30 -44
- package/src/sap/fe/core/messagebundle_lt.properties +25 -39
- package/src/sap/fe/core/messagebundle_lv.properties +25 -39
- package/src/sap/fe/core/messagebundle_ms.properties +25 -39
- package/src/sap/fe/core/messagebundle_nl.properties +27 -41
- package/src/sap/fe/core/messagebundle_no.properties +25 -39
- package/src/sap/fe/core/messagebundle_pl.properties +26 -40
- package/src/sap/fe/core/messagebundle_pt.properties +26 -40
- package/src/sap/fe/core/messagebundle_pt_PT.properties +25 -39
- package/src/sap/fe/core/messagebundle_ro.properties +25 -39
- package/src/sap/fe/core/messagebundle_ru.properties +25 -39
- package/src/sap/fe/core/messagebundle_sh.properties +25 -39
- package/src/sap/fe/core/messagebundle_sk.properties +25 -39
- package/src/sap/fe/core/messagebundle_sl.properties +25 -39
- package/src/sap/fe/core/messagebundle_sv.properties +25 -39
- package/src/sap/fe/core/messagebundle_th.properties +25 -39
- package/src/sap/fe/core/messagebundle_tr.properties +25 -39
- package/src/sap/fe/core/messagebundle_uk.properties +25 -39
- package/src/sap/fe/core/messagebundle_vi.properties +25 -39
- package/src/sap/fe/core/messagebundle_zh_CN.properties +25 -39
- package/src/sap/fe/core/messagebundle_zh_TW.properties +25 -39
- package/src/sap/fe/core/services/AsyncComponentServiceFactory.js +2 -2
- package/src/sap/fe/core/services/AsyncComponentServiceFactory.ts +5 -5
- package/src/sap/fe/core/services/CacheHandlerServiceFactory.js +97 -69
- package/src/sap/fe/core/services/CacheHandlerServiceFactory.ts +68 -69
- package/src/sap/fe/core/services/EnvironmentServiceFactory.js +1 -1
- package/src/sap/fe/core/services/EnvironmentServiceFactory.ts +3 -2
- package/src/sap/fe/core/services/NavigationServiceFactory.js +61 -49
- package/src/sap/fe/core/services/NavigationServiceFactory.ts +63 -52
- package/src/sap/fe/core/services/ResourceModelServiceFactory.js +2 -2
- package/src/sap/fe/core/services/ResourceModelServiceFactory.ts +4 -4
- package/src/sap/fe/core/services/RoutingServiceFactory.js +55 -55
- package/src/sap/fe/core/services/RoutingServiceFactory.ts +67 -65
- package/src/sap/fe/core/services/ShellServicesFactory.js +92 -76
- package/src/sap/fe/core/services/ShellServicesFactory.ts +95 -82
- package/src/sap/fe/core/services/SideEffectsServiceFactory.js +61 -61
- package/src/sap/fe/core/services/SideEffectsServiceFactory.ts +102 -92
- package/src/sap/fe/core/services/TemplatedViewServiceFactory.js +224 -198
- package/src/sap/fe/core/services/TemplatedViewServiceFactory.ts +138 -139
- package/src/sap/fe/core/support/CommonHelper.js +3 -2
- package/src/sap/fe/core/support/CommonHelper.ts +9 -13
- package/src/sap/fe/core/support/Diagnostics.js +1 -1
- package/src/sap/fe/core/support/Diagnostics.ts +5 -5
- package/src/sap/fe/core/templating/CommonFormatters.js +84 -0
- package/src/sap/fe/core/templating/CommonFormatters.ts +86 -0
- package/src/sap/fe/core/templating/CriticalityFormatters.js +31 -31
- package/src/sap/fe/core/templating/CriticalityFormatters.ts +42 -40
- package/src/sap/fe/core/templating/DataFieldFormatters.js +8 -8
- package/src/sap/fe/core/templating/DataFieldFormatters.ts +13 -10
- package/src/sap/fe/core/templating/DataModelPathHelper.js +16 -15
- package/src/sap/fe/core/templating/DataModelPathHelper.ts +42 -32
- package/src/sap/fe/core/templating/DisplayModeFormatter.js +1 -1
- package/src/sap/fe/core/templating/DisplayModeFormatter.ts +2 -3
- package/src/sap/fe/core/templating/EntitySetHelper.js +7 -7
- package/src/sap/fe/core/templating/EntitySetHelper.ts +6 -8
- package/src/sap/fe/core/templating/FieldControlHelper.js +35 -34
- package/src/sap/fe/core/templating/FieldControlHelper.ts +29 -46
- package/src/sap/fe/core/templating/FilterHelper.js +16 -15
- package/src/sap/fe/core/templating/FilterHelper.ts +18 -18
- package/src/sap/fe/core/templating/FilterTemplating.js +1 -1
- package/src/sap/fe/core/templating/FilterTemplating.ts +3 -3
- package/src/sap/fe/core/templating/PropertyFormatters.js +7 -7
- package/src/sap/fe/core/templating/PropertyFormatters.ts +21 -19
- package/src/sap/fe/core/templating/PropertyHelper.js +25 -25
- package/src/sap/fe/core/templating/PropertyHelper.ts +25 -26
- package/src/sap/fe/core/templating/UIFormatters.js +152 -95
- package/src/sap/fe/core/templating/UIFormatters.ts +202 -128
- package/src/sap/fe/core/type/Email.js +2 -2
- package/src/sap/fe/core/type/Email.ts +2 -2
- package/src/sap/fe/core/helpers/BindingExpression.js +0 -1732
|
@@ -2,11 +2,25 @@
|
|
|
2
2
|
* SAP UI development toolkit for HTML5 (SAPUI5)
|
|
3
3
|
* (c) Copyright 2009-2021 SAP SE. All rights reserved
|
|
4
4
|
*/
|
|
5
|
-
sap.ui.define(["sap/
|
|
5
|
+
sap.ui.define(["sap/base/strings/hash", "sap/ui/core/cache/CacheManager", "sap/ui/core/service/Service", "sap/ui/core/service/ServiceFactory"], function (hash, CacheManager, Service, ServiceFactory) {
|
|
6
6
|
"use strict";
|
|
7
7
|
|
|
8
8
|
var _exports = {};
|
|
9
9
|
|
|
10
|
+
function _catch(body, recover) {
|
|
11
|
+
try {
|
|
12
|
+
var result = body();
|
|
13
|
+
} catch (e) {
|
|
14
|
+
return recover(e);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
if (result && result.then) {
|
|
18
|
+
return result.then(void 0, recover);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
return result;
|
|
22
|
+
}
|
|
23
|
+
|
|
10
24
|
function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
|
|
11
25
|
|
|
12
26
|
function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
|
|
@@ -66,70 +80,84 @@ sap.ui.define(["sap/ui/core/service/Service", "sap/ui/core/service/ServiceFactor
|
|
|
66
80
|
};
|
|
67
81
|
|
|
68
82
|
_proto.validateCacheKey = function validateCacheKey(sCacheIdentifier) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
83
|
+
try {
|
|
84
|
+
var _this3 = this;
|
|
85
|
+
|
|
86
|
+
function _temp4() {
|
|
87
|
+
_this3.mCacheNeedsInvalidate[sCacheIdentifier] = bCacheNeedUpdate;
|
|
88
|
+
return sCacheKey;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
// Keep track if the cache will anyway need to be updated
|
|
92
|
+
var bCacheNeedUpdate = true;
|
|
93
|
+
var sCacheKey;
|
|
94
|
+
|
|
95
|
+
var _temp5 = _catch(function () {
|
|
96
|
+
return Promise.resolve(CacheManager.get(sCacheIdentifier)).then(function (mCacheOutput) {
|
|
97
|
+
// We provide a default key so that an xml view cache is written
|
|
98
|
+
var mMetaModelETags = _this3.getETags();
|
|
99
|
+
|
|
100
|
+
sCacheKey = JSON.stringify(mMetaModelETags); // Case #1a - No cache, so mCacheOuput is empty, cacheKey = current metamodel ETags
|
|
101
|
+
|
|
102
|
+
var _temp = function () {
|
|
103
|
+
if (mCacheOutput) {
|
|
104
|
+
// Case #2 - Cache entry found, check if it's still valid
|
|
105
|
+
var mUpdatedMetaModelETags = {};
|
|
106
|
+
var mCachedETags = JSON.parse(mCacheOutput.cachedETags);
|
|
107
|
+
return Promise.resolve(Promise.all(Object.keys(mCachedETags).map(function (sUrl) {
|
|
108
|
+
// Check validity of every single Url that's in the FE Cache object
|
|
109
|
+
if (mCachedETags[sUrl]) {
|
|
110
|
+
if (mMetaModelETags[sUrl]) {
|
|
111
|
+
// Case #2a - Same number of ETags in the cache and in the metadata
|
|
112
|
+
mUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];
|
|
113
|
+
return mCachedETags[sUrl] === mMetaModelETags[sUrl];
|
|
114
|
+
} else {
|
|
115
|
+
// Case #2b - No ETag in the cache for that URL, cachedETags was enhanced
|
|
116
|
+
return getMetadataETag(sUrl, mCachedETags[sUrl], mUpdatedMetaModelETags);
|
|
117
|
+
}
|
|
118
|
+
} else {
|
|
119
|
+
// Case #2z - Last Templating added an URL without ETag
|
|
120
|
+
mUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];
|
|
121
|
+
return mCachedETags[sUrl] === mMetaModelETags[sUrl];
|
|
122
|
+
}
|
|
123
|
+
}))).then(function (aValidETags) {
|
|
124
|
+
bCacheNeedUpdate = aValidETags.indexOf(false) >= 0; // Case #2a - Same number of ETags and all valid -> we return the viewCacheKey
|
|
125
|
+
// Case #2b - Different number of ETags and still all valid -> we return the viewCacheKey
|
|
126
|
+
// Case #2c - Same number of ETags but different values, main service Etag has changed, use that as cache key
|
|
127
|
+
// Case #2d - Different number of ETags but different value, main service Etag or linked service Etag has changed, new ETags should be used as cacheKey
|
|
128
|
+
// Case #2z - Cache has an invalid Etag - if there is an Etag provided from MetaModel use it as cacheKey
|
|
129
|
+
|
|
130
|
+
if (Object.keys(mUpdatedMetaModelETags).some(function (sUrl) {
|
|
131
|
+
return !mUpdatedMetaModelETags[sUrl];
|
|
132
|
+
})) {
|
|
133
|
+
// At least one of the MetaModel URLs doesn't provide an ETag, so no caching
|
|
134
|
+
sCacheKey = null;
|
|
135
|
+
} else {
|
|
136
|
+
sCacheKey = bCacheNeedUpdate ? JSON.stringify(mUpdatedMetaModelETags) : mCacheOutput.viewCacheKey;
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
} else if (Object.keys(mMetaModelETags).some(function (sUrl) {
|
|
140
|
+
return !mMetaModelETags[sUrl];
|
|
141
|
+
})) {
|
|
142
|
+
// Check if cache can be used (all the metadata and annotations have to provide at least a ETag or a Last-Modified header)
|
|
143
|
+
// Case #1-b - No Cache, mCacheOuput is empty, but metamodel etags cannot be used, so no caching
|
|
144
|
+
bCacheNeedUpdate = true;
|
|
145
|
+
sCacheKey = null;
|
|
93
146
|
}
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
return mCachedETags[sUrl] === mMetaModelETags[sUrl];
|
|
98
|
-
}
|
|
99
|
-
})).then(function (aValidETags) {
|
|
100
|
-
bCacheNeedUpdate = aValidETags.indexOf(false) >= 0; // Case #2a - Same number of ETags and all valid -> we return the viewCacheKey
|
|
101
|
-
// Case #2b - Different number of ETags and still all valid -> we return the viewCacheKey
|
|
102
|
-
// Case #2c - Same number of ETags but different values, main service Etag has changed, use that as cache key
|
|
103
|
-
// Case #2d - Different number of ETags but different value, main service Etag or linked service Etag has changed, new ETags should be used as cacheKey
|
|
104
|
-
// Case #2z - Cache has an invalid Etag - if there is an Etag provided from MetaModel use it as cacheKey
|
|
105
|
-
|
|
106
|
-
if (Object.keys(mUpdatedMetaModelETags).some(function (sUrl) {
|
|
107
|
-
return !mUpdatedMetaModelETags[sUrl];
|
|
108
|
-
})) {
|
|
109
|
-
// At least one of the MetaModel URLs doesn't provide an ETag, so no caching
|
|
110
|
-
return null;
|
|
111
|
-
} else {
|
|
112
|
-
return bCacheNeedUpdate ? JSON.stringify(mUpdatedMetaModelETags) : mCacheOutput.viewCacheKey;
|
|
113
|
-
}
|
|
147
|
+
}();
|
|
148
|
+
|
|
149
|
+
if (_temp && _temp.then) return _temp.then(function () {});
|
|
114
150
|
});
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
})) {
|
|
118
|
-
// Check if cache can be used (all the metadata and annotations have to provide at least a ETag or a Last-Modified header)
|
|
119
|
-
// Case #1-b - No Cache, mCacheOuput is empty, but metamodel etags cannot be used, so no caching
|
|
151
|
+
}, function () {
|
|
152
|
+
// Don't use view cache in case of issues with the LRU cache
|
|
120
153
|
bCacheNeedUpdate = true;
|
|
121
|
-
|
|
122
|
-
}
|
|
154
|
+
sCacheKey = null;
|
|
155
|
+
});
|
|
123
156
|
|
|
124
|
-
return
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
return null;
|
|
129
|
-
}).then(function (sCacheKey) {
|
|
130
|
-
_this2.mCacheNeedsInvalidate[sCacheIdentifier] = bCacheNeedUpdate;
|
|
131
|
-
return sCacheKey;
|
|
132
|
-
});
|
|
157
|
+
return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp4) : _temp4(_temp5));
|
|
158
|
+
} catch (e) {
|
|
159
|
+
return Promise.reject(e);
|
|
160
|
+
}
|
|
133
161
|
};
|
|
134
162
|
|
|
135
163
|
_proto.invalidateIfNeeded = function invalidateIfNeeded(sCacheKeys, sCacheIdentifier) {
|
|
@@ -181,21 +209,21 @@ sap.ui.define(["sap/ui/core/service/Service", "sap/ui/core/service/ServiceFactor
|
|
|
181
209
|
_inheritsLoose(CacheHandlerServiceFactory, _ServiceFactory);
|
|
182
210
|
|
|
183
211
|
function CacheHandlerServiceFactory() {
|
|
184
|
-
var
|
|
212
|
+
var _this4;
|
|
185
213
|
|
|
186
214
|
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
187
215
|
args[_key] = arguments[_key];
|
|
188
216
|
}
|
|
189
217
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
return
|
|
218
|
+
_this4 = _ServiceFactory.call.apply(_ServiceFactory, [this].concat(args)) || this;
|
|
219
|
+
_this4._oInstanceRegistry = {};
|
|
220
|
+
return _this4;
|
|
193
221
|
}
|
|
194
222
|
|
|
195
223
|
var _proto2 = CacheHandlerServiceFactory.prototype;
|
|
196
224
|
|
|
197
225
|
_proto2.createInstance = function createInstance(oServiceContext) {
|
|
198
|
-
var
|
|
226
|
+
var _this5 = this;
|
|
199
227
|
|
|
200
228
|
var sMetaModelId = oServiceContext.settings.metaModel.getId();
|
|
201
229
|
var cacheHandlerInstance = this._oInstanceRegistry[sMetaModelId];
|
|
@@ -209,10 +237,10 @@ sap.ui.define(["sap/ui/core/service/Service", "sap/ui/core/service/ServiceFactor
|
|
|
209
237
|
}
|
|
210
238
|
|
|
211
239
|
return cacheHandlerInstance.initPromise.then(function () {
|
|
212
|
-
return
|
|
240
|
+
return _this5._oInstanceRegistry[sMetaModelId];
|
|
213
241
|
}).catch(function (e) {
|
|
214
242
|
// In case of error delete the global instance;
|
|
215
|
-
|
|
243
|
+
_this5._oInstanceRegistry[sMetaModelId] = null;
|
|
216
244
|
throw e;
|
|
217
245
|
});
|
|
218
246
|
};
|
|
@@ -230,4 +258,4 @@ sap.ui.define(["sap/ui/core/service/Service", "sap/ui/core/service/ServiceFactor
|
|
|
230
258
|
|
|
231
259
|
return CacheHandlerServiceFactory;
|
|
232
260
|
}, false);
|
|
233
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["CacheHandlerServiceFactory.ts"],"names":["getMetadataETag","sUrl","sETag","mUpdatedMetaModelETags","Promise","resolve","jQuery","ajax","method","done","oResponse","sTextStatus","jqXHR","getResponseHeader","fail","CacheHandlerService","init","oContext","getContext","oFactory","factory","mSettings","settings","metaModel","Error","oMetaModel","oAppComponent","appComponent","oComponent","component","initPromise","fetchEntityContainer","then","mCacheNeedsInvalidate","exit","removeGlobalInstance","validateCacheKey","sCacheIdentifier","bCacheNeedUpdate","CacheManager","get","mCacheOutput","mMetaModelETags","getETags","sUpdatedCacheKey","JSON","stringify","mCachedETags","parse","cachedETags","all","Object","keys","map","aValidETags","indexOf","some","viewCacheKey","catch","sCacheKey","invalidateIfNeeded","sCacheKeys","sDataSourceETags","mCacheKeys","set","forEach","sMetaModelKey","Date","toISOString","oManifestContent","getManifest","sManifestHash","hash","sapApp","viewData","getViewData","getInterface","Service","CacheHandlerServiceFactory","_oInstanceRegistry","createInstance","oServiceContext","sMetaModelId","getId","cacheHandlerInstance","assign","scopeObject","scopeType","e","getInstance","ServiceFactory"],"mappings":"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","sourceRoot":".","sourcesContent":["import Service from \"sap/ui/core/service/Service\";\nimport ServiceFactory from \"sap/ui/core/service/ServiceFactory\";\nimport CacheManager from \"sap/ui/core/cache/CacheManager\";\nimport hash from \"sap/base/strings/hash\";\nimport ODataMetaModel from \"sap/ui/model/odata/v4/ODataMetaModel\";\nimport AppComponent from \"sap/fe/core/AppComponent\";\nimport UIComponent from \"sap/ui/core/UIComponent\";\nimport { ServiceContext } from \"types/extension_types\";\n\nfunction getMetadataETag(sUrl: any, sETag: any, mUpdatedMetaModelETags: any) {\n\treturn new Promise(function(resolve) {\n\t\t// There is an Url in the FE cache, that's not in the MetaModel yet -> we need to check the ETag\n\t\t(jQuery as any)\n\t\t\t.ajax(sUrl, { method: \"GET\" })\n\t\t\t.done(function(oResponse: any, sTextStatus: any, jqXHR: any) {\n\t\t\t\t// ETag is not the same -> invalid\n\t\t\t\t// ETag is the same -> valid\n\t\t\t\t// If ETag is available use it, otherwise use Last-Modified\n\t\t\t\tmUpdatedMetaModelETags[sUrl] = jqXHR.getResponseHeader(\"ETag\") || jqXHR.getResponseHeader(\"Last-Modified\");\n\t\t\t\tresolve(sETag === mUpdatedMetaModelETags[sUrl]);\n\t\t\t})\n\t\t\t.fail(function() {\n\t\t\t\t// Case 2z - Make sure we update the map so that we invalidate the cache\n\t\t\t\tmUpdatedMetaModelETags[sUrl] = \"\";\n\t\t\t\tresolve(false);\n\t\t\t});\n\t});\n}\ntype CacheHandlerServiceSettings = {\n\tmetaModel: ODataMetaModel;\n};\n\nexport class CacheHandlerService extends Service<CacheHandlerServiceSettings> {\n\tresolveFn: any;\n\trejectFn: any;\n\tinitPromise!: Promise<any>;\n\n\toFactory!: CacheHandlerServiceFactory;\n\toMetaModel!: ODataMetaModel;\n\toAppComponent!: AppComponent;\n\toComponent!: UIComponent;\n\tmCacheNeedsInvalidate: any;\n\n\tinit() {\n\t\tconst oContext = this.getContext();\n\t\tthis.oFactory = oContext.factory;\n\t\tconst mSettings = oContext.settings;\n\t\tif (!mSettings.metaModel) {\n\t\t\tthrow new Error(\"a `metaModel` property is expected when instantiating the CacheHandlerService\");\n\t\t}\n\t\tthis.oMetaModel = mSettings.metaModel;\n\t\tthis.oAppComponent = mSettings.appComponent;\n\t\tthis.oComponent = mSettings.component;\n\t\tthis.initPromise = (this.oMetaModel as any).fetchEntityContainer().then(() => {\n\t\t\treturn this;\n\t\t});\n\t\tthis.mCacheNeedsInvalidate = {};\n\t}\n\texit() {\n\t\t// Deregister global instance\n\t\tthis.oFactory.removeGlobalInstance(this.oMetaModel);\n\t}\n\tvalidateCacheKey(sCacheIdentifier: any): Promise<string> {\n\t\t// Keep track if the cache will anyway need to be updated\n\t\tlet bCacheNeedUpdate = true;\n\t\treturn CacheManager.get(sCacheIdentifier)\n\t\t\t.then((mCacheOutput: any) => {\n\t\t\t\t// We provide a default key so that an xml view cache is written\n\t\t\t\tconst mMetaModelETags = this.getETags();\n\t\t\t\tlet sUpdatedCacheKey: string | null = JSON.stringify(mMetaModelETags);\n\t\t\t\t// Case #1a - No cache, so mCacheOuput is empty, cacheKey = current metamodel ETags\n\t\t\t\tif (mCacheOutput) {\n\t\t\t\t\t// Case #2 - Cache entry found, check if it's still valid\n\t\t\t\t\tconst mUpdatedMetaModelETags: any = {};\n\t\t\t\t\tconst mCachedETags = JSON.parse(mCacheOutput.cachedETags);\n\t\t\t\t\treturn Promise.all(\n\t\t\t\t\t\tObject.keys(mCachedETags).map(function(sUrl: string) {\n\t\t\t\t\t\t\t// Check validity of every single Url that's in the FE Cache object\n\t\t\t\t\t\t\tif (mCachedETags[sUrl]) {\n\t\t\t\t\t\t\t\tif (mMetaModelETags[sUrl]) {\n\t\t\t\t\t\t\t\t\t// Case #2a - Same number of ETags in the cache and in the metadata\n\t\t\t\t\t\t\t\t\tmUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];\n\t\t\t\t\t\t\t\t\treturn mCachedETags[sUrl] === mMetaModelETags[sUrl];\n\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\t// Case #2b - No ETag in the cache for that URL, cachedETags was enhanced\n\t\t\t\t\t\t\t\t\treturn getMetadataETag(sUrl, mCachedETags[sUrl], mUpdatedMetaModelETags);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t// Case #2z - Last Templating added an URL without ETag\n\t\t\t\t\t\t\t\tmUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];\n\t\t\t\t\t\t\t\treturn mCachedETags[sUrl] === mMetaModelETags[sUrl];\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t})\n\t\t\t\t\t).then(function(aValidETags: any[]) {\n\t\t\t\t\t\tbCacheNeedUpdate = aValidETags.indexOf(false) >= 0;\n\t\t\t\t\t\t// Case #2a - Same number of ETags and all valid -> we return the viewCacheKey\n\t\t\t\t\t\t// Case #2b - Different number of ETags and still all valid -> we return the viewCacheKey\n\t\t\t\t\t\t// Case #2c - Same number of ETags but different values, main service Etag has changed, use that as cache key\n\t\t\t\t\t\t// Case #2d - Different number of ETags but different value, main service Etag or linked service Etag has changed, new ETags should be used as cacheKey\n\t\t\t\t\t\t// Case #2z - Cache has an invalid Etag - if there is an Etag provided from MetaModel use it as cacheKey\n\t\t\t\t\t\tif (\n\t\t\t\t\t\t\tObject.keys(mUpdatedMetaModelETags).some(function(sUrl: string) {\n\t\t\t\t\t\t\t\treturn !mUpdatedMetaModelETags[sUrl];\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t) {\n\t\t\t\t\t\t\t// At least one of the MetaModel URLs doesn't provide an ETag, so no caching\n\t\t\t\t\t\t\treturn null;\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\treturn bCacheNeedUpdate ? JSON.stringify(mUpdatedMetaModelETags) : mCacheOutput.viewCacheKey;\n\t\t\t\t\t\t}\n\t\t\t\t\t});\n\t\t\t\t} else if (\n\t\t\t\t\tObject.keys(mMetaModelETags).some(function(sUrl: string) {\n\t\t\t\t\t\treturn !mMetaModelETags[sUrl];\n\t\t\t\t\t})\n\t\t\t\t) {\n\t\t\t\t\t// Check if cache can be used (all the metadata and annotations have to provide at least a ETag or a Last-Modified header)\n\t\t\t\t\t// Case #1-b - No Cache, mCacheOuput is empty, but metamodel etags cannot be used, so no caching\n\t\t\t\t\tbCacheNeedUpdate = true;\n\t\t\t\t\tsUpdatedCacheKey = null;\n\t\t\t\t}\n\t\t\t\treturn sUpdatedCacheKey;\n\t\t\t})\n\t\t\t.catch(() => {\n\t\t\t\t// Don't use view cache in case of issues with the LRU cache\n\t\t\t\tbCacheNeedUpdate = true;\n\t\t\t\treturn null;\n\t\t\t})\n\t\t\t.then((sCacheKey: any) => {\n\t\t\t\tthis.mCacheNeedsInvalidate[sCacheIdentifier] = bCacheNeedUpdate;\n\t\t\t\treturn sCacheKey;\n\t\t\t});\n\t}\n\tinvalidateIfNeeded(sCacheKeys: string, sCacheIdentifier: string) {\n\t\t// Check FE cache after XML view is processed completely\n\t\tconst sDataSourceETags = JSON.stringify(this.getETags());\n\t\tif (this.mCacheNeedsInvalidate[sCacheIdentifier] || (sCacheKeys && sCacheKeys !== sDataSourceETags)) {\n\t\t\t// Something in the sources and/or its ETags changed -> update the FE cache\n\t\t\tconst mCacheKeys: any = {};\n\t\t\t// New ETags that need to be verified, may differ from the one used to generate the view\n\t\t\tmCacheKeys.cachedETags = sDataSourceETags;\n\t\t\t// Old ETags that are used for the xml view cache as key\n\t\t\tmCacheKeys.viewCacheKey = sCacheKeys;\n\t\t\treturn CacheManager.set(sCacheIdentifier, mCacheKeys);\n\t\t} else {\n\t\t\treturn Promise.resolve();\n\t\t}\n\t}\n\tgetETags() {\n\t\tconst mMetaModelETags = (this.oMetaModel as any).getETags();\n\t\t// ETags from UI5 are either a Date or a string, let's rationalize that\n\t\tObject.keys(mMetaModelETags).forEach(function(sMetaModelKey: string) {\n\t\t\tif (mMetaModelETags[sMetaModelKey] instanceof Date) {\n\t\t\t\t// MetaModel contains a Last-Modified timestamp for the URL\n\t\t\t\tmMetaModelETags[sMetaModelKey] = mMetaModelETags[sMetaModelKey].toISOString();\n\t\t\t}\n\t\t});\n\n\t\t// add also the manifest hash as UI5 only considers the root component hash\n\t\tconst oManifestContent: any = this.oAppComponent.getManifest();\n\t\tconst sManifestHash = hash(\n\t\t\tJSON.stringify({\n\t\t\t\tsapApp: oManifestContent[\"sap.app\"],\n\t\t\t\tviewData: (this.oComponent as any).getViewData()\n\t\t\t})\n\t\t);\n\t\tmMetaModelETags[\"manifest\"] = sManifestHash;\n\t\treturn mMetaModelETags;\n\t}\n\tgetInterface(): any {\n\t\treturn this;\n\t}\n}\n\nclass CacheHandlerServiceFactory extends ServiceFactory<CacheHandlerServiceSettings> {\n\t_oInstanceRegistry: Record<string, CacheHandlerService | null> = {};\n\tcreateInstance(oServiceContext: ServiceContext<CacheHandlerServiceSettings>) {\n\t\tconst sMetaModelId = oServiceContext.settings.metaModel.getId();\n\t\tlet cacheHandlerInstance = this._oInstanceRegistry[sMetaModelId];\n\t\tif (!cacheHandlerInstance) {\n\t\t\tthis._oInstanceRegistry[sMetaModelId] = cacheHandlerInstance = new CacheHandlerService(\n\t\t\t\tObject.assign(\n\t\t\t\t\t{\n\t\t\t\t\t\tfactory: this,\n\t\t\t\t\t\tscopeObject: null,\n\t\t\t\t\t\tscopeType: \"service\"\n\t\t\t\t\t},\n\t\t\t\t\toServiceContext\n\t\t\t\t)\n\t\t\t);\n\t\t}\n\n\t\treturn cacheHandlerInstance.initPromise\n\t\t\t.then(() => {\n\t\t\t\treturn this._oInstanceRegistry[sMetaModelId] as CacheHandlerService;\n\t\t\t})\n\t\t\t.catch((e: any) => {\n\t\t\t\t// In case of error delete the global instance;\n\t\t\t\tthis._oInstanceRegistry[sMetaModelId] = null;\n\t\t\t\tthrow e;\n\t\t\t});\n\t}\n\tgetInstance(oMetaModel: ODataMetaModel) {\n\t\treturn this._oInstanceRegistry[oMetaModel.getId()];\n\t}\n\tremoveGlobalInstance(oMetaModel: ODataMetaModel) {\n\t\tthis._oInstanceRegistry[oMetaModel.getId()] = null;\n\t}\n}\n\nexport default CacheHandlerServiceFactory;\n"]}
|
|
261
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["CacheHandlerServiceFactory.ts"],"names":["body","recover","result","e","then","getMetadataETag","sUrl","sETag","mUpdatedMetaModelETags","Promise","resolve","jQuery","ajax","method","done","oResponse","sTextStatus","jqXHR","getResponseHeader","fail","CacheHandlerService","init","oContext","getContext","oFactory","factory","mSettings","settings","metaModel","Error","oMetaModel","oAppComponent","appComponent","oComponent","component","initPromise","fetchEntityContainer","mCacheNeedsInvalidate","exit","removeGlobalInstance","validateCacheKey","sCacheIdentifier","bCacheNeedUpdate","sCacheKey","CacheManager","get","mCacheOutput","mMetaModelETags","getETags","JSON","stringify","mCachedETags","parse","cachedETags","all","Object","keys","map","aValidETags","indexOf","some","viewCacheKey","invalidateIfNeeded","sCacheKeys","sDataSourceETags","mCacheKeys","set","forEach","sMetaModelKey","Date","toISOString","oManifestContent","getManifest","sManifestHash","hash","sapApp","viewData","getViewData","getInterface","Service","CacheHandlerServiceFactory","_oInstanceRegistry","createInstance","oServiceContext","sMetaModelId","getId","cacheHandlerInstance","assign","scopeObject","scopeType","catch","getInstance","ServiceFactory"],"mappings":";AAAA;AACA;AACA;;;;;;AAgjBO,kBAAgBA,IAAhB,EAAsBC,OAAtB,EAA+B;AACrC,QAAI;AACH,UAAIC,MAAM,GAAGF,IAAI,EAAjB;AACA,KAFD,CAEE,OAAMG,CAAN,EAAS;AACV,aAAOF,OAAO,CAACE,CAAD,CAAd;AACA;;AACD,QAAID,MAAM,IAAIA,MAAM,CAACE,IAArB,EAA2B;AAC1B,aAAOF,MAAM,CAACE,IAAP,CAAY,KAAK,CAAjB,EAAoBH,OAApB,CAAP;AACA;;AACD,WAAOC,MAAP;AACA;;;;;;AAnjBD,WAASG,eAAT,CAAyBC,IAAzB,EAAoCC,KAApC,EAAgDC,sBAAhD,EAA6E;AAC5E,WAAO,IAAIC,OAAJ,CAAY,UAAUC,OAAV,EAAmB;AACrC;AACCC,MAAAA,MAAD,CACEC,IADF,CACON,IADP,EACa;AAAEO,QAAAA,MAAM,EAAE;AAAV,OADb,EAEEC,IAFF,CAEO,UAAUC,SAAV,EAA0BC,WAA1B,EAA4CC,KAA5C,EAAwD;AAC7D;AACA;AACA;AACAT,QAAAA,sBAAsB,CAACF,IAAD,CAAtB,GAA+BW,KAAK,CAACC,iBAAN,CAAwB,MAAxB,KAAmCD,KAAK,CAACC,iBAAN,CAAwB,eAAxB,CAAlE;AACAR,QAAAA,OAAO,CAACH,KAAK,KAAKC,sBAAsB,CAACF,IAAD,CAAjC,CAAP;AACA,OARF,EASEa,IATF,CASO,YAAY;AACjB;AACAX,QAAAA,sBAAsB,CAACF,IAAD,CAAtB,GAA+B,EAA/B;AACAI,QAAAA,OAAO,CAAC,KAAD,CAAP;AACA,OAbF;AAcA,KAhBM,CAAP;AAiBA;;MAKYU,mB;;;;;;;;;;WAWZC,I,GAAA,gBAAO;AAAA;;AACN,UAAMC,QAAQ,GAAG,KAAKC,UAAL,EAAjB;AACA,WAAKC,QAAL,GAAgBF,QAAQ,CAACG,OAAzB;AACA,UAAMC,SAAS,GAAGJ,QAAQ,CAACK,QAA3B;;AACA,UAAI,CAACD,SAAS,CAACE,SAAf,EAA0B;AACzB,cAAM,IAAIC,KAAJ,CAAU,+EAAV,CAAN;AACA;;AACD,WAAKC,UAAL,GAAkBJ,SAAS,CAACE,SAA5B;AACA,WAAKG,aAAL,GAAqBL,SAAS,CAACM,YAA/B;AACA,WAAKC,UAAL,GAAkBP,SAAS,CAACQ,SAA5B;AACA,WAAKC,WAAL,GAAoB,KAAKL,UAAN,CAAyBM,oBAAzB,GAAgDhC,IAAhD,CAAqD,YAAM;AAC7E,eAAO,KAAP;AACA,OAFkB,CAAnB;AAGA,WAAKiC,qBAAL,GAA6B,EAA7B;AACA,K;;WACDC,I,GAAA,gBAAO;AACN;AACA,WAAKd,QAAL,CAAce,oBAAd,CAAmC,KAAKT,UAAxC;AACA,K;;WACKU,gB,6BAAiBC,gB;UAA+C;AAAA,qBAQ5C,IAR4C;;AAAA;AAmErE,iBAAKJ,qBAAL,CAA2BI,gBAA3B,IAA+CC,gBAA/C;AACA,iBAAOC,SAAP;AApEqE;;AACrE;AACA,YAAID,gBAAgB,GAAG,IAAvB;AACA,YAAIC,SAAJ;;AAHqE,wCAKjE;AAAA,iCACwBC,YAAY,CAACC,GAAb,CAAiBJ,gBAAjB,CADxB,iBACGK,YADH;AAEH;AACA,gBAAMC,eAAe,GAAG,OAAKC,QAAL,EAAxB;;AACAL,YAAAA,SAAS,GAAGM,IAAI,CAACC,SAAL,CAAeH,eAAf,CAAZ,CAJG,CAKH;;AALG;AAAA,kBAMCD,YAND;AAOF;AACA,oBAAMtC,sBAA2B,GAAG,EAApC;AACA,oBAAM2C,YAAY,GAAGF,IAAI,CAACG,KAAL,CAAWN,YAAY,CAACO,WAAxB,CAArB;AATE,uCAUwB5C,OAAO,CAAC6C,GAAR,CACzBC,MAAM,CAACC,IAAP,CAAYL,YAAZ,EAA0BM,GAA1B,CAA8B,UAAUnD,IAAV,EAAwB;AACrD;AACA,sBAAI6C,YAAY,CAAC7C,IAAD,CAAhB,EAAwB;AACvB,wBAAIyC,eAAe,CAACzC,IAAD,CAAnB,EAA2B;AAC1B;AACAE,sBAAAA,sBAAsB,CAACF,IAAD,CAAtB,GAA+ByC,eAAe,CAACzC,IAAD,CAA9C;AACA,6BAAO6C,YAAY,CAAC7C,IAAD,CAAZ,KAAuByC,eAAe,CAACzC,IAAD,CAA7C;AACA,qBAJD,MAIO;AACN;AACA,6BAAOD,eAAe,CAACC,IAAD,EAAO6C,YAAY,CAAC7C,IAAD,CAAnB,EAA2BE,sBAA3B,CAAtB;AACA;AACD,mBATD,MASO;AACN;AACAA,oBAAAA,sBAAsB,CAACF,IAAD,CAAtB,GAA+ByC,eAAe,CAACzC,IAAD,CAA9C;AACA,2BAAO6C,YAAY,CAAC7C,IAAD,CAAZ,KAAuByC,eAAe,CAACzC,IAAD,CAA7C;AACA;AACD,iBAhBD,CADyB,CAVxB,iBAUIoD,WAVJ;AA8BFhB,kBAAAA,gBAAgB,GAAGgB,WAAW,CAACC,OAAZ,CAAoB,KAApB,KAA8B,CAAjD,CA9BE,CA+BF;AACA;AACA;AACA;AACA;;AAnCE,sBAqCDJ,MAAM,CAACC,IAAP,CAAYhD,sBAAZ,EAAoCoD,IAApC,CAAyC,UAAUtD,IAAV,EAAwB;AAChE,2BAAO,CAACE,sBAAsB,CAACF,IAAD,CAA9B;AACA,mBAFD,CArCC;AAyCD;AACAqC,oBAAAA,SAAS,GAAG,IAAZ;AA1CC;AA4CDA,oBAAAA,SAAS,GAAGD,gBAAgB,GAAGO,IAAI,CAACC,SAAL,CAAe1C,sBAAf,CAAH,GAA4CsC,YAAY,CAACe,YAArF;AA5CC;AAAA;AAAA,qBA8CI,IACNN,MAAM,CAACC,IAAP,CAAYT,eAAZ,EAA6Ba,IAA7B,CAAkC,UAAUtD,IAAV,EAAwB;AACzD,uBAAO,CAACyC,eAAe,CAACzC,IAAD,CAAvB;AACA,eAFD,CADM,EAIL;AACD;AACA;AACAoC,gBAAAA,gBAAgB,GAAG,IAAnB;AACAC,gBAAAA,SAAS,GAAG,IAAZ;AACA;AAvDE;;AAAA;AAAA;AAwDH,SA7DoE,cA6DzD;AACX;AACAD,UAAAA,gBAAgB,GAAG,IAAnB;AACAC,UAAAA,SAAS,GAAG,IAAZ;AACA,SAjEoE;;AAAA;AAqErE,O;;;;;WACDmB,kB,GAAA,4BAAmBC,UAAnB,EAAuCtB,gBAAvC,EAAiE;AAChE;AACA,UAAMuB,gBAAgB,GAAGf,IAAI,CAACC,SAAL,CAAe,KAAKF,QAAL,EAAf,CAAzB;;AACA,UAAI,KAAKX,qBAAL,CAA2BI,gBAA3B,KAAiDsB,UAAU,IAAIA,UAAU,KAAKC,gBAAlF,EAAqG;AACpG;AACA,YAAMC,UAAe,GAAG,EAAxB,CAFoG,CAGpG;;AACAA,QAAAA,UAAU,CAACZ,WAAX,GAAyBW,gBAAzB,CAJoG,CAKpG;;AACAC,QAAAA,UAAU,CAACJ,YAAX,GAA0BE,UAA1B;AACA,eAAOnB,YAAY,CAACsB,GAAb,CAAiBzB,gBAAjB,EAAmCwB,UAAnC,CAAP;AACA,OARD,MAQO;AACN,eAAOxD,OAAO,CAACC,OAAR,EAAP;AACA;AACD,K;;WACDsC,Q,GAAA,oBAAW;AACV,UAAMD,eAAe,GAAI,KAAKjB,UAAN,CAAyBkB,QAAzB,EAAxB,CADU,CAEV;;AACAO,MAAAA,MAAM,CAACC,IAAP,CAAYT,eAAZ,EAA6BoB,OAA7B,CAAqC,UAAUC,aAAV,EAAiC;AACrE,YAAIrB,eAAe,CAACqB,aAAD,CAAf,YAA0CC,IAA9C,EAAoD;AACnD;AACAtB,UAAAA,eAAe,CAACqB,aAAD,CAAf,GAAiCrB,eAAe,CAACqB,aAAD,CAAf,CAA+BE,WAA/B,EAAjC;AACA;AACD,OALD,EAHU,CAUV;;AACA,UAAMC,gBAAqB,GAAG,KAAKxC,aAAL,CAAmByC,WAAnB,EAA9B;AACA,UAAMC,aAAa,GAAGC,IAAI,CACzBzB,IAAI,CAACC,SAAL,CAAe;AACdyB,QAAAA,MAAM,EAAEJ,gBAAgB,CAAC,SAAD,CADV;AAEdK,QAAAA,QAAQ,EAAG,KAAK3C,UAAN,CAAyB4C,WAAzB;AAFI,OAAf,CADyB,CAA1B;AAMA9B,MAAAA,eAAe,CAAC,UAAD,CAAf,GAA8B0B,aAA9B;AACA,aAAO1B,eAAP;AACA,K;;WACD+B,Y,GAAA,wBAAoB;AACnB,aAAO,IAAP;AACA,K;;;IA1IuCC,O;;;;MA6InCC,0B;;;;;;;;;;;aACLC,kB,GAAiE,E;;;;;;YACjEC,c,GAAA,wBAAeC,eAAf,EAA6E;AAAA;;AAC5E,UAAMC,YAAY,GAAGD,eAAe,CAACxD,QAAhB,CAAyBC,SAAzB,CAAmCyD,KAAnC,EAArB;AACA,UAAIC,oBAAoB,GAAG,KAAKL,kBAAL,CAAwBG,YAAxB,CAA3B;;AACA,UAAI,CAACE,oBAAL,EAA2B;AAC1B,aAAKL,kBAAL,CAAwBG,YAAxB,IAAwCE,oBAAoB,GAAG,IAAIlE,mBAAJ,CAC9DmC,MAAM,CAACgC,MAAP,CACC;AACC9D,UAAAA,OAAO,EAAE,IADV;AAEC+D,UAAAA,WAAW,EAAE,IAFd;AAGCC,UAAAA,SAAS,EAAE;AAHZ,SADD,EAMCN,eAND,CAD8D,CAA/D;AAUA;;AAED,aAAOG,oBAAoB,CAACnD,WAArB,CACL/B,IADK,CACA,YAAM;AACX,eAAO,MAAI,CAAC6E,kBAAL,CAAwBG,YAAxB,CAAP;AACA,OAHK,EAILM,KAJK,CAIC,UAACvF,CAAD,EAAY;AAClB;AACA,QAAA,MAAI,CAAC8E,kBAAL,CAAwBG,YAAxB,IAAwC,IAAxC;AACA,cAAMjF,CAAN;AACA,OARK,CAAP;AASA,K;;YACDwF,W,GAAA,qBAAY7D,UAAZ,EAAwC;AACvC,aAAO,KAAKmD,kBAAL,CAAwBnD,UAAU,CAACuD,KAAX,EAAxB,CAAP;AACA,K;;YACD9C,oB,GAAA,8BAAqBT,UAArB,EAAiD;AAChD,WAAKmD,kBAAL,CAAwBnD,UAAU,CAACuD,KAAX,EAAxB,IAA8C,IAA9C;AACA,K;;;IAjCuCO,c;;SAoC1BZ,0B","sourceRoot":".","sourcesContent":["import hash from \"sap/base/strings/hash\";\nimport type AppComponent from \"sap/fe/core/AppComponent\";\nimport CacheManager from \"sap/ui/core/cache/CacheManager\";\nimport Service from \"sap/ui/core/service/Service\";\nimport ServiceFactory from \"sap/ui/core/service/ServiceFactory\";\nimport type UIComponent from \"sap/ui/core/UIComponent\";\nimport type ODataMetaModel from \"sap/ui/model/odata/v4/ODataMetaModel\";\nimport type { ServiceContext } from \"types/extension_types\";\n\nfunction getMetadataETag(sUrl: any, sETag: any, mUpdatedMetaModelETags: any) {\n\treturn new Promise(function (resolve) {\n\t\t// There is an Url in the FE cache, that's not in the MetaModel yet -> we need to check the ETag\n\t\t(jQuery as any)\n\t\t\t.ajax(sUrl, { method: \"GET\" })\n\t\t\t.done(function (oResponse: any, sTextStatus: any, jqXHR: any) {\n\t\t\t\t// ETag is not the same -> invalid\n\t\t\t\t// ETag is the same -> valid\n\t\t\t\t// If ETag is available use it, otherwise use Last-Modified\n\t\t\t\tmUpdatedMetaModelETags[sUrl] = jqXHR.getResponseHeader(\"ETag\") || jqXHR.getResponseHeader(\"Last-Modified\");\n\t\t\t\tresolve(sETag === mUpdatedMetaModelETags[sUrl]);\n\t\t\t})\n\t\t\t.fail(function () {\n\t\t\t\t// Case 2z - Make sure we update the map so that we invalidate the cache\n\t\t\t\tmUpdatedMetaModelETags[sUrl] = \"\";\n\t\t\t\tresolve(false);\n\t\t\t});\n\t});\n}\ntype CacheHandlerServiceSettings = {\n\tmetaModel: ODataMetaModel;\n};\n\nexport class CacheHandlerService extends Service<CacheHandlerServiceSettings> {\n\tresolveFn: any;\n\trejectFn: any;\n\tinitPromise!: Promise<any>;\n\n\toFactory!: CacheHandlerServiceFactory;\n\toMetaModel!: ODataMetaModel;\n\toAppComponent!: AppComponent;\n\toComponent!: UIComponent;\n\tmCacheNeedsInvalidate: any;\n\n\tinit() {\n\t\tconst oContext = this.getContext();\n\t\tthis.oFactory = oContext.factory;\n\t\tconst mSettings = oContext.settings;\n\t\tif (!mSettings.metaModel) {\n\t\t\tthrow new Error(\"a `metaModel` property is expected when instantiating the CacheHandlerService\");\n\t\t}\n\t\tthis.oMetaModel = mSettings.metaModel;\n\t\tthis.oAppComponent = mSettings.appComponent;\n\t\tthis.oComponent = mSettings.component;\n\t\tthis.initPromise = (this.oMetaModel as any).fetchEntityContainer().then(() => {\n\t\t\treturn this;\n\t\t});\n\t\tthis.mCacheNeedsInvalidate = {};\n\t}\n\texit() {\n\t\t// Deregister global instance\n\t\tthis.oFactory.removeGlobalInstance(this.oMetaModel);\n\t}\n\tasync validateCacheKey(sCacheIdentifier: any): Promise<string | null> {\n\t\t// Keep track if the cache will anyway need to be updated\n\t\tlet bCacheNeedUpdate = true;\n\t\tlet sCacheKey: string | null;\n\n\t\ttry {\n\t\t\tconst mCacheOutput = await CacheManager.get(sCacheIdentifier);\n\t\t\t// We provide a default key so that an xml view cache is written\n\t\t\tconst mMetaModelETags = this.getETags();\n\t\t\tsCacheKey = JSON.stringify(mMetaModelETags);\n\t\t\t// Case #1a - No cache, so mCacheOuput is empty, cacheKey = current metamodel ETags\n\t\t\tif (mCacheOutput) {\n\t\t\t\t// Case #2 - Cache entry found, check if it's still valid\n\t\t\t\tconst mUpdatedMetaModelETags: any = {};\n\t\t\t\tconst mCachedETags = JSON.parse(mCacheOutput.cachedETags);\n\t\t\t\tconst aValidETags = await Promise.all(\n\t\t\t\t\tObject.keys(mCachedETags).map(function (sUrl: string) {\n\t\t\t\t\t\t// Check validity of every single Url that's in the FE Cache object\n\t\t\t\t\t\tif (mCachedETags[sUrl]) {\n\t\t\t\t\t\t\tif (mMetaModelETags[sUrl]) {\n\t\t\t\t\t\t\t\t// Case #2a - Same number of ETags in the cache and in the metadata\n\t\t\t\t\t\t\t\tmUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];\n\t\t\t\t\t\t\t\treturn mCachedETags[sUrl] === mMetaModelETags[sUrl];\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t// Case #2b - No ETag in the cache for that URL, cachedETags was enhanced\n\t\t\t\t\t\t\t\treturn getMetadataETag(sUrl, mCachedETags[sUrl], mUpdatedMetaModelETags);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t// Case #2z - Last Templating added an URL without ETag\n\t\t\t\t\t\t\tmUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];\n\t\t\t\t\t\t\treturn mCachedETags[sUrl] === mMetaModelETags[sUrl];\n\t\t\t\t\t\t}\n\t\t\t\t\t})\n\t\t\t\t);\n\n\t\t\t\tbCacheNeedUpdate = aValidETags.indexOf(false) >= 0;\n\t\t\t\t// Case #2a - Same number of ETags and all valid -> we return the viewCacheKey\n\t\t\t\t// Case #2b - Different number of ETags and still all valid -> we return the viewCacheKey\n\t\t\t\t// Case #2c - Same number of ETags but different values, main service Etag has changed, use that as cache key\n\t\t\t\t// Case #2d - Different number of ETags but different value, main service Etag or linked service Etag has changed, new ETags should be used as cacheKey\n\t\t\t\t// Case #2z - Cache has an invalid Etag - if there is an Etag provided from MetaModel use it as cacheKey\n\t\t\t\tif (\n\t\t\t\t\tObject.keys(mUpdatedMetaModelETags).some(function (sUrl: string) {\n\t\t\t\t\t\treturn !mUpdatedMetaModelETags[sUrl];\n\t\t\t\t\t})\n\t\t\t\t) {\n\t\t\t\t\t// At least one of the MetaModel URLs doesn't provide an ETag, so no caching\n\t\t\t\t\tsCacheKey = null;\n\t\t\t\t} else {\n\t\t\t\t\tsCacheKey = bCacheNeedUpdate ? JSON.stringify(mUpdatedMetaModelETags) : mCacheOutput.viewCacheKey;\n\t\t\t\t}\n\t\t\t} else if (\n\t\t\t\tObject.keys(mMetaModelETags).some(function (sUrl: string) {\n\t\t\t\t\treturn !mMetaModelETags[sUrl];\n\t\t\t\t})\n\t\t\t) {\n\t\t\t\t// Check if cache can be used (all the metadata and annotations have to provide at least a ETag or a Last-Modified header)\n\t\t\t\t// Case #1-b - No Cache, mCacheOuput is empty, but metamodel etags cannot be used, so no caching\n\t\t\t\tbCacheNeedUpdate = true;\n\t\t\t\tsCacheKey = null;\n\t\t\t}\n\t\t} catch (e) {\n\t\t\t// Don't use view cache in case of issues with the LRU cache\n\t\t\tbCacheNeedUpdate = true;\n\t\t\tsCacheKey = null;\n\t\t}\n\n\t\tthis.mCacheNeedsInvalidate[sCacheIdentifier] = bCacheNeedUpdate;\n\t\treturn sCacheKey;\n\t}\n\tinvalidateIfNeeded(sCacheKeys: string, sCacheIdentifier: string) {\n\t\t// Check FE cache after XML view is processed completely\n\t\tconst sDataSourceETags = JSON.stringify(this.getETags());\n\t\tif (this.mCacheNeedsInvalidate[sCacheIdentifier] || (sCacheKeys && sCacheKeys !== sDataSourceETags)) {\n\t\t\t// Something in the sources and/or its ETags changed -> update the FE cache\n\t\t\tconst mCacheKeys: any = {};\n\t\t\t// New ETags that need to be verified, may differ from the one used to generate the view\n\t\t\tmCacheKeys.cachedETags = sDataSourceETags;\n\t\t\t// Old ETags that are used for the xml view cache as key\n\t\t\tmCacheKeys.viewCacheKey = sCacheKeys;\n\t\t\treturn CacheManager.set(sCacheIdentifier, mCacheKeys);\n\t\t} else {\n\t\t\treturn Promise.resolve();\n\t\t}\n\t}\n\tgetETags() {\n\t\tconst mMetaModelETags = (this.oMetaModel as any).getETags();\n\t\t// ETags from UI5 are either a Date or a string, let's rationalize that\n\t\tObject.keys(mMetaModelETags).forEach(function (sMetaModelKey: string) {\n\t\t\tif (mMetaModelETags[sMetaModelKey] instanceof Date) {\n\t\t\t\t// MetaModel contains a Last-Modified timestamp for the URL\n\t\t\t\tmMetaModelETags[sMetaModelKey] = mMetaModelETags[sMetaModelKey].toISOString();\n\t\t\t}\n\t\t});\n\n\t\t// add also the manifest hash as UI5 only considers the root component hash\n\t\tconst oManifestContent: any = this.oAppComponent.getManifest();\n\t\tconst sManifestHash = hash(\n\t\t\tJSON.stringify({\n\t\t\t\tsapApp: oManifestContent[\"sap.app\"],\n\t\t\t\tviewData: (this.oComponent as any).getViewData()\n\t\t\t})\n\t\t);\n\t\tmMetaModelETags[\"manifest\"] = sManifestHash;\n\t\treturn mMetaModelETags;\n\t}\n\tgetInterface(): any {\n\t\treturn this;\n\t}\n}\n\nclass CacheHandlerServiceFactory extends ServiceFactory<CacheHandlerServiceSettings> {\n\t_oInstanceRegistry: Record<string, CacheHandlerService | null> = {};\n\tcreateInstance(oServiceContext: ServiceContext<CacheHandlerServiceSettings>) {\n\t\tconst sMetaModelId = oServiceContext.settings.metaModel.getId();\n\t\tlet cacheHandlerInstance = this._oInstanceRegistry[sMetaModelId];\n\t\tif (!cacheHandlerInstance) {\n\t\t\tthis._oInstanceRegistry[sMetaModelId] = cacheHandlerInstance = new CacheHandlerService(\n\t\t\t\tObject.assign(\n\t\t\t\t\t{\n\t\t\t\t\t\tfactory: this,\n\t\t\t\t\t\tscopeObject: null,\n\t\t\t\t\t\tscopeType: \"service\"\n\t\t\t\t\t},\n\t\t\t\t\toServiceContext\n\t\t\t\t)\n\t\t\t);\n\t\t}\n\n\t\treturn cacheHandlerInstance.initPromise\n\t\t\t.then(() => {\n\t\t\t\treturn this._oInstanceRegistry[sMetaModelId] as CacheHandlerService;\n\t\t\t})\n\t\t\t.catch((e: any) => {\n\t\t\t\t// In case of error delete the global instance;\n\t\t\t\tthis._oInstanceRegistry[sMetaModelId] = null;\n\t\t\t\tthrow e;\n\t\t\t});\n\t}\n\tgetInstance(oMetaModel: ODataMetaModel) {\n\t\treturn this._oInstanceRegistry[oMetaModel.getId()];\n\t}\n\tremoveGlobalInstance(oMetaModel: ODataMetaModel) {\n\t\tthis._oInstanceRegistry[oMetaModel.getId()] = null;\n\t}\n}\n\nexport default CacheHandlerServiceFactory;\n"]}
|
|
@@ -1,25 +1,25 @@
|
|
|
1
|
+
import hash from "sap/base/strings/hash";
|
|
2
|
+
import type AppComponent from "sap/fe/core/AppComponent";
|
|
3
|
+
import CacheManager from "sap/ui/core/cache/CacheManager";
|
|
1
4
|
import Service from "sap/ui/core/service/Service";
|
|
2
5
|
import ServiceFactory from "sap/ui/core/service/ServiceFactory";
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import AppComponent from "sap/fe/core/AppComponent";
|
|
7
|
-
import UIComponent from "sap/ui/core/UIComponent";
|
|
8
|
-
import { ServiceContext } from "types/extension_types";
|
|
6
|
+
import type UIComponent from "sap/ui/core/UIComponent";
|
|
7
|
+
import type ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
|
|
8
|
+
import type { ServiceContext } from "types/extension_types";
|
|
9
9
|
|
|
10
10
|
function getMetadataETag(sUrl: any, sETag: any, mUpdatedMetaModelETags: any) {
|
|
11
|
-
return new Promise(function(resolve) {
|
|
11
|
+
return new Promise(function (resolve) {
|
|
12
12
|
// There is an Url in the FE cache, that's not in the MetaModel yet -> we need to check the ETag
|
|
13
13
|
(jQuery as any)
|
|
14
14
|
.ajax(sUrl, { method: "GET" })
|
|
15
|
-
.done(function(oResponse: any, sTextStatus: any, jqXHR: any) {
|
|
15
|
+
.done(function (oResponse: any, sTextStatus: any, jqXHR: any) {
|
|
16
16
|
// ETag is not the same -> invalid
|
|
17
17
|
// ETag is the same -> valid
|
|
18
18
|
// If ETag is available use it, otherwise use Last-Modified
|
|
19
19
|
mUpdatedMetaModelETags[sUrl] = jqXHR.getResponseHeader("ETag") || jqXHR.getResponseHeader("Last-Modified");
|
|
20
20
|
resolve(sETag === mUpdatedMetaModelETags[sUrl]);
|
|
21
21
|
})
|
|
22
|
-
.fail(function() {
|
|
22
|
+
.fail(function () {
|
|
23
23
|
// Case 2z - Make sure we update the map so that we invalidate the cache
|
|
24
24
|
mUpdatedMetaModelETags[sUrl] = "";
|
|
25
25
|
resolve(false);
|
|
@@ -60,76 +60,75 @@ export class CacheHandlerService extends Service<CacheHandlerServiceSettings> {
|
|
|
60
60
|
// Deregister global instance
|
|
61
61
|
this.oFactory.removeGlobalInstance(this.oMetaModel);
|
|
62
62
|
}
|
|
63
|
-
validateCacheKey(sCacheIdentifier: any): Promise<string> {
|
|
63
|
+
async validateCacheKey(sCacheIdentifier: any): Promise<string | null> {
|
|
64
64
|
// Keep track if the cache will anyway need to be updated
|
|
65
65
|
let bCacheNeedUpdate = true;
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
} else {
|
|
85
|
-
// Case #2b - No ETag in the cache for that URL, cachedETags was enhanced
|
|
86
|
-
return getMetadataETag(sUrl, mCachedETags[sUrl], mUpdatedMetaModelETags);
|
|
87
|
-
}
|
|
88
|
-
} else {
|
|
89
|
-
// Case #2z - Last Templating added an URL without ETag
|
|
66
|
+
let sCacheKey: string | null;
|
|
67
|
+
|
|
68
|
+
try {
|
|
69
|
+
const mCacheOutput = await CacheManager.get(sCacheIdentifier);
|
|
70
|
+
// We provide a default key so that an xml view cache is written
|
|
71
|
+
const mMetaModelETags = this.getETags();
|
|
72
|
+
sCacheKey = JSON.stringify(mMetaModelETags);
|
|
73
|
+
// Case #1a - No cache, so mCacheOuput is empty, cacheKey = current metamodel ETags
|
|
74
|
+
if (mCacheOutput) {
|
|
75
|
+
// Case #2 - Cache entry found, check if it's still valid
|
|
76
|
+
const mUpdatedMetaModelETags: any = {};
|
|
77
|
+
const mCachedETags = JSON.parse(mCacheOutput.cachedETags);
|
|
78
|
+
const aValidETags = await Promise.all(
|
|
79
|
+
Object.keys(mCachedETags).map(function (sUrl: string) {
|
|
80
|
+
// Check validity of every single Url that's in the FE Cache object
|
|
81
|
+
if (mCachedETags[sUrl]) {
|
|
82
|
+
if (mMetaModelETags[sUrl]) {
|
|
83
|
+
// Case #2a - Same number of ETags in the cache and in the metadata
|
|
90
84
|
mUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];
|
|
91
85
|
return mCachedETags[sUrl] === mMetaModelETags[sUrl];
|
|
86
|
+
} else {
|
|
87
|
+
// Case #2b - No ETag in the cache for that URL, cachedETags was enhanced
|
|
88
|
+
return getMetadataETag(sUrl, mCachedETags[sUrl], mUpdatedMetaModelETags);
|
|
92
89
|
}
|
|
93
|
-
})
|
|
94
|
-
).then(function(aValidETags: any[]) {
|
|
95
|
-
bCacheNeedUpdate = aValidETags.indexOf(false) >= 0;
|
|
96
|
-
// Case #2a - Same number of ETags and all valid -> we return the viewCacheKey
|
|
97
|
-
// Case #2b - Different number of ETags and still all valid -> we return the viewCacheKey
|
|
98
|
-
// Case #2c - Same number of ETags but different values, main service Etag has changed, use that as cache key
|
|
99
|
-
// Case #2d - Different number of ETags but different value, main service Etag or linked service Etag has changed, new ETags should be used as cacheKey
|
|
100
|
-
// Case #2z - Cache has an invalid Etag - if there is an Etag provided from MetaModel use it as cacheKey
|
|
101
|
-
if (
|
|
102
|
-
Object.keys(mUpdatedMetaModelETags).some(function(sUrl: string) {
|
|
103
|
-
return !mUpdatedMetaModelETags[sUrl];
|
|
104
|
-
})
|
|
105
|
-
) {
|
|
106
|
-
// At least one of the MetaModel URLs doesn't provide an ETag, so no caching
|
|
107
|
-
return null;
|
|
108
90
|
} else {
|
|
109
|
-
|
|
91
|
+
// Case #2z - Last Templating added an URL without ETag
|
|
92
|
+
mUpdatedMetaModelETags[sUrl] = mMetaModelETags[sUrl];
|
|
93
|
+
return mCachedETags[sUrl] === mMetaModelETags[sUrl];
|
|
110
94
|
}
|
|
111
|
-
})
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
95
|
+
})
|
|
96
|
+
);
|
|
97
|
+
|
|
98
|
+
bCacheNeedUpdate = aValidETags.indexOf(false) >= 0;
|
|
99
|
+
// Case #2a - Same number of ETags and all valid -> we return the viewCacheKey
|
|
100
|
+
// Case #2b - Different number of ETags and still all valid -> we return the viewCacheKey
|
|
101
|
+
// Case #2c - Same number of ETags but different values, main service Etag has changed, use that as cache key
|
|
102
|
+
// Case #2d - Different number of ETags but different value, main service Etag or linked service Etag has changed, new ETags should be used as cacheKey
|
|
103
|
+
// Case #2z - Cache has an invalid Etag - if there is an Etag provided from MetaModel use it as cacheKey
|
|
104
|
+
if (
|
|
105
|
+
Object.keys(mUpdatedMetaModelETags).some(function (sUrl: string) {
|
|
106
|
+
return !mUpdatedMetaModelETags[sUrl];
|
|
115
107
|
})
|
|
116
108
|
) {
|
|
117
|
-
//
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
109
|
+
// At least one of the MetaModel URLs doesn't provide an ETag, so no caching
|
|
110
|
+
sCacheKey = null;
|
|
111
|
+
} else {
|
|
112
|
+
sCacheKey = bCacheNeedUpdate ? JSON.stringify(mUpdatedMetaModelETags) : mCacheOutput.viewCacheKey;
|
|
121
113
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
114
|
+
} else if (
|
|
115
|
+
Object.keys(mMetaModelETags).some(function (sUrl: string) {
|
|
116
|
+
return !mMetaModelETags[sUrl];
|
|
117
|
+
})
|
|
118
|
+
) {
|
|
119
|
+
// Check if cache can be used (all the metadata and annotations have to provide at least a ETag or a Last-Modified header)
|
|
120
|
+
// Case #1-b - No Cache, mCacheOuput is empty, but metamodel etags cannot be used, so no caching
|
|
126
121
|
bCacheNeedUpdate = true;
|
|
127
|
-
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
122
|
+
sCacheKey = null;
|
|
123
|
+
}
|
|
124
|
+
} catch (e) {
|
|
125
|
+
// Don't use view cache in case of issues with the LRU cache
|
|
126
|
+
bCacheNeedUpdate = true;
|
|
127
|
+
sCacheKey = null;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
this.mCacheNeedsInvalidate[sCacheIdentifier] = bCacheNeedUpdate;
|
|
131
|
+
return sCacheKey;
|
|
133
132
|
}
|
|
134
133
|
invalidateIfNeeded(sCacheKeys: string, sCacheIdentifier: string) {
|
|
135
134
|
// Check FE cache after XML view is processed completely
|
|
@@ -149,7 +148,7 @@ export class CacheHandlerService extends Service<CacheHandlerServiceSettings> {
|
|
|
149
148
|
getETags() {
|
|
150
149
|
const mMetaModelETags = (this.oMetaModel as any).getETags();
|
|
151
150
|
// ETags from UI5 are either a Date or a string, let's rationalize that
|
|
152
|
-
Object.keys(mMetaModelETags).forEach(function(sMetaModelKey: string) {
|
|
151
|
+
Object.keys(mMetaModelETags).forEach(function (sMetaModelKey: string) {
|
|
153
152
|
if (mMetaModelETags[sMetaModelKey] instanceof Date) {
|
|
154
153
|
// MetaModel contains a Last-Modified timestamp for the URL
|
|
155
154
|
mMetaModelETags[sMetaModelKey] = mMetaModelETags[sMetaModelKey].toISOString();
|
|
@@ -103,4 +103,4 @@ sap.ui.define(["sap/ui/core/Core", "sap/ui/core/service/Service", "sap/ui/core/s
|
|
|
103
103
|
|
|
104
104
|
return EnvironmentServiceFactory;
|
|
105
105
|
}, false);
|
|
106
|
-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
106
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVudmlyb25tZW50U2VydmljZUZhY3RvcnkudHMiXSwibmFtZXMiOlsiRW52aXJvbm1lbnRDYXBhYmlsaXRpZXNTZXJ2aWNlIiwiaW5pdCIsImluaXRQcm9taXNlIiwiUHJvbWlzZSIsInJlc29sdmUiLCJyZWplY3QiLCJyZXNvbHZlRm4iLCJyZWplY3RGbiIsIm9Db250ZXh0IiwiZ2V0Q29udGV4dCIsImVudmlyb25tZW50Q2FwYWJpbGl0aWVzIiwiT2JqZWN0IiwiYXNzaWduIiwiRGVmYXVsdEVudmlyb25tZW50Q2FwYWJpbGl0aWVzIiwiVmVyc2lvbkluZm8iLCJsb2FkIiwidGhlbiIsInZlcnNpb25JbmZvIiwiQ2hhcnQiLCJsaWJyYXJpZXMiLCJmaW5kIiwibGliIiwibmFtZSIsIk1pY3JvQ2hhcnQiLCJVU2hlbGwiLCJzYXAiLCJ1c2hlbGwiLCJDb250YWluZXIiLCJJbnRlbnRCYXNlZE5hdmlnYXRpb24iLCJzZXR0aW5ncyIsImNhdGNoIiwicmVzb2x2ZUxpYnJhcnkiLCJsaWJyYXJ5TmFtZSIsIkNvcmUiLCJsb2FkTGlicmFyeSIsInJlcGxhY2UiLCJhc3luYyIsImUiLCJzZXRDYXBhYmlsaXRpZXMiLCJvQ2FwYWJpbGl0aWVzIiwic2V0Q2FwYWJpbGl0eSIsImNhcGFiaWxpdHkiLCJ2YWx1ZSIsImdldENhcGFiaWxpdGllcyIsImdldEludGVyZmFjZSIsIlNlcnZpY2UiLCJFbnZpcm9ubWVudFNlcnZpY2VGYWN0b3J5IiwiY3JlYXRlSW5zdGFuY2UiLCJvU2VydmljZUNvbnRleHQiLCJlbnZpcm9ubWVudENhcGFiaWxpdGllc1NlcnZpY2UiLCJTZXJ2aWNlRmFjdG9yeSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7TUFNYUEsOEI7Ozs7Ozs7Ozs7QUFLWjtXQUVBQyxJLEdBQUEsZ0JBQU87QUFBQTs7QUFDTixXQUFLQyxXQUFMLEdBQW1CLElBQUlDLE9BQUosQ0FBWSxVQUFDQyxPQUFELEVBQVVDLE1BQVYsRUFBcUI7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eEUsVUFBTUMsOEJBQThCLEdBQUcsSUFBSWpELDhCQUFKLENBQW1DZ0QsZUFBbkMsQ0FBdkM7QUFDQSxhQUFPQyw4QkFBOEIsQ0FBQy9DLFdBQXRDO0FBQ0EsSzs7O0lBSnNDZ0QsYzs7U0FPekJKLHlCIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQ29yZSBmcm9tIFwic2FwL3VpL2NvcmUvQ29yZVwiO1xuaW1wb3J0IFNlcnZpY2UgZnJvbSBcInNhcC91aS9jb3JlL3NlcnZpY2UvU2VydmljZVwiO1xuaW1wb3J0IFNlcnZpY2VGYWN0b3J5IGZyb20gXCJzYXAvdWkvY29yZS9zZXJ2aWNlL1NlcnZpY2VGYWN0b3J5XCI7XG5pbXBvcnQgVmVyc2lvbkluZm8gZnJvbSBcInNhcC91aS9WZXJzaW9uSW5mb1wiO1xuaW1wb3J0IHR5cGUgeyBDb3JlRXgsIFNlcnZpY2VDb250ZXh0IH0gZnJvbSBcInR5cGVzL2V4dGVuc2lvbl90eXBlc1wiO1xuaW1wb3J0IHR5cGUgeyBFbnZpcm9ubWVudENhcGFiaWxpdGllcyB9IGZyb20gXCIuLi9jb252ZXJ0ZXJzL01ldGFNb2RlbENvbnZlcnRlclwiO1xuaW1wb3J0IHsgRGVmYXVsdEVudmlyb25tZW50Q2FwYWJpbGl0aWVzIH0gZnJvbSBcIi4uL2NvbnZlcnRlcnMvTWV0YU1vZGVsQ29udmVydGVyXCI7XG5cbmV4cG9ydCBjbGFzcyBFbnZpcm9ubWVudENhcGFiaWxpdGllc1NlcnZpY2UgZXh0ZW5kcyBTZXJ2aWNlPEVudmlyb25tZW50Q2FwYWJpbGl0aWVzPiB7XG5cdHJlc29sdmVGbjogYW55O1xuXHRyZWplY3RGbjogYW55O1xuXHRpbml0UHJvbWlzZSE6IFByb21pc2U8YW55Pjtcblx0ZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMhOiBFbnZpcm9ubWVudENhcGFiaWxpdGllcztcblx0Ly8gITogbWVhbnMgdGhhdCB3ZSBrbm93IGl0IHdpbGwgYmUgYXNzaWduZWQgYmVmb3JlIHVzYWdlXG5cblx0aW5pdCgpIHtcblx0XHR0aGlzLmluaXRQcm9taXNlID0gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4ge1xuXHRcdFx0dGhpcy5yZXNvbHZlRm4gPSByZXNvbHZlO1xuXHRcdFx0dGhpcy5yZWplY3RGbiA9IHJlamVjdDtcblx0XHR9KTtcblx0XHRjb25zdCBvQ29udGV4dCA9IHRoaXMuZ2V0Q29udGV4dCgpO1xuXHRcdHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMgPSBPYmplY3QuYXNzaWduKHt9LCBEZWZhdWx0RW52aXJvbm1lbnRDYXBhYmlsaXRpZXMpO1xuXHRcdFZlcnNpb25JbmZvLmxvYWQoKVxuXHRcdFx0LnRoZW4oKHZlcnNpb25JbmZvOiBhbnkpID0+IHtcblx0XHRcdFx0dGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcy5DaGFydCA9ICEhdmVyc2lvbkluZm8ubGlicmFyaWVzLmZpbmQoKGxpYjogYW55KSA9PiBsaWIubmFtZSA9PT0gXCJzYXAudml6XCIpO1xuXHRcdFx0XHR0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzLk1pY3JvQ2hhcnQgPSAhIXZlcnNpb25JbmZvLmxpYnJhcmllcy5maW5kKFxuXHRcdFx0XHRcdChsaWI6IGFueSkgPT4gbGliLm5hbWUgPT09IFwic2FwLnN1aXRlLnVpLm1pY3JvY2hhcnRcIlxuXHRcdFx0XHQpO1xuXHRcdFx0XHR0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzLlVTaGVsbCA9ICEhKHNhcCAmJiBzYXAudXNoZWxsICYmIHNhcC51c2hlbGwuQ29udGFpbmVyKTtcblx0XHRcdFx0dGhpcy5lbnZpcm9ubWVudENhcGFiaWxpdGllcy5JbnRlbnRCYXNlZE5hdmlnYXRpb24gPSAhIShzYXAgJiYgc2FwLnVzaGVsbCAmJiBzYXAudXNoZWxsLkNvbnRhaW5lcik7XG5cdFx0XHRcdHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMgPSBPYmplY3QuYXNzaWduKHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXMsIG9Db250ZXh0LnNldHRpbmdzKTtcblx0XHRcdFx0dGhpcy5yZXNvbHZlRm4odGhpcyk7XG5cdFx0XHR9KVxuXHRcdFx0LmNhdGNoKHRoaXMucmVqZWN0Rm4pO1xuXHR9XG5cblx0cmVzb2x2ZUxpYnJhcnkobGlicmFyeU5hbWU6IHN0cmluZyk6IFByb21pc2U8Ym9vbGVhbj4ge1xuXHRcdHJldHVybiBuZXcgUHJvbWlzZShmdW5jdGlvbiAocmVzb2x2ZSkge1xuXHRcdFx0dHJ5IHtcblx0XHRcdFx0KENvcmUgYXMgQ29yZUV4KVxuXHRcdFx0XHRcdC5sb2FkTGlicmFyeShgJHtsaWJyYXJ5TmFtZS5yZXBsYWNlKC9cXC4vZywgXCIvXCIpfWAsIHsgYXN5bmM6IHRydWUgfSlcblx0XHRcdFx0XHQudGhlbihmdW5jdGlvbiAoKSB7XG5cdFx0XHRcdFx0XHRyZXNvbHZlKHRydWUpO1xuXHRcdFx0XHRcdH0pXG5cdFx0XHRcdFx0LmNhdGNoKGZ1bmN0aW9uICgpIHtcblx0XHRcdFx0XHRcdHJlc29sdmUoZmFsc2UpO1xuXHRcdFx0XHRcdH0pO1xuXHRcdFx0fSBjYXRjaCAoZSkge1xuXHRcdFx0XHRyZXNvbHZlKGZhbHNlKTtcblx0XHRcdH1cblx0XHR9KTtcblx0fVxuXG5cdHB1YmxpYyBzZXRDYXBhYmlsaXRpZXMob0NhcGFiaWxpdGllczogRW52aXJvbm1lbnRDYXBhYmlsaXRpZXMpIHtcblx0XHR0aGlzLmVudmlyb25tZW50Q2FwYWJpbGl0aWVzID0gb0NhcGFiaWxpdGllcztcblx0fVxuXG5cdHB1YmxpYyBzZXRDYXBhYmlsaXR5KGNhcGFiaWxpdHk6IGtleW9mIEVudmlyb25tZW50Q2FwYWJpbGl0aWVzLCB2YWx1ZTogYm9vbGVhbikge1xuXHRcdHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXNbY2FwYWJpbGl0eV0gPSB2YWx1ZTtcblx0fVxuXG5cdHB1YmxpYyBnZXRDYXBhYmlsaXRpZXMoKSB7XG5cdFx0cmV0dXJuIHRoaXMuZW52aXJvbm1lbnRDYXBhYmlsaXRpZXM7XG5cdH1cblxuXHRnZXRJbnRlcmZhY2UoKTogYW55IHtcblx0XHRyZXR1cm4gdGhpcztcblx0fVxufVxuXG5jbGFzcyBFbnZpcm9ubWVudFNlcnZpY2VGYWN0b3J5IGV4dGVuZHMgU2VydmljZUZhY3Rvcnk8RW52aXJvbm1lbnRDYXBhYmlsaXRpZXM+IHtcblx0Y3JlYXRlSW5zdGFuY2Uob1NlcnZpY2VDb250ZXh0OiBTZXJ2aWNlQ29udGV4dDxFbnZpcm9ubWVudENhcGFiaWxpdGllcz4pIHtcblx0XHRjb25zdCBlbnZpcm9ubWVudENhcGFiaWxpdGllc1NlcnZpY2UgPSBuZXcgRW52aXJvbm1lbnRDYXBhYmlsaXRpZXNTZXJ2aWNlKG9TZXJ2aWNlQ29udGV4dCk7XG5cdFx0cmV0dXJuIGVudmlyb25tZW50Q2FwYWJpbGl0aWVzU2VydmljZS5pbml0UHJvbWlzZTtcblx0fVxufVxuXG5leHBvcnQgZGVmYXVsdCBFbnZpcm9ubWVudFNlcnZpY2VGYWN0b3J5O1xuIl19
|
|
@@ -2,8 +2,9 @@ import Core from "sap/ui/core/Core";
|
|
|
2
2
|
import Service from "sap/ui/core/service/Service";
|
|
3
3
|
import ServiceFactory from "sap/ui/core/service/ServiceFactory";
|
|
4
4
|
import VersionInfo from "sap/ui/VersionInfo";
|
|
5
|
-
import { CoreEx, ServiceContext } from "types/extension_types";
|
|
6
|
-
import {
|
|
5
|
+
import type { CoreEx, ServiceContext } from "types/extension_types";
|
|
6
|
+
import type { EnvironmentCapabilities } from "../converters/MetaModelConverter";
|
|
7
|
+
import { DefaultEnvironmentCapabilities } from "../converters/MetaModelConverter";
|
|
7
8
|
|
|
8
9
|
export class EnvironmentCapabilitiesService extends Service<EnvironmentCapabilities> {
|
|
9
10
|
resolveFn: any;
|