Skip to content

Commit 32a8e08

Browse files
committed
refactor: edit concept button is dropdown when on archived version
1 parent ace8b0c commit 32a8e08

3 files changed

Lines changed: 35 additions & 16 deletions

File tree

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

Lines changed: 32 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,39 @@ 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.List>
981+
<Dropdown.Item>
982+
<Dropdown.Button onClick={handleEditConcept}>
983+
{localization.concept.editAllFields}
984+
</Dropdown.Button>
985+
</Dropdown.Item>
986+
<Dropdown.Item>
987+
<Dropdown.Button onClick={handleEditArchivedConcept}>
988+
{localization.concept.editInternalFields}
989+
</Dropdown.Button>
990+
</Dropdown.Item>
991+
</Dropdown.List>
992+
</Dropdown>
993+
</Dropdown.TriggerContext>
980994
) : (
981-
<Button
982-
data-color="danger"
983-
variant="secondary"
984-
onClick={() => setShowConfirmDelete(true)}
985-
>
986-
{localization.button.delete}
987-
</Button>
995+
<>
996+
<Button onClick={handleEditConcept}>
997+
{localization.button.edit}
998+
</Button>
999+
<Button
1000+
data-color="danger"
1001+
variant="secondary"
1002+
onClick={() => setShowConfirmDelete(true)}
1003+
>
1004+
{localization.button.delete}
1005+
</Button>
1006+
</>
9881007
)}
9891008
</>
9901009
)}

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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,8 @@ 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+
editInternalFields: "Rediger interne felter",
409+
editAllFields: "Rediger alle felter",
409410
divisionCriterion: "Inndelingskriterium",
410411
example: "Eksempel",
411412
formFieldLabel: "{fieldType} på {lang}",

0 commit comments

Comments
 (0)