diff --git a/assets/auto-imports.d.ts b/assets/auto-imports.d.ts index 3c620a21..c01370d3 100644 --- a/assets/auto-imports.d.ts +++ b/assets/auto-imports.d.ts @@ -5,8 +5,8 @@ // Generated by unplugin-auto-import export {} declare global { - const $: typeof import('vue/macros')['$'] const $$: typeof import('vue/macros')['$$'] + const $: typeof import('vue/macros')['$'] const $computed: typeof import('vue/macros')['$computed'] const $customRef: typeof import('vue/macros')['$customRef'] const $ref: typeof import('vue/macros')['$ref'] @@ -27,7 +27,6 @@ declare global { const computedInject: typeof import('@vueuse/core')['computedInject'] const computedWithControl: typeof import('@vueuse/core')['computedWithControl'] const config: typeof import('./stores/config')['default'] - const containerContext: typeof import('./composable/containerContext')['containerContext'] const controlledComputed: typeof import('@vueuse/core')['controlledComputed'] const controlledRef: typeof import('@vueuse/core')['controlledRef'] const createApp: typeof import('vue')['createApp'] @@ -46,6 +45,7 @@ declare global { const debouncedWatch: typeof import('@vueuse/core')['debouncedWatch'] const defineAsyncComponent: typeof import('vue')['defineAsyncComponent'] const defineComponent: typeof import('vue')['defineComponent'] + const definePage: typeof import('unplugin-vue-router/runtime')['definePage'] const defineStore: typeof import('pinia')['defineStore'] const eagerComputed: typeof import('@vueuse/core')['eagerComputed'] const effectScope: typeof import('vue')['effectScope'] @@ -84,8 +84,8 @@ declare global { const nextTick: typeof import('vue')['nextTick'] const onActivated: typeof import('vue')['onActivated'] const onBeforeMount: typeof import('vue')['onBeforeMount'] - const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave'] - const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate'] + const onBeforeRouteLeave: typeof import('vue-router/auto')['onBeforeRouteLeave'] + const onBeforeRouteUpdate: typeof import('vue-router/auto')['onBeforeRouteUpdate'] const onBeforeUnmount: typeof import('vue')['onBeforeUnmount'] const onBeforeUpdate: typeof import('vue')['onBeforeUpdate'] const onClickOutside: typeof import('@vueuse/core')['onClickOutside'] @@ -105,7 +105,6 @@ declare global { const persistentVisibleKeysForContainer: typeof import('./composable/storage')['persistentVisibleKeysForContainer'] const pinnedContainers: typeof import('./composable/storage')['pinnedContainers'] const provide: typeof import('vue')['provide'] - const provideContainerContext: typeof import('./composable/containerContext')['provideContainerContext'] const provideLocal: typeof import('@vueuse/core')['provideLocal'] const provideLoggingContext: typeof import('./composable/logContext')['provideLoggingContext'] const reactify: typeof import('@vueuse/core')['reactify'] @@ -190,7 +189,6 @@ declare global { const useColorMode: typeof import('@vueuse/core')['useColorMode'] const useConfirmDialog: typeof import('@vueuse/core')['useConfirmDialog'] const useContainerActions: typeof import('./composable/containerActions')['useContainerActions'] - const useContainerContext: typeof import('./composable/containerContext')['useContainerContext'] const useContainerStore: typeof import('./stores/container')['useContainerStore'] const useContainerStream: typeof import('./composable/eventStreams')['useContainerStream'] const useCounter: typeof import('@vueuse/core')['useCounter'] @@ -244,7 +242,6 @@ declare global { const useIntervalFn: typeof import('@vueuse/core')['useIntervalFn'] const useKeyModifier: typeof import('@vueuse/core')['useKeyModifier'] const useLastChanged: typeof import('@vueuse/core')['useLastChanged'] - const useLink: typeof import('vue-router')['useLink'] const useLocalStorage: typeof import('@vueuse/core')['useLocalStorage'] const useLogSearchContext: typeof import('./composable/logSearchContext')['useLogSearchContext'] const useLoggingContext: typeof import('./composable/logContext')['useLoggingContext'] @@ -286,8 +283,8 @@ declare global { const useRefHistory: typeof import('@vueuse/core')['useRefHistory'] const useReleases: typeof import('./stores/releases')['useReleases'] const useResizeObserver: typeof import('@vueuse/core')['useResizeObserver'] - const useRoute: typeof import('vue-router')['useRoute'] - const useRouter: typeof import('vue-router')['useRouter'] + const useRoute: typeof import('vue-router/auto')['useRoute'] + const useRouter: typeof import('vue-router/auto')['useRouter'] const useScreenOrientation: typeof import('@vueuse/core')['useScreenOrientation'] const useScreenSafeArea: typeof import('@vueuse/core')['useScreenSafeArea'] const useScriptTag: typeof import('@vueuse/core')['useScriptTag'] @@ -413,6 +410,7 @@ declare module 'vue' { readonly debouncedWatch: UnwrapRef readonly defineAsyncComponent: UnwrapRef readonly defineComponent: UnwrapRef + readonly definePage: UnwrapRef readonly defineStore: UnwrapRef readonly eagerComputed: UnwrapRef readonly effectScope: UnwrapRef @@ -451,8 +449,8 @@ declare module 'vue' { readonly nextTick: UnwrapRef readonly onActivated: UnwrapRef readonly onBeforeMount: UnwrapRef - readonly onBeforeRouteLeave: UnwrapRef - readonly onBeforeRouteUpdate: UnwrapRef + readonly onBeforeRouteLeave: UnwrapRef + readonly onBeforeRouteUpdate: UnwrapRef readonly onBeforeUnmount: UnwrapRef readonly onBeforeUpdate: UnwrapRef readonly onClickOutside: UnwrapRef @@ -609,7 +607,6 @@ declare module 'vue' { readonly useIntervalFn: UnwrapRef readonly useKeyModifier: UnwrapRef readonly useLastChanged: UnwrapRef - readonly useLink: UnwrapRef readonly useLocalStorage: UnwrapRef readonly useLogSearchContext: UnwrapRef readonly useLoggingContext: UnwrapRef @@ -651,8 +648,8 @@ declare module 'vue' { readonly useRefHistory: UnwrapRef readonly useReleases: UnwrapRef readonly useResizeObserver: UnwrapRef - readonly useRoute: UnwrapRef - readonly useRouter: UnwrapRef + readonly useRoute: UnwrapRef + readonly useRouter: UnwrapRef readonly useScreenOrientation: UnwrapRef readonly useScreenSafeArea: UnwrapRef readonly useScriptTag: UnwrapRef @@ -771,6 +768,7 @@ declare module '@vue/runtime-core' { readonly debouncedWatch: UnwrapRef readonly defineAsyncComponent: UnwrapRef readonly defineComponent: UnwrapRef + readonly definePage: UnwrapRef readonly defineStore: UnwrapRef readonly eagerComputed: UnwrapRef readonly effectScope: UnwrapRef @@ -809,8 +807,8 @@ declare module '@vue/runtime-core' { readonly nextTick: UnwrapRef readonly onActivated: UnwrapRef readonly onBeforeMount: UnwrapRef - readonly onBeforeRouteLeave: UnwrapRef - readonly onBeforeRouteUpdate: UnwrapRef + readonly onBeforeRouteLeave: UnwrapRef + readonly onBeforeRouteUpdate: UnwrapRef readonly onBeforeUnmount: UnwrapRef readonly onBeforeUpdate: UnwrapRef readonly onClickOutside: UnwrapRef @@ -967,7 +965,6 @@ declare module '@vue/runtime-core' { readonly useIntervalFn: UnwrapRef readonly useKeyModifier: UnwrapRef readonly useLastChanged: UnwrapRef - readonly useLink: UnwrapRef readonly useLocalStorage: UnwrapRef readonly useLogSearchContext: UnwrapRef readonly useLoggingContext: UnwrapRef @@ -1009,8 +1006,8 @@ declare module '@vue/runtime-core' { readonly useRefHistory: UnwrapRef readonly useReleases: UnwrapRef readonly useResizeObserver: UnwrapRef - readonly useRoute: UnwrapRef - readonly useRouter: UnwrapRef + readonly useRoute: UnwrapRef + readonly useRouter: UnwrapRef readonly useScreenOrientation: UnwrapRef readonly useScreenSafeArea: UnwrapRef readonly useScriptTag: UnwrapRef diff --git a/assets/components/ContainerTable.vue b/assets/components/ContainerTable.vue index 4ddc390c..a6237bc8 100644 --- a/assets/components/ContainerTable.vue +++ b/assets/components/ContainerTable.vue @@ -66,7 +66,7 @@ - + {{ container.name }} diff --git a/assets/components/FuzzySearchModal.spec.ts b/assets/components/FuzzySearchModal.spec.ts index 441ff4eb..3297dd42 100644 --- a/assets/components/FuzzySearchModal.spec.ts +++ b/assets/components/FuzzySearchModal.spec.ts @@ -75,6 +75,6 @@ describe("", () => { const wrapper = createFuzzySearchModal(); await wrapper.find("input").setValue("baz"); await wrapper.find("input").trigger("keydown.enter"); - expect(useRouter().push).toHaveBeenCalledWith({ name: "container-id", params: { id: "567" } }); + expect(useRouter().push).toHaveBeenCalledWith({ name: "/container/[id]", params: { id: "567" } }); }); }); diff --git a/assets/components/FuzzySearchModal.vue b/assets/components/FuzzySearchModal.vue index fe149580..ff19dfb9 100644 --- a/assets/components/FuzzySearchModal.vue +++ b/assets/components/FuzzySearchModal.vue @@ -166,11 +166,11 @@ useFocus(input, { initialValue: true }); function selected(item: Item) { if (item.type === "container") { - router.push({ name: "container-id", params: { id: item.id } }); + router.push({ name: "/container/[id]", params: { id: item.id } }); } else if (item.type === "service") { - router.push({ name: "service-name", params: { name: item.id } }); + router.push({ name: "/service/[name]", params: { name: item.id } }); } else if (item.type === "stack") { - router.push({ name: "stack-name", params: { name: item.id } }); + router.push({ name: "/stack/[name]", params: { name: item.id } }); } close(); } diff --git a/assets/components/HostMenu.vue b/assets/components/HostMenu.vue index 5a05431c..282d11e3 100644 --- a/assets/components/HostMenu.vue +++ b/assets/components/HostMenu.vue @@ -33,7 +33,7 @@ @@ -59,7 +59,7 @@ const nextContainer = computed( const followEligible = computed( () => - router.currentRoute.value.name === "container-id" && + router.currentRoute.value.name === "/container/[id]" && logEntry.event === "container-stopped" && containers.value.length === 1 && nextContainer.value !== undefined, @@ -74,7 +74,7 @@ function redirectNow() { }, { expire: 5000 }, ); - router.push({ name: "container-id", params: { id: nextContainer.value?.id } }); + router.push({ name: "/container/[id]", params: { id: nextContainer.value?.id } }); } diff --git a/assets/components/SidePanel.vue b/assets/components/SidePanel.vue index 54e4dbf6..a208d773 100644 --- a/assets/components/SidePanel.vue +++ b/assets/components/SidePanel.vue @@ -1,7 +1,7 @@