feat: restrict edit of archived versions to internal fields

Author: NilsOveTen

apps/concept-catalog/app/actions/concept/actions.ts

@@ -4,6 +4,7 @@ import {
   deleteConcept as deleteConceptApi,
   createConcept as createConceptApi,
   patchConcept as patchConceptApi,
+  createConceptRevision,
   getConcept,
   removeImportResultConcept as removeImportResult,
   cancelConceptImport,
@@ -16,9 +17,13 @@ import {
   redirectToSignIn,
   removeEmptyValues,
 } from "@catalog-frontend/utils";
+import { Operation } from "fast-json-patch";
 import _ from "lodash";
 import { updateTag } from "next/cache";
-import { conceptJsonPatchOperations } from "@concept-catalog/utils/json-patch";
+import {
+  archivedConceptJsonPatchOperations,
+  conceptJsonPatchOperations,
+} from "@concept-catalog/utils/json-patch";
 
 const clearValues = (object: Concept, path: string): void => {
   const fields = path.split(".");
@@ -144,16 +149,11 @@ export async function deleteConcept(conceptId: string): Promise<void> {
   }
 }
 
-export async function updateConcept(
-  initialConcept: Concept,
+function sanitizeConceptValues(
   values: Concept,
   internalFields: InternalField[],
-): Promise<Concept> {
-  if (!initialConcept.id) {
-    throw new Error("Concept id cannot be null");
-  }
-
-  let conceptId: string | undefined = initialConcept.id;
+): Concept {
+  const cleaned = _.cloneDeep(values);
 
   [
     "definisjon.kildebeskrivelse.kilde[].uri",
@@ -166,45 +166,57 @@ export async function updateConcept(
     "interneFelt.*.value",
     "omfang.*",
   ].forEach((field) => {
-    clearValues(values, field);
+    clearValues(cleaned, field);
   });
 
   internalFields.forEach((field) => {
     if (
       field.type === "boolean" &&
-      values.interneFelt?.[field.id]?.value === undefined
+      cleaned.interneFelt?.[field.id]?.value === undefined
     ) {
-      // Ensure interneFelt is defined before assignment
-      values.interneFelt = values.interneFelt || {};
-      values.interneFelt[field.id] = { value: "false" };
+      cleaned.interneFelt = cleaned.interneFelt || {};
+      cleaned.interneFelt[field.id] = { value: "false" };
     }
   });
 
-  const diff = conceptJsonPatchOperations(initialConcept, values);
+  return cleaned;
+}
+
+async function applyConceptChanges(
+  initialConcept: Concept,
+  diff: Operation[],
+  mode: "patch" | "revision",
+): Promise<Concept | undefined> {
+  if (!initialConcept.id) {
+    throw new Error("Concept id cannot be null");
+  }
 
   if (diff.length === 0) {
     return initialConcept;
   }
 
-  let success = false;
   const session = await getValidSession();
   if (!session) {
     return redirectToSignIn();
   }
 
+  const initialId = initialConcept.id;
+  let success = false;
+  let resolvedConceptId: string | undefined = initialId;
+
   try {
-    const response = await patchConceptApi(
-      initialConcept.id,
-      diff,
-      session.accessToken,
-    );
+    const response =
+      mode === "revision"
+        ? await createConceptRevision(initialId, diff, session.accessToken)
+        : await patchConceptApi(initialId, diff, session.accessToken);
     if (response.status !== 200 && response.status !== 201) {
       throw new Error(`${response.status} ${response.statusText}`);
     }
 
     success = true;
     if (response.status === 201) {
-      conceptId = response.headers.get("location")?.split("/").pop();
+      resolvedConceptId =
+        response.headers.get("location")?.split("/").pop() ?? initialId;
     }
   } catch (error) {
     console.error(`${localization.alert.fail} ${error}`);
@@ -216,11 +228,54 @@ export async function updateConcept(
     updateTag("concepts");
   }
 
-  return await getConcept(`${conceptId}`, session.accessToken).then(
+  return await getConcept(`${resolvedConceptId}`, session.accessToken).then(
     (response) => (response.ok ? response.json() : undefined),
   );
 }
 
+/**
+ * Update a concept from the standard edit form.
+ *
+ * When editing an archived concept, a new revision is created server-side
+ * (POST /revision). Otherwise a normal PATCH is performed against the concept.
+ */
+export async function updateConcept(
+  initialConcept: Concept,
+  values: Concept,
+  internalFields: InternalField[],
+): Promise<Concept | undefined> {
+  const diff = conceptJsonPatchOperations(
+    initialConcept,
+    sanitizeConceptValues(values, internalFields),
+  );
+  return applyConceptChanges(
+    initialConcept,
+    diff,
+    initialConcept.isArchived ? "revision" : "patch",
+  );
+}
+
+/**
+ * Update an archived concept from the restricted edit form. Only fields that
+ * the backend allows to be mutated on an archived concept are diffed; all
+ * other field changes are silently ignored. Throws if the concept isn't
+ * actually archived.
+ */
+export async function updateArchivedConcept(
+  initialConcept: Concept,
+  values: Concept,
+  internalFields: InternalField[],
+): Promise<Concept | undefined> {
+  if (!initialConcept.isArchived) {
+    throw new Error("Concept is not archived");
+  }
+  const diff = archivedConceptJsonPatchOperations(
+    initialConcept,
+    sanitizeConceptValues(values, internalFields),
+  );
+  return applyConceptChanges(initialConcept, diff, "patch");
+}
+
 export async function deleteImportResult(
   catalogId: string,
   resultId: string,

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

@@ -405,18 +405,51 @@ export const ConceptPageClient = ({
     setLanguage(lang);
   };
 
+  const compareVersions = (a: Concept, b: Concept): number => {
+    const va = a?.versjonsnr;
+    const vb = b?.versjonsnr;
+    if (!va && !vb) return 0;
+    if (!va) return -1;
+    if (!vb) return 1;
+    return (
+      (va.major ?? 0) - (vb.major ?? 0) ||
+      (va.minor ?? 0) - (vb.minor ?? 0) ||
+      (va.patch ?? 0) - (vb.patch ?? 0)
+    );
+  };
+
+  const pickLatest = (candidates: Concept[]): Concept | undefined =>
+    candidates.reduce<Concept | undefined>(
+      (latest, current) =>
+        !latest || compareVersions(current, latest) > 0 ? current : latest,
+      undefined,
+    );
+
+  const safeRevisions = revisions ?? [];
+  const latestRevision = pickLatest(safeRevisions);
+  const latestNonArchivedRevision = pickLatest(
+    safeRevisions.filter((r) => !r.isArchived),
+  );
+
   const handleEditConcept = () => {
-    const revision = revisions?.find((revision) => !revision.isArchived);
-    const id = revision ? revision.id : concept?.id;
+    const id = latestRevision?.id ?? concept?.id;
     if (validOrganizationNumber(catalogId) && validUUID(id)) {
       router.push(`/catalogs/${catalogId}/concepts/${id}/edit`);
     }
   };
 
+  const handleEditArchivedConcept = () => {
+    if (validOrganizationNumber(catalogId) && validUUID(concept?.id)) {
+      router.push(
+        `/catalogs/${catalogId}/concepts/${concept?.id}/edit-archived`,
+      );
+    }
+  };
+
   const handleDeleteConcept = () => {
-    const revision = revisions?.find((revision) => !revision.isArchived);
-    if (revision) {
-      deleteConcept.mutate(revision.id as string);
+    const target = latestNonArchivedRevision?.id ?? concept?.id;
+    if (target && validUUID(target)) {
+      deleteConcept.mutate(target);
     }
   };
 
@@ -940,7 +973,11 @@ export const ConceptPageClient = ({
                 <Button onClick={handleEditConcept}>
                   {localization.button.edit}
                 </Button>
-                {!concept?.isArchived && (
+                {concept?.isArchived ? (
+                  <Button onClick={handleEditArchivedConcept}>
+                    {localization.concept.editArchived}
+                  </Button>
+                ) : (
                   <Button
                     data-color="danger"
                     variant="secondary"

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

@@ -0,0 +1,14 @@
+import { withWriteProtectedPage } from "@concept-catalog/utils/auth";
+import { renderConceptEditPage } from "@concept-catalog/components/concept-form/edit-page-loader";
+
+export default withWriteProtectedPage(
+  ({ catalogId, conceptId }) =>
+    `/catalogs/${catalogId}/concepts/${conceptId}/edit-archived`,
+  async ({ catalogId, conceptId, session }) =>
+    renderConceptEditPage({
+      catalogId,
+      conceptId: `${conceptId}`,
+      session,
+      mode: "archived",
+    }),
+);

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

@@ -1,117 +1,14 @@
-import {
-  getAllCodeLists,
-  getConcept,
-  getConceptStatuses,
-  getFields,
-  getUsers,
-  searchChangeRequest,
-} from "@catalog-frontend/data-access";
-import { redirect, RedirectType } from "next/navigation";
-import {
-  Breadcrumbs,
-  BreadcrumbType,
-  DesignBanner,
-} from "@catalog-frontend/ui";
-import {
-  getTranslateText,
-  localization,
-  prepareStatusList,
-} from "@catalog-frontend/utils";
-import {
-  CodeListsResult,
-  Concept,
-  FieldsResult,
-  UsersResult,
-} from "@catalog-frontend/types";
 import { withWriteProtectedPage } from "@concept-catalog/utils/auth";
-import { EditPage } from "./edit-page.client";
+import { renderConceptEditPage } from "@concept-catalog/components/concept-form/edit-page-loader";
 
 export default withWriteProtectedPage(
   ({ catalogId, conceptId }) =>
     `/catalogs/${catalogId}/concepts/${conceptId}/edit`,
-  async ({ catalogId, conceptId, session }) => {
-    const concept: Concept = await getConcept(
-      `${conceptId}`,
-      session.accessToken,
-    ).then((response) => {
-      if (response.ok) return response.json();
-    });
-    if (!concept || concept.ansvarligVirksomhet?.id !== catalogId) {
-      return redirect("/notfound", RedirectType.replace);
-    }
-
-    const changeRequests = await searchChangeRequest(
-      catalogId,
-      `${conceptId}`,
-      session.accessToken,
-      "OPEN",
-    ).then((response) => {
-      if (response.ok) {
-        return response.json();
-      } else {
-        console.error(
-          `Failed to fetch change requests, status: ${response.status}`,
-        );
-        throw new Error("Failed to fetch change requests");
-      }
-    });
-
-    const conceptStatuses = await getConceptStatuses().then((body) =>
-      prepareStatusList(body.conceptStatuses),
-    );
-
-    const codeListsResult: CodeListsResult = await getAllCodeLists(
+  async ({ catalogId, conceptId, session }) =>
+    renderConceptEditPage({
       catalogId,
-      session.accessToken,
-    ).then((response) => response.json());
-    const fieldsResult: FieldsResult = await getFields(
-      catalogId,
-      session.accessToken,
-    ).then((response) => response.json());
-    const usersResult: UsersResult = await getUsers(
-      catalogId,
-      session.accessToken,
-    ).then((response) => response.json());
-
-    const getTitle = (text: string | string[]) =>
-      text ? text : localization.concept.noName;
-    const breadcrumbList = catalogId
-      ? ([
-          {
-            href: `/catalogs/${catalogId}`,
-            text: localization.catalogType.concept,
-          },
-          {
-            href: `/catalogs/${catalogId}/concepts/${concept?.id}`,
-            text: getTitle(getTranslateText(concept?.anbefaltTerm?.navn)),
-          },
-          {
-            href: `/catalogs/${catalogId}/concepts/${concept?.id}/edit`,
-            text: localization.edit,
-          },
-        ] as BreadcrumbType[])
-      : [];
-
-    return (
-      <>
-        <Breadcrumbs
-          breadcrumbList={breadcrumbList}
-          catalogPortalUrl={`${process.env.CATALOG_PORTAL_BASE_URI}/catalogs`}
-        />
-        <DesignBanner
-          title={localization.catalogType.concept}
-          catalogId={catalogId}
-        />
-        <EditPage
-          catalogId={catalogId}
-          concept={concept}
-          conceptStatuses={conceptStatuses}
-          codeListsResult={codeListsResult}
-          fieldsResult={fieldsResult}
-          usersResult={usersResult}
-          hasChangeRequests={changeRequests?.length}
-        />
-      </>
-    );
-  },
+      conceptId: `${conceptId}`,
+      session,
+      mode: "full",
+    }),
 );