diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 31d111f..95326b5 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -5,7 +5,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. --> diff --git a/frontend/src/components/LogView.vue b/frontend/src/components/LogView.vue deleted file mode 100644 index 891ba62..0000000 --- a/frontend/src/components/LogView.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - diff --git a/frontend/src/components/NodeListItem.vue b/frontend/src/components/NodeListItem.vue deleted file mode 100644 index 980b080..0000000 --- a/frontend/src/components/NodeListItem.vue +++ /dev/null @@ -1,209 +0,0 @@ - - - - diff --git a/frontend/src/components/ServerListItem.vue b/frontend/src/components/ServerListItem.vue deleted file mode 100644 index 95bf960..0000000 --- a/frontend/src/components/ServerListItem.vue +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - diff --git a/frontend/src/components/Shell.vue b/frontend/src/components/Shell.vue deleted file mode 100644 index d0e1e24..0000000 --- a/frontend/src/components/Shell.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - diff --git a/frontend/src/components/StackedList.vue b/frontend/src/components/StackedList.vue deleted file mode 100644 index 564e854..0000000 --- a/frontend/src/components/StackedList.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - diff --git a/frontend/src/components/TButton.vue b/frontend/src/components/TButton.vue deleted file mode 100644 index 99cc8d4..0000000 --- a/frontend/src/components/TButton.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - diff --git a/frontend/src/components/TChart.vue b/frontend/src/components/TChart.vue deleted file mode 100644 index 687aa94..0000000 --- a/frontend/src/components/TChart.vue +++ /dev/null @@ -1,256 +0,0 @@ - - - - diff --git a/frontend/src/components/TCheckbox.vue b/frontend/src/components/TCheckbox.vue deleted file mode 100644 index 3ead451..0000000 --- a/frontend/src/components/TCheckbox.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - - diff --git a/frontend/src/components/TDropdown.vue b/frontend/src/components/TDropdown.vue deleted file mode 100644 index 7fc8eae..0000000 --- a/frontend/src/components/TDropdown.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - diff --git a/frontend/src/components/TInput.vue b/frontend/src/components/TInput.vue deleted file mode 100644 index 0981b6a..0000000 --- a/frontend/src/components/TInput.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - diff --git a/frontend/src/components/TLabel.vue b/frontend/src/components/TLabel.vue deleted file mode 100644 index b02e99d..0000000 --- a/frontend/src/components/TLabel.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - diff --git a/frontend/src/components/TNotification.vue b/frontend/src/components/TNotification.vue deleted file mode 100644 index a666591..0000000 --- a/frontend/src/components/TNotification.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - diff --git a/frontend/src/components/TSpinner.vue b/frontend/src/components/TSpinner.vue deleted file mode 100644 index f98d6e3..0000000 --- a/frontend/src/components/TSpinner.vue +++ /dev/null @@ -1,13 +0,0 @@ - - diff --git a/frontend/src/components/TStat.vue b/frontend/src/components/TStat.vue deleted file mode 100644 index 0f2aaed..0000000 --- a/frontend/src/components/TStat.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/frontend/src/components/Watch.vue b/frontend/src/components/Watch.vue deleted file mode 100644 index 30238b6..0000000 --- a/frontend/src/components/Watch.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - diff --git a/frontend/src/components/views/SideBar/components/TSideBarList.vue b/frontend/src/components/views/SideBar/components/TSideBarList.vue index 4872f99..46757f5 100644 --- a/frontend/src/components/views/SideBar/components/TSideBarList.vue +++ b/frontend/src/components/views/SideBar/components/TSideBarList.vue @@ -2,13 +2,13 @@ @@ -26,15 +26,17 @@ export default { const route = useRoute(); const context = getContext(); const getRoute = (name: string, path: string) => { - return route.query.cluster !== undefined ? { - name: name, - query: { - cluster: route.query.cluster, - namespace: route.query.namespace, - uid: route.query.uid, - }, - } : path - } + return route.query.cluster !== undefined + ? { + name: name, + query: { + cluster: route.query.cluster, + namespace: route.query.namespace, + uid: route.query.uid, + }, + } + : path; + }; const menuItems = computed(() => { const res = [ diff --git a/frontend/src/components/views/TUpgradeKubernetesModal/TUpgradeKubernetesModal.vue b/frontend/src/components/views/TUpgradeKubernetesModal/TUpgradeKubernetesModal.vue index c272d80..913b9da 100644 --- a/frontend/src/components/views/TUpgradeKubernetesModal/TUpgradeKubernetesModal.vue +++ b/frontend/src/components/views/TUpgradeKubernetesModal/TUpgradeKubernetesModal.vue @@ -243,17 +243,20 @@ export default { const res: string[] = []; if (fromVersion.value === "unknown") return res; - for (const version of versions.value) { - const v = version["spec"]["version"]; + for (const ver of versions.value) { + const v = ver["spec"]["version"]; if (!isValidSemVer(v)) continue; + + const parts = fromVersion.value.split("."); + const version = `${parts.slice(0, 2).join(".")}.0`; + if ( - compareSemVer(v, fromVersion.value) === 0 || - compareSemVer(v, fromVersion.value) === 1 + compareSemVer(v, version) === 0 || + compareSemVer(v, version) === 1 ) res.push(v); } - - return res; + return res.sort(); }), running: computed(() => { if (statuses.value.length === 0) { diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 2994dbe..d26aa52 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -3,13 +3,11 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. import { createWebHistory, createRouter } from "vue-router"; -import Clusters from "../views/Clusters.vue"; import Servers from "../views/Servers/TServers.vue"; import Dashboard from "../views/Dashboard/TDashboard.vue"; import TKubernetes from "../views/Kubernetes/TKubernetes.vue"; import TUpgradeKubernetesModal from '@/components/views/TUpgradeKubernetesModal/TUpgradeKubernetesModal.vue'; import Nodes from "../views/Nodes/TNodes.vue"; -import Pods from "../views/cluster/Pods.vue"; import TPods from "../views/Pods/TPods.vue"; import Overview from "../views/Nodes/TNodesOverview.vue"; import OverviewPage from "../views/Overview/Overview.vue"; @@ -19,11 +17,8 @@ import SidebarRoot from "../views/SidebarRoot.vue"; import SidebarCluster from "../views/SidebarCluster.vue"; import SidebarNode from "../views/SidebarNode.vue"; import TSidebarNodesLogs from "../components/views/SideBar/components/TSideBarNodesLogs.vue"; -import Settings from "../views/Settings.vue"; import TReboot from "../components/views/Reboot/TReboot.vue"; import TReset from "../components/views/Reset/TReset.vue"; -import Upgrade from "../views/Upgrade.vue"; -import { context } from "../context"; const withPrefix = (prefix, routes) => routes.map((route) => { @@ -89,13 +84,6 @@ const routes = [ default: TPods, }, }, - { - path: "/clusters", - name: "Clusters", - components: { - default: Clusters, - }, - }, { path: "/servers", name: "Servers", @@ -155,7 +143,6 @@ const router = createRouter({ }); const modals = { - settings: Settings, reboot: TReboot, upgrade: TUpgradeKubernetesModal, reset: TReset, diff --git a/frontend/src/views/Clusters.vue b/frontend/src/views/Clusters.vue deleted file mode 100644 index 969a8a8..0000000 --- a/frontend/src/views/Clusters.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - diff --git a/frontend/src/views/Reboot.vue b/frontend/src/views/Reboot.vue deleted file mode 100644 index 54a6ff1..0000000 --- a/frontend/src/views/Reboot.vue +++ /dev/null @@ -1,88 +0,0 @@ - - - - diff --git a/frontend/src/views/Reset.vue b/frontend/src/views/Reset.vue deleted file mode 100644 index d853266..0000000 --- a/frontend/src/views/Reset.vue +++ /dev/null @@ -1,105 +0,0 @@ - - - - diff --git a/frontend/src/views/Servers.vue b/frontend/src/views/Servers.vue deleted file mode 100644 index ce63af2..0000000 --- a/frontend/src/views/Servers.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - - diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue deleted file mode 100644 index 281d7ca..0000000 --- a/frontend/src/views/Settings.vue +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - diff --git a/frontend/src/views/Sidebar.vue b/frontend/src/views/Sidebar.vue deleted file mode 100644 index 93190a4..0000000 --- a/frontend/src/views/Sidebar.vue +++ /dev/null @@ -1,39 +0,0 @@ - - - - diff --git a/frontend/src/views/SidebarChangeContext.vue b/frontend/src/views/SidebarChangeContext.vue deleted file mode 100644 index 02358af..0000000 --- a/frontend/src/views/SidebarChangeContext.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - diff --git a/frontend/src/views/Upgrade.vue b/frontend/src/views/Upgrade.vue deleted file mode 100644 index e49ed49..0000000 --- a/frontend/src/views/Upgrade.vue +++ /dev/null @@ -1,292 +0,0 @@ - - - - diff --git a/frontend/src/views/cluster/Nodes.vue b/frontend/src/views/cluster/Nodes.vue deleted file mode 100644 index 0fcdc82..0000000 --- a/frontend/src/views/cluster/Nodes.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - diff --git a/frontend/src/views/cluster/Pods.vue b/frontend/src/views/cluster/Pods.vue deleted file mode 100644 index a35c6f9..0000000 --- a/frontend/src/views/cluster/Pods.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - -