From 697e54758d284349fdc4c78baa17969eab5f0ac6 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 23 Jun 2025 21:20:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20frontend=C2=A0linter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/components/CreateIdentityProviderDialog.tsx | 4 ---- .../MemoRelationForceGraph/MemoRelationForceGraph.tsx | 3 ++- web/src/components/MemoRelationListView.tsx | 9 +++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/web/src/components/CreateIdentityProviderDialog.tsx b/web/src/components/CreateIdentityProviderDialog.tsx index ee8d2d8fd..67aed6802 100644 --- a/web/src/components/CreateIdentityProviderDialog.tsx +++ b/web/src/components/CreateIdentityProviderDialog.tsx @@ -12,7 +12,6 @@ import { generateDialog } from "./Dialog"; const templateList: IdentityProvider[] = [ { name: "", - uid: "", title: "GitHub", type: IdentityProvider_Type.OAUTH2, identifierFilter: "", @@ -34,7 +33,6 @@ const templateList: IdentityProvider[] = [ }, { name: "", - uid: "", title: "GitLab", type: IdentityProvider_Type.OAUTH2, identifierFilter: "", @@ -56,7 +54,6 @@ const templateList: IdentityProvider[] = [ }, { name: "", - uid: "", title: "Google", type: IdentityProvider_Type.OAUTH2, identifierFilter: "", @@ -78,7 +75,6 @@ const templateList: IdentityProvider[] = [ }, { name: "", - uid: "", title: "Custom", type: IdentityProvider_Type.OAUTH2, identifierFilter: "", diff --git a/web/src/components/MemoRelationForceGraph/MemoRelationForceGraph.tsx b/web/src/components/MemoRelationForceGraph/MemoRelationForceGraph.tsx index 8bf005317..49df0e49b 100644 --- a/web/src/components/MemoRelationForceGraph/MemoRelationForceGraph.tsx +++ b/web/src/components/MemoRelationForceGraph/MemoRelationForceGraph.tsx @@ -2,6 +2,7 @@ import { useColorScheme } from "@mui/joy"; import { useEffect, useRef, useState } from "react"; import ForceGraph2D, { ForceGraphMethods, LinkObject, NodeObject } from "react-force-graph-2d"; import useNavigateTo from "@/hooks/useNavigateTo"; +import { extractMemoIdFromName } from "@/store/common"; import { Memo, MemoRelation_Type } from "@/types/proto/api/v1/memo_service"; import { cn } from "@/utils"; import { LinkType, NodeType } from "./types"; @@ -47,7 +48,7 @@ const MemoRelationForceGraph = ({ className, memo, parentPage }: Props) => { cooldownTicks={0} nodeColor={(node) => (node.id === memo.name ? MAIN_NODE_COLOR : DEFAULT_NODE_COLOR)} nodeRelSize={3} - nodeLabel={(node) => node.memo.uid.slice(0, 6).toLowerCase()} + nodeLabel={(node) => extractMemoIdFromName(node.memo.name).slice(0, 6).toLowerCase()} linkColor={() => (mode === "light" ? "#e4e4e7" : "#3f3f46")} graphData={convertMemoRelationsToGraphData(memo.relations.filter((r) => r.type === MemoRelation_Type.REFERENCE))} onNodeClick={onNodeClick} diff --git a/web/src/components/MemoRelationListView.tsx b/web/src/components/MemoRelationListView.tsx index 9d12d13f1..999c825d2 100644 --- a/web/src/components/MemoRelationListView.tsx +++ b/web/src/components/MemoRelationListView.tsx @@ -1,6 +1,7 @@ import { LinkIcon, MilestoneIcon } from "lucide-react"; import { memo, useState } from "react"; import { Link } from "react-router-dom"; +import { extractMemoIdFromName } from "@/store/common"; import { Memo, MemoRelation } from "@/types/proto/api/v1/memo_service"; import { cn } from "@/utils"; import { useTranslate } from "@/utils/i18n"; @@ -65,14 +66,14 @@ const MemoRelationListView = (props: Props) => { - {memo.uid.slice(0, 6)} + {extractMemoIdFromName(memo.name).slice(0, 6)} {memo.snippet} @@ -87,14 +88,14 @@ const MemoRelationListView = (props: Props) => { - {memo.uid.slice(0, 6)} + {extractMemoIdFromName(memo.name).slice(0, 6)} {memo.snippet}