feat: add requests library as a global shared dependency

This commit is contained in:
Ryan Wang
2024-06-25 12:31:44 +08:00
parent ecc0a70249
commit c74187c066
156 changed files with 1866 additions and 1964 deletions

View File

@@ -15,7 +15,7 @@ import MenuItemEditingModal from "./components/MenuItemEditingModal.vue";
import MenuItemListItem from "./components/MenuItemListItem.vue";
import MenuList from "./components/MenuList.vue";
import { computed, ref } from "vue";
import { apiClient } from "@/utils/api-client";
import { coreApiClient } from "@halo-dev/api-client";
import type { Menu, MenuItem } from "@halo-dev/api-client";
import { cloneDeep } from "lodash-es";
import type { MenuTreeItem } from "./utils";
@@ -51,7 +51,7 @@ const {
}
const menuItemNames = selectedMenu.value.spec.menuItems.filter(Boolean);
const { data } = await apiClient.extension.menuItem.listV1alpha1MenuItem({
const { data } = await coreApiClient.menuItem.listMenuItem({
page: 0,
size: 0,
fieldSelector: [`name=(${menuItemNames.join(",")})`],
@@ -72,8 +72,8 @@ const {
});
const handleOpenEditingModal = (menuItem: MenuTreeItem) => {
apiClient.extension.menuItem
.getV1alpha1MenuItem({
coreApiClient.menuItem
.getMenuItem({
name: menuItem.metadata.name,
})
.then((response) => {
@@ -106,7 +106,7 @@ const onMenuItemSaved = async (menuItem: MenuItem) => {
menuItem.metadata.name,
];
await apiClient.extension.menu.updateV1alpha1Menu({
await coreApiClient.menu.updateMenu({
name: menuToUpdate.metadata.name,
menu: menuToUpdate,
});
@@ -124,7 +124,7 @@ const handleUpdateInBatch = useDebounceFn(async () => {
try {
batchUpdating.value = true;
const promises = menuItemsToUpdate.map((menuItem) =>
apiClient.extension.menuItem.updateV1alpha1MenuItem({
coreApiClient.menuItem.updateMenuItem({
name: menuItem.metadata.name,
menuItem,
})
@@ -147,7 +147,7 @@ const handleDelete = async (menuItem: MenuTreeItem) => {
confirmText: t("core.common.buttons.confirm"),
cancelText: t("core.common.buttons.cancel"),
onConfirm: async () => {
await apiClient.extension.menuItem.deleteV1alpha1MenuItem({
await coreApiClient.menuItem.deleteMenuItem({
name: menuItem.metadata.name,
});
@@ -155,7 +155,7 @@ const handleDelete = async (menuItem: MenuTreeItem) => {
if (childrenNames.length) {
const deleteChildrenRequests = childrenNames.map((name) =>
apiClient.extension.menuItem.deleteV1alpha1MenuItem({
coreApiClient.menuItem.deleteMenuItem({
name,
})
);
@@ -170,7 +170,7 @@ const handleDelete = async (menuItem: MenuTreeItem) => {
menuToUpdate.spec.menuItems = menuToUpdate.spec.menuItems?.filter(
(name) => ![menuItem.metadata.name, ...childrenNames].includes(name)
);
await apiClient.extension.menu.updateV1alpha1Menu({
await coreApiClient.menu.updateMenu({
name: menuToUpdate.metadata.name,
menu: menuToUpdate,
});

View File

@@ -3,7 +3,7 @@ import { Toast, VButton, VModal, VSpace } from "@halo-dev/components";
import SubmitButton from "@/components/button/SubmitButton.vue";
import type { Menu } from "@halo-dev/api-client";
import { onMounted, ref } from "vue";
import { apiClient } from "@/utils/api-client";
import { coreApiClient } from "@halo-dev/api-client";
import { setFocus } from "@/formkit/utils/focus";
import { useI18n } from "vue-i18n";
import { useQueryClient } from "@tanstack/vue-query";
@@ -51,12 +51,12 @@ const handleSaveMenu = async () => {
try {
saving.value = true;
if (props.menu) {
await apiClient.extension.menu.updateV1alpha1Menu({
await coreApiClient.menu.updateMenu({
name: formState.value.metadata.name,
menu: formState.value,
});
} else {
const { data } = await apiClient.extension.menu.createV1alpha1Menu({
const { data } = await coreApiClient.menu.createMenu({
menu: formState.value,
});
emit("created", data);

View File

@@ -3,7 +3,7 @@ import { Toast, VButton, VModal, VSpace } from "@halo-dev/components";
import SubmitButton from "@/components/button/SubmitButton.vue";
import { computed, nextTick, onMounted, ref } from "vue";
import type { Menu, MenuItem, Ref } from "@halo-dev/api-client";
import { apiClient } from "@/utils/api-client";
import { coreApiClient } from "@halo-dev/api-client";
import { setFocus } from "@/formkit/utils/focus";
import AnnotationsForm from "@/components/form/AnnotationsForm.vue";
import { useI18n } from "vue-i18n";
@@ -87,23 +87,21 @@ const handleSaveMenuItem = async () => {
}
if (isUpdateMode) {
const { data } =
await apiClient.extension.menuItem.updateV1alpha1MenuItem({
name: formState.value.metadata.name,
menuItem: formState.value,
});
const { data } = await coreApiClient.menuItem.updateMenuItem({
name: formState.value.metadata.name,
menuItem: formState.value,
});
emit("saved", data);
} else {
const { data } =
await apiClient.extension.menuItem.createV1alpha1MenuItem({
menuItem: formState.value,
});
const { data } = await coreApiClient.menuItem.createMenuItem({
menuItem: formState.value,
});
// if parent menu item is selected, add the new menu item to the parent menu item
if (selectedParentMenuItem.value) {
const { data: menuItemToUpdate } =
await apiClient.extension.menuItem.getV1alpha1MenuItem({
await coreApiClient.menuItem.getMenuItem({
name: selectedParentMenuItem.value,
});
@@ -112,7 +110,7 @@ const handleSaveMenuItem = async () => {
data.metadata.name,
];
await apiClient.extension.menuItem.updateV1alpha1MenuItem({
await coreApiClient.menuItem.updateMenuItem({
name: menuItemToUpdate.metadata.name,
menuItem: menuItemToUpdate,
});

View File

@@ -16,7 +16,7 @@ import {
import MenuEditingModal from "./MenuEditingModal.vue";
import { onMounted, ref } from "vue";
import type { Menu } from "@halo-dev/api-client";
import { apiClient } from "@/utils/api-client";
import { coreApiClient } from "@halo-dev/api-client";
import { useRouteQuery } from "@vueuse/router";
import { usePermission } from "@/utils/permission";
import { useI18n } from "vue-i18n";
@@ -48,7 +48,7 @@ const {
} = useQuery<Menu[]>({
queryKey: ["menus"],
queryFn: async () => {
const { data } = await apiClient.extension.menu.listV1alpha1Menu({
const { data } = await coreApiClient.menu.listMenu({
page: 0,
size: 0,
});
@@ -87,12 +87,12 @@ const handleDeleteMenu = async (menu: Menu) => {
cancelText: t("core.common.buttons.cancel"),
onConfirm: async () => {
try {
await apiClient.extension.menu.deleteV1alpha1Menu({
await coreApiClient.menu.deleteMenu({
name: menu.metadata.name,
});
const deleteItemsPromises = menu.spec.menuItems?.map((item) =>
apiClient.extension.menuItem.deleteV1alpha1MenuItem({
coreApiClient.menuItem.deleteMenuItem({
name: item,
})
);
@@ -138,7 +138,7 @@ onMounted(async () => {
const { data: primaryMenuName, refetch: refetchPrimaryMenuName } = useQuery({
queryKey: ["primary-menu-name"],
queryFn: async () => {
const { data } = await apiClient.extension.configMap.getV1alpha1ConfigMap({
const { data } = await coreApiClient.configMap.getConfigMap({
name: "system",
});
@@ -153,17 +153,16 @@ const { data: primaryMenuName, refetch: refetchPrimaryMenuName } = useQuery({
});
const handleSetPrimaryMenu = async (menu: Menu) => {
const { data: systemConfigMap } =
await apiClient.extension.configMap.getV1alpha1ConfigMap({
name: "system",
});
const { data: systemConfigMap } = await coreApiClient.configMap.getConfigMap({
name: "system",
});
if (systemConfigMap.data) {
const menuConfigToUpdate = JSON.parse(systemConfigMap.data?.menu || "{}");
menuConfigToUpdate.primary = menu.metadata.name;
systemConfigMap.data["menu"] = JSON.stringify(menuConfigToUpdate);
await apiClient.extension.configMap.updateV1alpha1ConfigMap({
await coreApiClient.configMap.updateConfigMap({
name: "system",
configMap: systemConfigMap,
});