Skip to content

Commit d4dcaa2

Browse files
committed
fix: 工作流工具列表去除刷新mcp逻辑
1 parent 504228b commit d4dcaa2

5 files changed

Lines changed: 31 additions & 30 deletions

File tree

src/frontend/platform/src/components/bs-ui/toast/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export function Toaster() {
2323
<div className="grid gap-1">
2424
{title && <ToastTitle>{title}</ToastTitle>}
2525
{description && (
26-
<ToastDescription>{description}</ToastDescription>
26+
<ToastDescription className="whitespace-pre-wrap">{description}</ToastDescription>
2727
)}
2828
</div>
2929
{action}

src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ export default function RunLog({ node, children }) {
2222
const setRunCache = useFlowStore(state => state.setRunCache) // 缓存TODO
2323
const [data, setData] = useState<any>([])
2424
const { t } = useTranslation('flow')
25-
2625
// 订阅日志事件
2726
useEffect(() => {
2827
const buildData = (data) => {
2928
if (data) {
3029
/**
3130
* newData
32-
* key: {type: value}
31+
* key: {type, value}
3332
* "current_time": {type: "param", value: "2023-11-20 16:00:00"}
3433
*/
3534
const newData = data.reduce((res, item) => {

src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import { LoadingIcon } from "@/components/bs-icons/loading";
21
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/bs-ui/accordion";
32
import { Button } from "@/components/bs-ui/button";
43
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/bs-ui/tabs";
54
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/bs-ui/tooltip";
6-
import { getAssistantToolsApi, refreshAssistantMcpApi } from "@/controllers/API/assistant";
5+
import { getAssistantToolsApi } from "@/controllers/API/assistant";
76
import { getWorkflowNodeTemplate } from "@/controllers/API/workflow";
87
import { getToolTree } from "@/util/flowUtils";
98
import { cloneDeep } from "lodash-es";
109
import { ListVideo } from "lucide-react";
11-
import { useMemo, useRef, useState } from "react";
10+
import { useMemo, useState } from "react";
1211
import { useTranslation } from "react-i18next";
1312
import { useQuery } from "react-query";
1413
import NodeLogo from "./FlowNode/NodeLogo";
@@ -87,19 +86,19 @@ export default function Sidebar({ dropdown = false, disabledNodes = [], onInitSt
8786
}
8887

8988
// 先刷新mcp服务接口
90-
const [loading, setLoading] = useState(true)
91-
const onecRef = useRef(false)
89+
// const [loading, setLoading] = useState(true)
90+
// const onecRef = useRef(false)
9291
const handleLoadTools = async (val) => {
93-
if (val !== 'tool' || onecRef.current) return
94-
setLoading(true)
95-
onecRef.current = true
96-
try {
97-
await refreshAssistantMcpApi()
98-
} catch (error) {
99-
console.error(error)
100-
}
101-
refetch()
102-
setLoading(false)
92+
// if (val !== 'tool' || onecRef.current) return
93+
// setLoading(true)
94+
// onecRef.current = true
95+
// try {
96+
// await refreshAssistantMcpApi()
97+
// } catch (error) {
98+
// console.error(error)
99+
// }
100+
// refetch()
101+
// setLoading(false)
103102
}
104103

105104
const nodeTemps = useMemo(() => {
@@ -228,9 +227,6 @@ export default function Sidebar({ dropdown = false, disabledNodes = [], onInitSt
228227
)}
229228
</TooltipProvider>
230229
</Accordion>
231-
{loading && <div className="absolute w-full h-full top-0 left-0 flex justify-center items-center z-10 bg-[rgba(255,255,255,0.6)] dark:bg-blur-shared">
232-
<LoadingIcon />
233-
</div>}
234230
</TabsContent>
235231
</Tabs>
236232
{/* 搜索 */}

src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ const TestDialog = forwardRef((props, ref) => {
6060
auth_method,
6161
auth_type,
6262
api_key,
63-
request_params: params
63+
request_params: params,
64+
openapi_schema: openapiSchemaRef.current
6465
}).then(setResult)
6566
);
6667
console.log('res :>> ', res);

src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from "@/com
1010
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/bs-ui/table"
1111
import { useToast } from "@/components/bs-ui/toast/use-toast"
1212
import { QuestionTooltip } from "@/components/bs-ui/tooltip"
13+
import { userContext } from "@/contexts/userContext"
1314
import { createTool, deleteTool, downloadToolSchema, testToolApi, updateTool } from "@/controllers/API/tools"
1415
import { captureAndAlertRequestErrorHoc } from "@/controllers/request"
1516
import { Plus } from "lucide-react"
16-
import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react"
17+
import { forwardRef, useContext, useEffect, useImperativeHandle, useRef, useState } from "react"
1718
import { useTranslation } from "react-i18next"
1819

1920
interface TestDialogProps {
@@ -180,7 +181,8 @@ const EditTool = forwardRef((props: any, ref) => {
180181
const schemaUrl = useRef('')
181182
const [formState, setFormState] = useState({ ...formData });
182183
const fromDataRef = useRef<any>({}) // 与formState同步,fromDataRef属性更多,透传保存
183-
184+
const { user } = useContext(userContext);
185+
const [isSelf, setIsSelf] = useState(false);
184186
// 表格数据(api接口列表)
185187
const [tableData, setTableData] = useApiTableData()
186188

@@ -200,6 +202,7 @@ const EditTool = forwardRef((props: any, ref) => {
200202
apiLocation: tool.api_location || "query",
201203
parameter: tool.parameter_name || ""
202204
})
205+
setIsSelf(tool.user_id === user.user_id);
203206
setEditShow(true)
204207
setDelShow(true)
205208

@@ -592,12 +595,14 @@ const EditTool = forwardRef((props: any, ref) => {
592595
)}
593596
</div>
594597
<SheetFooter className="absolute bottom-0 right-0 w-full px-6 py-4">
595-
{delShow && <Button
596-
size="sm"
597-
variant="destructive"
598-
className="absolute left-6"
599-
onClick={handleDelete}
600-
>{t('tools.delete')}</Button>}
598+
{delShow && (user.role === 'admin' || isSelf) && (
599+
<Button
600+
size="sm"
601+
variant="destructive"
602+
className="absolute left-6"
603+
onClick={handleDelete}
604+
>{t('tools.delete')}</Button>
605+
)}
601606
<Button size="sm" variant="outline" onClick={() => setEditShow(false)}>{t('tools.cancel')}</Button>
602607
<Button size="sm" className="text-[white]" onClick={handleSave}>{t('tools.save')}</Button>
603608
</SheetFooter>

0 commit comments

Comments
 (0)