From fae0b64a082805d2507b0d56dd9a171a9bdba1ab Mon Sep 17 00:00:00 2001 From: boojack Date: Sat, 14 Jan 2023 12:08:31 +0800 Subject: [PATCH] fix: delete tag api (#950) * fix: delete tag api * chore: update --- server/tag.go | 7 +++++-- web/src/components/MemoResource.tsx | 3 ++- web/src/components/MemoResources.tsx | 5 +++-- web/src/components/ResourcesDialog.tsx | 10 ++++------ web/src/components/ResourcesSelectorDialog.tsx | 7 ++----- web/src/helpers/api.ts | 2 +- web/src/utils/resource.ts | 3 +++ 7 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 web/src/utils/resource.ts diff --git a/server/tag.go b/server/tag.go index 86c9682c..1d139501 100644 --- a/server/tag.go +++ b/server/tag.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "net/http" + "net/url" "regexp" "sort" @@ -133,8 +134,10 @@ func (s *Server) registerTagRoutes(g *echo.Group) { return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session") } - tagName := c.Param("tagName") - if tagName == "" { + tagName, err := url.QueryUnescape(c.Param("tagName")) + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, "Invalid tag name").SetInternal(err) + } else if tagName == "" { return echo.NewHTTPError(http.StatusBadRequest, "Tag name cannot be empty") } diff --git a/web/src/components/MemoResource.tsx b/web/src/components/MemoResource.tsx index e1b29138..ca7e0d2d 100644 --- a/web/src/components/MemoResource.tsx +++ b/web/src/components/MemoResource.tsx @@ -1,3 +1,4 @@ +import { getResourceUrl } from "../utils/resource"; import Icon from "./Icon"; interface Props { @@ -7,7 +8,7 @@ interface Props { const MemoResource: React.FC = (props: Props) => { const { className, resource } = props; - const resourceUrl = `${window.location.origin}/o/r/${resource.id}/${resource.filename}`; + const resourceUrl = getResourceUrl(resource); const handlePreviewBtnClick = () => { window.open(resourceUrl); diff --git a/web/src/components/MemoResources.tsx b/web/src/components/MemoResources.tsx index 77f8e089..adc3dcee 100644 --- a/web/src/components/MemoResources.tsx +++ b/web/src/components/MemoResources.tsx @@ -1,4 +1,5 @@ import { absolutifyLink } from "../helpers/utils"; +import { getResourceUrl } from "../utils/resource"; import SquareDiv from "./common/SquareDiv"; import showPreviewImageDialog from "./PreviewImageDialog"; import MemoResource from "./MemoResource"; @@ -27,7 +28,7 @@ const MemoResources: React.FC = (props: Props) => { const imgUrls = availableResourceList .filter((resource) => resource.type.startsWith("image")) .map((resource) => { - return `/o/r/${resource.id}/${resource.filename}`; + return getResourceUrl(resource); }); const handleImageClick = (imgUrl: string) => { @@ -41,7 +42,7 @@ const MemoResources: React.FC = (props: Props) => { {availableResourceList.length > 0 && (
{availableResourceList.map((resource) => { - const url = `/o/r/${resource.id}/${resource.filename}`; + const url = getResourceUrl(resource); if (resource.type.startsWith("image")) { return ( diff --git a/web/src/components/ResourcesDialog.tsx b/web/src/components/ResourcesDialog.tsx index 9a0b113e..8bc3e88e 100644 --- a/web/src/components/ResourcesDialog.tsx +++ b/web/src/components/ResourcesDialog.tsx @@ -1,9 +1,10 @@ import { Tooltip } from "@mui/joy"; import copy from "copy-to-clipboard"; -import { useCallback, useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import useLoading from "../hooks/useLoading"; import { useResourceStore } from "../store/module"; +import { getResourceUrl } from "../utils/resource"; import Icon from "./Icon"; import toastHelper from "./Toast"; import Dropdown from "./common/Dropdown"; @@ -83,10 +84,6 @@ const ResourcesDialog: React.FC = (props: Props) => { inputEl.click(); }; - const getResourceUrl = useCallback((resource: Resource) => { - return `${window.location.origin}/o/r/${resource.id}/${resource.filename}`; - }, []); - const handlePreviewBtnClick = (resource: Resource) => { const resourceUrl = getResourceUrl(resource); if (resource.type.startsWith("image")) { @@ -104,7 +101,8 @@ const ResourcesDialog: React.FC = (props: Props) => { }; const handleCopyResourceLinkBtnClick = (resource: Resource) => { - copy(`${window.location.origin}/o/r/${resource.id}/${resource.filename}`); + const url = getResourceUrl(resource); + copy(url); toastHelper.success(t("message.succeed-copy-resource-link")); }; diff --git a/web/src/components/ResourcesSelectorDialog.tsx b/web/src/components/ResourcesSelectorDialog.tsx index 891dfc43..aecc6ebd 100644 --- a/web/src/components/ResourcesSelectorDialog.tsx +++ b/web/src/components/ResourcesSelectorDialog.tsx @@ -1,8 +1,9 @@ import { Checkbox, Tooltip } from "@mui/joy"; -import { useCallback, useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import useLoading from "../hooks/useLoading"; import { useEditorStore, useResourceStore } from "../store/module"; +import { getResourceUrl } from "../utils/resource"; import Icon from "./Icon"; import toastHelper from "./Toast"; import { generateDialog } from "./Dialog"; @@ -47,10 +48,6 @@ const ResourcesSelectorDialog: React.FC = (props: Props) => { }); }, [resources]); - const getResourceUrl = useCallback((resource: Resource) => { - return `${window.location.origin}/o/r/${resource.id}/${resource.filename}`; - }, []); - const handlePreviewBtnClick = (resource: Resource) => { const resourceUrl = getResourceUrl(resource); if (resource.type.startsWith("image")) { diff --git a/web/src/helpers/api.ts b/web/src/helpers/api.ts index 94097094..010c03c0 100644 --- a/web/src/helpers/api.ts +++ b/web/src/helpers/api.ts @@ -198,7 +198,7 @@ export function upsertTag(tagName: string) { } export function deleteTag(tagName: string) { - return axios.delete>(`/api/tag/${tagName}`); + return axios.delete>(`/api/tag/${encodeURI(tagName)}`); } export async function getRepoStarCount() { diff --git a/web/src/utils/resource.ts b/web/src/utils/resource.ts new file mode 100644 index 00000000..c52795de --- /dev/null +++ b/web/src/utils/resource.ts @@ -0,0 +1,3 @@ +export const getResourceUrl = (resource: Resource, withOrigin = true) => { + return `${withOrigin ? window.location.origin : ""}/o/r/${resource.id}/${encodeURI(resource.filename)}`; +};