Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
f7a2f7a7
Unverified
Commit
f7a2f7a7
authored
Jan 16, 2024
by
zxhlyh
Committed by
GitHub
Jan 16, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: dataset sidebar (#2048)
parent
a4adca59
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
layout.tsx
...ut)/datasets/(datasetDetailLayout)/[datasetId]/layout.tsx
+5
-5
index.tsx
web/app/components/app-sidebar/index.tsx
+2
-2
plan-item.tsx
web/app/components/billing/pricing/plan-item.tsx
+0
-2
No files found.
web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout.tsx
View file @
f7a2f7a7
...
@@ -55,8 +55,8 @@ const LikedItem = ({
...
@@ -55,8 +55,8 @@ const LikedItem = ({
isMobile
,
isMobile
,
}:
ILikedItemProps
)
=>
{
}:
ILikedItemProps
)
=>
{
return
(
return
(
<
Link
className=
{
classNames
(
s
.
itemWrapper
,
'px-0
sm:px-3 justify-center sm:justify-start
'
)
}
href=
{
`/app/${detail?.id}/overview`
}
>
<
Link
className=
{
classNames
(
s
.
itemWrapper
,
'px-0
'
,
isMobile
&&
'justify-center
'
)
}
href=
{
`/app/${detail?.id}/overview`
}
>
<
div
className=
{
classNames
(
s
.
iconWrapper
,
'mr-0
sm:mr-2
'
)
}
>
<
div
className=
{
classNames
(
s
.
iconWrapper
,
'mr-0'
)
}
>
<
AppIcon
size=
'tiny'
icon=
{
detail
?.
icon
}
background=
{
detail
?.
icon_background
}
/>
<
AppIcon
size=
'tiny'
icon=
{
detail
?.
icon
}
background=
{
detail
?.
icon_background
}
/>
{
type
===
'app'
&&
(
{
type
===
'app'
&&
(
<
div
className=
{
s
.
statusPoint
}
>
<
div
className=
{
s
.
statusPoint
}
>
...
@@ -64,7 +64,7 @@ const LikedItem = ({
...
@@ -64,7 +64,7 @@ const LikedItem = ({
</
div
>
</
div
>
)
}
)
}
</
div
>
</
div
>
{
!
isMobile
&&
<
div
className=
{
s
.
appInfo
}
>
{
detail
?.
name
||
'--'
}
</
div
>
}
{
!
isMobile
&&
<
div
className=
{
classNames
(
s
.
appInfo
,
'ml-2'
)
}
>
{
detail
?.
name
||
'--'
}
</
div
>
}
</
Link
>
</
Link
>
)
)
}
}
...
@@ -197,14 +197,14 @@ const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
...
@@ -197,14 +197,14 @@ const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
return
<
Loading
/>
return
<
Loading
/>
return
(
return
(
<
div
className=
'flex overflow-hidden'
>
<
div
className=
'
grow
flex overflow-hidden'
>
{
!
hideSideBar
&&
<
AppSideBar
{
!
hideSideBar
&&
<
AppSideBar
title=
{
datasetRes
?.
name
||
'--'
}
title=
{
datasetRes
?.
name
||
'--'
}
icon=
{
datasetRes
?.
icon
||
'https://static.dify.ai/images/dataset-default-icon.png'
}
icon=
{
datasetRes
?.
icon
||
'https://static.dify.ai/images/dataset-default-icon.png'
}
icon_background=
{
datasetRes
?.
icon_background
||
'#F5F5F5'
}
icon_background=
{
datasetRes
?.
icon_background
||
'#F5F5F5'
}
desc=
{
datasetRes
?.
description
||
'--'
}
desc=
{
datasetRes
?.
description
||
'--'
}
navigation=
{
navigation
}
navigation=
{
navigation
}
extraInfo=
{
<
ExtraInfo
isMobile=
{
isMobile
}
relatedApps=
{
relatedApps
}
/>
}
extraInfo=
{
mode
=>
<
ExtraInfo
isMobile=
{
mode
===
'collapse'
}
relatedApps=
{
relatedApps
}
/>
}
iconType=
{
datasetRes
?.
data_source_type
===
DataSourceType
.
NOTION
?
'notion'
:
'dataset'
}
iconType=
{
datasetRes
?.
data_source_type
===
DataSourceType
.
NOTION
?
'notion'
:
'dataset'
}
/>
}
/>
}
<
DatasetDetailContext
.
Provider
value=
{
{
<
DatasetDetailContext
.
Provider
value=
{
{
...
...
web/app/components/app-sidebar/index.tsx
View file @
f7a2f7a7
...
@@ -20,7 +20,7 @@ export type IAppDetailNavProps = {
...
@@ -20,7 +20,7 @@ export type IAppDetailNavProps = {
icon
:
NavIcon
icon
:
NavIcon
selectedIcon
:
NavIcon
selectedIcon
:
NavIcon
}
>
}
>
extraInfo
?:
React
.
ReactNode
extraInfo
?:
(
modeState
:
string
)
=>
React
.
ReactNode
}
}
const
AppDetailNav
=
({
title
,
desc
,
icon
,
icon_background
,
navigation
,
extraInfo
,
iconType
=
'app'
}:
IAppDetailNavProps
)
=>
{
const
AppDetailNav
=
({
title
,
desc
,
icon
,
icon_background
,
navigation
,
extraInfo
,
iconType
=
'app'
}:
IAppDetailNavProps
)
=>
{
...
@@ -72,7 +72,7 @@ const AppDetailNav = ({ title, desc, icon, icon_background, navigation, extraInf
...
@@ -72,7 +72,7 @@ const AppDetailNav = ({ title, desc, icon, icon_background, navigation, extraInf
<
NavLink
key=
{
index
}
mode=
{
modeState
}
iconMap=
{
{
selected
:
item
.
selectedIcon
,
normal
:
item
.
icon
}
}
name=
{
item
.
name
}
href=
{
item
.
href
}
/>
<
NavLink
key=
{
index
}
mode=
{
modeState
}
iconMap=
{
{
selected
:
item
.
selectedIcon
,
normal
:
item
.
icon
}
}
name=
{
item
.
name
}
href=
{
item
.
href
}
/>
)
)
})
}
})
}
{
extraInfo
??
null
}
{
extraInfo
&&
extraInfo
(
modeState
)
}
</
nav
>
</
nav
>
{
{
!
isMobile
&&
(
!
isMobile
&&
(
...
...
web/app/components/billing/pricing/plan-item.tsx
View file @
f7a2f7a7
...
@@ -107,7 +107,6 @@ const PlanItem: FC<Props> = ({
...
@@ -107,7 +107,6 @@ const PlanItem: FC<Props> = ({
<
div
>
{
t
(
'billing.plansCommon.supportItems.emailSupport'
)
}
</
div
>
<
div
>
{
t
(
'billing.plansCommon.supportItems.emailSupport'
)
}
</
div
>
<
div
className=
'mt-3.5 flex items-center space-x-1'
>
<
div
className=
'mt-3.5 flex items-center space-x-1'
>
<
div
>
+
{
t
(
'billing.plansCommon.supportItems.logoChange'
)
}
</
div
>
<
div
>
+
{
t
(
'billing.plansCommon.supportItems.logoChange'
)
}
</
div
>
<
div
>
{
comingSoon
}
</
div
>
</
div
>
</
div
>
<
div
className=
'mt-3.5 flex items-center space-x-1'
>
<
div
className=
'mt-3.5 flex items-center space-x-1'
>
<
div
className=
'flex items-center'
>
<
div
className=
'flex items-center'
>
...
@@ -135,7 +134,6 @@ const PlanItem: FC<Props> = ({
...
@@ -135,7 +134,6 @@ const PlanItem: FC<Props> = ({
<
div
>
{
t
(
'billing.plansCommon.supportItems.priorityEmail'
)
}
</
div
>
<
div
>
{
t
(
'billing.plansCommon.supportItems.priorityEmail'
)
}
</
div
>
<
div
className=
'mt-3.5 flex items-center space-x-1'
>
<
div
className=
'mt-3.5 flex items-center space-x-1'
>
<
div
>
+
{
t
(
'billing.plansCommon.supportItems.logoChange'
)
}
</
div
>
<
div
>
+
{
t
(
'billing.plansCommon.supportItems.logoChange'
)
}
</
div
>
<
div
>
{
comingSoon
}
</
div
>
</
div
>
</
div
>
<
div
className=
'mt-3.5 flex items-center space-x-1'
>
<
div
className=
'mt-3.5 flex items-center space-x-1'
>
<
div
>
+
{
t
(
'billing.plansCommon.supportItems.SSOAuthentication'
)
}
</
div
>
<
div
>
+
{
t
(
'billing.plansCommon.supportItems.SSOAuthentication'
)
}
</
div
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment