From 506edbb5a48f20c41f767dba3b476902cdec0590 Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Tue, 23 Aug 2022 18:15:58 +0100 Subject: [PATCH] WIP Fix routing - includes project/namespace and namespace pages --- pkg/harvester/config/harvester.js | 2 +- .../edit/harvesterhci.io.setting.vue | 4 +- .../VirtualMachineVolume/index.vue | 3 +- .../list/harvesterhci.io.dashboard/index.vue | 41 ++++++++++++----- pkg/harvester/models/configmap.js | 8 ++-- pkg/harvester/models/harvester.js | 44 +++++++++++++++++++ .../models/harvesterhci.io.blockdevice.js | 3 +- .../models/harvesterhci.io.keypair.js | 4 +- .../models/harvesterhci.io.setting.js | 7 +-- .../models/harvesterhci.io.supportbundle.js | 4 +- .../models/harvesterhci.io.upgrade.js | 4 +- .../harvesterhci.io.virtualmachinebackup.js | 9 ++-- .../harvesterhci.io.virtualmachineimage.js | 7 +-- .../harvesterhci.io.virtualmachinerestore.js | 4 +- .../harvesterhci.io.virtualmachinetemplate.js | 9 ++-- ...terhci.io.virtualmachinetemplateversion.js | 7 +-- ...cni.cncf.io.networkattachmentdefinition.js | 20 ++++++++- .../models/kubevirt.io.virtualmachine.js | 3 +- .../kubevirt.io.virtualmachineinstance.js | 4 +- .../management.cattle.io.managedchart.js | 5 ++- .../models/management.cattle.io.setting.js | 11 +++-- .../network.harvesterhci.io.clusternetwork.js | 5 ++- .../network.harvesterhci.io.nodenetwork.js | 3 +- pkg/harvester/models/node.js | 7 +-- pkg/harvester/models/persistentvolumeclaim.js | 8 ++-- pkg/harvester/models/pod.js | 3 +- .../pages/c/_cluster/airgapupgrade/index.vue | 3 +- .../pages/c/_cluster/projectsnamespaces.vue | 19 +++++++- .../components/ExplorerProjectsNamespaces.vue | 10 ++++- shell/models/management.cattle.io.project.js | 4 ++ shell/models/namespace.js | 4 -- 31 files changed, 198 insertions(+), 71 deletions(-) create mode 100644 pkg/harvester/models/harvester.js diff --git a/pkg/harvester/config/harvester.js b/pkg/harvester/config/harvester.js index 3fcb6d5e2a..8d23bd6592 100644 --- a/pkg/harvester/config/harvester.js +++ b/pkg/harvester/config/harvester.js @@ -128,7 +128,7 @@ export function init($plugin, store) { namespaced: false, name: VIRTUAL_TYPES.CLUSTER_MEMBERS, weight: 100, - route: { name: 'harvester-c-cluster-members' }, + route: { name: `${ PRODUCT_NAME }-c-cluster-members` }, exact: true, ifHaveType: { type: MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, diff --git a/pkg/harvester/edit/harvesterhci.io.setting.vue b/pkg/harvester/edit/harvesterhci.io.setting.vue index 95e372cf8f..d4f39ea4d1 100644 --- a/pkg/harvester/edit/harvesterhci.io.setting.vue +++ b/pkg/harvester/edit/harvesterhci.io.setting.vue @@ -8,6 +8,7 @@ import { TextAreaAutoGrow } from '@components/Form/TextArea'; import CreateEditView from '@shell/mixins/create-edit-view'; import { HCI_ALLOWED_SETTINGS, HCI_SINGLE_CLUSTER_ALLOWED_SETTING, HCI_SETTING } from '../config/settings'; +import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester'; export default { components: { @@ -123,9 +124,10 @@ export default {