ivan-igorevich/mdm-ordinis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/delete-dict-button-colors' into 'main'

Browse Source 
fix(ui): delete dict modal — destructive вместо invalid mars/danger

See merge request 2-6/2-6-4/terravault/ordinis!294
This commit is contained in:
Александр Зимин
2026-06-08 10:08:53 +00:00
parent 419d9fd821 6392621199
commit 6242a771ec
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ordinis-admin-ui/src/components/editor/EditorInfoPanel.tsx
+1 -1
View File
@@ -241,7 +241,7 @@ export function EditorInfoPanel({ detail, recordCount, actions, banner }: Editor
type="button"
onClick={actions.onDelete}
disabled={actions.deletePending}
className="w-full h-8 rounded-md border border-mars/40 bg-surface text-mars text-cell flex items-center justify-center gap-1.5 transition-colors hover:border-mars hover:bg-mars/8 disabled:opacity-50 disabled:cursor-not-allowed"
className="w-full h-8 rounded-md border border-destructive/40 bg-surface text-destructive text-cell flex items-center justify-center gap-1.5 transition-colors hover:border-destructive hover:bg-destructive/10 disabled:opacity-50 disabled:cursor-not-allowed"
>
{actions.deletePending
? t('dict.delete.pending', { defaultValue: 'Удаляю…' })
ordinis-admin-ui/src/routes/dictionaries.$name.tsx
+4 -4
View File
@@ -1848,12 +1848,12 @@ function DictionaryDetail() {
'Будут удалены: ВСЕ записи справочника, drafts, schema-drafts, история версий. Эта операция необратима.',
})}
</p>
<div className="rounded-md border border-mars/30 bg-mars/8 px-3 py-2 text-cell">
<div className="rounded-md border border-destructive/30 bg-destructive/10 px-3 py-2 text-cell">
<strong>{name}</strong>
{detailQuery.data?.displayName ? ` — ${detailQuery.data.displayName}` : null}
</div>
{deleteError && (
<div className="rounded-md border border-mars/40 bg-mars/8 px-3 py-2 text-cell text-mars whitespace-pre-line">
<div className="rounded-md border border-destructive/40 bg-destructive/10 px-3 py-2 text-cell text-destructive whitespace-pre-line">
{deleteError}
</div>
)}
@@ -1871,7 +1871,7 @@ function DictionaryDetail() {
</button>
<button
type="button"
className="h-9 px-4 rounded-md bg-mars text-surface text-cell font-medium hover:bg-mars/85 disabled:opacity-50 disabled:cursor-not-allowed"
className="h-9 px-4 rounded-md bg-destructive text-destructive-foreground text-cell font-medium hover:bg-destructive/85 disabled:opacity-50 disabled:cursor-not-allowed"
onClick={() => {
setDeleteError(null)
deleteMut.mutate(
@@ -1913,7 +1913,7 @@ function DictionaryDetail() {
deleteError.toLowerCase().includes('зависимы')) ? (
<button
type="button"
className="h-9 px-4 rounded-md border border-mars/40 bg-surface text-mars text-cell hover:bg-mars/8 disabled:opacity-50 disabled:cursor-not-allowed"
className="h-9 px-4 rounded-md border border-destructive/40 bg-surface text-destructive text-cell hover:bg-destructive/10 disabled:opacity-50 disabled:cursor-not-allowed"
onClick={() => {
setDeleteError(null)
deleteMut.mutate(