@sumaris-net/ngx-components 4.0.0-rc9 → 18.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -3
- package/doc/changelog.md +522 -280
- package/esm2022/public_api.mjs +38 -19
- package/esm2022/src/app/admin/admin-routing.module.mjs +10 -17
- package/esm2022/src/app/admin/admin.module.mjs +7 -9
- package/esm2022/src/app/admin/services/filter/person.filter.mjs +3 -3
- package/esm2022/src/app/admin/services/person.service.mjs +31 -31
- package/esm2022/src/app/admin/services/validator/person.validator.mjs +10 -10
- package/esm2022/src/app/admin/users/users.mjs +22 -19
- package/esm2022/src/app/admin/users/users.module.mjs +8 -10
- package/esm2022/src/app/core/about/about.modal.mjs +7 -7
- package/esm2022/src/app/core/about/about.module.mjs +8 -21
- package/esm2022/src/app/core/account/account.module.mjs +28 -18
- package/esm2022/src/app/core/account/account.page.mjs +19 -5
- package/esm2022/src/app/core/account/new-token.form.mjs +106 -0
- package/esm2022/src/app/core/account/new-token.modal.mjs +27 -86
- package/esm2022/src/app/core/account/password/change-password.form.mjs +60 -0
- package/esm2022/src/app/core/account/password/change-password.module.mjs +22 -0
- package/esm2022/src/app/core/account/password/change-password.page.mjs +144 -0
- package/esm2022/src/app/core/account/token.table.mjs +47 -35
- package/esm2022/src/app/core/auth/auth.form.mjs +47 -28
- package/esm2022/src/app/core/auth/auth.modal.mjs +6 -6
- package/esm2022/src/app/core/auth/auth.module.mjs +22 -13
- package/esm2022/src/app/core/auth/reset-password.modal.mjs +77 -0
- package/esm2022/src/app/core/core.module.mjs +28 -61
- package/esm2022/src/app/core/core.testing.module.mjs +34 -20
- package/esm2022/src/app/core/form/array/form-array.mjs +325 -0
- package/esm2022/src/app/core/form/array/testing/form-array-test.module.mjs +23 -0
- package/esm2022/src/app/core/form/array/testing/form-array.test.mjs +94 -0
- package/esm2022/src/app/core/form/buttons/form-buttons-bar.component.mjs +24 -25
- package/esm2022/src/app/core/form/buttons/form-buttons-bar.module.mjs +9 -13
- package/esm2022/src/app/core/form/entity/editor.class.mjs +64 -517
- package/esm2022/src/app/core/form/entity/entity-editor-modal.class.mjs +26 -42
- package/esm2022/src/app/core/form/entity/entity-editor.class.mjs +42 -41
- package/esm2022/src/app/core/form/entity/entity-metadata.component.mjs +5 -5
- package/esm2022/src/app/core/form/entity/entity.module.mjs +8 -14
- package/esm2022/src/app/core/form/entity/tab-editor.class.mjs +194 -0
- package/esm2022/src/app/core/form/form-container.class.mjs +327 -0
- package/esm2022/src/app/core/form/form.class.mjs +39 -56
- package/esm2022/src/app/core/form/form.module.mjs +14 -10
- package/esm2022/src/app/core/form/form.utils.mjs +23 -306
- package/esm2022/src/app/core/form/list/list.form.mjs +16 -14
- package/esm2022/src/app/core/form/list/list.module.mjs +8 -12
- package/esm2022/src/app/core/form/properties/properties.form.mjs +139 -57
- package/esm2022/src/app/core/form/properties/properties.module.mjs +9 -15
- package/esm2022/src/app/core/form/properties/properties.table.mjs +27 -28
- package/esm2022/src/app/core/form/properties/properties.utils.mjs +60 -0
- package/esm2022/src/app/core/form/properties/property.validator.mjs +23 -9
- package/esm2022/src/app/core/form/properties/testing/properties-form.test.mjs +18 -18
- package/esm2022/src/app/core/form/properties/testing/properties-form.testing.module.mjs +8 -24
- package/esm2022/src/app/core/form/text-popover/testing/text-popover.testing.mjs +15 -15
- package/esm2022/src/app/core/form/text-popover/testing/text-popover.testing.module.mjs +10 -25
- package/esm2022/src/app/core/form/text-popover/text-popover.component.mjs +7 -7
- package/esm2022/src/app/core/form/text-popover/text-popover.module.mjs +9 -13
- package/esm2022/src/app/core/form/username/username.form.mjs +52 -0
- package/esm2022/src/app/core/form/username/username.module.mjs +20 -0
- package/esm2022/src/app/core/graphql/graphql.module.mjs +8 -16
- package/esm2022/src/app/core/graphql/graphql.service.mjs +101 -109
- package/esm2022/src/app/core/graphql/graphql.utils.mjs +12 -11
- package/esm2022/src/app/core/home/home.mjs +81 -52
- package/esm2022/src/app/core/home/home.module.mjs +10 -19
- package/esm2022/src/app/core/icon/icon.component.mjs +5 -5
- package/esm2022/src/app/core/icon/icon.module.mjs +8 -17
- package/esm2022/src/app/core/install/install-upgrade-card.component.mjs +33 -37
- package/esm2022/src/app/core/install/install-upgrade-card.module.mjs +9 -13
- package/esm2022/src/app/core/menu/menu.component.mjs +5 -6
- package/esm2022/src/app/core/menu/menu.model.mjs +21 -18
- package/esm2022/src/app/core/menu/menu.module.mjs +7 -12
- package/esm2022/src/app/core/menu/menu.service.mjs +44 -60
- package/esm2022/src/app/core/menu/sub-menu-tab.directive.mjs +4 -4
- package/esm2022/src/app/core/menu/testing/menu-other.testing.mjs +7 -6
- package/esm2022/src/app/core/menu/testing/menu.testing.mjs +43 -8
- package/esm2022/src/app/core/menu/testing/menu.testing.module.mjs +8 -27
- package/esm2022/src/app/core/offline/update-offline-mode-card.component.mjs +6 -7
- package/esm2022/src/app/core/offline/update-offline-mode-card.module.mjs +9 -13
- package/esm2022/src/app/core/peer/select-peer.modal.mjs +31 -21
- package/esm2022/src/app/core/peer/select-peer.module.mjs +11 -23
- package/esm2022/src/app/core/register/register-confirm.page.mjs +18 -16
- package/esm2022/src/app/core/register/register.form.mjs +7 -7
- package/esm2022/src/app/core/register/register.modal.mjs +6 -6
- package/esm2022/src/app/core/register/register.module.mjs +8 -29
- package/esm2022/src/app/core/services/account.service.mjs +272 -170
- package/esm2022/src/app/core/services/auth-guard.service.mjs +13 -15
- package/esm2022/src/app/core/services/base-entity-service.class.mjs +55 -64
- package/esm2022/src/app/core/services/base-graphql-service.class.mjs +39 -33
- package/esm2022/src/app/core/services/base58.mjs +8 -4
- package/esm2022/src/app/core/services/config/core.config.mjs +88 -37
- package/esm2022/src/app/core/services/config.service.mjs +81 -62
- package/esm2022/src/app/core/services/crypto.service.mjs +11 -11
- package/esm2022/src/app/core/services/errors.mjs +6 -5
- package/esm2022/src/app/core/services/local-settings.service.mjs +58 -44
- package/esm2022/src/app/core/services/model/account.model.mjs +12 -17
- package/esm2022/src/app/core/services/model/config.model.mjs +7 -7
- package/esm2022/src/app/core/services/model/department.model.mjs +3 -2
- package/esm2022/src/app/core/services/model/entity.decorators.mjs +6 -6
- package/esm2022/src/app/core/services/model/entity.model.mjs +27 -31
- package/esm2022/src/app/core/services/model/filter.model.mjs +12 -15
- package/esm2022/src/app/core/services/model/history.model.mjs +1 -1
- package/esm2022/src/app/core/services/model/model.enum.mjs +2 -2
- package/esm2022/src/app/core/services/model/peer.model.mjs +19 -9
- package/esm2022/src/app/core/services/model/person.model.mjs +26 -22
- package/esm2022/src/app/core/services/model/referential.model.mjs +36 -23
- package/esm2022/src/app/core/services/model/settings.model.mjs +2 -1
- package/esm2022/src/app/core/services/model/token.model.mjs +7 -3
- package/esm2022/src/app/core/services/model/tree-item-entity.model.mjs +3 -7
- package/esm2022/src/app/core/services/network.service.mjs +99 -76
- package/esm2022/src/app/core/services/network.types.mjs +1 -1
- package/esm2022/src/app/core/services/network.utils.mjs +3 -3
- package/esm2022/src/app/core/services/pipes/account.pipes.mjs +11 -11
- package/esm2022/src/app/core/services/pipes/department-to-string.pipe.mjs +6 -6
- package/esm2022/src/app/core/services/pipes/person-to-string.pipe.mjs +9 -9
- package/esm2022/src/app/core/services/pipes/pipes.module.mjs +54 -0
- package/esm2022/src/app/core/services/pipes/referential-to-string.pipe.mjs +21 -0
- package/esm2022/src/app/core/services/pipes/usage-mode.pipes.mjs +11 -11
- package/esm2022/src/app/core/services/platform.service.mjs +102 -69
- package/esm2022/src/app/core/services/storage/entities-storage.service.mjs +32 -39
- package/esm2022/src/app/core/services/storage/entity-store.class.mjs +36 -45
- package/esm2022/src/app/core/services/testing/referential-filter.model.mjs +1 -1
- package/esm2022/src/app/core/services/testing/referential.validator.mjs +14 -14
- package/esm2022/src/app/core/services/validator/account.validator.mjs +5 -5
- package/esm2022/src/app/core/services/validator/base.validator.class.mjs +5 -5
- package/esm2022/src/app/core/services/validator/local-settings.validator.mjs +34 -20
- package/esm2022/src/app/core/services/validator/user-settings.validator.mjs +5 -5
- package/esm2022/src/app/core/services/validator/user-token.validator.mjs +12 -9
- package/esm2022/src/app/core/settings/settings.module.mjs +9 -21
- package/esm2022/src/app/core/settings/settings.page.mjs +76 -63
- package/esm2022/src/app/core/table/async-table.class.mjs +219 -201
- package/esm2022/src/app/core/table/column/actions-column.component.mjs +127 -0
- package/esm2022/src/app/core/table/column/nav-actions-column.component.mjs +117 -0
- package/esm2022/src/app/core/table/column/row-field.component.mjs +116 -0
- package/esm2022/src/app/core/table/entities-async-table-datasource.class.mjs +31 -33
- package/esm2022/src/app/core/table/entities-table-datasource.class.mjs +36 -36
- package/esm2022/src/app/core/table/memory-table.class.mjs +5 -5
- package/esm2022/src/app/core/table/table-select-columns.component.mjs +8 -8
- package/esm2022/src/app/core/table/table.class.mjs +193 -152
- package/esm2022/src/app/core/table/table.model.mjs +1 -1
- package/esm2022/src/app/core/table/table.module.mjs +35 -24
- package/esm2022/src/app/core/table/table.pipes.mjs +77 -0
- package/esm2022/src/app/core/table/table.utils.mjs +2 -4
- package/esm2022/src/app/core/table/testing/table-validator.service.mjs +9 -5
- package/esm2022/src/app/core/table/testing/table.testing.mjs +116 -78
- package/esm2022/src/app/core/table/testing/table.testing.module.mjs +8 -33
- package/esm2022/src/app/core/table/testing/table2-validator.service.mjs +4 -4
- package/esm2022/src/app/core/table/testing/table2.testing.mjs +68 -45
- package/esm2022/src/app/shared/alerts.mjs +49 -45
- package/esm2022/src/app/shared/audio/audio.mjs +25 -27
- package/esm2022/src/app/shared/audio/audio.testing.mjs +5 -5
- package/esm2022/src/app/shared/audio/audio.testing.module.mjs +10 -25
- package/esm2022/src/app/shared/capacitor/keyboard.mjs +5 -5
- package/esm2022/src/app/shared/capacitor/plugins.mjs +1 -1
- package/esm2022/src/app/shared/constants.mjs +9 -4
- package/esm2022/src/app/shared/dates.mjs +18 -16
- package/esm2022/src/app/shared/debug/debug-service.class.mjs +1 -1
- package/esm2022/src/app/shared/debug/debug.component.mjs +5 -5
- package/esm2022/src/app/shared/debug/debug.module.mjs +8 -29
- package/esm2022/src/app/shared/directives/autofocus.directive.mjs +8 -15
- package/esm2022/src/app/shared/directives/autotitle.directive.mjs +4 -4
- package/esm2022/src/app/shared/directives/directives.module.mjs +8 -29
- package/esm2022/src/app/shared/directives/drag-and-drop.directive.mjs +4 -4
- package/esm2022/src/app/shared/directives/ng-var.directive.mjs +4 -4
- package/esm2022/src/app/shared/directives/resizable/resizable.component.mjs +4 -4
- package/esm2022/src/app/shared/directives/resizable/resizable.directive.mjs +4 -4
- package/esm2022/src/app/shared/directives/resizable/resizable.module.mjs +4 -4
- package/esm2022/src/app/shared/events.mjs +6 -8
- package/esm2022/src/app/shared/file/csv.utils.mjs +38 -18
- package/esm2022/src/app/shared/file/file.service.mjs +11 -15
- package/esm2022/src/app/shared/file/file.utils.mjs +13 -11
- package/esm2022/src/app/shared/file/images.utils.mjs +29 -4
- package/esm2022/src/app/shared/file/json.utils.mjs +11 -4
- package/esm2022/src/app/shared/file/uri.utils.mjs +1 -1
- package/esm2022/src/app/shared/focusable.mjs +1 -1
- package/esm2022/src/app/shared/form/field.component.mjs +69 -43
- package/esm2022/src/app/shared/form/field.model.mjs +4 -4
- package/esm2022/src/app/shared/form/loading-spinner.mjs +5 -5
- package/esm2022/src/app/shared/forms.mjs +116 -43
- package/esm2022/src/app/shared/functions.mjs +139 -71
- package/esm2022/src/app/shared/geolocation/geolocation.utils.mjs +14 -14
- package/esm2022/src/app/shared/gesture/gesture-config.mjs +10 -10
- package/esm2022/src/app/shared/gesture/hammer.utils.mjs +1 -1
- package/esm2022/src/app/shared/graph/colors.utils.mjs +14 -18
- package/esm2022/src/app/shared/graph/graph-colors.mjs +23 -29
- package/esm2022/src/app/shared/guard/component-dirty.guard.mjs +4 -4
- package/esm2022/src/app/shared/help/help.modal.mjs +6 -6
- package/esm2022/src/app/shared/hotkeys/dialog/hotkeys-dialog.component.mjs +5 -5
- package/esm2022/src/app/shared/hotkeys/hotkeys.service.mjs +44 -17
- package/esm2022/src/app/shared/hotkeys/shared-hotkeys.module.mjs +9 -27
- package/esm2022/src/app/shared/http/http.utils.mjs +15 -11
- package/esm2022/src/app/shared/image/gallery/image-gallery.component.mjs +27 -27
- package/esm2022/src/app/shared/image/gallery/image-gallery.module.mjs +13 -10
- package/esm2022/src/app/shared/image/gallery/testing/gallegry.model.testing.mjs +1 -1
- package/esm2022/src/app/shared/image/gallery/testing/gallery.service.testing.mjs +14 -17
- package/esm2022/src/app/shared/image/gallery/testing/gallery.testing.mjs +9 -13
- package/esm2022/src/app/shared/image/gallery/testing/gallery.testing.module.mjs +14 -11
- package/esm2022/src/app/shared/image/image.model.mjs +1 -1
- package/esm2022/src/app/shared/image/image.module.mjs +8 -13
- package/esm2022/src/app/shared/image/image.service.mjs +14 -12
- package/esm2022/src/app/shared/inputs.mjs +52 -20
- package/esm2022/src/app/shared/interceptors/progess.interceptor.mjs +2 -3
- package/esm2022/src/app/shared/logging/log-level.model.mjs +1 -1
- package/esm2022/src/app/shared/logging/logger.model.mjs +2 -2
- package/esm2022/src/app/shared/logging/logging-service.class.mjs +17 -20
- package/esm2022/src/app/shared/logging/logging-service.module.mjs +6 -6
- package/esm2022/src/app/shared/material/autocomplete/material.autocomplete.config.mjs +7 -10
- package/esm2022/src/app/shared/material/autocomplete/material.autocomplete.mjs +348 -238
- package/esm2022/src/app/shared/material/autocomplete/material.autocomplete.module.mjs +13 -16
- package/esm2022/src/app/shared/material/autocomplete/material.autocomplete.utils.mjs +5 -4
- package/esm2022/src/app/shared/material/autocomplete/testing/autocomplete.test.mjs +51 -37
- package/esm2022/src/app/shared/material/badge/badge.directive.mjs +99 -57
- package/esm2022/src/app/shared/material/badge/badge.module.mjs +8 -20
- package/esm2022/src/app/shared/material/badge/badge.test.mjs +5 -5
- package/esm2022/src/app/shared/material/boolean/boolean.module.mjs +19 -20
- package/esm2022/src/app/shared/material/boolean/material.boolean.mjs +209 -104
- package/esm2022/src/app/shared/material/boolean/testing/boolean.test.page.mjs +15 -8
- package/esm2022/src/app/shared/material/chips/chips.module.mjs +12 -13
- package/esm2022/src/app/shared/material/chips/material.chips.mjs +228 -168
- package/esm2022/src/app/shared/material/chips/testing/chips.test.mjs +20 -21
- package/esm2022/src/app/shared/material/datetime/datetime.module.mjs +12 -27
- package/esm2022/src/app/shared/material/datetime/material.date.mjs +167 -92
- package/esm2022/src/app/shared/material/datetime/material.dateshort.mjs +128 -77
- package/esm2022/src/app/shared/material/datetime/material.datetime.mjs +297 -165
- package/esm2022/src/app/shared/material/datetime/testing/mat-date-time.test.mjs +34 -30
- package/esm2022/src/app/shared/material/datetime/testing/mat-date.test.mjs +31 -27
- package/esm2022/src/app/shared/material/datetime/testing/mat-dateshort.test.mjs +26 -23
- package/esm2022/src/app/shared/material/duration/duration.module.mjs +11 -16
- package/esm2022/src/app/shared/material/duration/duration.utils.mjs +3 -6
- package/esm2022/src/app/shared/material/duration/material.duration.mjs +35 -34
- package/esm2022/src/app/shared/material/duration/testing/mat-duration.test.mjs +23 -22
- package/esm2022/src/app/shared/material/latlong/latlong.utils.mjs +217 -170
- package/esm2022/src/app/shared/material/latlong/material.latlong.mjs +182 -241
- package/esm2022/src/app/shared/material/latlong/material.latlong.module.mjs +10 -15
- package/esm2022/src/app/shared/material/latlong/testing/latlong.test.mjs +19 -14
- package/esm2022/src/app/shared/material/material.animations.mjs +22 -22
- package/esm2022/src/app/shared/material/material.config.mjs +3 -0
- package/esm2022/src/app/shared/material/material.module.mjs +16 -16
- package/esm2022/src/app/shared/material/material.testing.module.mjs +50 -37
- package/esm2022/src/app/shared/material/paginator/material.paginator-i18n.mjs +12 -9
- package/esm2022/src/app/shared/material/stepper/material.stepper-i18n.mjs +4 -4
- package/esm2022/src/app/shared/material/swipe/material.swipe.mjs +26 -19
- package/esm2022/src/app/shared/material/swipe/swipe.module.mjs +7 -11
- package/esm2022/src/app/shared/material/swipe/testing/swipe.test.mjs +8 -8
- package/esm2022/src/app/shared/material/testing/common.test.mjs +30 -24
- package/esm2022/src/app/shared/material/text/testing/text-form.testing.mjs +30 -19
- package/esm2022/src/app/shared/material/text/text-form.component.mjs +128 -21
- package/esm2022/src/app/shared/material/text/text-form.module.mjs +8 -8
- package/esm2022/src/app/shared/modules.mjs +1 -1
- package/esm2022/src/app/shared/named-filter/named-filter-selector.component.mjs +118 -37
- package/esm2022/src/app/shared/named-filter/named-filter.model.mjs +1 -1
- package/esm2022/src/app/shared/named-filter/named-filter.module.mjs +5 -5
- package/esm2022/src/app/shared/named-filter/named-filter.service.mjs +8 -8
- package/esm2022/src/app/shared/named-filter/testing/named-filter-selector.testing.mjs +74 -0
- package/esm2022/src/app/shared/named-filter/testing/named-filter.testing.module.mjs +28 -0
- package/esm2022/src/app/shared/observables.mjs +14 -18
- package/esm2022/src/app/shared/pipes/arrays.pipe.mjs +53 -38
- package/esm2022/src/app/shared/pipes/badge.pipes.mjs +24 -0
- package/esm2022/src/app/shared/pipes/colors.pipe.mjs +8 -6
- package/esm2022/src/app/shared/pipes/date-diff-duration.pipe.mjs +8 -10
- package/esm2022/src/app/shared/pipes/date-format.pipe.mjs +15 -15
- package/esm2022/src/app/shared/pipes/date-from-now.pipe.mjs +6 -6
- package/esm2022/src/app/shared/pipes/duration.pipe.mjs +6 -6
- package/esm2022/src/app/shared/pipes/file-size.pipe.mjs +6 -13
- package/esm2022/src/app/shared/pipes/form.pipes.mjs +72 -47
- package/esm2022/src/app/shared/pipes/highlight.pipe.mjs +15 -15
- package/esm2022/src/app/shared/pipes/html.pipes.mjs +52 -0
- package/esm2022/src/app/shared/pipes/latlong-format.pipe.mjs +14 -14
- package/esm2022/src/app/shared/pipes/maps.pipe.mjs +17 -17
- package/esm2022/src/app/shared/pipes/maskito.pipe.mjs +37 -88
- package/esm2022/src/app/shared/pipes/math.pipes.mjs +16 -16
- package/esm2022/src/app/shared/pipes/ng-init.pipe.mjs +5 -5
- package/esm2022/src/app/shared/pipes/number-format.pipe.mjs +6 -6
- package/esm2022/src/app/shared/pipes/pipes.module.mjs +117 -137
- package/esm2022/src/app/shared/pipes/property.pipes.mjs +86 -47
- package/esm2022/src/app/shared/pipes/selection.pipes.mjs +179 -0
- package/esm2022/src/app/shared/pipes/string.pipes.mjs +50 -49
- package/esm2022/src/app/shared/pipes/translate-context.pipe.mjs +11 -11
- package/esm2022/src/app/shared/pipes/types.pipes.mjs +33 -17
- package/esm2022/src/app/shared/platforms.mjs +7 -5
- package/esm2022/src/app/shared/rx-state.module.mjs +7 -11
- package/esm2022/src/app/shared/services/entity-service.class.mjs +2 -2
- package/esm2022/src/app/shared/services/job.utils.mjs +7 -7
- package/esm2022/src/app/shared/services/memory-entity-service.class.mjs +43 -41
- package/esm2022/src/app/shared/services/progress-bar.service.mjs +4 -4
- package/esm2022/src/app/shared/services/startable-observable-service.class.mjs +11 -14
- package/esm2022/src/app/shared/services/startable-service.class.mjs +11 -17
- package/esm2022/src/app/shared/services/translate-context.service.mjs +18 -15
- package/esm2022/src/app/shared/services/validator-service.class.mjs +1 -1
- package/esm2022/src/app/shared/services.mjs +12 -12
- package/esm2022/src/app/shared/shared-routing.module.mjs +19 -18
- package/esm2022/src/app/shared/shared.module.mjs +29 -28
- package/esm2022/src/app/shared/shared.testing.module.mjs +18 -10
- package/esm2022/src/app/shared/storage/storage-explorer.component.mjs +39 -46
- package/esm2022/src/app/shared/storage/storage-explorer.module.mjs +8 -12
- package/esm2022/src/app/shared/storage/storage-explorer.testing-routing.module.mjs +9 -17
- package/esm2022/src/app/shared/storage/storage-explorer.testing.module.mjs +10 -18
- package/esm2022/src/app/shared/storage/storage.service.mjs +4 -4
- package/esm2022/src/app/shared/storage/storage.utils.mjs +2 -2
- package/esm2022/src/app/shared/testing/maskito.test.mjs +41 -0
- package/esm2022/src/app/shared/testing/observable.test.mjs +11 -13
- package/esm2022/src/app/shared/testing/tests.page.mjs +6 -6
- package/esm2022/src/app/shared/toast/toast.testing.mjs +11 -11
- package/esm2022/src/app/shared/toast/toast.testing.module.mjs +10 -25
- package/esm2022/src/app/shared/toast/toasts.mjs +9 -9
- package/esm2022/src/app/shared/toolbar/modal-toolbar.mjs +10 -8
- package/esm2022/src/app/shared/toolbar/toolbar.mjs +31 -32
- package/esm2022/src/app/shared/toolbar/toolbar.module.mjs +8 -39
- package/esm2022/src/app/shared/types.mjs +1 -1
- package/esm2022/src/app/shared/upload-file/testing/upload-file.testing.mjs +12 -12
- package/esm2022/src/app/shared/upload-file/testing/upload-file.testing.module.mjs +10 -25
- package/esm2022/src/app/shared/upload-file/upload-file-popover.component.mjs +7 -8
- package/esm2022/src/app/shared/upload-file/upload-file.component.mjs +21 -19
- package/esm2022/src/app/shared/upload-file/upload-file.model.mjs +2 -3
- package/esm2022/src/app/shared/validator/form-error-adapter.class.mjs +64 -56
- package/esm2022/src/app/shared/validator/validators.mjs +60 -39
- package/esm2022/src/app/shared/version/versions.mjs +2 -2
- package/esm2022/src/app/social/job/job.module.mjs +8 -27
- package/esm2022/src/app/social/job/progression/job-progression.component.mjs +9 -9
- package/esm2022/src/app/social/job/progression/job-progression.icon.mjs +49 -46
- package/esm2022/src/app/social/job/progression/job-progression.list.mjs +10 -13
- package/esm2022/src/app/social/job/progression/job-progression.model.mjs +1 -1
- package/esm2022/src/app/social/job/progression/job-progression.service.mjs +39 -21
- package/esm2022/src/app/social/job/testing/job-progression.testing.mjs +6 -11
- package/esm2022/src/app/social/job/testing/job-progression.testing.service.mjs +11 -30
- package/esm2022/src/app/social/job/testing/job.testing.module.mjs +8 -21
- package/esm2022/src/app/social/message/message.form.mjs +5 -5
- package/esm2022/src/app/social/message/message.modal.mjs +8 -8
- package/esm2022/src/app/social/message/message.model.mjs +8 -8
- package/esm2022/src/app/social/message/message.module.mjs +4 -4
- package/esm2022/src/app/social/message/message.service.mjs +7 -7
- package/esm2022/src/app/social/social.errors.mjs +2 -2
- package/esm2022/src/app/social/social.module.mjs +7 -32
- package/esm2022/src/app/social/social.testing.module.mjs +9 -20
- package/esm2022/src/app/social/user-event/notification/user-event-notification.icon.mjs +27 -23
- package/esm2022/src/app/social/user-event/notification/user-event-notification.list.mjs +19 -22
- package/esm2022/src/app/social/user-event/testing/user-event.testing.mjs +47 -23
- package/esm2022/src/app/social/user-event/testing/user-event.testing.model.mjs +8 -8
- package/esm2022/src/app/social/user-event/testing/user-event.testing.module.mjs +8 -21
- package/esm2022/src/app/social/user-event/testing/user-event.testing.service.mjs +27 -15
- package/esm2022/src/app/social/user-event/user-event.model.mjs +1 -1
- package/esm2022/src/app/social/user-event/user-event.module.mjs +8 -28
- package/esm2022/src/app/social/user-event/user-event.service.mjs +61 -64
- package/esm2022/src/environments/environment.class.mjs +9 -1
- package/esm2022/src/environments/environment.loader.mjs +5 -11
- package/esm2022/src/environments/environment.mjs +19 -11
- package/fesm2022/sumaris-net.ngx-components.mjs +16117 -14592
- package/fesm2022/sumaris-net.ngx-components.mjs.map +1 -1
- package/package.json +33 -18
- package/public_api.d.ts +30 -22
- package/src/app/admin/services/filter/person.filter.d.ts +1 -1
- package/src/app/admin/users/users.d.ts +5 -6
- package/src/app/core/account/account.module.d.ts +10 -8
- package/src/app/core/account/account.page.d.ts +25 -15
- package/src/app/core/account/new-token.form.d.ts +29 -0
- package/src/app/core/account/new-token.modal.d.ts +9 -21
- package/src/app/core/account/password/change-password.form.d.ts +19 -0
- package/src/app/core/account/password/change-password.module.d.ts +11 -0
- package/src/app/core/account/password/change-password.page.d.ts +36 -0
- package/src/app/core/account/token.table.d.ts +7 -5
- package/src/app/core/auth/auth.form.d.ts +11 -9
- package/src/app/core/auth/auth.module.d.ts +6 -4
- package/src/app/core/auth/reset-password.modal.d.ts +26 -0
- package/src/app/core/core.module.d.ts +21 -24
- package/src/app/core/core.testing.module.d.ts +2 -1
- package/src/app/core/form/array/form-array.d.ts +136 -0
- package/src/app/core/form/array/testing/form-array-test.module.d.ts +12 -0
- package/src/app/core/form/array/testing/form-array.test.d.ts +26 -0
- package/src/app/core/form/buttons/form-buttons-bar.component.d.ts +2 -3
- package/src/app/core/form/entity/editor.class.d.ts +19 -179
- package/src/app/core/form/entity/entity-editor-modal.class.d.ts +10 -13
- package/src/app/core/form/entity/entity-editor.class.d.ts +12 -17
- package/src/app/core/form/entity/entity-metadata.component.d.ts +1 -1
- package/src/app/core/form/entity/tab-editor.class.d.ts +70 -0
- package/src/app/core/form/form-container.class.d.ts +126 -0
- package/src/app/core/form/form.class.d.ts +13 -26
- package/src/app/core/form/form.module.d.ts +2 -1
- package/src/app/core/form/form.utils.d.ts +60 -145
- package/src/app/core/form/list/list.form.d.ts +2 -2
- package/src/app/core/form/properties/properties.form.d.ts +34 -12
- package/src/app/core/form/properties/properties.table.d.ts +2 -2
- package/src/app/core/form/properties/properties.utils.d.ts +27 -0
- package/src/app/core/form/properties/property.validator.d.ts +9 -3
- package/src/app/core/form/text-popover/testing/text-popover.testing.d.ts +3 -1
- package/src/app/core/form/username/username.form.d.ts +19 -0
- package/src/app/core/form/username/username.module.d.ts +9 -0
- package/src/app/core/graphql/graphql.module.d.ts +1 -2
- package/src/app/core/graphql/graphql.service.d.ts +2 -4
- package/src/app/core/home/home.d.ts +26 -6
- package/src/app/core/menu/testing/menu-other.testing.d.ts +1 -1
- package/src/app/core/menu/testing/menu.testing.d.ts +11 -3
- package/src/app/core/peer/select-peer.modal.d.ts +13 -7
- package/src/app/core/peer/select-peer.module.d.ts +3 -4
- package/src/app/core/services/account.service.d.ts +9 -0
- package/src/app/core/services/base-entity-service.class.d.ts +1 -1
- package/src/app/core/services/config/core.config.d.ts +12 -1
- package/src/app/core/services/config.service.d.ts +4 -3
- package/src/app/core/services/errors.d.ts +11 -0
- package/src/app/core/services/local-settings.service.d.ts +8 -4
- package/src/app/core/services/model/entity.model.d.ts +6 -5
- package/src/app/core/services/model/filter.model.d.ts +1 -1
- package/src/app/core/services/model/peer.model.d.ts +1 -0
- package/src/app/core/services/model/person.model.d.ts +6 -2
- package/src/app/core/services/model/referential.model.d.ts +8 -3
- package/src/app/core/services/model/settings.model.d.ts +4 -2
- package/src/app/core/services/model/token.model.d.ts +1 -0
- package/src/app/core/services/model/tree-item-entity.model.d.ts +1 -1
- package/src/app/core/services/network.service.d.ts +11 -7
- package/src/app/core/services/pipes/department-to-string.pipe.d.ts +1 -1
- package/src/app/core/services/pipes/person-to-string.pipe.d.ts +3 -1
- package/src/app/core/services/pipes/pipes.module.d.ts +11 -0
- package/src/app/core/services/pipes/referential-to-string.pipe.d.ts +13 -0
- package/src/app/core/services/platform.service.d.ts +8 -3
- package/src/app/core/services/testing/referential-filter.model.d.ts +1 -1
- package/src/app/core/services/validator/local-settings.validator.d.ts +6 -2
- package/src/app/core/settings/settings.module.d.ts +2 -1
- package/src/app/core/settings/settings.page.d.ts +34 -21
- package/src/app/core/table/async-table.class.d.ts +22 -17
- package/src/app/core/table/column/actions-column.component.d.ts +59 -0
- package/src/app/core/table/column/nav-actions-column.component.d.ts +46 -0
- package/src/app/core/table/column/row-field.component.d.ts +40 -0
- package/src/app/core/table/entities-async-table-datasource.class.d.ts +1 -0
- package/src/app/core/table/entities-table-datasource.class.d.ts +1 -0
- package/src/app/core/table/table.class.d.ts +14 -11
- package/src/app/core/table/table.module.d.ts +8 -4
- package/src/app/core/table/table.pipes.d.ts +28 -0
- package/src/app/core/table/testing/table.testing.d.ts +12 -13
- package/src/app/core/table/testing/table2.testing.d.ts +13 -10
- package/src/app/shared/alerts.d.ts +4 -2
- package/src/app/shared/constants.d.ts +5 -0
- package/src/app/shared/dates.d.ts +12 -5
- package/src/app/shared/directives/autofocus.directive.d.ts +0 -1
- package/src/app/shared/events.d.ts +1 -1
- package/src/app/shared/file/csv.utils.d.ts +5 -0
- package/src/app/shared/file/images.utils.d.ts +17 -0
- package/src/app/shared/file/json.utils.d.ts +3 -0
- package/src/app/shared/form/field.component.d.ts +6 -3
- package/src/app/shared/forms.d.ts +32 -0
- package/src/app/shared/functions.d.ts +27 -8
- package/src/app/shared/graph/graph-colors.d.ts +1 -1
- package/src/app/shared/guard/component-dirty.guard.d.ts +1 -6
- package/src/app/shared/hotkeys/hotkeys.service.d.ts +17 -3
- package/src/app/shared/http/http.utils.d.ts +1 -0
- package/src/app/shared/image/gallery/image-gallery.component.d.ts +10 -10
- package/src/app/shared/image/gallery/image-gallery.module.d.ts +2 -1
- package/src/app/shared/image/gallery/testing/gallery.service.testing.d.ts +2 -2
- package/src/app/shared/image/gallery/testing/gallery.testing.module.d.ts +2 -1
- package/src/app/shared/inputs.d.ts +7 -5
- package/src/app/shared/material/autocomplete/material.autocomplete.config.d.ts +20 -1
- package/src/app/shared/material/autocomplete/material.autocomplete.d.ts +56 -16
- package/src/app/shared/material/autocomplete/material.autocomplete.module.d.ts +1 -1
- package/src/app/shared/material/autocomplete/material.autocomplete.utils.d.ts +2 -1
- package/src/app/shared/material/autocomplete/testing/autocomplete.test.d.ts +3 -2
- package/src/app/shared/material/badge/badge.directive.d.ts +10 -4
- package/src/app/shared/material/boolean/boolean.module.d.ts +15 -14
- package/src/app/shared/material/boolean/material.boolean.d.ts +51 -25
- package/src/app/shared/material/boolean/testing/boolean.test.page.d.ts +1 -0
- package/src/app/shared/material/chips/chips.module.d.ts +2 -1
- package/src/app/shared/material/chips/material.chips.d.ts +46 -21
- package/src/app/shared/material/chips/testing/chips.test.d.ts +1 -0
- package/src/app/shared/material/datetime/datetime.module.d.ts +1 -1
- package/src/app/shared/material/datetime/material.date.d.ts +33 -18
- package/src/app/shared/material/datetime/material.dateshort.d.ts +29 -16
- package/src/app/shared/material/datetime/material.datetime.d.ts +41 -28
- package/src/app/shared/material/datetime/testing/mat-date-time.test.d.ts +3 -3
- package/src/app/shared/material/duration/duration.module.d.ts +1 -1
- package/src/app/shared/material/duration/material.duration.d.ts +1 -1
- package/src/app/shared/material/latlong/latlong.utils.d.ts +9 -1
- package/src/app/shared/material/latlong/material.latlong.d.ts +29 -32
- package/src/app/shared/material/latlong/material.latlong.module.d.ts +1 -1
- package/src/app/shared/material/latlong/testing/latlong.test.d.ts +5 -1
- package/src/app/shared/material/material.config.d.ts +3 -0
- package/src/app/shared/material/material.module.d.ts +5 -6
- package/src/app/shared/material/material.testing.module.d.ts +8 -7
- package/src/app/shared/material/swipe/material.swipe.d.ts +4 -3
- package/src/app/shared/material/text/testing/text-form.testing.d.ts +10 -4
- package/src/app/shared/material/text/text-form.component.d.ts +42 -8
- package/src/app/shared/named-filter/named-filter-selector.component.d.ts +30 -14
- package/src/app/shared/named-filter/named-filter.service.d.ts +12 -6
- package/src/app/shared/named-filter/testing/named-filter-selector.testing.d.ts +34 -0
- package/src/app/shared/named-filter/testing/named-filter.testing.module.d.ts +10 -0
- package/src/app/shared/pipes/arrays.pipe.d.ts +5 -0
- package/src/app/shared/pipes/badge.pipes.d.ts +7 -0
- package/src/app/shared/pipes/date-format.pipe.d.ts +3 -2
- package/src/app/shared/pipes/form.pipes.d.ts +18 -8
- package/src/app/shared/pipes/html.pipes.d.ts +15 -0
- package/src/app/shared/pipes/maps.pipe.d.ts +4 -4
- package/src/app/shared/pipes/maskito.pipe.d.ts +7 -9
- package/src/app/shared/pipes/pipes.module.d.ts +7 -4
- package/src/app/shared/pipes/property.pipes.d.ts +24 -3
- package/src/app/shared/pipes/selection.pipes.d.ts +62 -0
- package/src/app/shared/pipes/string.pipes.d.ts +6 -6
- package/src/app/shared/pipes/types.pipes.d.ts +6 -1
- package/src/app/shared/services/entity-service.class.d.ts +0 -2
- package/src/app/shared/services/memory-entity-service.class.d.ts +6 -3
- package/src/app/shared/services.d.ts +1 -0
- package/src/app/shared/shared.testing.module.d.ts +2 -1
- package/src/app/shared/storage/storage-explorer.component.d.ts +4 -3
- package/src/app/shared/testing/maskito.test.d.ts +10 -0
- package/src/app/shared/toolbar/toolbar.d.ts +7 -2
- package/src/app/shared/types.d.ts +5 -0
- package/src/app/shared/upload-file/upload-file.component.d.ts +1 -0
- package/src/app/shared/validator/form-error-adapter.class.d.ts +17 -11
- package/src/app/shared/validator/validators.d.ts +20 -9
- package/src/app/social/job/progression/job-progression.icon.d.ts +4 -5
- package/src/app/social/job/progression/job-progression.list.d.ts +1 -3
- package/src/app/social/job/progression/job-progression.service.d.ts +3 -4
- package/src/app/social/job/testing/job-progression.testing.d.ts +0 -1
- package/src/app/social/job/testing/job-progression.testing.service.d.ts +3 -11
- package/src/app/social/message/message.modal.d.ts +2 -2
- package/src/app/social/message/message.model.d.ts +1 -1
- package/src/app/social/user-event/notification/user-event-notification.icon.d.ts +4 -4
- package/src/app/social/user-event/testing/user-event.testing.d.ts +1 -0
- package/src/app/social/user-event/testing/user-event.testing.model.d.ts +2 -3
- package/src/app/social/user-event/testing/user-event.testing.service.d.ts +1 -0
- package/src/assets/i18n/en-US.json +48 -19
- package/src/assets/i18n/en.json +48 -20
- package/src/assets/i18n/fr.json +50 -20
- package/src/assets/manifest.json +1 -1
- package/src/environments/environment.class.d.ts +10 -0
- package/src/environments/environment.d.ts +0 -1
- package/src/environments/environment.loader.d.ts +0 -2
- package/src/theme/_functions.scss +15 -0
- package/src/theme/_icons.scss +1 -1
- package/src/theme/_ionic.globals.scss +8 -2
- package/src/theme/_ionic.scss +10 -10
- package/src/theme/_material.globals.scss +16 -43
- package/src/theme/_material.scss +45 -32
- package/src/theme/_mixins.scss +99 -18
- package/src/theme/_ngx-components.forms.scss +354 -0
- package/src/theme/_ngx-components.globals.scss +20 -10
- package/src/theme/_ngx-components.scss +194 -400
- package/src/theme/_ngx-components.table.scss +200 -207
- package/src/theme/_ngx-components.tabs.scss +54 -0
- package/src/theme/_responsive.scss +0 -31
- package/src/theme/_theme.scss +2 -0
- package/src/theme/_theme.variables.scss +172 -0
- package/esm2022/src/app/core/table/actions-column.component.mjs +0 -115
- package/esm2022/src/app/shared/material/boolean/material-boolean2.mjs +0 -266
- package/esm2022/src/app/shared/material/numpad/numpad.append-to-input.directive.mjs +0 -104
- package/esm2022/src/app/shared/material/numpad/numpad.component.mjs +0 -83
- package/esm2022/src/app/shared/material/numpad/numpad.container.mjs +0 -203
- package/esm2022/src/app/shared/material/numpad/numpad.content.mjs +0 -19
- package/esm2022/src/app/shared/material/numpad/numpad.directive.mjs +0 -168
- package/esm2022/src/app/shared/material/numpad/numpad.dom-service.mjs +0 -36
- package/esm2022/src/app/shared/material/numpad/numpad.model.mjs +0 -16
- package/esm2022/src/app/shared/material/numpad/numpad.module.mjs +0 -60
- package/esm2022/src/app/shared/material/numpad/testing/numpad.test.mjs +0 -48
- package/src/app/core/table/actions-column.component.d.ts +0 -48
- package/src/app/shared/material/boolean/material-boolean2.d.ts +0 -66
- package/src/app/shared/material/numpad/numpad.append-to-input.directive.d.ts +0 -22
- package/src/app/shared/material/numpad/numpad.component.d.ts +0 -26
- package/src/app/shared/material/numpad/numpad.container.d.ts +0 -40
- package/src/app/shared/material/numpad/numpad.content.d.ts +0 -7
- package/src/app/shared/material/numpad/numpad.directive.d.ts +0 -35
- package/src/app/shared/material/numpad/numpad.dom-service.d.ts +0 -16
- package/src/app/shared/material/numpad/numpad.model.d.ts +0 -30
- package/src/app/shared/material/numpad/numpad.module.d.ts +0 -16
- package/src/app/shared/material/numpad/testing/numpad.test.d.ts +0 -13
|
@@ -16,9 +16,7 @@ export class StartableObservableService {
|
|
|
16
16
|
_startPrerequisite = null;
|
|
17
17
|
_subscription = null;
|
|
18
18
|
constructor(prerequisiteService) {
|
|
19
|
-
this._startPrerequisite = prerequisiteService
|
|
20
|
-
? () => prerequisiteService.ready()
|
|
21
|
-
: () => Promise.resolve();
|
|
19
|
+
this._startPrerequisite = prerequisiteService ? () => prerequisiteService.ready() : () => Promise.resolve();
|
|
22
20
|
}
|
|
23
21
|
start(opts) {
|
|
24
22
|
if (this._startPromise)
|
|
@@ -27,7 +25,7 @@ export class StartableObservableService {
|
|
|
27
25
|
return Promise.resolve(this.dataSubject.value);
|
|
28
26
|
this._startPromise = this._startPrerequisite()
|
|
29
27
|
.then(() => this.ngOnStart(opts))
|
|
30
|
-
.then(data => {
|
|
28
|
+
.then((data) => {
|
|
31
29
|
this._started = true;
|
|
32
30
|
this._startPromise = undefined;
|
|
33
31
|
// Should be done AFTER 'this._started = true', because of the 'filter' operator, inside ready() function
|
|
@@ -35,9 +33,9 @@ export class StartableObservableService {
|
|
|
35
33
|
this.startSubject.next(data);
|
|
36
34
|
return data;
|
|
37
35
|
})
|
|
38
|
-
.catch(err => {
|
|
36
|
+
.catch((err) => {
|
|
39
37
|
if (!this.stopped) {
|
|
40
|
-
console.error('Failed to start a service: ' + (err && err.message || err), err);
|
|
38
|
+
console.error('Failed to start a service: ' + ((err && err.message) || err), err);
|
|
41
39
|
this._started = false;
|
|
42
40
|
this._startPromise = null;
|
|
43
41
|
}
|
|
@@ -52,10 +50,9 @@ export class StartableObservableService {
|
|
|
52
50
|
return this._startPromise;
|
|
53
51
|
if (this._startByReadyFunction)
|
|
54
52
|
return this.start();
|
|
55
|
-
return firstValueFrom(this.dataSubject
|
|
56
|
-
.pipe(takeUntil(this.stopSubject),
|
|
53
|
+
return firstValueFrom(this.dataSubject.pipe(takeUntil(this.stopSubject),
|
|
57
54
|
// Wait start() to be called, to exclude the initial 'null' value
|
|
58
|
-
filter(_ => this._started)));
|
|
55
|
+
filter((_) => this._started)));
|
|
59
56
|
}
|
|
60
57
|
async stop() {
|
|
61
58
|
try {
|
|
@@ -63,7 +60,7 @@ export class StartableObservableService {
|
|
|
63
60
|
await this.ngOnStop();
|
|
64
61
|
}
|
|
65
62
|
catch (err) {
|
|
66
|
-
console.error('Failed to stop a service: ' + (err && err.message || err), err);
|
|
63
|
+
console.error('Failed to stop a service: ' + ((err && err.message) || err), err);
|
|
67
64
|
}
|
|
68
65
|
finally {
|
|
69
66
|
this._started = false;
|
|
@@ -110,12 +107,12 @@ export class StartableObservableService {
|
|
|
110
107
|
ngOnStop() {
|
|
111
108
|
// Can be overwritten by subclasses
|
|
112
109
|
}
|
|
113
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
114
|
-
static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "
|
|
110
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: StartableObservableService, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
|
|
111
|
+
static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.8", type: StartableObservableService, ngImport: i0 });
|
|
115
112
|
}
|
|
116
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
113
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: StartableObservableService, decorators: [{
|
|
117
114
|
type: Directive
|
|
118
115
|
}], ctorParameters: () => [{ type: undefined, decorators: [{
|
|
119
116
|
type: Optional
|
|
120
117
|
}] }] });
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"startable-observable-service.class.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/startable-observable-service.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { Directive,Optional } from '@angular/core';\nimport { BehaviorSubject, firstValueFrom, Subject, Subscription } from 'rxjs';\nimport { filter, takeUntil } from 'rxjs/operators';\nimport { IStartableService } from './startable-service.class';\n\n/**\n * Same as StartableService, but with a dataSubject instead of a simple 'data' property\n */\n@Directive()\nexport abstract class StartableObservableService<T = any, O = any> implements IStartableService<T> {\n\n  readonly dataSubject = new BehaviorSubject<T>(null);\n  readonly startSubject = new Subject<T>();\n  readonly stopSubject = new Subject<void>();\n\n  protected _debug = false;\n  protected _startByReadyFunction = true; // should start when calling ready() ?\n\n  private _started = false;\n  private _startPromise: Promise<T> = null;\n  private _startPrerequisite: () => Promise<any> = null;\n  private _subscription: Subscription = null;\n\n  protected constructor(\n    @Optional() prerequisiteService?: { ready: () => Promise<any> }\n  ) {\n    this._startPrerequisite = prerequisiteService\n      ? () => prerequisiteService.ready()\n      : () => Promise.resolve();\n  }\n\n  start(opts?: O): Promise<T> {\n    if (this._startPromise) return this._startPromise;\n    if (this._started) return Promise.resolve(this.dataSubject.value);\n\n    this._startPromise = this._startPrerequisite()\n      .then(() => this.ngOnStart(opts))\n      .then(data => {\n\n        this._started = true;\n        this._startPromise = undefined;\n\n        // Should be done AFTER 'this._started = true', because of the 'filter' operator, inside ready() function\n        this.dataSubject.next(data);\n        this.startSubject.next(data);\n\n        return data;\n      })\n      .catch(err => {\n        if (!this.stopped) {\n          console.error('Failed to start a service: ' + (err && err.message || err), err);\n          this._started = false;\n          this._startPromise = null;\n        }\n        return null;\n      });\n    return this._startPromise;\n  }\n\n  ready(): Promise<T> {\n    if (this._started) return Promise.resolve(this.dataSubject.value);\n    if (this._startPromise) return this._startPromise;\n    if (this._startByReadyFunction) return this.start();\n\n    return firstValueFrom(this.dataSubject\n      .pipe(\n        takeUntil(this.stopSubject),\n        // Wait start() to be called, to exclude the initial 'null' value\n        filter(_ => this._started)\n      ));\n  }\n\n  async stop() {\n\n    try {\n      this.unsubscribe();\n      await this.ngOnStop();\n    }\n    catch (err) {\n      console.error('Failed to stop a service: ' + (err && err.message || err), err);\n    }\n    finally {\n      this._started = false;\n      this._startPromise = undefined;\n      this.stopSubject.next(); // Stop all running observables\n      this.dataSubject.next(null); // Reset data\n    }\n  }\n\n  async restart(opts?: O): Promise<T> {\n    if (this._startPromise) await this._startPromise; // Wait end of previous loading\n    if (this._started) await this.stop(); // Then stop if started\n    return this.start(opts); // Then start again\n  }\n\n  get started(): boolean {\n    return this._started;\n  }\n\n  get starting(): boolean {\n    return !!this._startPromise;\n  }\n\n  get stopped(): boolean {\n    return !this._started && !this._startPromise;\n  }\n\n  protected get data(): T {\n    return this.dataSubject.value;\n  }\n\n  protected set data(value: T) {\n    if (this.dataSubject.value !== value) {\n      this.dataSubject.next(value);\n    }\n  }\n\n  protected registerSubscription(sub: Subscription) {\n    this._subscription = this._subscription || new Subscription();\n    this._subscription.add(sub);\n  }\n\n  protected unregisterSubscription(sub: Subscription): void {\n    this._subscription?.remove(sub);\n  }\n\n  protected unsubscribe() {\n    this._subscription?.unsubscribe();\n    this._subscription = null;\n  }\n\n  protected ngOnStop(): Promise<void> | void {\n    // Can be overwritten by subclasses\n  }\n\n  protected abstract ngOnStart(opts?: O): Promise<T>;\n}\n"]}
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"startable-observable-service.class.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/startable-observable-service.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;;AAGnD;;GAEG;AAEH,MAAM,OAAgB,0BAA0B;IACrC,WAAW,GAAG,IAAI,eAAe,CAAI,IAAI,CAAC,CAAC;IAC3C,YAAY,GAAG,IAAI,OAAO,EAAK,CAAC;IAChC,WAAW,GAAG,IAAI,OAAO,EAAQ,CAAC;IAEjC,MAAM,GAAG,KAAK,CAAC;IACf,qBAAqB,GAAG,IAAI,CAAC,CAAC,sCAAsC;IAEtE,QAAQ,GAAG,KAAK,CAAC;IACjB,aAAa,GAAe,IAAI,CAAC;IACjC,kBAAkB,GAAuB,IAAI,CAAC;IAC9C,aAAa,GAAiB,IAAI,CAAC;IAE3C,YAAkC,mBAAmD;QACnF,IAAI,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC9G,CAAC;IAED,KAAK,CAAC,IAAQ;QACZ,IAAI,IAAI,CAAC,aAAa;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC;QAClD,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAElE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE;aAC3C,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aAChC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;YAE/B,yGAAyG;YACzG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAE7B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,6BAA6B,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;gBAClF,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC5B,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClE,IAAI,IAAI,CAAC,aAAa;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC;QAClD,IAAI,IAAI,CAAC,qBAAqB;YAAE,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;QAEpD,OAAO,cAAc,CACnB,IAAI,CAAC,WAAW,CAAC,IAAI,CACnB,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;QAC3B,iEAAiE;QACjE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAC7B,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC;YACH,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;QACnF,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;YAC/B,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,+BAA+B;YACxD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa;QAC5C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAQ;QACpB,IAAI,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,+BAA+B;QACjF,IAAI,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,uBAAuB;QAC7D,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB;IAC9C,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;IAC/C,CAAC;IAED,IAAc,IAAI;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,IAAc,IAAI,CAAC,KAAQ;QACzB,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAES,oBAAoB,CAAC,GAAiB;QAC9C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,IAAI,YAAY,EAAE,CAAC;QAC9D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAES,sBAAsB,CAAC,GAAiB;QAChD,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAES,WAAW;QACnB,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;IAES,QAAQ;QAChB,mCAAmC;IACrC,CAAC;uGApHmB,0BAA0B;2FAA1B,0BAA0B;;2FAA1B,0BAA0B;kBAD/C,SAAS;;0BAce,QAAQ","sourcesContent":["import { Directive, Optional } from '@angular/core';\nimport { BehaviorSubject, firstValueFrom, Subject, Subscription } from 'rxjs';\nimport { filter, takeUntil } from 'rxjs/operators';\nimport { IStartableService } from './startable-service.class';\n\n/**\n * Same as StartableService, but with a dataSubject instead of a simple 'data' property\n */\n@Directive()\nexport abstract class StartableObservableService<T = any, O = any> implements IStartableService<T> {\n  readonly dataSubject = new BehaviorSubject<T>(null);\n  readonly startSubject = new Subject<T>();\n  readonly stopSubject = new Subject<void>();\n\n  protected _debug = false;\n  protected _startByReadyFunction = true; // should start when calling ready() ?\n\n  private _started = false;\n  private _startPromise: Promise<T> = null;\n  private _startPrerequisite: () => Promise<any> = null;\n  private _subscription: Subscription = null;\n\n  protected constructor(@Optional() prerequisiteService?: { ready: () => Promise<any> }) {\n    this._startPrerequisite = prerequisiteService ? () => prerequisiteService.ready() : () => Promise.resolve();\n  }\n\n  start(opts?: O): Promise<T> {\n    if (this._startPromise) return this._startPromise;\n    if (this._started) return Promise.resolve(this.dataSubject.value);\n\n    this._startPromise = this._startPrerequisite()\n      .then(() => this.ngOnStart(opts))\n      .then((data) => {\n        this._started = true;\n        this._startPromise = undefined;\n\n        // Should be done AFTER 'this._started = true', because of the 'filter' operator, inside ready() function\n        this.dataSubject.next(data);\n        this.startSubject.next(data);\n\n        return data;\n      })\n      .catch((err) => {\n        if (!this.stopped) {\n          console.error('Failed to start a service: ' + ((err && err.message) || err), err);\n          this._started = false;\n          this._startPromise = null;\n        }\n        return null;\n      });\n    return this._startPromise;\n  }\n\n  ready(): Promise<T> {\n    if (this._started) return Promise.resolve(this.dataSubject.value);\n    if (this._startPromise) return this._startPromise;\n    if (this._startByReadyFunction) return this.start();\n\n    return firstValueFrom(\n      this.dataSubject.pipe(\n        takeUntil(this.stopSubject),\n        // Wait start() to be called, to exclude the initial 'null' value\n        filter((_) => this._started)\n      )\n    );\n  }\n\n  async stop() {\n    try {\n      this.unsubscribe();\n      await this.ngOnStop();\n    } catch (err) {\n      console.error('Failed to stop a service: ' + ((err && err.message) || err), err);\n    } finally {\n      this._started = false;\n      this._startPromise = undefined;\n      this.stopSubject.next(); // Stop all running observables\n      this.dataSubject.next(null); // Reset data\n    }\n  }\n\n  async restart(opts?: O): Promise<T> {\n    if (this._startPromise) await this._startPromise; // Wait end of previous loading\n    if (this._started) await this.stop(); // Then stop if started\n    return this.start(opts); // Then start again\n  }\n\n  get started(): boolean {\n    return this._started;\n  }\n\n  get starting(): boolean {\n    return !!this._startPromise;\n  }\n\n  get stopped(): boolean {\n    return !this._started && !this._startPromise;\n  }\n\n  protected get data(): T {\n    return this.dataSubject.value;\n  }\n\n  protected set data(value: T) {\n    if (this.dataSubject.value !== value) {\n      this.dataSubject.next(value);\n    }\n  }\n\n  protected registerSubscription(sub: Subscription) {\n    this._subscription = this._subscription || new Subscription();\n    this._subscription.add(sub);\n  }\n\n  protected unregisterSubscription(sub: Subscription): void {\n    this._subscription?.remove(sub);\n  }\n\n  protected unsubscribe() {\n    this._subscription?.unsubscribe();\n    this._subscription = null;\n  }\n\n  protected ngOnStop(): Promise<void> | void {\n    // Can be overwritten by subclasses\n  }\n\n  protected abstract ngOnStart(opts?: O): Promise<T>;\n}\n"]}
|
|
@@ -3,9 +3,7 @@ import { Subject, Subscription } from 'rxjs';
|
|
|
3
3
|
import { takeUntil } from 'rxjs/operators';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
export function isStartableService(data) {
|
|
6
|
-
return
|
|
7
|
-
&& (typeof data?.['stop'] === 'function')
|
|
8
|
-
&& (typeof data?.['ready'] === 'function');
|
|
6
|
+
return typeof data?.['start'] === 'function' && typeof data?.['stop'] === 'function' && typeof data?.['ready'] === 'function';
|
|
9
7
|
}
|
|
10
8
|
export class StartableService {
|
|
11
9
|
startSubject = new Subject();
|
|
@@ -18,9 +16,7 @@ export class StartableService {
|
|
|
18
16
|
_startPrerequisite = null;
|
|
19
17
|
_subscription = null;
|
|
20
18
|
constructor(prerequisiteService) {
|
|
21
|
-
this._startPrerequisite = prerequisiteService
|
|
22
|
-
? () => prerequisiteService.ready()
|
|
23
|
-
: () => Promise.resolve();
|
|
19
|
+
this._startPrerequisite = prerequisiteService ? () => prerequisiteService.ready() : () => Promise.resolve();
|
|
24
20
|
}
|
|
25
21
|
start(opts) {
|
|
26
22
|
if (this._startPromise)
|
|
@@ -29,16 +25,16 @@ export class StartableService {
|
|
|
29
25
|
return Promise.resolve(this._data);
|
|
30
26
|
this._startPromise = this._startPrerequisite()
|
|
31
27
|
.then(() => this.ngOnStart(opts))
|
|
32
|
-
.then(data => {
|
|
28
|
+
.then((data) => {
|
|
33
29
|
this._data = data;
|
|
34
30
|
this._started = true;
|
|
35
31
|
this._startPromise = undefined;
|
|
36
32
|
this.startSubject.next(data);
|
|
37
33
|
return data;
|
|
38
34
|
})
|
|
39
|
-
.catch(err => {
|
|
35
|
+
.catch((err) => {
|
|
40
36
|
if (!this.stopped) {
|
|
41
|
-
console.error('Failed to start a service: ' + (err && err.message || err), err);
|
|
37
|
+
console.error('Failed to start a service: ' + ((err && err.message) || err), err);
|
|
42
38
|
this._startPromise = null;
|
|
43
39
|
this._started = false;
|
|
44
40
|
}
|
|
@@ -53,9 +49,7 @@ export class StartableService {
|
|
|
53
49
|
return this._startPromise;
|
|
54
50
|
if (this._startByReadyFunction)
|
|
55
51
|
return this.start();
|
|
56
|
-
return this.startSubject
|
|
57
|
-
.pipe(takeUntil(this.stopSubject))
|
|
58
|
-
.toPromise();
|
|
52
|
+
return this.startSubject.pipe(takeUntil(this.stopSubject)).toPromise();
|
|
59
53
|
}
|
|
60
54
|
async stop() {
|
|
61
55
|
try {
|
|
@@ -63,7 +57,7 @@ export class StartableService {
|
|
|
63
57
|
await this.ngOnStop();
|
|
64
58
|
}
|
|
65
59
|
catch (err) {
|
|
66
|
-
console.error('Failed to stop a service: ' + (err && err.message || err), err);
|
|
60
|
+
console.error('Failed to stop a service: ' + ((err && err.message) || err), err);
|
|
67
61
|
}
|
|
68
62
|
finally {
|
|
69
63
|
this._data = null;
|
|
@@ -102,12 +96,12 @@ export class StartableService {
|
|
|
102
96
|
ngOnStop() {
|
|
103
97
|
// Can be overwritten by subclasses
|
|
104
98
|
}
|
|
105
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
106
|
-
static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "
|
|
99
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: StartableService, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
|
|
100
|
+
static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.8", type: StartableService, ngImport: i0 });
|
|
107
101
|
}
|
|
108
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
102
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: StartableService, decorators: [{
|
|
109
103
|
type: Directive
|
|
110
104
|
}], ctorParameters: () => [{ type: undefined, decorators: [{
|
|
111
105
|
type: Optional
|
|
112
106
|
}] }] });
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"startable-service.class.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/startable-service.class.ts"],"names":[],"mappings":"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","sourcesContent":["import { Directive, Optional } from '@angular/core';\nimport { Subject, Subscription } from 'rxjs';\nimport { takeUntil } from 'rxjs/operators';\n\nexport interface IStartableService<T = any> {\n  started: boolean;\n  start(): Promise<T>;\n  stop(): Promise<void>;\n  ready(): Promise<T>;\n}\n\nexport function isStartableService(data: any): data is IStartableService {\n  return typeof data?.['start'] === 'function' && typeof data?.['stop'] === 'function' && typeof data?.['ready'] === 'function';\n}\n\n@Directive()\nexport abstract class StartableService<T = any, O = any> implements IStartableService<T> {\n  readonly startSubject = new Subject<T>();\n  readonly stopSubject = new Subject<void>();\n\n  protected _debug = false;\n  protected _startByReadyFunction = true; // should start when calling ready() ?\n  protected _data: T = null;\n\n  private _started = false;\n  private _startPromise: Promise<T> = null;\n  private _startPrerequisite: () => Promise<any> = null;\n  private _subscription: Subscription = null;\n\n  protected constructor(@Optional() prerequisiteService?: { ready: () => Promise<any> }) {\n    this._startPrerequisite = prerequisiteService ? () => prerequisiteService.ready() : () => Promise.resolve();\n  }\n\n  start(opts?: O): Promise<T> {\n    if (this._startPromise) return this._startPromise;\n    if (this._started) return Promise.resolve(this._data);\n\n    this._startPromise = this._startPrerequisite()\n      .then(() => this.ngOnStart(opts))\n      .then((data) => {\n        this._data = data;\n\n        this._started = true;\n        this._startPromise = undefined;\n\n        this.startSubject.next(data);\n\n        return data;\n      })\n      .catch((err) => {\n        if (!this.stopped) {\n          console.error('Failed to start a service: ' + ((err && err.message) || err), err);\n          this._startPromise = null;\n          this._started = false;\n        }\n        return null;\n      });\n    return this._startPromise;\n  }\n\n  ready(): Promise<T> {\n    if (this._started) return Promise.resolve(this._data);\n    if (this._startPromise) return this._startPromise;\n    if (this._startByReadyFunction) return this.start();\n\n    return this.startSubject.pipe(takeUntil(this.stopSubject)).toPromise();\n  }\n\n  async stop() {\n    try {\n      this.unsubscribe();\n      await this.ngOnStop();\n    } catch (err) {\n      console.error('Failed to stop a service: ' + ((err && err.message) || err), err);\n    } finally {\n      this._data = null;\n      this._started = false;\n      this._startPromise = undefined;\n      this.stopSubject.next();\n    }\n  }\n\n  async restart(opts?: O): Promise<T> {\n    if (this._startPromise) await this._startPromise; // Wait end of previous start, if running\n    if (this._started) await this.stop(); // Then stop if started\n    return this.start(opts); // Then start again\n  }\n\n  get started(): boolean {\n    return this._started;\n  }\n\n  get starting(): boolean {\n    return !!this._startPromise;\n  }\n\n  get stopped(): boolean {\n    return !this._started && !this._startPromise;\n  }\n\n  protected registerSubscription(sub: Subscription) {\n    this._subscription = this._subscription || new Subscription();\n    this._subscription.add(sub);\n  }\n\n  protected unregisterSubscription(sub: Subscription): void {\n    this._subscription?.remove(sub);\n  }\n\n  protected unsubscribe() {\n    this._subscription?.unsubscribe();\n    this._subscription = null;\n  }\n\n  protected ngOnStop(): Promise<void> | void {\n    // Can be overwritten by subclasses\n  }\n\n  protected abstract ngOnStart(opts?: O): Promise<T>;\n}\n"]}
|
|
@@ -11,28 +11,27 @@ export class TranslateContextService {
|
|
|
11
11
|
}
|
|
12
12
|
get(key, context, interpolateParams) {
|
|
13
13
|
// No context: do a normal translate
|
|
14
|
-
if (!key ||
|
|
14
|
+
if (!key || isNil(context))
|
|
15
15
|
return this.translate.get(key, interpolateParams);
|
|
16
16
|
if (Array.isArray(key)) {
|
|
17
17
|
if (!key.length)
|
|
18
18
|
return of();
|
|
19
19
|
// Observe the first key, then add other
|
|
20
|
-
return this.get(key[0])
|
|
21
|
-
.
|
|
20
|
+
return this.get(key[0]).pipe(map((translation) => key
|
|
21
|
+
.slice(1) // Skip 1, because we already have it
|
|
22
22
|
.reduce((map, k) => {
|
|
23
23
|
map[k] = this.instant(k, context);
|
|
24
24
|
return map;
|
|
25
25
|
},
|
|
26
26
|
// Init with the first value
|
|
27
27
|
{
|
|
28
|
-
[key[0]]: translation
|
|
28
|
+
[key[0]]: translation,
|
|
29
29
|
})));
|
|
30
30
|
}
|
|
31
31
|
// Compute a contextual i18n key, using the context as suffix
|
|
32
32
|
const contextualKeys = this.contextualKeys(key, context);
|
|
33
33
|
// Return the contextual translation, or default of not exists
|
|
34
|
-
return this.translate.get(contextualKeys, interpolateParams)
|
|
35
|
-
.pipe(map(translations => this.findFirstValid(contextualKeys, translations)));
|
|
34
|
+
return this.translate.get(contextualKeys, interpolateParams).pipe(map((translations) => this.findFirstValid(contextualKeys, translations)));
|
|
36
35
|
}
|
|
37
36
|
instant(key, context, interpolateParams) {
|
|
38
37
|
// No context: do a normal translate
|
|
@@ -58,14 +57,15 @@ export class TranslateContextService {
|
|
|
58
57
|
* @private
|
|
59
58
|
*/
|
|
60
59
|
contextualKeys(key, context) {
|
|
61
|
-
return context
|
|
60
|
+
return context
|
|
61
|
+
.split('.')
|
|
62
62
|
.filter(isNotNilOrBlank)
|
|
63
63
|
.reduce((res, item) => {
|
|
64
|
-
const inheritedContext = res.length > 0 ?
|
|
64
|
+
const inheritedContext = res.length > 0 ? res[res.length - 1] + '.' : '';
|
|
65
65
|
return res.concat(inheritedContext + item);
|
|
66
66
|
}, [])
|
|
67
67
|
.reverse() // Start with children, ends with parent key
|
|
68
|
-
.map(contextItem => this.contextualKey(key, contextItem))
|
|
68
|
+
.map((contextItem) => this.contextualKey(key, contextItem))
|
|
69
69
|
.concat(key);
|
|
70
70
|
}
|
|
71
71
|
/**
|
|
@@ -82,9 +82,12 @@ export class TranslateContextService {
|
|
|
82
82
|
}
|
|
83
83
|
// Compute a contextual i18n key, using the context as suffix
|
|
84
84
|
const parts = key.split('.');
|
|
85
|
-
return
|
|
85
|
+
return parts.length === 1
|
|
86
86
|
? `${context}${key}`
|
|
87
|
-
: parts
|
|
87
|
+
: parts
|
|
88
|
+
.slice(0, parts.length - 1)
|
|
89
|
+
.concat(context + parts[parts.length - 1])
|
|
90
|
+
.join('.');
|
|
88
91
|
}
|
|
89
92
|
findFirstValid(keys, translations) {
|
|
90
93
|
// For eac contextual key: try to find translation, then use the first valid
|
|
@@ -94,11 +97,11 @@ export class TranslateContextService {
|
|
|
94
97
|
}
|
|
95
98
|
return translations[keys[keys.length - 1]]; // Return the last keys translation
|
|
96
99
|
}
|
|
97
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
98
|
-
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
|
100
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: TranslateContextService, deps: [{ token: i1.TranslateService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
101
|
+
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: TranslateContextService, providedIn: 'root' });
|
|
99
102
|
}
|
|
100
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
103
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: TranslateContextService, decorators: [{
|
|
101
104
|
type: Injectable,
|
|
102
105
|
args: [{ providedIn: 'root' }]
|
|
103
106
|
}], ctorParameters: () => [{ type: i1.TranslateService }] });
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"translate-context.service.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/translate-context.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { TranslateService } from '@ngx-translate/core';\nimport { map } from 'rxjs/operators';\nimport { Observable, of } from 'rxjs';\nimport { isNil, isNilOrBlank, isNotNilOrBlank } from '../functions';\n\n@Injectable({ providedIn: 'root' })\nexport class TranslateContextService {\n  constructor(protected translate: TranslateService) {}\n\n  get(key: string | string[], context?: string, interpolateParams?: any): Observable<any> {\n    // No context: do a normal translate\n    if (!key || isNil(context)) return this.translate.get(key, interpolateParams);\n\n    if (Array.isArray(key)) {\n      if (!key.length) return of();\n      // Observe the first key, then add other\n      return this.get(key[0]).pipe(\n        map((translation) =>\n          key\n            .slice(1) // Skip 1, because we already have it\n            .reduce(\n              (map, k) => {\n                map[k] = this.instant(k, context);\n                return map;\n              },\n              // Init with the first value\n              {\n                [key[0]]: translation,\n              }\n            )\n        )\n      );\n    }\n\n    // Compute a contextual i18n key, using the context as suffix\n    const contextualKeys = this.contextualKeys(key, context);\n\n    // Return the contextual translation, or default of not exists\n    return this.translate.get(contextualKeys, interpolateParams).pipe(map((translations) => this.findFirstValid(contextualKeys, translations)));\n  }\n\n  instant(key: string | string[], context?: string, interpolateParams?: any): any {\n    // No context: do a normal translate\n    if (!key || isNilOrBlank(context)) return this.translate.instant(key, interpolateParams);\n\n    if (Array.isArray(key)) {\n      return key.reduce((map, k) => {\n        map[k] = this.instant(k, context);\n        return map;\n      }, {});\n    }\n\n    // Compute a contextual i18n key, using the context as suffix\n    const contextualKeys = this.contextualKeys(key, context);\n    const translations = this.translate.instant(contextualKeys, interpolateParams);\n\n    return this.findFirstValid(contextualKeys, translations);\n  }\n\n  /**\n   * Compute contextual i18n keys, using the context as suffix.<br>\n   * Suffix can be simple name (like 'aaa' - will return ['<key>.aaa']) or complexe (like 'aaa.bbb' - will return ['<key>.aaa.bbb', '<key>.aaa']\n   *\n   * @param key\n   * @param context\n   * @private\n   */\n  contextualKeys(key: string, context: string): string[] {\n    return context\n      .split('.')\n      .filter(isNotNilOrBlank)\n      .reduce((res, item) => {\n        const inheritedContext = res.length > 0 ? res[res.length - 1] + '.' : '';\n        return res.concat(inheritedContext + item);\n      }, [])\n      .reverse() // Start with children, ends with parent key\n      .map((contextItem) => this.contextualKey(key, contextItem))\n      .concat(key);\n  }\n\n  /**\n   * Compute a contextual i18n key, using the context as suffix\n   *\n   * @param key\n   * @param context\n   * @private\n   */\n  contextualKey(key: string, context: string): string {\n    // Append a dot on context if missing\n    if (!context.endsWith('.')) {\n      context = context + '.';\n    }\n\n    // Compute a contextual i18n key, using the context as suffix\n    const parts = key.split('.');\n    return parts.length === 1\n      ? `${context}${key}`\n      : parts\n          .slice(0, parts.length - 1)\n          .concat(context + parts[parts.length - 1])\n          .join('.');\n  }\n\n  private findFirstValid(keys: string[], translations: { [key: string]: string }): string {\n    // For eac contextual key: try to find translation, then use the first valid\n    for (const key of keys) {\n      if (translations[key] !== key) return translations[key];\n    }\n    return translations[keys[keys.length - 1]]; // Return the last keys translation\n  }\n}\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9yLXNlcnZpY2UuY2xhc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL3NoYXJlZC9zZXJ2aWNlcy92YWxpZGF0b3Itc2VydmljZS5jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVmFsaWRhdG9yU2VydmljZSB9IGZyb20gJ0BlLWlzL25neC1tYXRlcmlhbC10YWJsZSc7XG5pbXBvcnQgeyBBYnN0cmFjdENvbnRyb2wsIFVudHlwZWRGb3JtR3JvdXAgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSVZhbGlkYXRvclNlcnZpY2U8VD4gZXh0ZW5kcyBWYWxpZGF0b3JTZXJ2aWNlIHtcbiAgZ2V0Rm9ybUdyb3VwKGRhdGE/OiBUKTogVW50eXBlZEZvcm1Hcm91cDtcblxuICAvKipcbiAgICogQ29tcHV0ZSBlcnJvcnMgZnJvbSBhIGNvbnRyb2xzXG4gICAqXG4gICAqIEBwYXJhbSBjb250cm9sIGFueSBjb250cm9sLCBvciBGb3JtR3JvdXAsIG9yIEZvcm1BcnJheVxuICAgKi9cbiAgZ2V0STE4bkZvcm1FcnJvcnMoY29udHJvbDogQWJzdHJhY3RDb250cm9sKTogc3RyaW5nW107XG59XG4iXX0=
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { getPropertyByPathAsString, isNotEmptyArray, isNotNil, isNotNilOrBlank, matchUpperCase, propertiesPathComparator, startsWithUpperCase } from './functions';
|
|
1
|
+
import { getPropertyByPathAsString, isNotEmptyArray, isNotNil, isNotNilOrBlank, matchUpperCase, propertiesPathComparator, startsWithUpperCase, } from './functions';
|
|
2
2
|
export function suggestFromArray(items, value, opts) {
|
|
3
3
|
if (isNotNil(value) && typeof value === 'object')
|
|
4
4
|
return { data: [value] };
|
|
5
|
-
value = (typeof value === 'string' && value !== '*'
|
|
6
|
-
const keys = opts && (opts.searchAttribute && [opts.searchAttribute] || opts.searchAttributes) || ['label'];
|
|
5
|
+
value = (typeof value === 'string' && value !== '*' && value.toUpperCase()) || undefined;
|
|
6
|
+
const keys = (opts && ((opts.searchAttribute && [opts.searchAttribute]) || opts.searchAttributes)) || ['label'];
|
|
7
7
|
if (!items) {
|
|
8
8
|
return { data: [], total: 0 };
|
|
9
9
|
}
|
|
@@ -11,18 +11,18 @@ export function suggestFromArray(items, value, opts) {
|
|
|
11
11
|
let filteredItems = items;
|
|
12
12
|
if (isNotNilOrBlank(value)) {
|
|
13
13
|
// If wildcard, search using regexp
|
|
14
|
-
if (value.indexOf('*') !== -1) {
|
|
14
|
+
if (opts?.anySearch || value.indexOf('*') !== -1) {
|
|
15
15
|
value = value.replace(/[*]+/g, '.*');
|
|
16
|
-
filteredItems = filteredItems.filter(v => keys.findIndex(key => matchUpperCase(getPropertyByPathAsString(v, key), value)) !== -1);
|
|
16
|
+
filteredItems = filteredItems.filter((v) => keys.findIndex((key) => matchUpperCase(getPropertyByPathAsString(v, key), value)) !== -1);
|
|
17
17
|
}
|
|
18
18
|
// Else (no wildcard), search using startsWith
|
|
19
19
|
else {
|
|
20
|
-
filteredItems = filteredItems.filter(v => keys.findIndex(key => startsWithUpperCase(getPropertyByPathAsString(v, key), value)) !== -1);
|
|
20
|
+
filteredItems = filteredItems.filter((v) => keys.findIndex((key) => startsWithUpperCase(getPropertyByPathAsString(v, key), value)) !== -1);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
// Exclude ids
|
|
24
24
|
if (isNotEmptyArray(opts?.excludedIds)) {
|
|
25
|
-
filteredItems = filteredItems.filter(v => !opts.excludedIds.includes(+v['id']));
|
|
25
|
+
filteredItems = filteredItems.filter((v) => !opts.excludedIds.includes(+v['id']));
|
|
26
26
|
}
|
|
27
27
|
// Sort
|
|
28
28
|
if (!opts || opts.skipSort !== true) {
|
|
@@ -45,18 +45,18 @@ export function suggestFromArray(items, value, opts) {
|
|
|
45
45
|
}
|
|
46
46
|
const result = {
|
|
47
47
|
data: pageData,
|
|
48
|
-
total
|
|
48
|
+
total,
|
|
49
49
|
};
|
|
50
50
|
// Add fetch more capability, if total was fetched
|
|
51
|
-
const nextOffset = (opts && opts.offset || 0) + pageData.length;
|
|
51
|
+
const nextOffset = ((opts && opts.offset) || 0) + pageData.length;
|
|
52
52
|
if (nextOffset < total) {
|
|
53
53
|
result.fetchMore = async (_) => suggestFromArray(filteredItems, undefined /*OPTIMISATION: already applied*/, {
|
|
54
54
|
...opts,
|
|
55
55
|
offset: nextOffset,
|
|
56
|
-
skipSort: true,
|
|
57
|
-
excludedIds: undefined // OPTIMISATION: already filtered
|
|
56
|
+
skipSort: true, // OPTIMISATION: already sorted
|
|
57
|
+
excludedIds: undefined, // OPTIMISATION: already filtered
|
|
58
58
|
});
|
|
59
59
|
}
|
|
60
60
|
return result;
|
|
61
61
|
}
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvYXBwL3NoYXJlZC9zZXJ2aWNlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQ0wseUJBQXlCLEVBQ3pCLGVBQWUsRUFDZixRQUFRLEVBQ1IsZUFBZSxFQUNmLGNBQWMsRUFDZCx3QkFBd0IsRUFDeEIsbUJBQW1CLEdBQ3BCLE1BQU0sYUFBYSxDQUFDO0FBRXJCLE1BQU0sVUFBVSxnQkFBZ0IsQ0FDOUIsS0FBVSxFQUNWLEtBQVUsRUFDVixJQVFDO0lBRUQsSUFBSSxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUTtRQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO0lBRTNFLEtBQUssR0FBRyxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxLQUFLLEtBQUssR0FBRyxJQUFJLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQyxJQUFJLFNBQVMsQ0FBQztJQUV6RixNQUFNLElBQUksR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLGVBQWUsSUFBSSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxJQUFJLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUVoSCxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDWCxPQUFPLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUM7SUFDaEMsQ0FBQztJQUVELGVBQWU7SUFDZixJQUFJLGFBQWEsR0FBRyxLQUFLLENBQUM7SUFDMUIsSUFBSSxlQUFlLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztRQUMzQixtQ0FBbUM7UUFDbkMsSUFBSSxJQUFJLEVBQUUsU0FBUyxJQUFLLEtBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDN0QsS0FBSyxHQUFJLEtBQWdCLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztZQUNqRCxhQUFhLEdBQUcsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsY0FBYyxDQUFDLHlCQUF5QixDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEksQ0FBQztRQUNELDhDQUE4QzthQUN6QyxDQUFDO1lBQ0osYUFBYSxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLG1CQUFtQixDQUFDLHlCQUF5QixDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDN0ksQ0FBQztJQUNILENBQUM7SUFFRCxjQUFjO0lBQ2QsSUFBSSxlQUFlLENBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxFQUFFLENBQUM7UUFDdkMsYUFBYSxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BGLENBQUM7SUFFRCxPQUFPO0lBQ1AsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsUUFBUSxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ3BDLHFFQUFxRTtRQUNyRSxJQUFJLGFBQWEsS0FBSyxLQUFLO1lBQUUsYUFBYSxHQUFHLGFBQWEsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUVuRSxlQUFlO1FBQ2YsYUFBYSxDQUFDLElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQ3JELENBQUM7SUFFRCxNQUFNLEtBQUssR0FBRyxhQUFhLENBQUMsTUFBTSxJQUFJLENBQUMsQ0FBQztJQUV4QyxnQ0FBZ0M7SUFDaEMsSUFBSSxRQUFRLEdBQUcsYUFBYSxDQUFDO0lBQzdCLElBQUksSUFBSSxFQUFFLENBQUM7UUFDVCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUMzQixRQUFRLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDekMsQ0FBQztRQUNELElBQUksUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxRQUFRLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUN2RCxRQUFRLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFDLENBQUM7SUFDSCxDQUFDO0lBRUQsTUFBTSxNQUFNLEdBQWtCO1FBQzVCLElBQUksRUFBRSxRQUFRO1FBQ2QsS0FBSztLQUNOLENBQUM7SUFFRixrREFBa0Q7SUFDbEQsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQztJQUNsRSxJQUFJLFVBQVUsR0FBRyxLQUFLLEVBQUUsQ0FBQztRQUN2QixNQUFNLENBQUMsU0FBUyxHQUFHLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUM3QixnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsU0FBUyxDQUFDLGlDQUFpQyxFQUFFO1lBQzNFLEdBQUcsSUFBSTtZQUNQLE1BQU0sRUFBRSxVQUFVO1lBQ2xCLFFBQVEsRUFBRSxJQUFJLEVBQUUsK0JBQStCO1lBQy9DLFdBQVcsRUFBRSxTQUFTLEVBQUUsaUNBQWlDO1NBQzFELENBQUMsQ0FBQztJQUNQLENBQUM7SUFFRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgTG9hZFJlc3VsdCB9IGZyb20gJy4vc2VydmljZXMvZW50aXR5LXNlcnZpY2UuY2xhc3MnO1xuaW1wb3J0IHtcbiAgZ2V0UHJvcGVydHlCeVBhdGhBc1N0cmluZyxcbiAgaXNOb3RFbXB0eUFycmF5LFxuICBpc05vdE5pbCxcbiAgaXNOb3ROaWxPckJsYW5rLFxuICBtYXRjaFVwcGVyQ2FzZSxcbiAgcHJvcGVydGllc1BhdGhDb21wYXJhdG9yLFxuICBzdGFydHNXaXRoVXBwZXJDYXNlLFxufSBmcm9tICcuL2Z1bmN0aW9ucyc7XG5cbmV4cG9ydCBmdW5jdGlvbiBzdWdnZXN0RnJvbUFycmF5PFQgPSBhbnk+KFxuICBpdGVtczogVFtdLFxuICB2YWx1ZTogYW55LFxuICBvcHRzPzoge1xuICAgIG9mZnNldD86IG51bWJlcjtcbiAgICBzaXplPzogbnVtYmVyO1xuICAgIHNlYXJjaEF0dHJpYnV0ZT86IHN0cmluZztcbiAgICBzZWFyY2hBdHRyaWJ1dGVzPzogc3RyaW5nW107XG4gICAgZXhjbHVkZWRJZHM/OiBudW1iZXJbXTtcbiAgICBza2lwU29ydD86IGJvb2xlYW47XG4gICAgYW55U2VhcmNoPzogYm9vbGVhbjtcbiAgfVxuKTogTG9hZFJlc3VsdDxUPiB7XG4gIGlmIChpc05vdE5pbCh2YWx1ZSkgJiYgdHlwZW9mIHZhbHVlID09PSAnb2JqZWN0JykgcmV0dXJuIHsgZGF0YTogW3ZhbHVlXSB9O1xuXG4gIHZhbHVlID0gKHR5cGVvZiB2YWx1ZSA9PT0gJ3N0cmluZycgJiYgdmFsdWUgIT09ICcqJyAmJiB2YWx1ZS50b1VwcGVyQ2FzZSgpKSB8fCB1bmRlZmluZWQ7XG5cbiAgY29uc3Qga2V5cyA9IChvcHRzICYmICgob3B0cy5zZWFyY2hBdHRyaWJ1dGUgJiYgW29wdHMuc2VhcmNoQXR0cmlidXRlXSkgfHwgb3B0cy5zZWFyY2hBdHRyaWJ1dGVzKSkgfHwgWydsYWJlbCddO1xuXG4gIGlmICghaXRlbXMpIHtcbiAgICByZXR1cm4geyBkYXRhOiBbXSwgdG90YWw6IDAgfTtcbiAgfVxuXG4gIC8vIEZpbHRlciBpdGVtc1xuICBsZXQgZmlsdGVyZWRJdGVtcyA9IGl0ZW1zO1xuICBpZiAoaXNOb3ROaWxPckJsYW5rKHZhbHVlKSkge1xuICAgIC8vIElmIHdpbGRjYXJkLCBzZWFyY2ggdXNpbmcgcmVnZXhwXG4gICAgaWYgKG9wdHM/LmFueVNlYXJjaCB8fCAodmFsdWUgYXMgc3RyaW5nKS5pbmRleE9mKCcqJykgIT09IC0xKSB7XG4gICAgICB2YWx1ZSA9ICh2YWx1ZSBhcyBzdHJpbmcpLnJlcGxhY2UoL1sqXSsvZywgJy4qJyk7XG4gICAgICBmaWx0ZXJlZEl0ZW1zID0gZmlsdGVyZWRJdGVtcy5maWx0ZXIoKHYpID0+IGtleXMuZmluZEluZGV4KChrZXkpID0+IG1hdGNoVXBwZXJDYXNlKGdldFByb3BlcnR5QnlQYXRoQXNTdHJpbmcodiwga2V5KSwgdmFsdWUpKSAhPT0gLTEpO1xuICAgIH1cbiAgICAvLyBFbHNlIChubyB3aWxkY2FyZCksIHNlYXJjaCB1c2luZyBzdGFydHNXaXRoXG4gICAgZWxzZSB7XG4gICAgICBmaWx0ZXJlZEl0ZW1zID0gZmlsdGVyZWRJdGVtcy5maWx0ZXIoKHYpID0+IGtleXMuZmluZEluZGV4KChrZXkpID0+IHN0YXJ0c1dpdGhVcHBlckNhc2UoZ2V0UHJvcGVydHlCeVBhdGhBc1N0cmluZyh2LCBrZXkpLCB2YWx1ZSkpICE9PSAtMSk7XG4gICAgfVxuICB9XG5cbiAgLy8gRXhjbHVkZSBpZHNcbiAgaWYgKGlzTm90RW1wdHlBcnJheShvcHRzPy5leGNsdWRlZElkcykpIHtcbiAgICBmaWx0ZXJlZEl0ZW1zID0gZmlsdGVyZWRJdGVtcy5maWx0ZXIoKHYpID0+ICFvcHRzLmV4Y2x1ZGVkSWRzLmluY2x1ZGVzKCt2WydpZCddKSk7XG4gIH1cblxuICAvLyBTb3J0XG4gIGlmICghb3B0cyB8fCBvcHRzLnNraXBTb3J0ICE9PSB0cnVlKSB7XG4gICAgLy8gTWFrZSB0byBjb3B5IGlucHV0IGl0ZW1zLCBiZWZvcmUgc29ydGluZyAoaWYgbm90IHlldCBhbHJlYWR5IGRvbmUpXG4gICAgaWYgKGZpbHRlcmVkSXRlbXMgPT09IGl0ZW1zKSBmaWx0ZXJlZEl0ZW1zID0gZmlsdGVyZWRJdGVtcy5zbGljZSgpO1xuXG4gICAgLy8gU29ydCBieSBrZXlzXG4gICAgZmlsdGVyZWRJdGVtcy5zb3J0KHByb3BlcnRpZXNQYXRoQ29tcGFyYXRvcihrZXlzKSk7XG4gIH1cblxuICBjb25zdCB0b3RhbCA9IGZpbHRlcmVkSXRlbXMubGVuZ3RoIHx8IDA7XG5cbiAgLy8gUGFnaW5hdGlvbiAodHJ1bmNhdGUgaWYgbmVlZClcbiAgbGV0IHBhZ2VEYXRhID0gZmlsdGVyZWRJdGVtcztcbiAgaWYgKG9wdHMpIHtcbiAgICBpZiAoKG9wdHMub2Zmc2V0IHx8IDApID4gMCkge1xuICAgICAgcGFnZURhdGEgPSBwYWdlRGF0YS5zbGljZShvcHRzLm9mZnNldCk7XG4gICAgfVxuICAgIGlmIChpc05vdE5pbChvcHRzLnNpemUpICYmIHBhZ2VEYXRhLmxlbmd0aCA+IG9wdHMuc2l6ZSkge1xuICAgICAgcGFnZURhdGEgPSBwYWdlRGF0YS5zbGljZSgwLCBvcHRzLnNpemUpO1xuICAgIH1cbiAgfVxuXG4gIGNvbnN0IHJlc3VsdDogTG9hZFJlc3VsdDxUPiA9IHtcbiAgICBkYXRhOiBwYWdlRGF0YSxcbiAgICB0b3RhbCxcbiAgfTtcblxuICAvLyBBZGQgZmV0Y2ggbW9yZSBjYXBhYmlsaXR5LCBpZiB0b3RhbCB3YXMgZmV0Y2hlZFxuICBjb25zdCBuZXh0T2Zmc2V0ID0gKChvcHRzICYmIG9wdHMub2Zmc2V0KSB8fCAwKSArIHBhZ2VEYXRhLmxlbmd0aDtcbiAgaWYgKG5leHRPZmZzZXQgPCB0b3RhbCkge1xuICAgIHJlc3VsdC5mZXRjaE1vcmUgPSBhc3luYyAoXykgPT5cbiAgICAgIHN1Z2dlc3RGcm9tQXJyYXkoZmlsdGVyZWRJdGVtcywgdW5kZWZpbmVkIC8qT1BUSU1JU0FUSU9OOiBhbHJlYWR5IGFwcGxpZWQqLywge1xuICAgICAgICAuLi5vcHRzLFxuICAgICAgICBvZmZzZXQ6IG5leHRPZmZzZXQsXG4gICAgICAgIHNraXBTb3J0OiB0cnVlLCAvLyBPUFRJTUlTQVRJT046IGFscmVhZHkgc29ydGVkXG4gICAgICAgIGV4Y2x1ZGVkSWRzOiB1bmRlZmluZWQsIC8vIE9QVElNSVNBVElPTjogYWxyZWFkeSBmaWx0ZXJlZFxuICAgICAgfSk7XG4gIH1cblxuICByZXR1cm4gcmVzdWx0O1xufVxuIl19
|
|
@@ -18,19 +18,22 @@ export class CustomReuseStrategy extends IonicRouteStrategy {
|
|
|
18
18
|
// Is sam route config
|
|
19
19
|
if (!reuse && future.routeConfig && future.routeConfig === curr.routeConfig) {
|
|
20
20
|
// Read the parameter name, where id is stored
|
|
21
|
-
const pathIdParam = future.routeConfig.data && future.routeConfig.data.pathIdParam || 'id';
|
|
21
|
+
const pathIdParam = (future.routeConfig.data && future.routeConfig.data.pathIdParam) || 'id';
|
|
22
22
|
// Read the current route id
|
|
23
23
|
const currId = curr.params[pathIdParam] === 'new'
|
|
24
|
-
?
|
|
24
|
+
? curr.queryParams[pathIdParam] || curr.queryParams['id'] || 'new' // e.g. path like '/new/?id=<ID>'
|
|
25
25
|
: curr.params[pathIdParam]; // e.g. path like '/<ID>'
|
|
26
26
|
// Read the future route id
|
|
27
27
|
const futureId = future.params[pathIdParam] === 'new'
|
|
28
|
-
?
|
|
28
|
+
? future.queryParams[pathIdParam] || future.queryParams['id'] || 'new' // e.g. path like '/new/?id=<ID>'
|
|
29
29
|
: future.params[pathIdParam]; // e.g. path like '/<ID>'
|
|
30
30
|
// Reuse if same ID, using a futureId, if exists
|
|
31
31
|
if (isNotNil(futureId)) {
|
|
32
32
|
// Allow reuse when changing from /new to /new?id=:id
|
|
33
|
-
if (currId === 'new' &&
|
|
33
|
+
if (currId === 'new' &&
|
|
34
|
+
isNil(curr.queryParams[pathIdParam]) &&
|
|
35
|
+
future.params[pathIdParam] === 'new' &&
|
|
36
|
+
isNotNil(future.queryParams[pathIdParam])) {
|
|
34
37
|
return true;
|
|
35
38
|
}
|
|
36
39
|
// Allow reuse same id, expect when expected '/new'
|
|
@@ -39,33 +42,31 @@ export class CustomReuseStrategy extends IonicRouteStrategy {
|
|
|
39
42
|
}
|
|
40
43
|
return reuse;
|
|
41
44
|
}
|
|
42
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
43
|
-
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
|
45
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: CustomReuseStrategy, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
|
|
46
|
+
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: CustomReuseStrategy });
|
|
44
47
|
}
|
|
45
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
48
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: CustomReuseStrategy, decorators: [{
|
|
46
49
|
type: Injectable
|
|
47
50
|
}] });
|
|
48
51
|
export class SharedRoutingModule {
|
|
49
52
|
constructor() {
|
|
50
53
|
console.debug('[shared-routing] Creating module...');
|
|
51
54
|
}
|
|
52
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
53
|
-
static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "
|
|
54
|
-
static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "
|
|
55
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: SharedRoutingModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
56
|
+
static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.8", ngImport: i0, type: SharedRoutingModule, imports: [RouterModule] });
|
|
57
|
+
static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: SharedRoutingModule, providers: [
|
|
55
58
|
{ provide: RouteReuseStrategy, useClass: CustomReuseStrategy },
|
|
56
|
-
{ provide: ComponentDirtyGuard, useClass: ComponentDirtyGuard }
|
|
59
|
+
{ provide: ComponentDirtyGuard, useClass: ComponentDirtyGuard },
|
|
57
60
|
], imports: [RouterModule] });
|
|
58
61
|
}
|
|
59
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
62
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.8", ngImport: i0, type: SharedRoutingModule, decorators: [{
|
|
60
63
|
type: NgModule,
|
|
61
64
|
args: [{
|
|
62
|
-
imports: [
|
|
63
|
-
RouterModule
|
|
64
|
-
],
|
|
65
|
+
imports: [RouterModule],
|
|
65
66
|
providers: [
|
|
66
67
|
{ provide: RouteReuseStrategy, useClass: CustomReuseStrategy },
|
|
67
|
-
{ provide: ComponentDirtyGuard, useClass: ComponentDirtyGuard }
|
|
68
|
-
]
|
|
68
|
+
{ provide: ComponentDirtyGuard, useClass: ComponentDirtyGuard },
|
|
69
|
+
],
|
|
69
70
|
}]
|
|
70
71
|
}], ctorParameters: () => [] });
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLXJvdXRpbmcubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vc3JjL2FwcC9zaGFyZWQvc2hhcmVkLXJvdXRpbmcubW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3JELE9BQU8sRUFBMEIsa0JBQWtCLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0YsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDcEQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDcEUsT0FBTyxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUM7O0FBRzlDLE1BQU0sT0FBTyxtQkFBb0IsU0FBUSxrQkFBa0I7SUFDekQ7Ozs7Ozs7T0FPRztJQUNILGdCQUFnQixDQUFDLE1BQThCLEVBQUUsSUFBNEI7UUFDM0UsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLGdCQUFnQixDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUVuRCxzQkFBc0I7UUFDdEIsSUFBSSxDQUFDLEtBQUssSUFBSSxNQUFNLENBQUMsV0FBVyxJQUFJLE1BQU0sQ0FBQyxXQUFXLEtBQUssSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQzVFLDhDQUE4QztZQUM5QyxNQUFNLFdBQVcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxJQUFJLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLElBQUksQ0FBQztZQUU3Riw0QkFBNEI7WUFDNUIsTUFBTSxNQUFNLEdBQ1YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxLQUFLO2dCQUNoQyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxJQUFJLEtBQUssQ0FBQyxpQ0FBaUM7Z0JBQ3BHLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMseUJBQXlCO1lBRXpELDJCQUEyQjtZQUMzQixNQUFNLFFBQVEsR0FDWixNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEtBQUs7Z0JBQ2xDLENBQUMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksS0FBSyxDQUFDLGlDQUFpQztnQkFDeEcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyx5QkFBeUI7WUFFM0QsZ0RBQWdEO1lBQ2hELElBQUksUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7Z0JBQ3ZCLHFEQUFxRDtnQkFDckQsSUFDRSxNQUFNLEtBQUssS0FBSztvQkFDaEIsS0FBSyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUM7b0JBQ3BDLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssS0FBSztvQkFDcEMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsRUFDekMsQ0FBQztvQkFDRCxPQUFPLElBQUksQ0FBQztnQkFDZCxDQUFDO2dCQUVELG1EQUFtRDtnQkFDbkQsT0FBTyxRQUFRLEtBQUssS0FBSyxJQUFJLFFBQVEsS0FBSyxNQUFNLENBQUM7WUFDbkQsQ0FBQztRQUNILENBQUM7UUFFRCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7dUdBL0NVLG1CQUFtQjsyR0FBbkIsbUJBQW1COzsyRkFBbkIsbUJBQW1CO2tCQUQvQixVQUFVOztBQTBEWCxNQUFNLE9BQU8sbUJBQW1CO0lBQzlCO1FBQ0UsT0FBTyxDQUFDLEtBQUssQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7dUdBSFUsbUJBQW1CO3dHQUFuQixtQkFBbUIsWUFOcEIsWUFBWTt3R0FNWCxtQkFBbUIsYUFMbkI7WUFDVCxFQUFFLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxRQUFRLEVBQUUsbUJBQW1CLEVBQUU7WUFDOUQsRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsUUFBUSxFQUFFLG1CQUFtQixFQUFFO1NBQ2hFLFlBSlMsWUFBWTs7MkZBTVgsbUJBQW1CO2tCQVAvQixRQUFRO21CQUFDO29CQUNSLE9BQU8sRUFBRSxDQUFDLFlBQVksQ0FBQztvQkFDdkIsU0FBUyxFQUFFO3dCQUNULEVBQUUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLFFBQVEsRUFBRSxtQkFBbUIsRUFBRTt3QkFDOUQsRUFBRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsUUFBUSxFQUFFLG1CQUFtQixFQUFFO3FCQUNoRTtpQkFDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUsIE5nTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBSb3V0ZVJldXNlU3RyYXRlZ3ksIFJvdXRlck1vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBJb25pY1JvdXRlU3RyYXRlZ3kgfSBmcm9tICdAaW9uaWMvYW5ndWxhcic7XG5pbXBvcnQgeyBDb21wb25lbnREaXJ0eUd1YXJkIH0gZnJvbSAnLi9ndWFyZC9jb21wb25lbnQtZGlydHkuZ3VhcmQnO1xuaW1wb3J0IHsgaXNOaWwsIGlzTm90TmlsIH0gZnJvbSAnLi9mdW5jdGlvbnMnO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgQ3VzdG9tUmV1c2VTdHJhdGVneSBleHRlbmRzIElvbmljUm91dGVTdHJhdGVneSB7XG4gIC8qKlxuICAgKiBGb3JjZSB0byByZXVzZSB0aGUgcm91dGUgd2hlbjpcbiAgICogIC0gcGF0aCBjaGFuZ2UgZnJvbSBbL25ld10gLT4gWy86aWRdXG4gICAqICAtIG9yIHBhdGggY2hhbmdlIGZyb20gWy9uZXddIC0+IFsvbmV3P2lkPTppZF1cbiAgICpcbiAgICogQHBhcmFtIGZ1dHVyZVxuICAgKiBAcGFyYW0gY3VyclxuICAgKi9cbiAgc2hvdWxkUmV1c2VSb3V0ZShmdXR1cmU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIGN1cnI6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QpOiBib29sZWFuIHtcbiAgICBjb25zdCByZXVzZSA9IHN1cGVyLnNob3VsZFJldXNlUm91dGUoZnV0dXJlLCBjdXJyKTtcblxuICAgIC8vIElzIHNhbSByb3V0ZSBjb25maWdcbiAgICBpZiAoIXJldXNlICYmIGZ1dHVyZS5yb3V0ZUNvbmZpZyAmJiBmdXR1cmUucm91dGVDb25maWcgPT09IGN1cnIucm91dGVDb25maWcpIHtcbiAgICAgIC8vIFJlYWQgdGhlIHBhcmFtZXRlciBuYW1lLCB3aGVyZSBpZCBpcyBzdG9yZWRcbiAgICAgIGNvbnN0IHBhdGhJZFBhcmFtID0gKGZ1dHVyZS5yb3V0ZUNvbmZpZy5kYXRhICYmIGZ1dHVyZS5yb3V0ZUNvbmZpZy5kYXRhLnBhdGhJZFBhcmFtKSB8fCAnaWQnO1xuXG4gICAgICAvLyBSZWFkIHRoZSBjdXJyZW50IHJvdXRlIGlkXG4gICAgICBjb25zdCBjdXJySWQgPVxuICAgICAgICBjdXJyLnBhcmFtc1twYXRoSWRQYXJhbV0gPT09ICduZXcnXG4gICAgICAgICAgPyBjdXJyLnF1ZXJ5UGFyYW1zW3BhdGhJZFBhcmFtXSB8fCBjdXJyLnF1ZXJ5UGFyYW1zWydpZCddIHx8ICduZXcnIC8vIGUuZy4gcGF0aCBsaWtlICcvbmV3Lz9pZD08SUQ+J1xuICAgICAgICAgIDogY3Vyci5wYXJhbXNbcGF0aElkUGFyYW1dOyAvLyBlLmcuIHBhdGggbGlrZSAnLzxJRD4nXG5cbiAgICAgIC8vIFJlYWQgdGhlIGZ1dHVyZSByb3V0ZSBpZFxuICAgICAgY29uc3QgZnV0dXJlSWQgPVxuICAgICAgICBmdXR1cmUucGFyYW1zW3BhdGhJZFBhcmFtXSA9PT0gJ25ldydcbiAgICAgICAgICA/IGZ1dHVyZS5xdWVyeVBhcmFtc1twYXRoSWRQYXJhbV0gfHwgZnV0dXJlLnF1ZXJ5UGFyYW1zWydpZCddIHx8ICduZXcnIC8vIGUuZy4gcGF0aCBsaWtlICcvbmV3Lz9pZD08SUQ+J1xuICAgICAgICAgIDogZnV0dXJlLnBhcmFtc1twYXRoSWRQYXJhbV07IC8vIGUuZy4gcGF0aCBsaWtlICcvPElEPidcblxuICAgICAgLy8gUmV1c2UgaWYgc2FtZSBJRCwgdXNpbmcgYSBmdXR1cmVJZCwgaWYgZXhpc3RzXG4gICAgICBpZiAoaXNOb3ROaWwoZnV0dXJlSWQpKSB7XG4gICAgICAgIC8vIEFsbG93IHJldXNlIHdoZW4gY2hhbmdpbmcgZnJvbSAvbmV3IHRvIC9uZXc/aWQ9OmlkXG4gICAgICAgIGlmIChcbiAgICAgICAgICBjdXJySWQgPT09ICduZXcnICYmXG4gICAgICAgICAgaXNOaWwoY3Vyci5xdWVyeVBhcmFtc1twYXRoSWRQYXJhbV0pICYmXG4gICAgICAgICAgZnV0dXJlLnBhcmFtc1twYXRoSWRQYXJhbV0gPT09ICduZXcnICYmXG4gICAgICAgICAgaXNOb3ROaWwoZnV0dXJlLnF1ZXJ5UGFyYW1zW3BhdGhJZFBhcmFtXSlcbiAgICAgICAgKSB7XG4gICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgIH1cblxuICAgICAgICAvLyBBbGxvdyByZXVzZSBzYW1lIGlkLCBleHBlY3Qgd2hlbiBleHBlY3RlZCAnL25ldydcbiAgICAgICAgcmV0dXJuIGZ1dHVyZUlkICE9PSAnbmV3JyAmJiBmdXR1cmVJZCA9PT0gY3VycklkO1xuICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiByZXVzZTtcbiAgfVxufVxuXG5ATmdNb2R1bGUoe1xuICBpbXBvcnRzOiBbUm91dGVyTW9kdWxlXSxcbiAgcHJvdmlkZXJzOiBbXG4gICAgeyBwcm92aWRlOiBSb3V0ZVJldXNlU3RyYXRlZ3ksIHVzZUNsYXNzOiBDdXN0b21SZXVzZVN0cmF0ZWd5IH0sXG4gICAgeyBwcm92aWRlOiBDb21wb25lbnREaXJ0eUd1YXJkLCB1c2VDbGFzczogQ29tcG9uZW50RGlydHlHdWFyZCB9LFxuICBdLFxufSlcbmV4cG9ydCBjbGFzcyBTaGFyZWRSb3V0aW5nTW9kdWxlIHtcbiAgY29uc3RydWN0b3IoKSB7XG4gICAgY29uc29sZS5kZWJ1ZygnW3NoYXJlZC1yb3V0aW5nXSBDcmVhdGluZyBtb2R1bGUuLi4nKTtcbiAgfVxufVxuIl19
|