feat(*): entity redirects

src/composables/useFormRedirect.ts

@@ -24,7 +24,7 @@ export const useFormRedirectOnCancel = (fallback: RouteLocationRaw) => {
   return routeOnCancel.value
 }
 
-export const useFormRedirectOnUpdate = (fallback: RouteLocationRaw) => {
+export const useFormRedirectOnUpdate = (fallback?: RouteLocationRaw) => {
   const redirectRouteLocation = useURLFromRouteQuery('redirect')
 
   const routeOnUpdate = computed(() => {

src/pages/ca-certificates/Form.vue

@@ -14,7 +14,7 @@ import { computed, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { CACertificateForm } from '@kong-ui-public/entities-certificates'
 import { useFormGeneralConfig } from '@/composables/useFormGeneralConfig'
-import { useFormRedirectOnCancel, useFormRedirectOnUpdate } from '@/composables/useFormRedirect'
+import { useFormRedirectOnCancel } from '@/composables/useFormRedirect'
 import { useToaster } from '@/composables/useToaster'
 import { useI18n } from '@/composables/useI18n'
 
@@ -36,19 +36,13 @@ const routeOnCancel = useFormRedirectOnCancel(
     : { name: 'ca-certificate-list' },
 )
 
-const routeOnUpdate = useFormRedirectOnUpdate(
-  isEditing.value
-    ? { name: 'ca-certificate-detail', params: { id: id.value } }
-    : { name: 'ca-certificate-list' },
-)
-
 const caCertificateFormConfig = reactive({
   ...useFormGeneralConfig(),
   cancelRoute: routeOnCancel,
 })
 
 const handleUpdate = (entity) => {
-  router.push(routeOnUpdate)
+  router.push({ name: 'ca-certificate-detail', params: { id: entity.id || id.value } })
   toaster.open({
     appearance: 'success',
     message: t(

src/pages/ca-certificates/List.vue

@@ -27,7 +27,6 @@ import { CACertificateList, type EntityRow } from '@kong-ui-public/entities-cert
 import { useCopyEventHandlers } from '@/composables/useCopyEventHandlers'
 import { useI18n } from '@/composables/useI18n'
 import { useListGeneralConfig } from '@/composables/useListGeneralConfig'
-import { useListRedirect } from '@/composables/useListRedirect'
 import { useToaster } from '@/composables/useToaster'
 import { useDocsLink } from '@/composables/useDocsLink'
 import { EntityType } from '@/types'
@@ -36,7 +35,6 @@ defineOptions({
   name: 'CACertificateList',
 })
 
-const { createRedirectRouteQuery } = useListRedirect()
 const toaster = useToaster()
 const { t } = useI18n()
 const docsLink = useDocsLink(EntityType.CACertificate)
@@ -52,7 +50,6 @@ const getViewRoute = (id: string) => {
 const getEditRoute = (id: string) => ({
   name: 'ca-certificate-edit',
   params: { id },
-  query: createRedirectRouteQuery(),
 })
 
 const caCertificateListConfig = reactive({

src/pages/certificates/Form.vue

@@ -15,7 +15,7 @@ import { computed, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { CertificateForm } from '@kong-ui-public/entities-certificates'
 import { useFormGeneralConfig } from '@/composables/useFormGeneralConfig'
-import { useFormRedirectOnCancel, useFormRedirectOnUpdate } from '@/composables/useFormRedirect'
+import { useFormRedirectOnCancel } from '@/composables/useFormRedirect'
 import { useToaster } from '@/composables/useToaster'
 import { useI18n } from '@/composables/useI18n'
 
@@ -37,20 +37,14 @@ const routeOnCancel = useFormRedirectOnCancel(
     : { name: 'certificate-list' },
 )
 
-const routeOnUpdate = useFormRedirectOnUpdate(
-  isEditing.value
-    ? { name: 'certificate-detail', params: { id: id.value } }
-    : { name: 'certificate-list' },
-)
-
 const certificateFormConfig = reactive({
   ...useFormGeneralConfig(),
   sniListRoute: { name: 'sni-list' },
   cancelRoute: routeOnCancel,
 })
 
 const handleUpdate = (entity) => {
-  router.push(routeOnUpdate)
+  router.push({ name: 'certificate-detail', params: { id: entity.id || id.value } })
   toaster.open({
     appearance: 'success',
     message: t(

src/pages/certificates/List.vue

@@ -27,7 +27,6 @@ import { CertificateList, type EntityRow } from '@kong-ui-public/entities-certif
 import { useCopyEventHandlers } from '@/composables/useCopyEventHandlers'
 import { useI18n } from '@/composables/useI18n'
 import { useListGeneralConfig } from '@/composables/useListGeneralConfig'
-import { useListRedirect } from '@/composables/useListRedirect'
 import { useToaster } from '@/composables/useToaster'
 import { useDocsLink } from '@/composables/useDocsLink'
 import { EntityType } from '@/types'
@@ -36,7 +35,6 @@ defineOptions({
   name: 'CertificateList',
 })
 
-const { createRedirectRouteQuery } = useListRedirect()
 const toaster = useToaster()
 const { t } = useI18n()
 const docsLink = useDocsLink(EntityType.Certificate)
@@ -52,7 +50,6 @@ const getViewRoute = (id: string) => {
 const getEditRoute = (id: string) => ({
   name: 'certificate-edit',
   params: { id },
-  query: createRedirectRouteQuery(),
 })
 
 const certificateListConfig = reactive({

src/pages/consumers/Form.vue

@@ -14,7 +14,7 @@ import { computed, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ConsumerForm } from '@kong-ui-public/entities-consumers'
 import { useFormGeneralConfig } from '@/composables/useFormGeneralConfig'
-import { useFormRedirectOnCancel, useFormRedirectOnUpdate } from '@/composables/useFormRedirect'
+import { useFormRedirectOnCancel } from '@/composables/useFormRedirect'
 import { useToaster } from '@/composables/useToaster'
 import { useI18n } from '@/composables/useI18n'
 
@@ -36,19 +36,13 @@ const routeOnCancel = useFormRedirectOnCancel(
     : { name: 'consumer-list' },
 )
 
-const routeOnUpdate = useFormRedirectOnUpdate(
-  isEditing.value
-    ? { name: 'consumer-detail', params: { id: id.value } }
-    : { name: 'consumer-list' },
-)
-
 const consumerFormConfig = reactive({
   ...useFormGeneralConfig(),
   cancelRoute: routeOnCancel,
 })
 
 const handleUpdate = (entity) => {
-  router.push(routeOnUpdate)
+  router.push({ name: 'consumer-detail', params: { id: entity.id || id.value } })
   toaster.open({
     appearance: 'success',
     message: t(

src/pages/consumers/List.vue

@@ -26,7 +26,6 @@ import { computed, reactive } from 'vue'
 import { ConsumerList, type EntityRow } from '@kong-ui-public/entities-consumers'
 import type { FilterSchema } from '@kong-ui-public/entities-shared'
 import { useListGeneralConfig } from '@/composables/useListGeneralConfig'
-import { useListRedirect } from '@/composables/useListRedirect'
 import { useCopyEventHandlers } from '@/composables/useCopyEventHandlers'
 import { useToaster } from '@/composables/useToaster'
 import { useI18n } from '@/composables/useI18n'
@@ -37,7 +36,6 @@ defineOptions({
   name: 'ConsumerList',
 })
 
-const { createRedirectRouteQuery } = useListRedirect()
 const toaster = useToaster()
 const { t } = useI18n()
 const docsLink = useDocsLink(EntityType.Consumer)
@@ -55,7 +53,6 @@ const getEditRoute = (id: string) => ({
   params: {
     id,
   },
-  query: createRedirectRouteQuery(),
 })
 
 const filterSchema: FilterSchema = {

src/pages/key-sets/Form.vue

@@ -14,7 +14,7 @@ import { computed, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { KeySetForm } from '@kong-ui-public/entities-key-sets'
 import { useFormGeneralConfig } from '@/composables/useFormGeneralConfig'
-import { useFormRedirectOnCancel, useFormRedirectOnUpdate } from '@/composables/useFormRedirect'
+import { useFormRedirectOnCancel } from '@/composables/useFormRedirect'
 import { useToaster } from '@/composables/useToaster'
 import { useI18n } from '@/composables/useI18n'
 
@@ -36,19 +36,13 @@ const routeOnCancel = useFormRedirectOnCancel(
     : { name: 'key-set-list' },
 )
 
-const routeOnUpdate = useFormRedirectOnUpdate(
-  isEditing.value
-    ? { name: 'key-set-detail', params: { id: id.value } }
-    : { name: 'key-set-list' },
-)
-
 const formConfig = reactive({
   ...useFormGeneralConfig(),
   cancelRoute: routeOnCancel,
 })
 
 const handleUpdate = (entity) => {
-  router.push(routeOnUpdate)
+  router.push({ name: 'key-set-detail', params: { id: entity.id || id.value } })
   toaster.open({
     appearance: 'success',
     message: t(isEditing.value ? 'entities.key-set.updated' : 'entities.key-set.created',

src/pages/key-sets/List.vue

@@ -26,7 +26,6 @@ import { computed, reactive } from 'vue'
 import { KeySetList, type EntityRow } from '@kong-ui-public/entities-key-sets'
 import type { FilterSchema } from '@kong-ui-public/entities-shared'
 import { useListGeneralConfig } from '@/composables/useListGeneralConfig'
-import { useListRedirect } from '@/composables/useListRedirect'
 import { useToaster } from '@/composables/useToaster'
 import { useCopyEventHandlers } from '@/composables/useCopyEventHandlers'
 import { useI18n } from '@/composables/useI18n'
@@ -37,7 +36,6 @@ defineOptions({
   name: 'KeySetList',
 })
 
-const { createRedirectRouteQuery } = useListRedirect()
 const toaster = useToaster()
 const { t } = useI18n()
 const docsLink = useDocsLink(EntityType.KeySet)
@@ -64,7 +62,6 @@ const getEditRoute = computed(() => (id: string) => ({
   params: {
     id,
   },
-  query: createRedirectRouteQuery(),
 }))
 
 const keyListConfig = reactive({

src/pages/keys/Form.vue

@@ -38,19 +38,15 @@ const routeOnCancel = useFormRedirectOnCancel(
     : { name: 'key-list' },
 )
 
-const routeOnUpdate = useFormRedirectOnUpdate(
-  isEditing.value
-    ? { name: 'key-detail', params: { id: id.value } }
-    : { name: 'key-list' },
-)
+const routeOnUpdate = useFormRedirectOnUpdate()
 
 const formConfig = reactive({
   ...useFormGeneralConfig(),
   cancelRoute: routeOnCancel,
 })
 
 const handleUpdate = (entity) => {
-  router.push(routeOnUpdate)
+  router.push(routeOnUpdate || { name: 'key-detail', params: { id: entity.id ?? '' } })
   toaster.open({
     appearance: 'success',
     message: t(isEditing.value ? 'entities.key.updated' : 'entities.key.created',

src/pages/keys/List.vue

@@ -60,10 +60,10 @@ const filterSchema = computed<FilterSchema>(() => {
 const createRoute = computed(() => {
   return {
     name: 'key-create',
-    query: {
+    query: keySetId.value ? {
       keySetId: keySetId.value,
       ...createRedirectRouteQuery(),
-    },
+    } : {},
   }
 })
 
@@ -83,10 +83,10 @@ const getEditRoute = computed(() => (id: string) => ({
   params: {
     id,
   },
-  query: {
+  query: keySetId.value ? {
     keySetId: keySetId.value,
     ...createRedirectRouteQuery(),
-  },
+  } : {},
 }))
 
 const keyListConfig = reactive({

src/pages/plugins/Form.vue

@@ -116,7 +116,7 @@ const onSave = (plugin) => {
     return
   }
 
-  router.go(-1)
+  router.push({ name: 'plugin-detail', params: { id: plugin.id } })
 }
 </script>
 

src/pages/plugins/List.vue

@@ -70,7 +70,6 @@ const createRoute = computed(() => {
     name: 'plugin-select',
     query: {
       ...scopedQuery.value,
-      ...createRedirectRouteQuery(),
     },
   }
 })
@@ -106,7 +105,7 @@ const getEditRoute = (plugin: EntityRow) => ({
   },
   query: {
     ...scopedQuery.value,
-    ...createRedirectRouteQuery(),
+    ...(route.name !== 'plugin-list' ? createRedirectRouteQuery() : {}),
   },
 })
 

src/pages/routes/Form.vue

@@ -46,19 +46,15 @@ const routeOnCancel = useFormRedirectOnCancel(
     : { name: 'route-list' },
 )
 
-const routeOnUpdate = useFormRedirectOnUpdate(
-  isEditing.value
-    ? { name: 'route-detail', params: { id: id.value } }
-    : { name: 'route-list' },
-)
+const routeOnUpdate = useFormRedirectOnUpdate()
 
 const routeFormConfig = reactive({
   ...useFormGeneralConfig(),
   cancelRoute: routeOnCancel,
 })
 
 const handleUpdate = (entity) => {
-  router.push(routeOnUpdate)
+  router.push(routeOnUpdate || { name: 'route-detail', params: { id: entity.id ?? '' } })
   toaster.open({
     appearance: 'success',
     message: t(

src/pages/routes/List.vue

@@ -83,10 +83,10 @@ const filterSchema: FilterSchema = {
 const createRoute = computed(() => {
   return {
     name: 'route-create',
-    query: {
+    query: serviceId.value ? {
       serviceId: serviceId.value,
       ...createRedirectRouteQuery(),
-    },
+    } : {},
   }
 })
 
@@ -104,10 +104,10 @@ const getEditRoute = (id: string) => ({
   params: {
     id,
   },
-  query: {
+  query: serviceId.value ? {
     serviceId: serviceId.value,
     ...createRedirectRouteQuery(),
-  },
+  } : {},
 })
 
 const routeListConfig = reactive({

src/pages/services/Form.vue

@@ -14,7 +14,7 @@ import { computed, reactive } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { GatewayServiceForm } from '@kong-ui-public/entities-gateway-services'
 import { useFormGeneralConfig } from '@/composables/useFormGeneralConfig'
-import { useFormRedirectOnCancel, useFormRedirectOnUpdate } from '@/composables/useFormRedirect'
+import { useFormRedirectOnCancel } from '@/composables/useFormRedirect'
 import { useToaster } from '@/composables/useToaster'
 import { useI18n } from '@/composables/useI18n'
 
@@ -36,19 +36,13 @@ const routeOnCancel = useFormRedirectOnCancel(
     : { name: 'service-list' },
 )
 
-const routeOnUpdate = useFormRedirectOnUpdate(
-  isEditing.value
-    ? { name: 'service-detail', params: { id: id.value } }
-    : { name: 'service-list' },
-)
-
 const serviceFormConfig = reactive({
   ...useFormGeneralConfig(),
   cancelRoute: routeOnCancel,
 })
 
 const handleUpdate = (entity) => {
-  router.push(routeOnUpdate)
+  router.push({ name: 'service-detail', params: { id: entity.id || id.value } })
   toaster.open({
     appearance: 'success',
     message: t(