Skip to content

Commit 8961efc

Browse files
authored
🐛 Bugfix: Fix incomplete display of tenant resources page after window resize (#3215)
* Move non-shadcn ui component to other folder * Bugfix: Fix incomplete display of tenant resources page after window resize * Bugfix: Fix incomplete display of tenant resources page after window resize
1 parent 4dd04b3 commit 8961efc

26 files changed

Lines changed: 284 additions & 261 deletions

frontend/app/[locale]/agents/components/agentConfig/SkillBuildModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import {
5656
SkillFilesAccessDeniedError,
5757
type SkillFileNode,
5858
} from "@/services/agentConfigService";
59-
import { MarkdownRenderer } from "@/components/ui/markdownRenderer";
59+
import { MarkdownRenderer } from "@/components/common/markdownRenderer";
6060
import log from "@/lib/logger";
6161

6262
const { TextArea } = Input;

frontend/app/[locale]/agents/components/agentConfig/SkillDetailModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
fetchSkillFileContent,
1111
SkillFilesAccessDeniedError,
1212
} from "@/services/agentConfigService";
13-
import { MarkdownRenderer } from "@/components/ui/markdownRenderer";
13+
import { MarkdownRenderer } from "@/components/common/markdownRenderer";
1414
import {
1515
buildTreeData,
1616
collectDirKeys,

frontend/app/[locale]/agents/components/agentConfig/skill/SkillConfigModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import {
1212
message,
1313
Tag,
1414
Skeleton,
15+
Tooltip
1516
} from "antd";
1617
import { Settings } from "lucide-react";
1718
import { CloseOutlined } from "@ant-design/icons";
1819

1920
import { Skill, SkillParam } from "@/types/agentConfig";
2021
import { KnowledgeBase } from "@/types/knowledgeBase";
21-
import { Tooltip } from "@/components/ui/tooltip";
2222
import { saveSkillInstance } from "@/services/agentConfigService";
2323
import KnowledgeBaseSelectorModal from "@/components/tool-config/KnowledgeBaseSelectorModal";
2424
import {

frontend/app/[locale]/chat/components/chatAttachment.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
} from "@/services/storageService";
2020
import { cn } from "@/lib/utils";
2121
import { AttachmentItem, ChatAttachmentProps } from "@/types/chat";
22-
import { FilePreviewDrawer } from "@/components/ui/filePreviewDrawer";
22+
import { FilePreviewDrawer } from "@/components/common/filePreviewDrawer";
2323
import { App } from "antd";
2424

2525
// Selected file state for preview drawer

frontend/app/[locale]/chat/components/chatInput.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ import {
1515
} from "@ant-design/icons";
1616

1717
import { Input } from "@/components/ui/input";
18-
import { Button } from "antd";
19-
import { Tooltip } from "@/components/ui/tooltip";
18+
import { Button, Tooltip } from "antd";
2019
import { Textarea } from "@/components/ui/textarea";
21-
import { FilePreviewDrawer } from "@/components/ui/filePreviewDrawer";
20+
import { FilePreviewDrawer } from "@/components/common/filePreviewDrawer";
2221
import { conversationService } from "@/services/conversationService";
2322
import { useConfig } from "@/hooks/useConfig";
2423
import { extractColorsFromUri } from "@/lib/avatar";
@@ -27,7 +26,7 @@ import { chatConfig } from "@/const/chatConfig";
2726
import { FilePreview } from "@/types/chat";
2827

2928
import { ChatAgentSelector } from "./chatAgentSelector";
30-
import { TokenUsageIndicator } from "@/components/ui/tokenUsageIndicator";
29+
import { TokenUsageIndicator } from "@/components/common/tokenUsageIndicator";
3130
import { TokenMetrics } from "@/types/chat";
3231

3332
// Get file extension

frontend/app/[locale]/chat/streaming/chatStreamFinalMessage.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
ThumbsUp,
1111
} from "lucide-react";
1212

13-
import { MarkdownRenderer } from "@/components/ui/markdownRenderer";
13+
import { MarkdownRenderer } from "@/components/common/markdownRenderer";
1414

1515
/**
1616
* Convert custom code tags to standard markdown code fences
@@ -30,8 +30,7 @@ const convertToMarkdownCodeFences = (content: string): string => {
3030
});
3131
return content;
3232
};
33-
import { Button } from "antd";
34-
import { Tooltip, TooltipProvider } from "@/components/ui/tooltip";
33+
import { Button, Tooltip } from "antd";
3534
import { ChatMessageType, MaxStepsInfo } from "@/types/chat";
3635
import { chatConfig, Opinion } from "@/const/chatConfig";
3736
import { conversationService } from "@/services/conversationService";
@@ -403,7 +402,7 @@ function ChatStreamFinalMessageInner({
403402

404403
{/* Tool button */}
405404
<div className="flex items-center space-x-2 mt-1 justify-end">
406-
<TooltipProvider>
405+
<div>
407406
{/* Copy button */}
408407
<Tooltip
409408
title={
@@ -487,7 +486,7 @@ function ChatStreamFinalMessageInner({
487486
{ttsButtonContent.icon}
488487
</Button>
489488
</Tooltip>
490-
</TooltipProvider>
489+
</div>
491490
</div>
492491
</div>
493492
)}

frontend/app/[locale]/chat/streaming/taskWindow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313

1414
import { ScrollArea } from "@/components/ui/scrollArea";
1515
import { Button, message as antdMessage } from "antd";
16-
import { MarkdownRenderer, CodeBlock } from "@/components/ui/markdownRenderer";
16+
import { MarkdownRenderer, CodeBlock } from "@/components/common/markdownRenderer";
1717
import { chatConfig } from "@/const/chatConfig";
1818
import {
1919
ChatMessageType,

frontend/app/[locale]/knowledges/components/document/DocumentList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import {
1818
Glasses,
1919
CircleOff,
2020
} from "lucide-react";
21-
import { MarkdownRenderer } from "@/components/ui/markdownRenderer";
22-
import { FilePreviewDrawer } from "@/components/ui/filePreviewDrawer";
21+
import { MarkdownRenderer } from "@/components/common/markdownRenderer";
22+
import { FilePreviewDrawer } from "@/components/common/filePreviewDrawer";
2323

2424
import {
2525
UI_CONFIG,

frontend/app/[locale]/knowledges/components/knowledge/KnowledgeBaseList.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
33

44
import log from "@/lib/logger";
55

6-
import { Button, Input, Select } from "antd";
6+
import { Button, Input, Select, Tooltip } from "antd";
77
import {
88
SyncOutlined,
99
PlusOutlined,
@@ -19,7 +19,6 @@ import {
1919
SquarePen,
2020
CircleOff,
2121
} from "lucide-react";
22-
import { Tooltip } from "@/components/ui/tooltip";
2322
import { Can } from "@/components/permission/Can";
2423
import { useAuthorizationContext } from "@/components/providers/AuthorizationProvider";
2524
import { useGroupList } from "@/hooks/group/useGroupList";

frontend/app/[locale]/tenant-resources/components/AssetOwnerResourcesComp.tsx

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default function AssetOwnerResourcesComp() {
5454

5555
<Tabs
5656
defaultActiveKey="users"
57-
className="h-full flex flex-col"
57+
className="h-full flex flex-col overflow-hidden [&_.ant-tabs-contentHolder]:flex-1 [&_.ant-tabs-contentHolder]:overflow-hidden asset-owner-tabs"
5858
items={[
5959
{
6060
key: "users",
@@ -108,3 +108,17 @@ export default function AssetOwnerResourcesComp() {
108108
</div>
109109
);
110110
}
111+
112+
<style jsx global>{`
113+
.asset-owner-tabs .ant-tabs-content {
114+
width: 100%;
115+
height: 100%;
116+
}
117+
.asset-owner-tabs .ant-tabs-tabpane {
118+
height: 100%;
119+
overflow: hidden;
120+
}
121+
.asset-owner-tabs .ant-tabs-nav {
122+
flex-shrink: 0;
123+
}
124+
`}</style>

0 commit comments

Comments
 (0)