fix: remove edit page dependency on erSistPublisert

Informasjonsforvaltning · Dec 5, 2024 · 730007d · 730007d
1 parent cf38ee0
commit 730007d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/components/form-control/index.tsx b/src/components/form-control/index.tsx
@@ -59,7 +59,6 @@ const FormControl = <V,>({
   const dispatch = useAppDispatch();
   const conceptForm = useAppSelector(state => state.conceptForm);
   const { concept } = conceptForm;
-  const erSistPublisert = concept?.erSistPublisert ?? false;
   const published = concept?.erPublisert ?? false;
   const isSaving = conceptForm.isSaving ?? false;
   const justChangedStatus = conceptForm.justChangedStatus ?? false;
@@ -109,7 +108,7 @@ const FormControl = <V,>({
   return concept ? (
     <SC.FormControl $isSticky={isSticky}>
       <SC.FormControlContent>
-        {isFormDirty && published && erSistPublisert && (
+        {isFormDirty && published && (
           <SC.Button onClick={onNewConceptRevision}>
             <SC.StatusDraftIcon />
             {localization.saveDraft}

diff --git a/src/lib/concept/index.ts b/src/lib/concept/index.ts
@@ -1,12 +1,9 @@
-import { Concept } from '../../types';
+import {Concept} from '../../types';
 
 export const isConceptEditable = (concept: Concept | undefined) => {
   if (concept == null) {
     return false;
   }
-  const { id, erPublisert, erSistPublisert, revisjonAvSistPublisert } = concept;
-  const editable =
-    id == null || (erPublisert && erSistPublisert) || revisjonAvSistPublisert;
-
-  return editable;
+  const { id, erPublisert } = concept;
+  return id == null || !erPublisert;
 };
diff --git a/src/pages/concept-registration-page/form-concept/form-concept.schema.ts b/src/pages/concept-registration-page/form-concept/form-concept.schema.ts
@@ -240,8 +240,11 @@ export const schema = Yup.object().shape({
         context.parent.id
           ? getRevisions(context.parent.id)
               .then(revisions => {
-                const latestPublishedRevision = revisions.find(
-                  rev => rev.erSistPublisert
+                const latestPublishedRevision = revisions.reduce(
+                  (prev, current) =>
+                    compareVersion(prev.versjonsnr, current.versjonsnr) < 0
+                      ? prev
+                      : current
                 );
                 return (
                   compareVersion(