feat: add requests library as a global shared dependency

ui/console-src/modules/system/plugins/PluginDetail.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 // core libs
-import { apiClient } from "@/utils/api-client";
+import { consoleApiClient, coreApiClient } from "@halo-dev/api-client";
 import { computed, provide, ref } from "vue";
 import { useRoute } from "vue-router";
 
@@ -44,10 +44,9 @@ provide<Ref<string>>("activeTab", activeTab);
 const { data: plugin } = useQuery({
   queryKey: ["plugin", route.params.name],
   queryFn: async () => {
-    const { data } =
-      await apiClient.extension.plugin.getPluginHaloRunV1alpha1Plugin({
-        name: route.params.name as string,
-      });
+    const { data } = await coreApiClient.plugin.plugin.getPlugin({
+      name: route.params.name as string,
+    });
     return data;
   },
   async onSuccess(data) {
@@ -65,7 +64,7 @@ provide<Ref<Plugin | undefined>>("plugin", plugin);
 const { data: setting } = useQuery({
   queryKey: ["plugin-setting", plugin],
   queryFn: async () => {
-    const { data } = await apiClient.plugin.fetchPluginSetting({
+    const { data } = await consoleApiClient.plugin.plugin.fetchPluginSetting({
       name: plugin.value?.metadata.name as string,
     });
     return data;

ui/console-src/modules/system/plugins/PluginList.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { apiClient } from "@/utils/api-client";
+import { consoleApiClient } from "@halo-dev/api-client";
 import { usePermission } from "@/utils/permission";
 import { PluginStatusPhaseEnum, type Plugin } from "@halo-dev/api-client";
 import {
@@ -56,7 +56,7 @@ const total = ref(0);
 const { data, isLoading, isFetching, refetch } = useQuery<Plugin[]>({
   queryKey: ["plugins", keyword, selectedEnabledValue, selectedSortValue],
   queryFn: async () => {
-    const { data } = await apiClient.plugin.listPlugins({
+    const { data } = await consoleApiClient.plugin.plugin.listPlugins({
       page: 0,
       size: 0,
       keyword: keyword.value,

ui/console-src/modules/system/plugins/components/PluginListItem.vue

@@ -10,10 +10,14 @@ import {
 import type { Ref } from "vue";
 import { computed, inject, markRaw, ref, toRefs } from "vue";
 import { usePluginLifeCycle } from "../composables/use-plugin";
-import { type Plugin, PluginStatusPhaseEnum } from "@halo-dev/api-client";
+import {
+  type Plugin,
+  PluginStatusPhaseEnum,
+  consoleApiClient,
+} from "@halo-dev/api-client";
 import { formatDatetime } from "@/utils/date";
 import { usePermission } from "@/utils/permission";
-import { apiClient } from "@/utils/api-client";
+
 import { useI18n } from "vue-i18n";
 import { useEntityFieldItemExtensionPoint } from "@console/composables/use-entity-extension-points";
 import { useOperationItemExtensionPoint } from "@console/composables/use-operation-extension-points";
@@ -61,7 +65,7 @@ const handleResetSettingConfig = async () => {
           return;
         }
 
-        await apiClient.plugin.resetPluginConfig({
+        await consoleApiClient.plugin.plugin.resetPluginConfig({
           name: plugin.value.metadata.name as string,
         });
 

ui/console-src/modules/system/plugins/components/installation-tabs/LocalUpload.vue

@@ -10,7 +10,7 @@ import type { UppyFile } from "@uppy/core";
 import type { ErrorResponse } from "@uppy/core";
 import type { PluginInstallationErrorResponse } from "../../types";
 import { PLUGIN_ALREADY_EXISTS_TYPE } from "../../constants";
-import { apiClient } from "@/utils/api-client";
+import { consoleApiClient } from "@halo-dev/api-client";
 import AppDownloadAlert from "@/components/common/AppDownloadAlert.vue";
 
 const emit = defineEmits<{
@@ -64,7 +64,7 @@ const handleShowActiveModalAfterInstall = (plugin: Plugin) => {
     cancelText: t("core.common.buttons.cancel"),
     onConfirm: async () => {
       try {
-        await apiClient.plugin.changePluginRunningState({
+        await consoleApiClient.plugin.plugin.changePluginRunningState({
           name: plugin.metadata.name,
           pluginRunningStateRequest: {
             enable: true,
@@ -93,7 +93,7 @@ const handleCatchExistsException = async (
     confirmText: t("core.common.buttons.confirm"),
     cancelText: t("core.common.buttons.cancel"),
     onConfirm: async () => {
-      await apiClient.plugin.upgradePlugin({
+      await consoleApiClient.plugin.plugin.upgradePlugin({
         name: error.pluginName,
         file: file,
       });

ui/console-src/modules/system/plugins/components/installation-tabs/RemoteDownload.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { apiClient } from "@/utils/api-client";
+import { consoleApiClient } from "@halo-dev/api-client";
 import { Dialog, Toast, VButton } from "@halo-dev/components";
 import type { Plugin } from "@halo-dev/api-client";
 import type { Ref } from "vue";
@@ -33,7 +33,7 @@ const handleDownloadPlugin = async () => {
   try {
     downloading.value = true;
     if (pluginToUpgrade.value) {
-      await apiClient.plugin.upgradePluginFromUri({
+      await consoleApiClient.plugin.plugin.upgradePluginFromUri({
         name: pluginToUpgrade.value.metadata.name,
         upgradeFromUriRequest: {
           uri: remoteDownloadUrl.value,
@@ -45,11 +45,12 @@ const handleDownloadPlugin = async () => {
       return;
     }
 
-    const { data: plugin } = await apiClient.plugin.installPluginFromUri({
-      installFromUriRequest: {
-        uri: remoteDownloadUrl.value,
-      },
-    });
+    const { data: plugin } =
+      await consoleApiClient.plugin.plugin.installPluginFromUri({
+        installFromUriRequest: {
+          uri: remoteDownloadUrl.value,
+        },
+      });
 
     emit("close-modal");
     queryClient.invalidateQueries({ queryKey: ["plugins"] });
@@ -80,7 +81,7 @@ const handleShowActiveModalAfterInstall = (plugin: Plugin) => {
     cancelText: t("core.common.buttons.cancel"),
     onConfirm: async () => {
       try {
-        await apiClient.plugin.changePluginRunningState({
+        await consoleApiClient.plugin.plugin.changePluginRunningState({
           name: plugin.metadata.name,
           pluginRunningStateRequest: {
             enable: true,
@@ -108,7 +109,7 @@ const handleCatchExistsException = async (
     confirmText: t("core.common.buttons.confirm"),
     cancelText: t("core.common.buttons.cancel"),
     onConfirm: async () => {
-      await apiClient.plugin.upgradePluginFromUri({
+      await consoleApiClient.plugin.plugin.upgradePluginFromUri({
         name: error.pluginName,
         upgradeFromUriRequest: {
           uri: remoteDownloadUrl.value,

ui/console-src/modules/system/plugins/composables/use-plugin.ts

@@ -1,7 +1,12 @@
 import type { ComputedRef, Ref } from "vue";
 import { computed } from "vue";
-import { type Plugin, PluginStatusPhaseEnum } from "@halo-dev/api-client";
-import { apiClient } from "@/utils/api-client";
+import {
+  type Plugin,
+  PluginStatusPhaseEnum,
+  coreApiClient,
+  consoleApiClient,
+} from "@halo-dev/api-client";
+
 import { Dialog, Toast } from "@halo-dev/components";
 import { useI18n } from "vue-i18n";
 import { useMutation } from "@tanstack/vue-query";
@@ -75,7 +80,7 @@ export function usePluginLifeCycle(
 
       const { enabled } = plugin.value.spec;
 
-      return await apiClient.plugin.changePluginRunningState({
+      return await consoleApiClient.plugin.plugin.changePluginRunningState({
         name: plugin.value.metadata.name,
         pluginRunningStateRequest: {
           enable: !enabled,
@@ -116,14 +121,14 @@ export function usePluginLifeCycle(
         if (!plugin.value) return;
 
         try {
-          await apiClient.plugin.changePluginRunningState({
+          await consoleApiClient.plugin.plugin.changePluginRunningState({
             name: plugin.value.metadata.name,
             pluginRunningStateRequest: {
               enable: false,
             },
           });
 
-          await apiClient.extension.plugin.deletePluginHaloRunV1alpha1Plugin({
+          await coreApiClient.plugin.plugin.deletePlugin({
             name: plugin.value.metadata.name,
           });
 
@@ -132,7 +137,7 @@ export function usePluginLifeCycle(
             const { settingName, configMapName } = plugin.value.spec;
 
             if (settingName) {
-              await apiClient.extension.setting.deleteV1alpha1Setting(
+              await coreApiClient.setting.deleteSetting(
                 {
                   name: settingName,
                 },
@@ -143,7 +148,7 @@ export function usePluginLifeCycle(
             }
 
             if (configMapName) {
-              await apiClient.extension.configMap.deleteV1alpha1ConfigMap(
+              await coreApiClient.configMap.deleteConfigMap(
                 {
                   name: configMapName,
                 },
@@ -193,22 +198,20 @@ export function usePluginBatchOperations(names: Ref<string[]>) {
       onConfirm: async () => {
         try {
           for (let i = 0; i < names.value.length; i++) {
-            await apiClient.extension.plugin.deletePluginHaloRunV1alpha1Plugin({
+            await coreApiClient.plugin.plugin.deletePlugin({
               name: names.value[i],
             });
 
             if (deleteExtensions) {
               const { data: plugin } =
-                await apiClient.extension.plugin.getPluginHaloRunV1alpha1Plugin(
-                  {
-                    name: names.value[i],
-                  }
-                );
+                await coreApiClient.plugin.plugin.getPlugin({
+                  name: names.value[i],
+                });
 
               const { settingName, configMapName } = plugin.spec;
 
               if (settingName) {
-                await apiClient.extension.setting.deleteV1alpha1Setting(
+                await coreApiClient.setting.deleteSetting(
                   {
                     name: settingName,
                   },
@@ -219,7 +222,7 @@ export function usePluginBatchOperations(names: Ref<string[]>) {
               }
 
               if (configMapName) {
-                await apiClient.extension.configMap.deleteV1alpha1ConfigMap(
+                await coreApiClient.configMap.deleteConfigMap(
                   {
                     name: configMapName,
                   },
@@ -249,7 +252,7 @@ export function usePluginBatchOperations(names: Ref<string[]>) {
       onConfirm: async () => {
         try {
           for (let i = 0; i < names.value.length; i++) {
-            await apiClient.plugin.changePluginRunningState({
+            await consoleApiClient.plugin.plugin.changePluginRunningState({
               name: names.value[i],
               pluginRunningStateRequest: {
                 enable: enabled,

ui/console-src/modules/system/plugins/tabs/Detail.vue

@@ -8,7 +8,7 @@ import {
 } from "@halo-dev/components";
 import type { Ref } from "vue";
 import { computed, inject } from "vue";
-import { apiClient } from "@/utils/api-client";
+import { coreApiClient } from "@halo-dev/api-client";
 import {
   PluginStatusPhaseEnum,
   type Plugin,
@@ -33,7 +33,7 @@ interface RoleTemplateGroup {
 const { data: pluginRoleTemplates } = useQuery({
   queryKey: ["plugin-roles", plugin?.value?.metadata.name],
   queryFn: async () => {
-    const { data } = await apiClient.extension.role.listV1alpha1Role({
+    const { data } = await coreApiClient.role.listRole({
       page: 0,
       size: 0,
       labelSelector: [

ui/console-src/modules/system/plugins/tabs/Setting.vue

@@ -4,7 +4,7 @@ import { inject, ref, type Ref, computed } from "vue";
 
 // hooks
 import { useSettingFormConvert } from "@console/composables/use-setting-form";
-import { apiClient } from "@/utils/api-client";
+import { consoleApiClient } from "@halo-dev/api-client";
 
 // components
 import { Toast, VButton } from "@halo-dev/components";
@@ -27,7 +27,7 @@ const saving = ref(false);
 const { data: configMap } = useQuery<ConfigMap>({
   queryKey: ["plugin-configMap", plugin],
   queryFn: async () => {
-    const { data } = await apiClient.plugin.fetchPluginConfig({
+    const { data } = await consoleApiClient.plugin.plugin.fetchPluginConfig({
       name: plugin?.value?.metadata.name as string,
     });
     return data;
@@ -51,7 +51,7 @@ const handleSaveConfigMap = async () => {
     return;
   }
 
-  await apiClient.plugin.updatePluginConfig({
+  await consoleApiClient.plugin.plugin.updatePluginConfig({
     name: plugin.value.metadata.name,
     configMap: configMapToUpdate,
   });