Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

refactor(web): normalize logical CSS in member and token forms (#44638)

yyh84f15414698a
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 59f4529560f..6f6fd5b33dc 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -133,16 +133,6 @@
"count": 1
}
},
- "web/app/components/api-key/api-key-table.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 1
- }
- },
- "web/app/components/api-key/dataset-scope-dialog.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 1
- }
- },
"web/app/components/app-sidebar/app-detail-top.tsx": {
"better-tailwindcss/enforce-logical-properties": {
"count": 4
@@ -3313,31 +3303,6 @@
"count": 1
}
},
- "web/app/components/header/account-setting/members-page/index.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 7
- }
- },
- "web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 1
- }
- },
- "web/app/components/header/account-setting/members-page/member-row.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 3
- }
- },
- "web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 1
- }
- },
- "web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 2
- }
- },
"web/app/components/header/account-setting/model-provider-page/__tests__/hooks.spec.ts": {
"typescript/no-deprecated": {
"count": 1
@@ -3570,21 +3535,6 @@
"count": 2
}
},
- "web/app/components/header/account-setting/resource-access-token-page/resource-selector.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 1
- }
- },
- "web/app/components/header/account-setting/resource-access-token-page/token-table-row.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 4
- }
- },
- "web/app/components/header/account-setting/resource-access-token-page/token-table.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 5
- }
- },
"web/app/components/header/account-setting/update-setting-dialog-form.tsx": {
"better-tailwindcss/enforce-logical-properties": {
"count": 1
@@ -8131,4 +8081,4 @@
"count": 2
}
}
-}
+}
\ No newline at end of file
diff --git a/web/app/components/api-key/api-key-table.tsx b/web/app/components/api-key/api-key-table.tsx
index ac78f88ed99..55d3c24de15 100644
--- a/web/app/components/api-key/api-key-table.tsx
+++ b/web/app/components/api-key/api-key-table.tsx
@@ -41,27 +41,27 @@ export function ApiKeyTable({
return (
<div className="mx-6 min-h-0 min-w-0 overflow-auto border-y border-divider-subtle">
- <table className="w-full min-w-180 table-fixed text-left system-sm-regular text-text-secondary">
+ <table className="w-full min-w-180 table-fixed text-start system-sm-regular text-text-secondary">
<caption className="sr-only">
{t(($) => $['apiKeyModal.apiSecretKey'], { ns: 'appApi' })}
</caption>
<thead className="sticky top-0 bg-components-panel-bg system-xs-semibold-uppercase text-text-tertiary">
<tr className="border-b border-divider-regular">
- <th className="w-60 px-3 py-2" scope="col">
+ <th className="w-60 px-3 py-2 text-start" scope="col">
{t(($) => $['apiKeyModal.secretKey'], { ns: 'appApi' })}
</th>
{showScope && (
- <th className="w-28 px-3 py-2" scope="col">
+ <th className="w-28 px-3 py-2 text-start" scope="col">
{t(($) => $['apiKeyModal.scope'], { ns: 'appApi' })}
</th>
)}
- <th className="w-40 px-3 py-2" scope="col">
+ <th className="w-40 px-3 py-2 text-start" scope="col">
{t(($) => $['apiKeyModal.created'], { ns: 'appApi' })}
</th>
- <th className="w-40 px-3 py-2" scope="col">
+ <th className="w-40 px-3 py-2 text-start" scope="col">
{t(($) => $['apiKeyModal.lastUsed'], { ns: 'appApi' })}
</th>
- <th className="w-28 px-3 py-2" scope="col">
+ <th className="w-28 px-3 py-2 text-start" scope="col">
<span className="sr-only">
{t(($) => $['apiKeyModal.actions'], { ns: 'appApi' })}
</span>
diff --git a/web/app/components/api-key/dataset-scope-dialog.tsx b/web/app/components/api-key/dataset-scope-dialog.tsx
index 50201b615f0..65b1dc377af 100644
--- a/web/app/components/api-key/dataset-scope-dialog.tsx
+++ b/web/app/components/api-key/dataset-scope-dialog.tsx
@@ -384,7 +384,7 @@ function DatasetScopeContent({
/>
}
>
- <span aria-hidden className="mr-1 i-ri-add-line size-4" />
+ <span aria-hidden className="me-1 i-ri-add-line size-4" />
{addLabel}
</ComboboxTrigger>
<ComboboxPortal>
diff --git a/web/app/components/header/account-setting/members-page/index.tsx b/web/app/components/header/account-setting/members-page/index.tsx
index 7d727223eaa..ce372b1ca75 100644
--- a/web/app/components/header/account-setting/members-page/index.tsx
+++ b/web/app/components/header/account-setting/members-page/index.tsx
@@ -109,7 +109,7 @@ const MembersPage = () => {
return (
<>
<div className="flex flex-col">
- <div className="mb-6 flex flex-wrap items-center gap-3 rounded-xl border-t-[0.5px] border-l-[0.5px] border-divider-subtle bg-linear-to-r from-background-gradient-bg-fill-chat-bg-2 to-background-gradient-bg-fill-chat-bg-1 py-2 pr-5 pl-2">
+ <div className="mb-6 flex flex-wrap items-center gap-3 rounded-xl border-s-[0.5px] border-t-[0.5px] border-divider-subtle bg-linear-to-r from-background-gradient-bg-fill-chat-bg-2 to-background-gradient-bg-fill-chat-bg-1 py-2 ps-2 pe-5 rtl:bg-linear-to-l">
<div className="flex min-w-0 grow basis-48 items-center gap-3">
<WorkspaceAvatar name={currentWorkspace.name} size="2xl" className="shrink-0" />
<div className="min-w-0 grow">
@@ -186,7 +186,7 @@ const MembersPage = () => {
</div>
</div>
<div className="overflow-x-auto">
- <table className="w-full min-w-150 table-fixed text-left">
+ <table className="w-full min-w-150 table-fixed text-start">
<colgroup>
<col className="w-65" />
<col className="w-30" />
@@ -195,13 +195,13 @@ const MembersPage = () => {
</colgroup>
<thead>
<tr className="border-b border-divider-regular">
- <th className="px-3 py-1.75 text-left system-xs-medium-uppercase text-text-tertiary">
+ <th className="px-3 py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">
{t(($) => $['members.name'], { ns: 'workspaceMembers' })}
</th>
- <th className="py-1.75 text-left system-xs-medium-uppercase text-text-tertiary">
+ <th className="py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">
{t(($) => $['members.lastActive'], { ns: 'workspaceMembers' })}
</th>
- <th className="px-3 py-1.75 text-left system-xs-medium-uppercase text-text-tertiary">
+ <th className="px-3 py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">
{roleColumnLabel}
</th>
{canManageMembers && <td />}
diff --git a/web/app/components/header/account-setting/members-page/invited-modal/index.tsx b/web/app/components/header/account-setting/members-page/invited-modal/index.tsx
index 0cfad42394b..941fb7151f3 100644
--- a/web/app/components/header/account-setting/members-page/invited-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/invited-modal/index.tsx
@@ -106,7 +106,7 @@ const InvitedModal = ({ invitationResults, onCancel }: IInvitedModalProps) => {
key={item.email}
className="flex justify-center rounded-md border border-components-panel-border bg-background-section-burn px-1 text-sm text-text-secondary"
>
- {item.email}
+ <span dir="ltr">{item.email}</span>
</div>
))}
</div>
@@ -135,7 +135,7 @@ const InvitedModal = ({ invitationResults, onCancel }: IInvitedModalProps) => {
id={`${failedEmailId}-${index}`}
className="min-w-0 wrap-anywhere"
>
- {item.email}
+ <span dir="ltr">{item.email}</span>
</span>
<span
aria-hidden="true"
diff --git a/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx b/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
index 8fb0056bebe..cce88193531 100644
--- a/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
+++ b/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
@@ -42,10 +42,10 @@ const InvitationLink = ({ value }: IInvitationLinkProps) => {
render={
<button
type="button"
- className="absolute inset-x-0 top-0 block w-full cursor-pointer truncate border-none bg-transparent p-0 px-2 text-left text-text-primary"
+ className="absolute inset-x-0 top-0 block w-full cursor-pointer truncate border-none bg-transparent p-0 px-2 text-start text-text-primary"
onClick={copyHandle}
>
- {value.url}
+ <span dir="ltr">{value.url}</span>
</button>
}
/>
diff --git a/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx b/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx
index 84b42b6aabc..b5490c3fbdc 100644
--- a/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx
@@ -154,7 +154,7 @@ const MemberDetailsModal = ({
{member.name}
</div>
<div className="system-xs-regular wrap-break-word text-text-tertiary">
- {member.email}
+ <span dir="ltr">{member.email}</span>
</div>
</div>
</div>
diff --git a/web/app/components/header/account-setting/members-page/member-row.tsx b/web/app/components/header/account-setting/members-page/member-row.tsx
index 0f16499dd98..38c682c7fc1 100644
--- a/web/app/components/header/account-setting/members-page/member-row.tsx
+++ b/web/app/components/header/account-setting/members-page/member-row.tsx
@@ -64,7 +64,7 @@ const MemberRow = ({
>
<td className="px-3 py-2">
<div className="flex min-w-0 items-center">
- <Avatar size="sm" className="mr-2" aria-hidden="true">
+ <Avatar size="sm" className="me-2" aria-hidden="true">
<AvatarFallback>{getAvatarInitial(member.name)}</AvatarFallback>
<AvatarImage src={member.avatar_url || undefined} alt="" />
</Avatar>
@@ -72,13 +72,13 @@ const MemberRow = ({
<div className="system-sm-medium text-text-secondary">
<button
type="button"
- className="max-w-full cursor-pointer rounded-sm text-left wrap-break-word hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+ className="max-w-full cursor-pointer rounded-sm text-start wrap-break-word hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
onClick={openDetails}
>
{member.name}
</button>
{member.status === 'pending' && (
- <span className="ml-1 system-xs-medium text-text-warning">
+ <span className="ms-1 system-xs-medium text-text-warning">
{t(($) => $['members.pending'], { ns: 'workspaceMembers' })}
</span>
)}
@@ -89,7 +89,7 @@ const MemberRow = ({
)}
</div>
<div className="system-xs-regular wrap-break-word text-text-tertiary">
- {member.email}
+ <span dir="ltr">{member.email}</span>
</div>
</div>
</div>
diff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
index 9989f081a41..a3721d9515d 100644
--- a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
@@ -240,7 +240,7 @@ const TransferOwnershipModal = ({ onClose, show }: Props) => {
<button
type="button"
onClick={sendCodeToOriginEmail}
- className="cursor-pointer border-none bg-transparent p-0 text-left system-xs-medium text-text-accent-secondary"
+ className="cursor-pointer border-none bg-transparent p-0 text-start system-xs-medium text-text-accent-secondary"
>
{t(($) => $['members.transferModal.resend'], { ns: 'workspaceMembers' })}
</button>
diff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
index 4a503dd3ec4..16a93920c0c 100644
--- a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
+++ b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
@@ -69,7 +69,9 @@ const MemberSelector: FC<Props> = ({ value, onSelect, exclude = [] }) => {
<span className="grow truncate system-sm-medium text-text-secondary">
{currentValue.name}
</span>
- <span className="system-xs-regular text-text-quaternary">{currentValue.email}</span>
+ <span dir="ltr" className="system-xs-regular text-text-quaternary">
+ {currentValue.email}
+ </span>
</>
)}
<span
@@ -106,7 +108,7 @@ const MemberSelector: FC<Props> = ({ value, onSelect, exclude = [] }) => {
<button
type="button"
key={account.id}
- className="flex w-full cursor-pointer appearance-none items-center gap-2 rounded-lg py-1 pr-3 pl-2 text-start outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+ className="flex w-full cursor-pointer appearance-none items-center gap-2 rounded-lg py-1 ps-2 pe-3 text-start outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
onClick={() => {
onSelect(account.id)
setOpen(false)
@@ -119,7 +121,9 @@ const MemberSelector: FC<Props> = ({ value, onSelect, exclude = [] }) => {
<span className="grow truncate system-sm-medium text-text-secondary">
{account.name}
</span>
- <span className="system-xs-regular text-text-quaternary">{account.email}</span>
+ <span dir="ltr" className="system-xs-regular text-text-quaternary">
+ {account.email}
+ </span>
</button>
))}
</div>
diff --git a/web/app/components/header/account-setting/resource-access-token-page/index.tsx b/web/app/components/header/account-setting/resource-access-token-page/index.tsx
index a90b6a868f8..e9275398568 100644
--- a/web/app/components/header/account-setting/resource-access-token-page/index.tsx
+++ b/web/app/components/header/account-setting/resource-access-token-page/index.tsx
@@ -44,9 +44,9 @@ export default function ResourceAccessTokenPage() {
return (
<div className="grid gap-6">
- <div className="flex items-center justify-between gap-3">
+ <div className="flex flex-wrap items-center justify-between gap-3">
<SearchInput
- className="w-80"
+ className="w-80 max-w-full"
placeholder={t(($) => $['resourceAccessToken.searchPlaceholder'], {
ns: 'accountSettings',
})}
diff --git a/web/app/components/header/account-setting/resource-access-token-page/resource-selector.tsx b/web/app/components/header/account-setting/resource-access-token-page/resource-selector.tsx
index c2d0ac5e84f..be57e4fe585 100644
--- a/web/app/components/header/account-setting/resource-access-token-page/resource-selector.tsx
+++ b/web/app/components/header/account-setting/resource-access-token-page/resource-selector.tsx
@@ -119,7 +119,7 @@ export default function ResourceSelector({
return (
<div
key={key}
- className={`relative mx-2 my-0.5 flex min-h-11 items-center gap-3 rounded-lg px-2 py-2 text-left hover:bg-state-base-hover ${index < candidates.length - 1 ? 'after:pointer-events-none after:absolute after:inset-x-2 after:-bottom-px after:border-b after:border-divider-subtle' : ''}`}
+ className={`relative mx-2 my-0.5 flex min-h-11 items-center gap-3 rounded-lg px-2 py-2 text-start hover:bg-state-base-hover ${index < candidates.length - 1 ? 'after:pointer-events-none after:absolute after:inset-x-2 after:-bottom-px after:border-b after:border-divider-subtle' : ''}`}
>
<span
aria-hidden
diff --git a/web/app/components/header/account-setting/resource-access-token-page/token-table-row.tsx b/web/app/components/header/account-setting/resource-access-token-page/token-table-row.tsx
index 5061f72f502..509effae422 100644
--- a/web/app/components/header/account-setting/resource-access-token-page/token-table-row.tsx
+++ b/web/app/components/header/account-setting/resource-access-token-page/token-table-row.tsx
@@ -69,13 +69,13 @@ export default function ResourceAccessTokenRow({
return (
<tr className="border-b border-divider-subtle system-md-regular last:border-b-0">
- <td className="h-12 pr-4">
+ <td className="h-12 pe-4">
<div className="truncate system-md-regular text-text-secondary">{row.name}</div>
</td>
- <td className="pr-4">
+ <td className="pe-4">
<div className="truncate font-mono text-text-secondary">{row.maskedToken}</div>
</td>
- <td className="pr-4">
+ <td className="pe-4">
<div className="flex min-w-0 items-center gap-1">
<div className="min-w-0 truncate text-text-secondary">
{resourceSummary ||
@@ -122,7 +122,7 @@ export default function ResourceAccessTokenRow({
</Infotip>
</div>
</td>
- <td className="pr-4">
+ <td className="pe-4">
<div className="truncate text-text-secondary">
{row.createdAt != null
? formatTime(
diff --git a/web/app/components/header/account-setting/resource-access-token-page/token-table.tsx b/web/app/components/header/account-setting/resource-access-token-page/token-table.tsx
index 9ca53d2201e..5fb1eae585c 100644
--- a/web/app/components/header/account-setting/resource-access-token-page/token-table.tsx
+++ b/web/app/components/header/account-setting/resource-access-token-page/token-table.tsx
@@ -43,7 +43,7 @@ export default function ResourceAccessTokenTable({
return (
<div className="max-h-[min(32rem,60vh)] overflow-auto overscroll-contain">
- <table className="w-full table-fixed text-left">
+ <table className="w-full min-w-150 table-fixed text-start">
<colgroup>
<col className="w-1/6" />
<col className="w-1/4" />
@@ -53,21 +53,21 @@ export default function ResourceAccessTokenTable({
</colgroup>
<thead className="sticky top-0 z-10 bg-components-panel-bg system-xs-medium-uppercase text-text-tertiary">
<tr className="border-b border-divider-subtle">
- <th scope="col" className="pr-4 pb-3 font-medium">
+ <th scope="col" className="pe-4 pb-3 text-start font-medium">
{t(($) => $['resourceAccessToken.name'], { ns: 'accountSettings' })}
</th>
- <th scope="col" className="pr-4 pb-3 font-medium">
+ <th scope="col" className="pe-4 pb-3 text-start font-medium">
{t(($) => $['resourceAccessToken.token'], { ns: 'accountSettings' })}
</th>
- <th scope="col" className="pr-4 pb-3 font-medium">
+ <th scope="col" className="pe-4 pb-3 text-start font-medium">
{t(($) => $['resourceAccessToken.accessibleResources'], {
ns: 'accountSettings',
})}
</th>
- <th scope="col" className="pr-4 pb-3 font-medium">
+ <th scope="col" className="pe-4 pb-3 text-start font-medium">
{t(($) => $['resourceAccessToken.createdColumn'], { ns: 'accountSettings' })}
</th>
- <th scope="col" className="pb-3 font-medium">
+ <th scope="col" className="pb-3 text-start font-medium">
{t(($) => $['resourceAccessToken.actions'], { ns: 'accountSettings' })}
</th>
</tr>