chore: add publisherId to posts

Informasjonsforvaltning · Sep 21, 2023 · 2b2beb0 · 2b2beb0
1 parent 517fb1b
commit 2b2beb0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/src/features/conceptForm/index.ts b/src/features/conceptForm/index.ts
@@ -32,7 +32,7 @@ export const postNewConcept = createAsyncThunk<
   PostNewAttributes,
   RejectValue
 >('conceptForm/postNewConcept', async ({ concept }, { rejectWithValue }) =>
-  postConceptWithPreProcess(concept)
+  postConceptWithPreProcess(concept.ansvarligVirksomhet.id, concept)
     .then(response => response)
     .catch(() => rejectWithValue(true))
 );

diff --git a/src/pages/concept-registration-page/form-concept/index.tsx b/src/pages/concept-registration-page/form-concept/index.tsx
@@ -42,7 +42,10 @@ import { getConfig } from '../../../config';
 import { setValidationError } from '../../../features/conceptForm';
 
 export const validateWithPreProcess = (values, { dispatch }) => {
-  const processedValues = preProcessValues(values);
+  const processedValues = preProcessValues(
+    values.ansvarligVirksomhet.id,
+    values
+  );
 
   return validateYupSchema(processedValues, validationSchema)
     .then(() => {
@@ -157,10 +160,12 @@ export const FormConceptPure: FC<Props> = ({
   };
 
   const createNewConceptRevisionAndNavigate = () =>
-    postConceptRevisionWithPreProcess(conceptId, values).then(resourceId => {
-      setShowUserPrompt(false);
-      history.push(`/${catalogId}/${resourceId}`);
-    });
+    postConceptRevisionWithPreProcess(conceptId, publisherId, values).then(
+      resourceId => {
+        setShowUserPrompt(false);
+        history.push(`/${catalogId}/${resourceId}`);
+      }
+    );
 
   useEffect(() => {
     const handler = event => {

diff --git a/src/pages/concept-registration-page/form-concept/utils/index.ts b/src/pages/concept-registration-page/form-concept/utils/index.ts
@@ -42,31 +42,40 @@ const pruneEmptyProperties = (obj: any, reduceAsArray = false) => {
       }, {});
 };
 
-export const preProcessValues = ({
-  merknad,
-  eksempel,
-  fagområde,
-  omfang,
-  kontaktpunkt,
-  ...conceptValues
-}) => ({
+export const preProcessValues = (
+  orgId: string,
+  {
+    ansvarligVirksomhet,
+    merknad,
+    eksempel,
+    fagområde,
+    omfang,
+    kontaktpunkt,
+    ...conceptValues
+  }
+) => ({
   ...conceptValues,
   merknad: merknad ? stringsToArray(merknad) : null,
   eksempel: eksempel ? stringsToArray(eksempel) : null,
   fagområde: fagområde ? stringsToArray(fagområde) : null,
   omfang: pruneEmptyProperties(omfang),
-  kontaktpunkt: pruneEmptyProperties(kontaktpunkt)
+  kontaktpunkt: pruneEmptyProperties(kontaktpunkt),
+  ansvarligVirksomhet: ansvarligVirksomhet || { id: orgId }
 });
 
-export const postConceptWithPreProcess = async (values): Promise<string> => {
-  const processedValues = preProcessValues(values);
+export const postConceptWithPreProcess = async (
+  publisherId: string,
+  values
+): Promise<string> => {
+  const processedValues = preProcessValues(publisherId, values);
   return postConcept(processedValues);
 };
 
 export const postConceptRevisionWithPreProcess = async (
   id: string,
+  publisherId: string,
   values
 ): Promise<void> => {
-  const processedValues = preProcessValues(values);
+  const processedValues = preProcessValues(publisherId, values);
   return postConceptRevision(id, processedValues);
 };