Skip to content

Commit a81f6d1

Browse files
authored
Fix: Bug Fixes - Added disabled logic RAPTOR scope #10703 (#11207)
### What problem does this PR solve? Fix: Bug Fixes #10703 - Fixed the menu order in the user center - Added a disabled RAPTOR scope - Fixed some style issues ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
1 parent 8406a5e commit a81f6d1

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

web/src/components/originui/select-with-search.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ export const SelectWithSearch = forwardRef<
149149
<span className="leading-none truncate">{selectLabel}</span>
150150
</span>
151151
) : (
152-
<span className="text-muted-foreground">{placeholder}</span>
152+
<span className="text-text-disabled">{placeholder}</span>
153153
)}
154154
<div className="flex items-center justify-between">
155155
{value && allowClear && (
156156
<>
157157
<XIcon
158-
className="h-4 mx-2 cursor-pointer text-muted-foreground"
158+
className="h-4 mx-2 cursor-pointer text-text-disabled"
159159
onClick={handleClear}
160160
/>
161161
<Separator

web/src/components/parse-configuration/raptor-form-fields.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ const RaptorFormFields = ({
127127
</FormLabel>
128128
<div className="w-3/4">
129129
<FormControl>
130-
<Radio.Group {...field}>
130+
<Radio.Group {...field} disabled={!!data?.finish_at}>
131131
<div className={'flex gap-4 w-full text-text-secondary '}>
132132
<Radio value="dataset">{t('scopeDataset')}</Radio>
133133
<Radio value="file">{t('scopeSingleFile')}</Radio>

web/src/locales/en.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -788,8 +788,8 @@ Example: general/v2/`,
788788
'Please enter the API key (for locally deployed model,ignore this).',
789789
apiKeyTip:
790790
'The API key can be obtained by registering the corresponding LLM supplier.',
791-
showMoreModels: 'View Models',
792-
hideModels: 'Hide Models',
791+
showMoreModels: 'View models',
792+
hideModels: 'Hide models',
793793
baseUrl: 'Base-Url',
794794
baseUrlTip:
795795
'If your API key is from OpenAI, just ignore it. Any other intermediate providers will give this base url with the API key.',
@@ -814,7 +814,7 @@ Example: general/v2/`,
814814
ttsModel: 'TTS',
815815
ttsModelTip:
816816
'The default text-to-speech model. If you cannot find a model from the dropdown, check https://ragflow.io/docs/dev/supported_models to see if your model provider supports this model.',
817-
workspace: 'Workspace',
817+
workspace: 'workspace',
818818
upgrade: 'Upgrade',
819819
addLlmTitle: 'Add LLM',
820820
editLlmTitle: 'Edit {{name}} Model',
@@ -922,7 +922,7 @@ Example: general/v2/`,
922922
add: 'Add',
923923
updateDate: 'Date',
924924
role: 'State',
925-
invite: 'Invite Member',
925+
invite: 'Invite member',
926926
agree: 'Accept',
927927
refuse: 'Decline',
928928
teamMembers: 'Team members',

web/src/pages/admin/login.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function AdminLogin() {
126126
color="rgb(128, 255, 248)"
127127
/>
128128

129-
<BgSvg />
129+
<BgSvg isPaused={true} />
130130

131131
<div className="absolute top-3 left-0 w-full">
132132
<div className="absolute mt-12 ml-12 flex items-center">

web/src/pages/user-setting/sidebar/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ import { useEffect } from 'react';
1717
import { useHandleMenuClick } from './hooks';
1818

1919
const menuItems = [
20-
{ icon: User, label: t('setting.profile'), key: Routes.Profile },
21-
{ icon: Users, label: t('setting.team'), key: Routes.Team },
20+
{ icon: Server, label: t('setting.dataSources'), key: Routes.DataSource },
2221
{ icon: Box, label: t('setting.model'), key: Routes.Model },
22+
{ icon: Banknote, label: 'MCP', key: Routes.Mcp },
23+
{ icon: Users, label: t('setting.team'), key: Routes.Team },
24+
{ icon: User, label: t('setting.profile'), key: Routes.Profile },
2325
{ icon: Unplug, label: t('setting.api'), key: Routes.Api },
2426
// {
2527
// icon: MessageSquareQuote,
2628
// label: 'Prompt Templates',
2729
// key: Routes.Profile,
2830
// },
2931
// { icon: TextSearch, label: 'Retrieval Templates', key: Routes.Profile },
30-
{ icon: Server, label: t('setting.dataSources'), key: Routes.DataSource },
3132
// { icon: Cog, label: t('setting.system'), key: Routes.System },
3233
// { icon: Banknote, label: 'Plan', key: Routes.Plan },
33-
{ icon: Banknote, label: 'MCP', key: Routes.Mcp },
3434
];
3535

3636
export function SideBar() {

web/src/routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ const routes = [
367367
component: '@/pages/user-setting',
368368
layout: false,
369369
routes: [
370-
{ path: '/user-setting', redirect: '/user-setting/profile' },
370+
{ path: '/user-setting', redirect: `/user-setting${Routes.DataSource}` },
371371
{
372372
path: '/user-setting/profile',
373373
// component: '@/pages/user-setting/setting-profile',

0 commit comments

Comments
 (0)