@rancher/shell 1.2.3 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/data/aws-regions.json +9 -0
- package/assets/images/vendor/openid.svg +18 -0
- package/assets/styles/app.scss +1 -2
- package/assets/styles/fonts/_icons.scss +3 -3
- package/assets/styles/global/_columns.scss +1 -1
- package/assets/styles/global/_labeled-input.scss +1 -0
- package/assets/styles/global/_layout.scss +99 -0
- package/assets/styles/themes/_csp.scss +2 -2
- package/assets/styles/themes/_dark.scss +8 -2
- package/assets/styles/themes/_light.scss +2 -1
- package/assets/styles/themes/_suse.scss +1 -1
- package/assets/styles/vendor/vue-select.scss +5 -0
- package/assets/translations/en-us.yaml +315 -64
- package/assets/translations/zh-hans.yaml +7 -31
- package/babel.config.js +8 -2
- package/chart/__tests__/S3.test.ts +9 -2
- package/chart/gatekeeper.vue +2 -11
- package/chart/istio.vue +1 -10
- package/chart/logging/index.vue +2 -11
- package/chart/monitoring/alerting/index.vue +7 -21
- package/chart/monitoring/grafana/index.vue +61 -2
- package/chart/monitoring/index.vue +52 -26
- package/chart/monitoring/prometheus/index.vue +39 -45
- package/chart/rancher-backup/S3.vue +11 -9
- package/chart/rancher-backup/index.vue +18 -15
- package/cloud-credential/__tests__/harvester.test.ts +18 -0
- package/cloud-credential/azure.vue +4 -17
- package/cloud-credential/generic.vue +18 -9
- package/cloud-credential/harvester.vue +11 -3
- package/components/AlertTable.vue +17 -7
- package/components/AppModal.vue +167 -0
- package/components/AssignTo.vue +7 -4
- package/components/AsyncButton.vue +27 -5
- package/components/BackLink.vue +4 -4
- package/components/BannerGraphic.vue +1 -0
- package/components/BrandImage.vue +47 -1
- package/components/Carousel.vue +15 -8
- package/components/Certificates.vue +161 -0
- package/components/ClusterBadge.vue +12 -3
- package/components/ClusterIconMenu.vue +55 -12
- package/components/ClusterProviderIcon.vue +14 -3
- package/components/CodeMirror.vue +111 -17
- package/components/CommunityLinks.vue +12 -8
- package/components/CopyCode.vue +6 -2
- package/components/CopyToClipboard.vue +2 -1
- package/components/CopyToClipboardText.vue +14 -9
- package/components/CreateDriver.vue +81 -0
- package/components/CruResource.vue +52 -27
- package/components/DetailTop.vue +2 -2
- package/components/Dialog.vue +6 -5
- package/components/DisableAuthProviderModal.vue +14 -8
- package/components/DraggableZone.vue +2 -2
- package/components/EtcdInfoBanner.vue +5 -5
- package/components/ExplorerMembers.vue +3 -3
- package/components/ExplorerProjectsNamespaces.vue +31 -7
- package/components/FixedBanner.vue +48 -36
- package/components/GlobalRoleBindings.vue +26 -0
- package/components/GrafanaDashboard.vue +6 -4
- package/components/IconOrSvg.vue +1 -1
- package/components/Import.vue +10 -6
- package/components/Inactivity.vue +1 -5
- package/components/KeyValueView.vue +14 -10
- package/components/Markdown.vue +16 -12
- package/components/MessageLink.vue +2 -2
- package/components/ModalWithCard.vue +5 -8
- package/components/MoveModal.vue +35 -33
- package/components/PodSecurityAdmission.vue +3 -3
- package/components/PromptChangePassword.vue +33 -33
- package/components/PromptModal.vue +11 -21
- package/components/PromptRemove.vue +12 -17
- package/components/PromptRestore.vue +18 -16
- package/components/Questions/__tests__/Boolean.test.ts +9 -19
- package/components/Questions/__tests__/Float.test.ts +9 -19
- package/components/Questions/__tests__/Int.test.ts +9 -19
- package/components/Questions/__tests__/String.test.ts +9 -19
- package/components/Questions/__tests__/Yaml.test.ts +9 -20
- package/components/Questions/__tests__/utils/questions-defaults.ts +20 -0
- package/components/Questions/index.vue +19 -3
- package/components/ResourceCancelModal.vue +34 -29
- package/components/ResourceDetail/Masthead.vue +48 -16
- package/components/ResourceDetail/index.vue +6 -4
- package/components/ResourceList/Masthead.vue +10 -9
- package/components/ResourceList/index.vue +65 -14
- package/components/ResourceTable.vue +87 -21
- package/components/ResourceYaml.vue +35 -5
- package/components/SelectIconGrid.vue +3 -3
- package/components/SideNav.vue +50 -94
- package/components/SingleClusterInfo.vue +4 -4
- package/components/SortableTable/THead.vue +33 -21
- package/components/SortableTable/filtering.js +9 -1
- package/components/SortableTable/grouping.js +8 -1
- package/components/SortableTable/index.vue +143 -44
- package/components/SortableTable/paging.js +36 -7
- package/components/SortableTable/selection.js +2 -1
- package/components/SortableTable/sorting.js +24 -7
- package/components/StatusTable.vue +5 -1
- package/components/Tabbed/index.vue +18 -1
- package/components/TableDataUserIcon.vue +47 -0
- package/components/TypeDescription.vue +1 -0
- package/components/Wizard.vue +1 -0
- package/components/YamlEditor.vue +1 -0
- package/components/__tests__/AppModal.test.ts +98 -0
- package/components/__tests__/AsyncButton.test.ts +1 -3
- package/components/__tests__/BackLink.test.ts +1 -1
- package/components/__tests__/ButtonGroup.test.ts +3 -6
- package/components/__tests__/Carousel.test.ts +43 -0
- package/components/__tests__/Certificates.test.ts +29 -0
- package/components/__tests__/CodeMirror.test.ts +87 -0
- package/components/__tests__/CopyCode.test.ts +5 -4
- package/components/__tests__/CruResource.test.ts +10 -9
- package/components/__tests__/EtcdInfoBanner.test.ts +37 -0
- package/components/__tests__/FixedBanner.test.ts +5 -20
- package/components/__tests__/NamespaceFilter.test.ts +9 -18
- package/components/__tests__/TabTitle.test.ts +129 -0
- package/components/auth/AzureWarning.vue +2 -2
- package/components/auth/RoleDetailEdit.vue +10 -0
- package/components/auth/__tests__/RoleDetailEdit.test.ts +3 -2
- package/components/auth/login/oidc.vue +7 -1
- package/components/fleet/FleetBundles.vue +5 -11
- package/components/fleet/FleetClusters.vue +9 -9
- package/components/fleet/FleetIntro.vue +11 -17
- package/components/fleet/FleetNoWorkspaces.vue +2 -2
- package/components/fleet/FleetRepos.vue +63 -27
- package/components/fleet/FleetResources.vue +6 -1
- package/components/fleet/FleetStatus.vue +3 -3
- package/components/fleet/FleetSummary.vue +35 -30
- package/components/fleet/ForceDirectedTreeChart/index.vue +9 -3
- package/components/fleet/__tests__/FleetSummary.test.ts +316 -0
- package/components/form/ArrayList.vue +22 -18
- package/components/form/ArrayListSelect.vue +5 -0
- package/components/form/BannerSettings.vue +3 -0
- package/components/form/ClusterAppearance.vue +132 -0
- package/components/form/ColorInput.vue +1 -0
- package/components/form/Error.vue +3 -3
- package/components/form/FileSelector.vue +1 -0
- package/components/form/Footer.vue +2 -2
- package/components/form/GitPicker.vue +83 -38
- package/components/form/KeyValue.vue +70 -48
- package/components/form/LabeledSelect.vue +145 -41
- package/components/form/Labels.vue +3 -1
- package/components/form/NameNsDescription.vue +26 -9
- package/components/form/Password.vue +3 -1
- package/components/form/ResourceLabeledSelect.vue +187 -0
- package/components/form/ResourceTabs/index.vue +31 -15
- package/components/form/SecretSelector.vue +93 -18
- package/components/form/SelectOrCreateAuthSecret.vue +132 -59
- package/components/form/SimpleSecretSelector.vue +88 -28
- package/components/form/Taints.vue +13 -7
- package/components/form/__tests__/BannerSettings.test.ts +53 -0
- package/components/form/__tests__/KeyValue.test.ts +120 -11
- package/components/form/__tests__/LabeledSelect.test.ts +0 -18
- package/components/form/__tests__/{NameNsDescription.ts → NameNsDescription.test.ts} +25 -15
- package/components/form/__tests__/Taints.test.ts +70 -0
- package/components/form/labeled-select-utils/labeled-select-pagination.ts +151 -0
- package/components/form/labeled-select-utils/labeled-select.utils.ts +122 -0
- package/components/formatter/AppSummaryGraph.vue +2 -2
- package/components/formatter/Checked.vue +11 -3
- package/components/formatter/CloudCredPublicData.vue +30 -0
- package/components/formatter/ClusterLink.vue +2 -2
- package/components/formatter/ClusterProvider.vue +1 -18
- package/components/formatter/FleetClusterSummaryGraph.vue +27 -0
- package/components/formatter/FleetSummaryGraph.vue +25 -12
- package/components/formatter/ImagePercentageBar.vue +0 -4
- package/components/formatter/IngressTarget.vue +18 -7
- package/components/formatter/Link.vue +2 -2
- package/components/formatter/LinkDetail.vue +2 -2
- package/components/formatter/LinkDetailImage.vue +2 -2
- package/components/formatter/LinkName.vue +2 -2
- package/components/formatter/LiveDuration.vue +1 -1
- package/components/formatter/PercentageBar.vue +1 -1
- package/components/formatter/PrincipalGroupBindings.vue +2 -2
- package/components/formatter/SecretType.vue +2 -2
- package/components/formatter/VirtualServiceGateways.vue +2 -2
- package/components/formatter/WorkloadDetailEndpoints.vue +12 -22
- package/components/formatter/__tests__/Checked.test.ts +19 -0
- package/components/formatter/__tests__/LinkDetail.test.ts +5 -5
- package/components/formatter/__tests__/WorkloadDetailEndpoints.test.ts +81 -0
- package/components/nav/Group.vue +9 -7
- package/components/nav/Header.vue +85 -46
- package/components/nav/Jump.vue +19 -9
- package/components/nav/NamespaceFilter.vue +8 -1
- package/components/nav/TopLevelMenu.vue +392 -136
- package/components/nav/Type.vue +71 -106
- package/components/nav/WindowManager/ContainerLogs.vue +120 -19
- package/components/nav/WindowManager/ContainerShell.vue +6 -1
- package/components/nav/WindowManager/__tests__/ContainerLogs.test.ts +186 -0
- package/components/nav/WindowManager/index.vue +11 -10
- package/components/nav/__tests__/TopLevelMenu.test.ts +400 -6
- package/components/nav/__tests__/Type.test.ts +322 -97
- package/components/nuxt/nuxt-child.js +9 -78
- package/components/nuxt/nuxt-error.vue +1 -1
- package/components/nuxt/nuxt-link.client.js +13 -95
- package/{layouts → components/templates}/blank.vue +1 -1
- package/{layouts → components/templates}/default.vue +11 -101
- package/{layouts → components/templates}/error.vue +13 -26
- package/{layouts → components/templates}/home.vue +4 -1
- package/{layouts → components/templates}/plain.vue +4 -1
- package/{layouts → components/templates}/standalone.vue +1 -5
- package/{layouts → components/templates}/unauthenticated.vue +2 -3
- package/composables/useCompactInput.test.ts +36 -0
- package/composables/useCompactInput.ts +20 -0
- package/composables/useLabeledFormElement.test.ts +135 -0
- package/composables/useLabeledFormElement.ts +138 -0
- package/config/harvester-manager-types.js +2 -0
- package/config/home-links.js +2 -1
- package/config/labels-annotations.js +2 -1
- package/config/middleware.js +0 -6
- package/config/pagination-table-headers.js +57 -0
- package/config/pod-security-admission.ts +1 -1
- package/config/private-label.js +21 -1
- package/config/product/auth.js +1 -0
- package/config/product/explorer.js +166 -45
- package/config/product/fleet.js +6 -1
- package/config/product/legacy.js +2 -11
- package/config/product/manager.js +51 -25
- package/config/query-params.js +2 -0
- package/config/roles.ts +23 -0
- package/config/router/index.js +23 -0
- package/config/router/navigation-guards/attempt-first-login.js +73 -0
- package/config/router/navigation-guards/authentication.js +63 -0
- package/config/router/navigation-guards/i18n.js +13 -0
- package/config/router/navigation-guards/index.js +16 -0
- package/config/router/navigation-guards/load-initial-settings.js +15 -0
- package/config/router/routes.js +487 -0
- package/config/settings.ts +31 -2
- package/config/store.js +8 -4
- package/config/system-namespaces.js +3 -0
- package/config/table-headers.js +66 -1
- package/config/types.js +35 -20
- package/config/uiplugins.js +10 -5
- package/core/plugin-helpers.js +4 -6
- package/core/plugin-routes.ts +56 -114
- package/core/plugin.ts +18 -11
- package/core/plugins-loader.js +7 -9
- package/core/plugins.js +289 -285
- package/core/types-provisioning.ts +7 -0
- package/creators/app/app.package.json +2 -1
- package/creators/app/files/.eslintignore +0 -2
- package/creators/app/files/.gitlab-ci.yml +14 -0
- package/creators/app/files/.vscode/settings.json +0 -1
- package/creators/app/init +19 -0
- package/creators/pkg/files/.github/workflows/build-extension-catalog.yml +2 -6
- package/creators/pkg/files/.github/workflows/build-extension-charts.yml +2 -6
- package/creators/pkg/init +32 -0
- package/detail/__tests__/provisioning.cattle.io.cluster.test.ts +119 -0
- package/detail/__tests__/service.test.ts +62 -0
- package/detail/catalog.cattle.io.app.vue +1 -1
- package/detail/cis.cattle.io.clusterscan.vue +14 -3
- package/detail/fleet.cattle.io.bundle.vue +1 -1
- package/detail/fleet.cattle.io.cluster.vue +11 -1
- package/detail/fleet.cattle.io.gitrepo.vue +15 -9
- package/detail/namespace.vue +2 -2
- package/detail/networking.k8s.io.ingress.vue +52 -19
- package/detail/node.vue +22 -3
- package/detail/provisioning.cattle.io.cluster.vue +31 -13
- package/detail/service.vue +1 -1
- package/detail/workload/index.vue +1 -0
- package/dialog/AddCustomBadgeDialog.vue +318 -161
- package/dialog/DeactivateDriverDialog.vue +137 -0
- package/dialog/RollbackWorkloadDialog.vue +2 -2
- package/dialog/RotateCertificatesDialog.vue +0 -21
- package/dialog/ScaleMachineDownDialog.vue +34 -17
- package/directives/clean-html.js +15 -0
- package/directives/clean-tooltip.js +32 -0
- package/directives/focus.js +41 -0
- package/directives/int-number.js +21 -0
- package/directives/positive-int-number.js +19 -0
- package/directives/trim-whitespace.js +19 -0
- package/edit/__tests__/fleet.cattle.io.gitrepo.test.ts +3 -2
- package/edit/__tests__/kontainerDriver.test.ts +107 -0
- package/edit/__tests__/management.cattle.io.clusterroletemplatebinding.test.ts +12 -1
- package/edit/__tests__/management.cattle.io.setting.test.ts +2 -1
- package/edit/__tests__/monitoring.coreos.com.prometheusrule.test.ts +2 -3
- package/edit/__tests__/nodeDriver.test.ts +107 -0
- package/edit/__tests__/service.test.ts +85 -0
- package/edit/__tests__/ui.cattle.io.navlink.test.ts +3 -1
- package/edit/auth/AuthProviderWarningBanners.vue +34 -0
- package/edit/auth/__tests__/AuthProviderWarningBanners.test.ts +19 -0
- package/edit/auth/__tests__/azuread.test.ts +241 -0
- package/edit/auth/__tests__/oidc.test.ts +137 -0
- package/edit/auth/azuread.vue +133 -31
- package/edit/auth/github.vue +5 -17
- package/edit/auth/googleoauth.vue +6 -23
- package/edit/auth/ldap/index.vue +5 -17
- package/edit/auth/oidc.vue +143 -42
- package/edit/auth/saml.vue +5 -14
- package/edit/catalog.cattle.io.clusterrepo.vue +177 -9
- package/edit/cis.cattle.io.clusterscan.vue +5 -2
- package/edit/cis.cattle.io.clusterscanbenchmark.vue +41 -9
- package/edit/cloudcredential.vue +28 -4
- package/edit/configmap.vue +10 -4
- package/edit/fleet.cattle.io.gitrepo.vue +3 -1
- package/edit/helm.cattle.io.projecthelmchart.vue +29 -19
- package/edit/kontainerDriver.vue +65 -0
- package/edit/logging-flow/Match.vue +10 -9
- package/edit/logging-flow/index.vue +4 -19
- package/edit/logging.banzaicloud.io.output/__tests__/logging.banzaicloud.io.output.test.ts +232 -2
- package/edit/logging.banzaicloud.io.output/index.vue +43 -26
- package/edit/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue +3 -3
- package/edit/management.cattle.io.project.vue +3 -53
- package/edit/management.cattle.io.setting.vue +52 -2
- package/edit/management.cattle.io.user.vue +2 -1
- package/edit/monitoring.coreos.com.alertmanagerconfig/index.vue +10 -7
- package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue +21 -16
- package/edit/monitoring.coreos.com.alertmanagerconfig/types/opsgenie.vue +1 -1
- package/edit/monitoring.coreos.com.alertmanagerconfig/types/pagerduty.vue +2 -2
- package/edit/monitoring.coreos.com.alertmanagerconfig/types/slack.vue +1 -1
- package/edit/monitoring.coreos.com.prometheusrule/AlertingRule.vue +15 -3
- package/edit/monitoring.coreos.com.prometheusrule/GroupRules.vue +4 -1
- package/edit/monitoring.coreos.com.prometheusrule/RecordingRule.vue +2 -0
- package/edit/monitoring.coreos.com.prometheusrule/index.vue +2 -0
- package/edit/networking.k8s.io.ingress/Rules.vue +8 -3
- package/edit/networking.k8s.io.ingress/index.vue +64 -8
- package/edit/networking.k8s.io.networkpolicy/PolicyRule.vue +1 -0
- package/edit/networking.k8s.io.networkpolicy/PolicyRuleTarget.vue +6 -2
- package/edit/networking.k8s.io.networkpolicy/__tests__/{PolicyRuleTarget.spec.ts → PolicyRuleTarget.test.ts} +46 -7
- package/edit/networking.k8s.io.networkpolicy/__tests__/utils/{selectors.ts → selectors.test.ts} +1 -1
- package/edit/networking.k8s.io.networkpolicy/index.vue +2 -0
- package/edit/nodeDriver.vue +65 -0
- package/edit/persistentvolume/index.vue +2 -2
- package/edit/provisioning.cattle.io.cluster/SelectCredential.vue +33 -16
- package/edit/provisioning.cattle.io.cluster/__tests__/Advanced.test.ts +276 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/Basics.test.ts +473 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/{CustomCommand.tests.ts → CustomCommand.test.ts} +3 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/DirectoryConfig.test.ts +228 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/DrainOptions.test.ts +1 -1
- package/edit/provisioning.cattle.io.cluster/__tests__/index.test.ts +73 -0
- package/edit/provisioning.cattle.io.cluster/__tests__/rke2.test.ts +77 -13
- package/edit/provisioning.cattle.io.cluster/__tests__/utils/cluster.ts +391 -0
- package/edit/provisioning.cattle.io.cluster/import.vue +4 -4
- package/edit/provisioning.cattle.io.cluster/index.vue +126 -51
- package/edit/provisioning.cattle.io.cluster/rke2.vue +325 -791
- package/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig.vue +137 -0
- package/edit/provisioning.cattle.io.cluster/tabs/Advanced.vue +217 -0
- package/edit/provisioning.cattle.io.cluster/{Basics.vue → tabs/Basics.vue} +123 -129
- package/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue +132 -0
- package/edit/provisioning.cattle.io.cluster/{MachinePool.vue → tabs/MachinePool.vue} +1 -0
- package/edit/provisioning.cattle.io.cluster/{S3Config.vue → tabs/etcd/S3Config.vue} +1 -0
- package/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue +135 -0
- package/edit/provisioning.cattle.io.cluster/tabs/networking/index.vue +190 -0
- package/edit/provisioning.cattle.io.cluster/{RegistryConfigs.vue → tabs/registries/RegistryConfigs.vue} +3 -0
- package/edit/provisioning.cattle.io.cluster/tabs/registries/index.vue +148 -0
- package/edit/provisioning.cattle.io.cluster/tabs/upgrade/index.vue +76 -0
- package/edit/resources.cattle.io.backup.vue +139 -124
- package/edit/resources.cattle.io.restore.vue +146 -126
- package/edit/service.vue +13 -0
- package/edit/serviceaccount.vue +46 -4
- package/edit/token.vue +3 -1
- package/edit/workload/Upgrading.vue +3 -2
- package/edit/workload/__tests__/Job.test.ts +1 -3
- package/edit/workload/__tests__/Upgrading.test.ts +2 -2
- package/edit/workload/index.vue +2 -1
- package/edit/workload/mixins/workload.js +35 -2
- package/edit/workload/storage/emptyDir.vue +2 -2
- package/initialize/App.vue +75 -0
- package/initialize/app-extended.js +128 -0
- package/initialize/entry-helpers.js +546 -0
- package/initialize/entry.js +32 -0
- package/initialize/install-components.js +23 -0
- package/initialize/install-directives.js +59 -0
- package/initialize/install-plugins.js +123 -0
- package/list/__tests__/workload.test.ts +1 -1
- package/list/catalog.cattle.io.app.vue +1 -0
- package/list/cis.cattle.io.clusterscan.vue +16 -10
- package/list/group.principal.vue +2 -2
- package/list/management.cattle.io.feature.vue +16 -16
- package/list/management.cattle.io.setting.vue +1 -0
- package/list/management.cattle.io.user.vue +13 -4
- package/list/networking.k8s.io.ingress.vue +36 -0
- package/list/node.vue +212 -73
- package/list/provisioning.cattle.io.cluster.vue +17 -4
- package/list/ui.cattle.io.navlink.vue +2 -2
- package/list/workload.vue +22 -0
- package/machine-config/__tests__/vmwarevsphere-pool-config-merge.test.ts +30 -0
- package/machine-config/__tests__/vmwarevsphere.test.ts +1 -3
- package/machine-config/amazonec2.vue +1 -1
- package/machine-config/azure.vue +2 -1
- package/machine-config/generic.vue +11 -15
- package/machine-config/vmwarevsphere-pool-config-merge.ts +25 -0
- package/machine-config/vmwarevsphere.vue +31 -27
- package/middleware/authenticated.js +23 -399
- package/mixins/__tests__/chart.test.ts +48 -6
- package/mixins/__tests__/create-edit-view.test.ts +2 -3
- package/mixins/auth-config.js +5 -9
- package/mixins/brand.js +102 -96
- package/mixins/chart.js +27 -13
- package/mixins/create-edit-view/index.js +2 -2
- package/mixins/fetch.client.js +42 -48
- package/mixins/labeled-form-element.ts +27 -2
- package/mixins/page-actions.js +7 -5
- package/mixins/resource-fetch-api-pagination.js +304 -0
- package/mixins/resource-fetch-namespaced.js +1 -1
- package/mixins/resource-fetch.js +46 -5
- package/models/__tests__/cluster.test.ts +44 -0
- package/models/__tests__/fleet.cattle.io.cluster.test.ts +36 -0
- package/models/__tests__/management.cattle.io.cluster.test.ts +23 -0
- package/models/__tests__/management.cattle.io.node.ts +85 -0
- package/models/__tests__/management.cattle.io.nodepool.ts +83 -0
- package/models/__tests__/namespace.test.ts +49 -9
- package/models/__tests__/provisioning.cattle.io.cluster.test.ts +241 -0
- package/models/__tests__/schema.tests.ts +24 -0
- package/models/__tests__/secret.test.ts +37 -0
- package/models/__tests__/steve-schema.test.ts +73 -0
- package/models/__tests__/storage.k8s.io.storageclass.test.ts +22 -0
- package/models/__tests__/workload.test.ts +91 -0
- package/models/catalog.cattle.io.app.js +8 -0
- package/models/catalog.cattle.io.clusterrepo.js +9 -1
- package/models/catalog.cattle.io.uiplugin.js +7 -8
- package/models/cis.cattle.io.clusterscan.js +29 -8
- package/models/cloudcredential.js +9 -1
- package/models/cluster/node.js +8 -4
- package/models/cluster/schema.js +6 -0
- package/models/cluster.js +33 -0
- package/models/cluster.x-k8s.io.machine.js +1 -1
- package/models/cluster.x-k8s.io.machinedeployment.js +14 -0
- package/models/driver.js +63 -0
- package/models/fleet.cattle.io.cluster.js +27 -11
- package/models/fleet.cattle.io.gitrepo.js +66 -13
- package/models/helm.cattle.io.projecthelmchart.js +1 -1
- package/models/kontainerdriver.js +85 -0
- package/models/management/schema.js +6 -0
- package/models/management.cattle.io.authconfig.js +3 -2
- package/models/management.cattle.io.cluster.js +16 -7
- package/models/management.cattle.io.globalrole.js +2 -0
- package/models/management.cattle.io.kontainerdriver.js +1 -0
- package/models/management.cattle.io.node.js +18 -14
- package/models/management.cattle.io.nodepool.js +17 -0
- package/models/management.cattle.io.project.js +0 -36
- package/models/management.cattle.io.setting.js +11 -7
- package/models/management.cattle.io.user.js +2 -2
- package/models/monitoring.coreos.com.receiver.js +3 -1
- package/models/monitoring.coreos.com.route.js +1 -1
- package/models/namespace.js +1 -1
- package/models/networking.k8s.io.ingress.js +2 -1
- package/models/nodedriver.js +85 -0
- package/models/pod.js +20 -0
- package/models/provisioning.cattle.io.cluster.js +125 -10
- package/models/schema.js +28 -7
- package/models/secret.js +126 -18
- package/models/service.js +2 -0
- package/models/steve-schema.ts +254 -0
- package/models/storage.k8s.io.storageclass.js +1 -1
- package/models/workload.js +17 -0
- package/models/workload.service.js +18 -0
- package/package.json +18 -14
- package/pages/about.vue +12 -6
- package/pages/account/create-key.vue +0 -1
- package/pages/account/index.vue +7 -3
- package/pages/auth/login.vue +106 -103
- package/pages/auth/logout.vue +2 -4
- package/pages/auth/setup.vue +92 -66
- package/pages/auth/verify.vue +30 -24
- package/pages/c/_cluster/apps/charts/__tests__/install.helper.test.ts +2 -17
- package/pages/c/_cluster/apps/charts/chart.vue +54 -9
- package/pages/c/_cluster/apps/charts/index.vue +99 -69
- package/pages/c/_cluster/apps/charts/install.helpers.js +2 -13
- package/pages/c/_cluster/apps/charts/install.vue +12 -11
- package/pages/c/_cluster/auth/config/_id.vue +0 -6
- package/pages/c/_cluster/auth/config/index.vue +15 -9
- package/pages/c/_cluster/auth/roles/index.vue +8 -10
- package/pages/c/_cluster/ecm/index.vue +0 -2
- package/pages/c/_cluster/explorer/ConfigBadge.vue +13 -8
- package/pages/c/_cluster/explorer/EventsTable.vue +18 -0
- package/pages/c/_cluster/explorer/__tests__/index.test.ts +181 -0
- package/pages/c/_cluster/explorer/index.vue +253 -91
- package/pages/c/_cluster/explorer/tools/__tests__/index.test.ts +69 -0
- package/pages/c/_cluster/explorer/tools/index.vue +10 -6
- package/pages/c/_cluster/fleet/index.vue +89 -94
- package/pages/c/_cluster/longhorn/__tests__/longhorn.index.test.ts +89 -0
- package/pages/c/_cluster/longhorn/index.vue +52 -17
- package/pages/c/_cluster/manager/cloudCredential/index.vue +18 -25
- package/pages/c/_cluster/manager/drivers/kontainerDriver/_id.vue +12 -0
- package/pages/c/_cluster/manager/drivers/kontainerDriver/create.vue +15 -0
- package/pages/c/_cluster/manager/drivers/kontainerDriver/index.vue +91 -0
- package/pages/c/_cluster/manager/drivers/nodeDriver/_id.vue +12 -0
- package/pages/c/_cluster/manager/drivers/nodeDriver/create.vue +15 -0
- package/pages/c/_cluster/manager/drivers/nodeDriver/index.vue +60 -0
- package/pages/c/_cluster/manager/jwt.authentication/index.vue +235 -0
- package/pages/c/_cluster/manager/pages/_page.vue +4 -5
- package/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/receiver.vue +4 -0
- package/pages/c/_cluster/monitoring/route-receiver/index.vue +2 -2
- package/pages/c/_cluster/neuvector/index.vue +1 -0
- package/pages/c/_cluster/settings/DefaultLinksEditor.vue +1 -0
- package/pages/c/_cluster/settings/banners.vue +86 -10
- package/pages/c/_cluster/settings/brand.vue +261 -38
- package/pages/c/_cluster/settings/index.vue +4 -6
- package/pages/c/_cluster/settings/links.vue +3 -2
- package/pages/c/_cluster/settings/performance.vue +71 -3
- package/pages/c/_cluster/uiplugins/AddExtensionRepos.vue +5 -2
- package/pages/c/_cluster/uiplugins/CatalogList/CatalogLoadDialog.vue +12 -8
- package/pages/c/_cluster/uiplugins/CatalogList/CatalogUninstallDialog.vue +9 -6
- package/pages/c/_cluster/uiplugins/CatalogList/index.vue +10 -46
- package/pages/c/_cluster/uiplugins/DeveloperInstallDialog.vue +11 -5
- package/pages/c/_cluster/uiplugins/InstallDialog.vue +55 -19
- package/pages/c/_cluster/uiplugins/SetupUIPlugins.vue +36 -301
- package/pages/c/_cluster/uiplugins/UninstallDialog.vue +14 -6
- package/pages/c/_cluster/uiplugins/__tests__/SetupUIPlugins.test.ts +52 -106
- package/pages/c/_cluster/uiplugins/index.vue +38 -54
- package/pages/diagnostic.vue +2 -2
- package/pages/fail-whale.vue +103 -42
- package/pages/home.vue +81 -24
- package/pages/prefs.vue +8 -4
- package/pages/support/index.vue +14 -10
- package/pkg/auto-import.js +1 -1
- package/plugins/axios.js +0 -36
- package/plugins/back-button.js +3 -5
- package/plugins/clean-html-directive.js +5 -30
- package/plugins/clean-html.js +53 -0
- package/plugins/clean-tooltip-directive.js +6 -31
- package/plugins/codemirror-loader.js +1 -1
- package/plugins/codemirror.js +41 -9
- package/plugins/dashboard-store/__tests__/mutations.test.ts +389 -0
- package/plugins/dashboard-store/__tests__/resource-class.test.ts +49 -0
- package/plugins/dashboard-store/__tests__/utils/store-mocks.ts +7 -0
- package/plugins/dashboard-store/actions.js +132 -25
- package/plugins/dashboard-store/classify.js +1 -18
- package/plugins/dashboard-store/getters.js +154 -44
- package/plugins/dashboard-store/index.js +0 -111
- package/plugins/dashboard-store/mutations.js +150 -52
- package/plugins/dashboard-store/resource-class.js +77 -127
- package/plugins/directives.js +6 -39
- package/plugins/ember-cookie.js +13 -0
- package/plugins/global-formatters.js +26 -5
- package/plugins/i18n.js +89 -55
- package/plugins/int-number.js +6 -20
- package/plugins/plugin.js +3 -3
- package/plugins/positive-int-number.js +6 -17
- package/plugins/steve/__tests__/{getters.spec.ts → getters.test.ts} +81 -10
- package/plugins/steve/__tests__/mutations.test.ts +49 -0
- package/plugins/steve/__tests__/resource-utils.test.ts +159 -0
- package/plugins/steve/__tests__/steve-class.test.ts +59 -0
- package/plugins/steve/__tests__/subscribe.spec.ts +4 -1
- package/plugins/steve/__tests__/utils/mutation.test.helpers.ts +105 -0
- package/plugins/steve/__tests__/utils/steve-mocks.ts +31 -0
- package/plugins/steve/accept-or-reject-socket-message.ts +103 -0
- package/plugins/steve/actions.js +3 -38
- package/plugins/steve/getters.js +164 -61
- package/plugins/steve/hybrid-class.js +5 -1
- package/plugins/steve/mutations.js +24 -3
- package/plugins/steve/norman-class.js +142 -2
- package/{utils → plugins/steve}/projectAndNamespaceFiltering.utils.ts +28 -10
- package/plugins/steve/resource-utils.ts +38 -0
- package/plugins/steve/schema.d.ts +22 -0
- package/plugins/steve/steve-class.js +22 -0
- package/plugins/steve/steve-pagination-utils.ts +368 -0
- package/plugins/steve/subscribe.js +17 -76
- package/plugins/trim-whitespace.js +6 -34
- package/plugins/vue-js-modal.js +1 -1
- package/promptRemove/pod.vue +15 -7
- package/public/index.html +1 -0
- package/rancher-components/Accordion/Accordion.test.ts +45 -0
- package/rancher-components/Accordion/Accordion.vue +86 -0
- package/rancher-components/Accordion/index.ts +1 -0
- package/rancher-components/BadgeState/BadgeState.vue +3 -3
- package/rancher-components/Banner/Banner.test.ts +1 -5
- package/rancher-components/Banner/Banner.vue +2 -2
- package/rancher-components/Card/Card.vue +4 -4
- package/rancher-components/Form/Checkbox/Checkbox.vue +4 -3
- package/rancher-components/Form/LabeledInput/LabeledInput.test.ts +18 -1
- package/rancher-components/Form/LabeledInput/LabeledInput.vue +57 -24
- package/rancher-components/Form/Radio/RadioButton.test.ts +1 -3
- package/rancher-components/Form/Radio/RadioButton.vue +13 -7
- package/rancher-components/Form/Radio/RadioGroup.vue +4 -3
- package/rancher-components/Form/TextArea/TextAreaAutoGrow.vue +6 -4
- package/rancher-components/Form/ToggleSwitch/ToggleSwitch.vue +7 -4
- package/rancher-components/LabeledTooltip/LabeledTooltip.vue +9 -4
- package/rancher-components/StringList/StringList.test.ts +270 -0
- package/rancher-components/StringList/StringList.vue +65 -26
- package/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml +69 -0
- package/scripts/clean +1 -1
- package/scripts/extension/bundle +19 -7
- package/scripts/extension/helm/charts/ui-plugin-server/templates/_helpers.tpl +11 -0
- package/scripts/extension/helm/charts/ui-plugin-server/templates/cr.yaml +2 -0
- package/scripts/extension/helm/charts/ui-plugin-server/values.yaml +2 -0
- package/scripts/extension/helm/package/Dockerfile +1 -1
- package/scripts/extension/helm/scripts/package +11 -3
- package/scripts/extension/helm/scripts/patch +27 -0
- package/scripts/extension/parse-tag-name +4 -4
- package/scripts/extension/publish +25 -14
- package/scripts/publish-shell.sh +11 -1
- package/scripts/serve-pkgs +0 -2
- package/scripts/test-plugins-build.sh +87 -11
- package/scripts/vue-migrate.js +683 -0
- package/server/har-file.js +183 -0
- package/store/__tests__/catalog.test.ts +224 -0
- package/store/__tests__/type-map.test.ts +1122 -0
- package/store/auth.js +23 -4
- package/store/aws.js +53 -6
- package/store/catalog.js +22 -6
- package/store/cru-resource.ts +26 -0
- package/store/customisation.js +35 -0
- package/store/features.js +7 -4
- package/store/i18n.js +11 -0
- package/store/index.js +140 -49
- package/store/plugins.js +8 -4
- package/store/prefs.js +33 -38
- package/store/type-map.js +288 -213
- package/store/type-map.utils.ts +226 -0
- package/tsconfig.json +34 -9
- package/tsconfig.paths.json +21 -0
- package/types/components/labeledSelect.ts +50 -0
- package/types/resources/settings.d.ts +32 -0
- package/types/{userPreferences.d.ts → resources/userPreferences.d.ts} +0 -1
- package/types/shell/index.d.ts +1045 -770
- package/types/store/dashboard-store.types.ts +42 -0
- package/types/store/pagination.types.ts +457 -0
- package/types/store/type-map.ts +30 -0
- package/types/store/vuex.d.ts +9 -0
- package/types/vue-shim.d.ts +51 -0
- package/utils/__tests__/cluster.test.ts +20 -18
- package/utils/__tests__/create-yaml.test.ts +359 -2
- package/utils/__tests__/kontainer.test.ts +180 -0
- package/utils/__tests__/pod-security-admission.test.ts +1 -1
- package/utils/alertmanagerconfig.js +19 -0
- package/utils/array.ts +40 -1
- package/utils/async.ts +2 -0
- package/utils/auth.js +152 -4
- package/utils/axios.js +2 -21
- package/utils/azure.js +24 -0
- package/utils/banners.js +103 -0
- package/utils/clipboard.js +5 -0
- package/utils/cluster.js +1 -1
- package/utils/config.js +4 -0
- package/utils/create-yaml.js +59 -28
- package/utils/custom-validators.js +0 -2
- package/utils/error.js +41 -1
- package/utils/formatter.js +5 -3
- package/utils/git.ts +1 -1
- package/utils/install-redirect.js +1 -1
- package/utils/kontainer.ts +190 -0
- package/utils/object.js +24 -0
- package/utils/pagination-utils.ts +154 -0
- package/utils/pod-security-admission.ts +1 -1
- package/utils/router.js +86 -0
- package/utils/settings.ts +46 -0
- package/utils/time.js +2 -1
- package/utils/unit-tests/ChildRenderingRouterLinkStub.ts +36 -0
- package/utils/url.ts +1 -1
- package/utils/validators/formRules/__tests__/index.test.ts +70 -4
- package/utils/validators/formRules/index.ts +15 -9
- package/utils/validators/index.js +1 -0
- package/utils/validators/setting.js +6 -10
- package/utils/version.js +2 -1
- package/vue.config.js +377 -401
- package/.DS_Store +0 -0
- package/assets/images/providers/aks-black.svg +0 -28
- package/assets/images/providers/aks.svg +0 -31
- package/assets/styles/vendor/vue-js-modal.scss +0 -16
- package/components/ChartPsp.vue +0 -76
- package/components/EventsTable.vue +0 -67
- package/components/TabbedLinks/index.vue +0 -94
- package/components/__tests__/ChartPsp.test.ts +0 -75
- package/components/formatter/__tests__/ClusterProvider.test.ts +0 -28
- package/components/nuxt/nuxt-link.server.js +0 -16
- package/components/nuxt/nuxt.js +0 -101
- package/config/router.js +0 -408
- package/edit/provisioning.cattle.io.cluster/__tests__/Basics.tests.ts +0 -237
- package/initialize/App.js +0 -198
- package/initialize/client.js +0 -875
- package/initialize/index.js +0 -364
- package/initialize/layouts.ts +0 -26
- package/middleware/i18n.js +0 -10
- package/middleware/unauthenticated.js +0 -22
- package/mixins/fetch.server.js +0 -73
- package/pages/c/_cluster/apps/index.vue +0 -17
- package/pages/c/_cluster/auth/index.vue +0 -19
- package/pages/c/_cluster/index.vue +0 -17
- package/pages/c/_cluster/legacy/index.vue +0 -22
- package/pages/c/_cluster/manager/index.vue +0 -22
- package/pages/c/_cluster/mcapps/index.vue +0 -21
- package/pages/c/_cluster/uiplugins/RemoveUIPlugins.vue +0 -232
- package/pages/c/index.vue +0 -9
- package/pages/rio/mesh.vue +0 -508
- package/plugins/dashboard-store/__tests__/mutations.spec.ts +0 -406
- package/plugins/dashboard-store/rehydrate-all.js +0 -44
- package/plugins/portal-vue.js +0 -4
- package/plugins/portal.js +0 -4
- package/plugins/resize.js +0 -5
- package/plugins/shortkey.js +0 -4
- package/plugins/tooltip.js +0 -4
- package/plugins/transitions.js +0 -4
- package/plugins/v-select.js +0 -4
- package/plugins/vue-clipboard2.js +0 -4
- package/tsconfig.default.json +0 -46
- package/utils/group.js +0 -70
- package/utils/nuxt.js +0 -659
- package/utils/router.scrollBehavior.js +0 -80
- /package/components/__tests__/{Collapse.spec.ts → Collapse.test.ts} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{AgentConfiguration.vue → tabs/AgentConfiguration.vue} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{MemberRoles.vue → tabs/MemberRoles.vue} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{ACE.vue → tabs/networking/ACE.vue} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{RegistryMirrors.vue → tabs/registries/RegistryMirrors.vue} +0 -0
- /package/edit/provisioning.cattle.io.cluster/{DrainOptions.vue → tabs/upgrade/DrainOptions.vue} +0 -0
- /package/models/__tests__/{node.ts → node.test.ts} +0 -0
- /package/plugins/dashboard-store/__tests__/{actions.spec.ts → actions.test.ts} +0 -0
- /package/plugins/dashboard-store/__tests__/{getters.spec.ts → getters.test.ts} +0 -0
- /package/plugins/steve/__tests__/{header-warnings.spec.ts → header-warnings.test.ts} +0 -0
- /package/rancher-components/BadgeState/{BadgeState.spec.ts → BadgeState.test.ts} +0 -0
- /package/types/{pod-security-admission.ts → resources/pod-security-admission.ts} +0 -0
package/utils/nuxt.js
DELETED
|
@@ -1,659 +0,0 @@
|
|
|
1
|
-
import Vue from 'vue';
|
|
2
|
-
import {
|
|
3
|
-
isSamePath as _isSamePath, joinURL, normalizeURL, withQuery, withoutTrailingSlash
|
|
4
|
-
} from 'ufo';
|
|
5
|
-
|
|
6
|
-
// window.{{globals.loadedCallback}} hook
|
|
7
|
-
// Useful for jsdom testing or plugins (https://github.com/tmpvar/jsdom#dealing-with-asynchronous-script-loading)
|
|
8
|
-
if (process.client) {
|
|
9
|
-
window.onNuxtReadyCbs = [];
|
|
10
|
-
window.onNuxtReady = (cb) => {
|
|
11
|
-
window.onNuxtReadyCbs.push(cb);
|
|
12
|
-
};
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
export function createGetCounter(counterObject, defaultKey = '') {
|
|
16
|
-
return function getCounter(id = defaultKey) {
|
|
17
|
-
if (counterObject[id] === undefined) {
|
|
18
|
-
counterObject[id] = 0;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
return counterObject[id]++;
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
export function empty() {}
|
|
26
|
-
|
|
27
|
-
export function globalHandleError(error) {
|
|
28
|
-
if (Vue.config.errorHandler) {
|
|
29
|
-
Vue.config.errorHandler(error);
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
export function interopDefault(promise) {
|
|
34
|
-
return promise.then((m) => m.default || m);
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
export function hasFetch(vm) {
|
|
38
|
-
return vm.$options && typeof vm.$options.fetch === 'function' && !vm.$options.fetch.length;
|
|
39
|
-
}
|
|
40
|
-
export function purifyData(data) {
|
|
41
|
-
if (process.env.NODE_ENV === 'production') {
|
|
42
|
-
return data;
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
return Object.entries(data).filter(
|
|
46
|
-
([key, value]) => {
|
|
47
|
-
const valid = !(value instanceof Function) && !(value instanceof Promise);
|
|
48
|
-
|
|
49
|
-
if (!valid) {
|
|
50
|
-
console.warn(`${ key } is not able to be stringified. This will break in a production environment.`); // eslint-disable-line no-console
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
return valid;
|
|
54
|
-
}
|
|
55
|
-
).reduce((obj, [key, value]) => {
|
|
56
|
-
obj[key] = value;
|
|
57
|
-
|
|
58
|
-
return obj;
|
|
59
|
-
}, {});
|
|
60
|
-
}
|
|
61
|
-
export function getChildrenComponentInstancesUsingFetch(vm, instances = []) {
|
|
62
|
-
const children = vm.$children || [];
|
|
63
|
-
|
|
64
|
-
for (const child of children) {
|
|
65
|
-
if (child.$fetch) {
|
|
66
|
-
instances.push(child);
|
|
67
|
-
continue; // Don't get the children since it will reload the template
|
|
68
|
-
}
|
|
69
|
-
if (child.$children) {
|
|
70
|
-
getChildrenComponentInstancesUsingFetch(child, instances);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
return instances;
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
export function applyAsyncData(Component, asyncData) {
|
|
78
|
-
if (
|
|
79
|
-
// For SSR, we once all this function without second param to just apply asyncData
|
|
80
|
-
// Prevent doing this for each SSR request
|
|
81
|
-
!asyncData && Component.options.__hasNuxtData
|
|
82
|
-
) {
|
|
83
|
-
return;
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
const ComponentData = Component.options._originDataFn || Component.options.data || function() {
|
|
87
|
-
return {};
|
|
88
|
-
};
|
|
89
|
-
|
|
90
|
-
Component.options._originDataFn = ComponentData;
|
|
91
|
-
|
|
92
|
-
Component.options.data = function() {
|
|
93
|
-
const data = ComponentData.call(this, this);
|
|
94
|
-
|
|
95
|
-
if (this.$ssrContext) {
|
|
96
|
-
asyncData = this.$ssrContext.asyncData[Component.cid];
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
return { ...data, ...asyncData };
|
|
100
|
-
};
|
|
101
|
-
|
|
102
|
-
Component.options.__hasNuxtData = true;
|
|
103
|
-
|
|
104
|
-
if (Component._Ctor && Component._Ctor.options) {
|
|
105
|
-
Component._Ctor.options.data = Component.options.data;
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
export function sanitizeComponent(Component) {
|
|
110
|
-
// If Component already sanitized
|
|
111
|
-
if (Component.options && Component._Ctor === Component) {
|
|
112
|
-
return Component;
|
|
113
|
-
}
|
|
114
|
-
if (!Component.options) {
|
|
115
|
-
Component = Vue.extend(Component); // fix issue #6
|
|
116
|
-
Component._Ctor = Component;
|
|
117
|
-
} else {
|
|
118
|
-
Component._Ctor = Component;
|
|
119
|
-
Component.extendOptions = Component.options;
|
|
120
|
-
}
|
|
121
|
-
// If no component name defined, set file path as name, (also fixes #5703)
|
|
122
|
-
if (!Component.options.name && Component.options.__file) {
|
|
123
|
-
Component.options.name = Component.options.__file;
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
return Component;
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
export function getMatchedComponents(route, matches = false, prop = 'components') {
|
|
130
|
-
return Array.prototype.concat.apply([], route.matched.map((m, index) => {
|
|
131
|
-
return Object.keys(m[prop]).map((key) => {
|
|
132
|
-
matches && matches.push(index);
|
|
133
|
-
|
|
134
|
-
return m[prop][key];
|
|
135
|
-
});
|
|
136
|
-
}));
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
export function getMatchedComponentsInstances(route, matches = false) {
|
|
140
|
-
return getMatchedComponents(route, matches, 'instances');
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
export function flatMapComponents(route, fn) {
|
|
144
|
-
return Array.prototype.concat.apply([], route.matched.map((m, index) => {
|
|
145
|
-
return Object.keys(m.components).reduce((promises, key) => {
|
|
146
|
-
if (m.components[key]) {
|
|
147
|
-
promises.push(fn(m.components[key], m.instances[key], m, key, index));
|
|
148
|
-
} else {
|
|
149
|
-
delete m.components[key];
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
return promises;
|
|
153
|
-
}, []);
|
|
154
|
-
}));
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
export function resolveRouteComponents(route, fn) {
|
|
158
|
-
return Promise.all(
|
|
159
|
-
flatMapComponents(route, async(Component, instance, match, key) => {
|
|
160
|
-
// If component is a function, resolve it
|
|
161
|
-
if (typeof Component === 'function' && !Component.options) {
|
|
162
|
-
try {
|
|
163
|
-
Component = await Component();
|
|
164
|
-
} catch (error) {
|
|
165
|
-
// Handle webpack chunk loading errors
|
|
166
|
-
// This may be due to a new deployment or a network problem
|
|
167
|
-
if (
|
|
168
|
-
error &&
|
|
169
|
-
error.name === 'ChunkLoadError' &&
|
|
170
|
-
typeof window !== 'undefined' &&
|
|
171
|
-
window.sessionStorage
|
|
172
|
-
) {
|
|
173
|
-
const timeNow = Date.now();
|
|
174
|
-
const previousReloadTime = parseInt(window.sessionStorage.getItem('nuxt-reload'));
|
|
175
|
-
|
|
176
|
-
// check for previous reload time not to reload infinitely
|
|
177
|
-
if (!previousReloadTime || previousReloadTime + 60000 < timeNow) {
|
|
178
|
-
window.sessionStorage.setItem('nuxt-reload', timeNow);
|
|
179
|
-
window.location.reload(true /* skip cache */);
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
throw error;
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
match.components[key] = Component = sanitizeComponent(Component);
|
|
187
|
-
|
|
188
|
-
return typeof fn === 'function' ? fn(Component, instance, match, key) : Component;
|
|
189
|
-
})
|
|
190
|
-
);
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
export async function getRouteData(route) {
|
|
194
|
-
if (!route) {
|
|
195
|
-
return;
|
|
196
|
-
}
|
|
197
|
-
// Make sure the components are resolved (code-splitting)
|
|
198
|
-
await resolveRouteComponents(route);
|
|
199
|
-
|
|
200
|
-
// Send back a copy of route with meta based on Component definition
|
|
201
|
-
return {
|
|
202
|
-
...route,
|
|
203
|
-
meta: getMatchedComponents(route).map((Component, index) => {
|
|
204
|
-
return { ...Component.options.meta, ...(route.matched[index] || {}).meta };
|
|
205
|
-
})
|
|
206
|
-
};
|
|
207
|
-
}
|
|
208
|
-
|
|
209
|
-
export async function setContext(app, context) {
|
|
210
|
-
// If context not defined, create it
|
|
211
|
-
if (!app.context) {
|
|
212
|
-
app.context = {
|
|
213
|
-
isStatic: process.static,
|
|
214
|
-
isDev: true,
|
|
215
|
-
isHMR: false,
|
|
216
|
-
app,
|
|
217
|
-
store: app.store,
|
|
218
|
-
payload: context.payload,
|
|
219
|
-
error: context.error,
|
|
220
|
-
base: app.router.options.base,
|
|
221
|
-
env: {
|
|
222
|
-
commit: 'head', version: '0.1.2', dev: true, pl: 1, perfTest: false, rancherEnv: 'web', api: 'http://localhost:8989'
|
|
223
|
-
}
|
|
224
|
-
};
|
|
225
|
-
// Only set once
|
|
226
|
-
|
|
227
|
-
if (context.req) {
|
|
228
|
-
app.context.req = context.req;
|
|
229
|
-
}
|
|
230
|
-
if (context.res) {
|
|
231
|
-
app.context.res = context.res;
|
|
232
|
-
}
|
|
233
|
-
|
|
234
|
-
if (context.ssrContext) {
|
|
235
|
-
app.context.ssrContext = context.ssrContext;
|
|
236
|
-
}
|
|
237
|
-
app.context.redirect = (status, path, query) => {
|
|
238
|
-
if (!status) {
|
|
239
|
-
return;
|
|
240
|
-
}
|
|
241
|
-
app.context._redirected = true;
|
|
242
|
-
// if only 1 or 2 arguments: redirect('/') or redirect('/', { foo: 'bar' })
|
|
243
|
-
let pathType = typeof path;
|
|
244
|
-
|
|
245
|
-
if (typeof status !== 'number' && (pathType === 'undefined' || pathType === 'object')) {
|
|
246
|
-
query = path || {};
|
|
247
|
-
path = status;
|
|
248
|
-
pathType = typeof path;
|
|
249
|
-
status = 302;
|
|
250
|
-
}
|
|
251
|
-
if (pathType === 'object') {
|
|
252
|
-
path = app.router.resolve(path).route.fullPath;
|
|
253
|
-
}
|
|
254
|
-
// "/absolute/route", "./relative/route" or "../relative/route"
|
|
255
|
-
if (/(^[.]{1,2}\/)|(^\/(?!\/))/.test(path)) {
|
|
256
|
-
app.context.next({
|
|
257
|
-
path,
|
|
258
|
-
query,
|
|
259
|
-
status
|
|
260
|
-
});
|
|
261
|
-
} else {
|
|
262
|
-
path = withQuery(path, query);
|
|
263
|
-
if (process.server) {
|
|
264
|
-
app.context.next({
|
|
265
|
-
path,
|
|
266
|
-
status
|
|
267
|
-
});
|
|
268
|
-
}
|
|
269
|
-
if (process.client) {
|
|
270
|
-
// https://developer.mozilla.org/en-US/docs/Web/API/Location/replace
|
|
271
|
-
window.location.replace(path);
|
|
272
|
-
|
|
273
|
-
// Throw a redirect error
|
|
274
|
-
throw new Error('ERR_REDIRECT');
|
|
275
|
-
}
|
|
276
|
-
}
|
|
277
|
-
};
|
|
278
|
-
if (process.server) {
|
|
279
|
-
app.context.beforeNuxtRender = (fn) => context.beforeRenderFns.push(fn);
|
|
280
|
-
}
|
|
281
|
-
if (process.client) {
|
|
282
|
-
app.context.nuxtState = window.__NUXT__;
|
|
283
|
-
}
|
|
284
|
-
}
|
|
285
|
-
|
|
286
|
-
// Dynamic keys
|
|
287
|
-
const [currentRouteData, fromRouteData] = await Promise.all([
|
|
288
|
-
getRouteData(context.route),
|
|
289
|
-
getRouteData(context.from)
|
|
290
|
-
]);
|
|
291
|
-
|
|
292
|
-
if (context.route) {
|
|
293
|
-
app.context.route = currentRouteData;
|
|
294
|
-
}
|
|
295
|
-
|
|
296
|
-
if (context.from) {
|
|
297
|
-
app.context.from = fromRouteData;
|
|
298
|
-
}
|
|
299
|
-
|
|
300
|
-
app.context.next = context.next;
|
|
301
|
-
app.context._redirected = false;
|
|
302
|
-
app.context._errored = false;
|
|
303
|
-
app.context.isHMR = Boolean(context.isHMR);
|
|
304
|
-
app.context.params = app.context.route.params || {};
|
|
305
|
-
app.context.query = app.context.route.query || {};
|
|
306
|
-
}
|
|
307
|
-
|
|
308
|
-
export function middlewareSeries(promises, appContext) {
|
|
309
|
-
if (!promises.length || appContext._redirected || appContext._errored) {
|
|
310
|
-
return Promise.resolve();
|
|
311
|
-
}
|
|
312
|
-
|
|
313
|
-
return promisify(promises[0], appContext)
|
|
314
|
-
.then(() => {
|
|
315
|
-
return middlewareSeries(promises.slice(1), appContext);
|
|
316
|
-
});
|
|
317
|
-
}
|
|
318
|
-
|
|
319
|
-
export function promisify(fn, context) {
|
|
320
|
-
let promise;
|
|
321
|
-
|
|
322
|
-
if (fn.length === 2) {
|
|
323
|
-
console.warn('Callback-based asyncData, fetch or middleware calls are deprecated. Please switch to promises or async/await syntax'); // eslint-disable-line no-console
|
|
324
|
-
|
|
325
|
-
// fn(context, callback)
|
|
326
|
-
promise = new Promise((resolve) => {
|
|
327
|
-
fn(context, (err, data) => {
|
|
328
|
-
if (err) {
|
|
329
|
-
context.error(err);
|
|
330
|
-
}
|
|
331
|
-
data = data || {};
|
|
332
|
-
resolve(data);
|
|
333
|
-
});
|
|
334
|
-
});
|
|
335
|
-
} else {
|
|
336
|
-
promise = fn(context);
|
|
337
|
-
}
|
|
338
|
-
|
|
339
|
-
if (promise && promise instanceof Promise && typeof promise.then === 'function') {
|
|
340
|
-
return promise;
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
return Promise.resolve(promise);
|
|
344
|
-
}
|
|
345
|
-
|
|
346
|
-
// Imported from vue-router
|
|
347
|
-
export function getLocation(base, mode) {
|
|
348
|
-
if (mode === 'hash') {
|
|
349
|
-
return window.location.hash.replace(/^#\//, '');
|
|
350
|
-
}
|
|
351
|
-
|
|
352
|
-
base = decodeURI(base).slice(0, -1); // consideration is base is normalized with trailing slash
|
|
353
|
-
let path = decodeURI(window.location.pathname);
|
|
354
|
-
|
|
355
|
-
if (base && path.startsWith(base)) {
|
|
356
|
-
path = path.slice(base.length);
|
|
357
|
-
}
|
|
358
|
-
|
|
359
|
-
const fullPath = (path || '/') + window.location.search + window.location.hash;
|
|
360
|
-
|
|
361
|
-
return normalizeURL(fullPath);
|
|
362
|
-
}
|
|
363
|
-
|
|
364
|
-
// Imported from path-to-regexp
|
|
365
|
-
|
|
366
|
-
/**
|
|
367
|
-
* Compile a string to a template function for the path.
|
|
368
|
-
*
|
|
369
|
-
* @param {string} str
|
|
370
|
-
* @param {Object=} options
|
|
371
|
-
* @return {!function(Object=, Object=)}
|
|
372
|
-
*/
|
|
373
|
-
export function compile(str, options) {
|
|
374
|
-
return tokensToFunction(parse(str, options), options);
|
|
375
|
-
}
|
|
376
|
-
|
|
377
|
-
export function getQueryDiff(toQuery, fromQuery) {
|
|
378
|
-
const diff = {};
|
|
379
|
-
const queries = { ...toQuery, ...fromQuery };
|
|
380
|
-
|
|
381
|
-
for (const k in queries) {
|
|
382
|
-
if (String(toQuery[k]) !== String(fromQuery[k])) {
|
|
383
|
-
diff[k] = true;
|
|
384
|
-
}
|
|
385
|
-
}
|
|
386
|
-
|
|
387
|
-
return diff;
|
|
388
|
-
}
|
|
389
|
-
|
|
390
|
-
export function normalizeError(err) {
|
|
391
|
-
let message;
|
|
392
|
-
|
|
393
|
-
if (!(err.message || typeof err === 'string')) {
|
|
394
|
-
try {
|
|
395
|
-
message = JSON.stringify(err, null, 2);
|
|
396
|
-
} catch (e) {
|
|
397
|
-
message = `[${ err.constructor.name }]`;
|
|
398
|
-
}
|
|
399
|
-
} else {
|
|
400
|
-
message = err.message || err;
|
|
401
|
-
}
|
|
402
|
-
|
|
403
|
-
return {
|
|
404
|
-
...err,
|
|
405
|
-
message,
|
|
406
|
-
statusCode: (err.statusCode || err.status || (err.response && err.response.status) || 500)
|
|
407
|
-
};
|
|
408
|
-
}
|
|
409
|
-
|
|
410
|
-
/**
|
|
411
|
-
* The main path matching regexp utility.
|
|
412
|
-
*
|
|
413
|
-
* @type {RegExp}
|
|
414
|
-
*/
|
|
415
|
-
const PATH_REGEXP = new RegExp([
|
|
416
|
-
// Match escaped characters that would otherwise appear in future matches.
|
|
417
|
-
// This allows the user to escape special characters that won't transform.
|
|
418
|
-
'(\\\\.)',
|
|
419
|
-
// Match Express-style parameters and un-named parameters with a prefix
|
|
420
|
-
// and optional suffixes. Matches appear as:
|
|
421
|
-
//
|
|
422
|
-
// "/:test(\\d+)?" => ["/", "test", "\d+", undefined, "?", undefined]
|
|
423
|
-
// "/route(\\d+)" => [undefined, undefined, undefined, "\d+", undefined, undefined]
|
|
424
|
-
// "/*" => ["/", undefined, undefined, undefined, undefined, "*"]
|
|
425
|
-
'([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))'
|
|
426
|
-
].join('|'), 'g');
|
|
427
|
-
|
|
428
|
-
/**
|
|
429
|
-
* Parse a string for the raw tokens.
|
|
430
|
-
*
|
|
431
|
-
* @param {string} str
|
|
432
|
-
* @param {Object=} options
|
|
433
|
-
* @return {!Array}
|
|
434
|
-
*/
|
|
435
|
-
function parse(str, options) {
|
|
436
|
-
const tokens = [];
|
|
437
|
-
let key = 0;
|
|
438
|
-
let index = 0;
|
|
439
|
-
let path = '';
|
|
440
|
-
const defaultDelimiter = (options && options.delimiter) || '/';
|
|
441
|
-
let res;
|
|
442
|
-
|
|
443
|
-
while ((res = PATH_REGEXP.exec(str)) !== null) {
|
|
444
|
-
const m = res[0];
|
|
445
|
-
const escaped = res[1];
|
|
446
|
-
const offset = res.index;
|
|
447
|
-
|
|
448
|
-
path += str.slice(index, offset);
|
|
449
|
-
index = offset + m.length;
|
|
450
|
-
|
|
451
|
-
// Ignore already escaped sequences.
|
|
452
|
-
if (escaped) {
|
|
453
|
-
path += escaped[1];
|
|
454
|
-
continue;
|
|
455
|
-
}
|
|
456
|
-
|
|
457
|
-
const next = str[index];
|
|
458
|
-
const prefix = res[2];
|
|
459
|
-
const name = res[3];
|
|
460
|
-
const capture = res[4];
|
|
461
|
-
const group = res[5];
|
|
462
|
-
const modifier = res[6];
|
|
463
|
-
const asterisk = res[7];
|
|
464
|
-
|
|
465
|
-
// Push the current path onto the tokens.
|
|
466
|
-
if (path) {
|
|
467
|
-
tokens.push(path);
|
|
468
|
-
path = '';
|
|
469
|
-
}
|
|
470
|
-
|
|
471
|
-
const partial = prefix !== null && next !== null && next !== prefix;
|
|
472
|
-
const repeat = modifier === '+' || modifier === '*';
|
|
473
|
-
const optional = modifier === '?' || modifier === '*';
|
|
474
|
-
const delimiter = res[2] || defaultDelimiter;
|
|
475
|
-
const pattern = capture || group;
|
|
476
|
-
|
|
477
|
-
tokens.push({
|
|
478
|
-
name: name || key++,
|
|
479
|
-
prefix: prefix || '',
|
|
480
|
-
delimiter,
|
|
481
|
-
optional,
|
|
482
|
-
repeat,
|
|
483
|
-
partial,
|
|
484
|
-
asterisk: Boolean(asterisk),
|
|
485
|
-
pattern: pattern ? escapeGroup(pattern) : (asterisk ? '.*' : `[^${ escapeString(delimiter) }]+?`)
|
|
486
|
-
});
|
|
487
|
-
}
|
|
488
|
-
|
|
489
|
-
// Match any characters still remaining.
|
|
490
|
-
if (index < str.length) {
|
|
491
|
-
path += str.substr(index);
|
|
492
|
-
}
|
|
493
|
-
|
|
494
|
-
// If the path exists, push it onto the end.
|
|
495
|
-
if (path) {
|
|
496
|
-
tokens.push(path);
|
|
497
|
-
}
|
|
498
|
-
|
|
499
|
-
return tokens;
|
|
500
|
-
}
|
|
501
|
-
|
|
502
|
-
/**
|
|
503
|
-
* Prettier encoding of URI path segments.
|
|
504
|
-
*
|
|
505
|
-
* @param {string}
|
|
506
|
-
* @return {string}
|
|
507
|
-
*/
|
|
508
|
-
function encodeURIComponentPretty(str, slashAllowed) {
|
|
509
|
-
const re = slashAllowed ? /[?#]/g : /[/?#]/g;
|
|
510
|
-
|
|
511
|
-
return encodeURI(str).replace(re, (c) => {
|
|
512
|
-
return `%${ c.charCodeAt(0).toString(16).toUpperCase() }`;
|
|
513
|
-
});
|
|
514
|
-
}
|
|
515
|
-
|
|
516
|
-
/**
|
|
517
|
-
* Encode the asterisk parameter. Similar to `pretty`, but allows slashes.
|
|
518
|
-
*
|
|
519
|
-
* @param {string}
|
|
520
|
-
* @return {string}
|
|
521
|
-
*/
|
|
522
|
-
function encodeAsterisk(str) {
|
|
523
|
-
return encodeURIComponentPretty(str, true);
|
|
524
|
-
}
|
|
525
|
-
|
|
526
|
-
/**
|
|
527
|
-
* Escape a regular expression string.
|
|
528
|
-
*
|
|
529
|
-
* @param {string} str
|
|
530
|
-
* @return {string}
|
|
531
|
-
*/
|
|
532
|
-
function escapeString(str) {
|
|
533
|
-
return str.replace(/([.+*?=^!:${}()[\]|/\\])/g, '\\$1');
|
|
534
|
-
}
|
|
535
|
-
|
|
536
|
-
/**
|
|
537
|
-
* Escape the capturing group by escaping special characters and meaning.
|
|
538
|
-
*
|
|
539
|
-
* @param {string} group
|
|
540
|
-
* @return {string}
|
|
541
|
-
*/
|
|
542
|
-
function escapeGroup(group) {
|
|
543
|
-
return group.replace(/([=!:$/()])/g, '\\$1');
|
|
544
|
-
}
|
|
545
|
-
|
|
546
|
-
/**
|
|
547
|
-
* Expose a method for transforming tokens into the path function.
|
|
548
|
-
*/
|
|
549
|
-
function tokensToFunction(tokens, options) {
|
|
550
|
-
// Compile all the tokens into regexps.
|
|
551
|
-
const matches = new Array(tokens.length);
|
|
552
|
-
|
|
553
|
-
// Compile all the patterns before compilation.
|
|
554
|
-
for (let i = 0; i < tokens.length; i++) {
|
|
555
|
-
if (typeof tokens[i] === 'object') {
|
|
556
|
-
matches[i] = new RegExp(`^(?:${ tokens[i].pattern })$`, flags(options));
|
|
557
|
-
}
|
|
558
|
-
}
|
|
559
|
-
|
|
560
|
-
return function(obj, opts) {
|
|
561
|
-
let path = '';
|
|
562
|
-
const data = obj || {};
|
|
563
|
-
const options = opts || {};
|
|
564
|
-
const encode = options.pretty ? encodeURIComponentPretty : encodeURIComponent;
|
|
565
|
-
|
|
566
|
-
for (let i = 0; i < tokens.length; i++) {
|
|
567
|
-
const token = tokens[i];
|
|
568
|
-
|
|
569
|
-
if (typeof token === 'string') {
|
|
570
|
-
path += token;
|
|
571
|
-
|
|
572
|
-
continue;
|
|
573
|
-
}
|
|
574
|
-
|
|
575
|
-
const value = data[token.name || 'pathMatch'];
|
|
576
|
-
let segment;
|
|
577
|
-
|
|
578
|
-
if (value === null) {
|
|
579
|
-
if (token.optional) {
|
|
580
|
-
// Prepend partial segment prefixes.
|
|
581
|
-
if (token.partial) {
|
|
582
|
-
path += token.prefix;
|
|
583
|
-
}
|
|
584
|
-
|
|
585
|
-
continue;
|
|
586
|
-
} else {
|
|
587
|
-
throw new TypeError(`Expected "${ token.name }" to be defined`);
|
|
588
|
-
}
|
|
589
|
-
}
|
|
590
|
-
|
|
591
|
-
if (Array.isArray(value)) {
|
|
592
|
-
if (!token.repeat) {
|
|
593
|
-
throw new TypeError(`Expected "${ token.name }" to not repeat, but received \`${ JSON.stringify(value) }\``);
|
|
594
|
-
}
|
|
595
|
-
|
|
596
|
-
if (value.length === 0) {
|
|
597
|
-
if (token.optional) {
|
|
598
|
-
continue;
|
|
599
|
-
} else {
|
|
600
|
-
throw new TypeError(`Expected "${ token.name }" to not be empty`);
|
|
601
|
-
}
|
|
602
|
-
}
|
|
603
|
-
|
|
604
|
-
for (let j = 0; j < value.length; j++) {
|
|
605
|
-
segment = encode(value[j]);
|
|
606
|
-
|
|
607
|
-
if (!matches[i].test(segment)) {
|
|
608
|
-
throw new TypeError(`Expected all "${ token.name }" to match "${ token.pattern }", but received \`${ JSON.stringify(segment) }\``);
|
|
609
|
-
}
|
|
610
|
-
|
|
611
|
-
path += (j === 0 ? token.prefix : token.delimiter) + segment;
|
|
612
|
-
}
|
|
613
|
-
|
|
614
|
-
continue;
|
|
615
|
-
}
|
|
616
|
-
|
|
617
|
-
segment = token.asterisk ? encodeAsterisk(value) : encode(value);
|
|
618
|
-
|
|
619
|
-
if (!matches[i].test(segment)) {
|
|
620
|
-
throw new TypeError(`Expected "${ token.name }" to match "${ token.pattern }", but received "${ segment }"`);
|
|
621
|
-
}
|
|
622
|
-
|
|
623
|
-
path += token.prefix + segment;
|
|
624
|
-
}
|
|
625
|
-
|
|
626
|
-
return path;
|
|
627
|
-
};
|
|
628
|
-
}
|
|
629
|
-
|
|
630
|
-
/**
|
|
631
|
-
* Get the flags for a regexp from the options.
|
|
632
|
-
*
|
|
633
|
-
* @param {Object} options
|
|
634
|
-
* @return {string}
|
|
635
|
-
*/
|
|
636
|
-
function flags(options) {
|
|
637
|
-
return options && options.sensitive ? '' : 'i';
|
|
638
|
-
}
|
|
639
|
-
|
|
640
|
-
export function addLifecycleHook(vm, hook, fn) {
|
|
641
|
-
if (!vm.$options[hook]) {
|
|
642
|
-
vm.$options[hook] = [];
|
|
643
|
-
}
|
|
644
|
-
if (!vm.$options[hook].includes(fn)) {
|
|
645
|
-
vm.$options[hook].push(fn);
|
|
646
|
-
}
|
|
647
|
-
}
|
|
648
|
-
|
|
649
|
-
export const urlJoin = joinURL;
|
|
650
|
-
|
|
651
|
-
export const stripTrailingSlash = withoutTrailingSlash;
|
|
652
|
-
|
|
653
|
-
export const isSamePath = _isSamePath;
|
|
654
|
-
|
|
655
|
-
export function setScrollRestoration(newVal) {
|
|
656
|
-
try {
|
|
657
|
-
window.history.scrollRestoration = newVal;
|
|
658
|
-
} catch (e) {}
|
|
659
|
-
}
|