fix: comment ref

Signed-off-by: Innei <[email protected]>
mx-space · Mar 27, 2024 · 590c172 · 590c172
1 parent af585e5
commit 590c172
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 18 deletions.
diff --git a/src/utils/is-init.ts b/src/utils/is-init.ts
@@ -1,3 +1,5 @@
+import { router } from '~/router'
+
 import { RESTManager } from './rest'
 
 export const checkIsInit = async (): Promise<boolean> => {
@@ -6,17 +8,27 @@ export const checkIsInit = async (): Promise<boolean> => {
     return (
       window.injectData?.INIT ??
       (
-        await RESTManager.api.init.get<{ isInit: boolean }>({
-          errorHandler(e) {
-            if (e?.response.status == 404) {
-              return
+        await RESTManager.api.init
+          .get<{ isInit: boolean }>({
+            errorHandler(e) {
+              if (e?.response.status == 404) {
+                return { isInit: true }
+              }
+              throw e
+            },
+          })
+          .then((res) => {
+            if (typeof res !== 'object' || (res && !('isInit' in res))) {
+              console.log('err sss')
+              router.push('/setup-api')
+              message.error('api error')
             }
-            throw e
-          },
-        })
-      ).isInit
+            return res
+          })
+      ).isInit === true
     )
   } catch (e) {
-    return true
+    console.error(e)
+    return false
   }
 }
diff --git a/src/views/comments/index.tsx b/src/views/comments/index.tsx
@@ -214,13 +214,13 @@ const ManageComment = defineComponent(() => {
       render(row: any) {
         const link = (() => {
           switch (row.refType) {
-            case 'Post': {
+            case 'posts': {
               return `${WEB_URL}/posts/${row.ref.category.slug}/${row.ref.slug}`
             }
-            case 'Note': {
+            case 'notes': {
               return `${WEB_URL}/notes/${row.ref.nid}`
             }
-            case 'Page': {
+            case 'pages': {
               return `${WEB_URL}/${row.ref.slug}`
             }
           }

diff --git a/src/views/setup-api/index.tsx b/src/views/setup-api/index.tsx
@@ -1,8 +1,6 @@
 import { NButton, NCard, NForm, NFormItem, NSelect, NSwitch } from 'naive-ui'
 import { defineComponent } from 'vue'
 
-import { router } from '~/router'
-
 const storeApiUrlKey = 'mx-admin:setup-api:url'
 const storeGatewayUrlKey = 'mx-admin:setup-api:gateway'
 
@@ -41,9 +39,10 @@ export default defineComponent({
         storeGatewayUrlKey,
         JSON.stringify([...new Set(historyApiUrl.concat(gatewayUrl))]),
       )
-
-      // location.href = url.toString()
-      router.push('/dashboard').then(() => location.reload())
+      const url = new URL(location.href)
+      url.hash = '#/dashboard'
+      location.href = url.toString()
+      location.reload()
     }
     const handleReset = () => {
       localStorage.removeItem('__api')

diff --git a/src/views/setup/index.tsx b/src/views/setup/index.tsx
@@ -16,6 +16,7 @@ import type { PropType } from 'vue'
 import type { UserModel } from '../../models/user'
 
 import { showConfetti } from '~/utils/confetti'
+import { checkIsInit } from '~/utils/is-init'
 
 import { getToken, removeToken } from '../../utils'
 import { RESTManager } from '../../utils/rest'
@@ -24,7 +25,8 @@ import styles from './index.module.css'
 const useDefaultConfigs = () => inject<any>('configs')
 export default defineComponent({
   setup() {
-    onBeforeMount(() => {
+    onBeforeMount(async () => {
+      await checkIsInit()
       if (getToken()) {
         removeToken()
       }