Skip to content

Commit b78dc03

Browse files
committed
refactor: edit concept button is dropdown when on archived version
1 parent 940a440 commit b78dc03

3 files changed

Lines changed: 39 additions & 16 deletions

File tree

apps/concept-catalog/app/catalogs/[catalogId]/concepts/[conceptId]/concept-page-client.tsx

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { ChatIcon, EnvelopeClosedIcon, PhoneIcon } from "@navikt/aksel-icons";
88
import {
99
Chip,
1010
Details,
11+
Dropdown,
1112
Link,
1213
Switch,
1314
Tabs,
@@ -970,21 +971,42 @@ export const ConceptPageClient = ({
970971
<div className={classes.actionButtons}>
971972
{hasWritePermission && (
972973
<>
973-
<Button onClick={handleEditConcept}>
974-
{localization.button.edit}
975-
</Button>
976974
{concept?.isArchived ? (
977-
<Button onClick={handleEditArchivedConcept}>
978-
{localization.concept.editArchived}
979-
</Button>
975+
<Dropdown.TriggerContext>
976+
<Dropdown.Trigger>
977+
{localization.button.edit}
978+
</Dropdown.Trigger>
979+
<Dropdown placement="bottom-end">
980+
<Dropdown.Heading>
981+
{localization.concept.archivedVersion}
982+
</Dropdown.Heading>
983+
<Dropdown.List>
984+
<Dropdown.Item>
985+
<Dropdown.Button onClick={handleEditConcept}>
986+
{localization.concept.editNewVersion}
987+
</Dropdown.Button>
988+
</Dropdown.Item>
989+
<Dropdown.Item>
990+
<Dropdown.Button onClick={handleEditArchivedConcept}>
991+
{localization.concept.editThisVersion}
992+
</Dropdown.Button>
993+
</Dropdown.Item>
994+
</Dropdown.List>
995+
</Dropdown>
996+
</Dropdown.TriggerContext>
980997
) : (
981-
<Button
982-
data-color="danger"
983-
variant="secondary"
984-
onClick={() => setShowConfirmDelete(true)}
985-
>
986-
{localization.button.delete}
987-
</Button>
998+
<>
999+
<Button onClick={handleEditConcept}>
1000+
{localization.button.edit}
1001+
</Button>
1002+
<Button
1003+
data-color="danger"
1004+
variant="secondary"
1005+
onClick={() => setShowConfirmDelete(true)}
1006+
>
1007+
{localization.button.delete}
1008+
</Button>
1009+
</>
9881010
)}
9891011
</>
9901012
)}

apps/concept-catalog/components/concept-form/edit-page-loader.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ export async function renderConceptEditPage({
127127
];
128128

129129
const editPathSegment = mode === "archived" ? "edit-archived" : "edit";
130-
const editBreadcrumbLabel =
131-
mode === "archived" ? localization.concept.editArchived : localization.edit;
130+
const editBreadcrumbLabel = localization.edit;
132131

133132
const breadcrumbList = getBreadcrumbList({
134133
catalogId,

libs/utils/src/lib/language/nb.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,9 @@ rettigheter, eller at det har oppstått en feil ved henting av tilganger. Vennli
405405
contactInformation: "Kontaktinformasjon for eksterne",
406406
definition: "Definisjon",
407407
deleteConcept: "Slett begrep",
408-
editArchived: "Rediger arkivert versjon",
408+
archivedVersion: "Dette er en arkivert versjon",
409+
editThisVersion: "Rediger av denne versjon",
410+
editNewVersion: "Vanlig redigering av begrepet",
409411
divisionCriterion: "Inndelingskriterium",
410412
example: "Eksempel",
411413
formFieldLabel: "{fieldType} på {lang}",

0 commit comments

Comments
 (0)