From 48c7fe7a5b60846320825523a0117d55b78c1a43 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Tue, 2 Jul 2024 17:39:04 +0800
Subject: [PATCH 1/2] feat: show plugin settings modal when share url is not
 config

Signed-off-by: Ryan Wang <i@ryanc.cc>
---
 console/package.json            |  3 +-
 console/src/views/UmamiView.vue | 49 ++++++++++++++------------
 console/vite.config.ts          | 62 +++++++--------------------------
 3 files changed, 40 insertions(+), 74 deletions(-)

diff --git a/console/package.json b/console/package.json
index a747dfd..308833e 100644
--- a/console/package.json
+++ b/console/package.json
@@ -1,6 +1,7 @@
 {
+  "type": "module",
   "scripts": {
-    "dev": "vite build --watch",
+    "dev": "vite build --watch --mode=development",
     "build": "vite build",
     "preview": "vite preview --port 4173",
     "test:unit": "vitest --environment jsdom",
diff --git a/console/src/views/UmamiView.vue b/console/src/views/UmamiView.vue
index ebf2c70..e03adb0 100644
--- a/console/src/views/UmamiView.vue
+++ b/console/src/views/UmamiView.vue
@@ -1,39 +1,42 @@
 <script lang="ts" setup>
-import { onMounted } from "vue";
-import type { ConfigMap } from "@halo-dev/api-client";
-import { Dialog } from "@halo-dev/components";
-import { ref } from "vue";
-import { useRouter } from "vue-router";
-import axios from "axios";
+import { coreApiClient } from "@halo-dev/api-client";
+import { Toast } from "@halo-dev/components";
+import { onMounted, ref } from "vue";
 
 const shareUrl = ref("");
-
-const router = useRouter();
+const pluginDetailModal = ref(false);
 
 const handleFetchUmamiShareUrl = async () => {
   try {
-    const { data: configMap } = await axios.get<ConfigMap>(
-      "/api/v1alpha1/configmaps/plugin-umami-configMap"
-    );
+    const { data: configMap } = await coreApiClient.configMap.getConfigMap({
+      name: "plugin-umami-configMap",
+    });
+
+    const url = JSON.parse(configMap.data?.basic || "{ url: '' }").url;
 
-    shareUrl.value = JSON.parse(configMap.data?.basic || "{ url: '' }").url;
+    if (!url) {
+      throw new Error("Umami share url is empty");
+    }
+
+    shareUrl.value = url;
   } catch (error) {
-    Dialog.warning({
-      title: "未正确配置 Umami 的共享链接",
-      description:
-        "当前没有正确配置 Umami 的共享链接，可以点击下方按钮进入设置。",
-      confirmText: "进入设置",
-      showCancel: false,
-      onConfirm: () => {
-        router.push(`/plugins/PluginUmami/settings/basic`);
-      },
-    });
-    console.error(error);
+    Toast.success("未正确配置 Umami 共享链接，请先配置");
+    pluginDetailModal.value = true;
   }
 };
 
 onMounted(handleFetchUmamiShareUrl);
+
+function onPluginDetailModalClose() {
+  pluginDetailModal.value = false;
+  handleFetchUmamiShareUrl();
+}
 </script>
 <template>
+  <PluginDetailModal
+    v-if="pluginDetailModal"
+    name="PluginUmami"
+    @close="onPluginDetailModalClose"
+  />
   <iframe :src="shareUrl" style="width: 100%; height: 100vh; border: none" />
 </template>
diff --git a/console/vite.config.ts b/console/vite.config.ts
index d1a1df2..741702f 100644
--- a/console/vite.config.ts
+++ b/console/vite.config.ts
@@ -1,56 +1,18 @@
 import { fileURLToPath, URL } from "url";
 
-import { defineConfig } from "vite";
+import { HaloUIPluginBundlerKit } from "@halo-dev/ui-plugin-bundler-kit";
 import Vue from "@vitejs/plugin-vue";
 import Icons from "unplugin-icons/vite";
+import { defineConfig } from "vite";
 
-export default ({ mode }: { mode: string }) => {
-  const isProduction = mode === "production";
-  const outDir = isProduction
-    ? "../src/main/resources/console"
-    : "../build/resources/main/console";
-
-  return defineConfig({
-    plugins: [Vue(), Icons({ compiler: "vue3" })],
-    resolve: {
-      alias: {
-        "@": fileURLToPath(new URL("./src", import.meta.url)),
-      },
-    },
-    define: {
-      "process.env": process.env,
-    },
-    build: {
-      outDir,
-      emptyOutDir: true,
-      lib: {
-        entry: "src/index.ts",
-        name: "PluginUmami",
-        formats: ["iife"],
-        fileName: () => "main.js",
-      },
-      rollupOptions: {
-        external: [
-          "vue",
-          "vue-router",
-          "@vueuse/core",
-          "@vueuse/components",
-          "@vueuse/router",
-          "@halo-dev/shared",
-          "@halo-dev/components",
-        ],
-        output: {
-          globals: {
-            vue: "Vue",
-            "vue-router": "VueRouter",
-            "@vueuse/core": "VueUse",
-            "@vueuse/components": "VueUse",
-            "@vueuse/router": "VueUse",
-            "@halo-dev/console-shared": "HaloConsoleShared",
-            "@halo-dev/components": "HaloComponents",
-          },
-        },
-      },
+export default defineConfig({
+  plugins: [Vue(), Icons({ compiler: "vue3" }), HaloUIPluginBundlerKit()],
+  resolve: {
+    alias: {
+      "@": fileURLToPath(new URL("./src", import.meta.url)),
     },
-  });
-};
+  },
+  define: {
+    "process.env": process.env,
+  },
+});

From 02f89ed2ce31b2df7d9bb4a2b74e6b0f059ce3cb Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Tue, 2 Jul 2024 17:49:56 +0800
Subject: [PATCH 2/2] Bump plugin requires

Signed-off-by: Ryan Wang <i@ryanc.cc>
---
 src/main/resources/plugin.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/plugin.yaml b/src/main/resources/plugin.yaml
index e76c498..923dd36 100644
--- a/src/main/resources/plugin.yaml
+++ b/src/main/resources/plugin.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   enabled: true
   version: 1.0.0
-  requires: ">=2.0.0"
+  requires: ">=2.17.0"
   author:
     name: Halo
     website: https://github.com/halo-dev