From bfc6bca73cd9f60a231a23c9fde251069146aa89 Mon Sep 17 00:00:00 2001
From: realaravinth <realaravinth@batsense.net>
Date: Wed, 26 May 2021 12:51:23 +0530
Subject: [PATCH] view sitekey route and redirection

---
 src/pages/panel/sitekey/mod.rs               | 2 +-
 src/pages/panel/sitekey/view.rs              | 2 +-
 templates/panel/sitekey/add/ts/form/index.ts | 3 ++-
 templates/views/v1/routes.ts                 | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/panel/sitekey/mod.rs b/src/pages/panel/sitekey/mod.rs
index 73d890d5..c4128e1e 100644
--- a/src/pages/panel/sitekey/mod.rs
+++ b/src/pages/panel/sitekey/mod.rs
@@ -31,7 +31,7 @@ pub mod routes {
             Sitekey {
                 list: "/sitekey/list",
                 add: "/sitekey/add",
-                view: "/sitekey/{key}/view",
+                view: "/sitekey/view/{key}",
             }
         }
     }
diff --git a/src/pages/panel/sitekey/view.rs b/src/pages/panel/sitekey/view.rs
index a3e2024b..e34703b3 100644
--- a/src/pages/panel/sitekey/view.rs
+++ b/src/pages/panel/sitekey/view.rs
@@ -115,7 +115,7 @@ mod test {
 
         let mut app = get_app!(data).await;
 
-        let url = format!("/sitekey/{}/view", &key.key);
+        let url = format!("/sitekey/view/{}", &key.key);
 
         let list_sitekey_resp = test::call_service(
             &mut app,
diff --git a/templates/panel/sitekey/add/ts/form/index.ts b/templates/panel/sitekey/add/ts/form/index.ts
index e57ae467..1d39c17f 100644
--- a/templates/panel/sitekey/add/ts/form/index.ts
+++ b/templates/panel/sitekey/add/ts/form/index.ts
@@ -54,7 +54,8 @@ const submit = async (e: Event) => {
   const res = await fetch(formUrl, genJsonPayload(payload));
   if (res.ok) {
     alert('success');
-    window.location.assign(VIEWS.listSitekey);
+    const data = await res.json();
+    window.location.assign(VIEWS.listSitekey(data.key));
   } else {
     const err = await res.json();
     alert(`error: ${err.error}`);
diff --git a/templates/views/v1/routes.ts b/templates/views/v1/routes.ts
index 547e0291..93bb432f 100644
--- a/templates/views/v1/routes.ts
+++ b/templates/views/v1/routes.ts
@@ -21,7 +21,7 @@ const ROUTES = {
   signoutUser: '/api/v1/signout',
   panelHome: '/',
   docsHome: '/docs/',
-  listSitekey: '/sitekey/view',
+  listSitekey: (key: string) => `/sitekey/view/${key}`,
   addSiteKey: '/sitekey/add',
 };