Endringer etter PR

navikt · Jan 17, 2025 · b2fe09c · b2fe09c
1 parent babb034
commit b2fe09c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/packages/bygger-backend/src/fetchUtils.ts b/packages/bygger-backend/src/fetchUtils.ts
@@ -50,6 +50,8 @@ export async function fetchWithErrorHandling(url: RequestInfo, options: RequestI
     };
   }
 
+  const logMeta = { status: res.status, method };
+  logger.warn(`Fetch ${method} ${url}: Unexpected content-type "${res.headers.get('content-type')}"`, logMeta);
   return {
     status: 'OK',
     data: null,

diff --git a/packages/bygger-backend/src/routers/api/forms-api-global-translations/global-translations.ts b/packages/bygger-backend/src/routers/api/forms-api-global-translations/global-translations.ts
@@ -23,7 +23,7 @@ const post: RequestHandler = async (req, res, next) => {
   const body = { key, tag, nb, nn, en };
   try {
     const translation = await globalTranslationsService.post(body, accessToken);
-    res.status(201).json(translation);
+    res.status(204).json(translation);
   } catch (error) {
     if (error instanceof OldHttpError) {
       next(new HttpError(error.message, error.response.status));

diff --git a/...s/bygger-backend/src/routers/api/forms-api-global-translations/utils/mapToFormioFormat.ts b/...s/bygger-backend/src/routers/api/forms-api-global-translations/utils/mapToFormioFormat.ts
@@ -4,6 +4,8 @@ import {
   TranslationResource,
 } from '@navikt/skjemadigitalisering-shared-domain';
 
+// We need to map to this deprecated format as long as we still use gitHub for publishing. When published translations are collected from forms-api this can be removed.
+// Note that tag here is not used, as it is superfluous. All tags have been combined into one, named 'dummy-tag'
 const mapGlobalToFormioFormat = ({ translations }: PublishedTranslations): GlobalTranslationsResourceContent => {
   const resourceDefaults: Pick<TranslationResource, 'id' | 'name' | 'scope' | 'tag'> = {
     id: '',

diff --git a/packages/bygger/src/api/useGlobalTranslationsApi.ts b/packages/bygger/src/api/useGlobalTranslationsApi.ts
@@ -46,11 +46,13 @@ const useGlobalTranslationsApi = () => {
 
   const publish = async () => {
     try {
-      return await http.post(`${basePath}/publish`, {});
+      await http.post(`${basePath}/publish`, {});
+      feedbackEmit.success(
+        'Publisering av globale oversettelser fullført. Endringene vil bli synlige på nav.no/fyllut om noen minutter.',
+      );
     } catch (error: any) {
       const message = (error as Error)?.message;
       feedbackEmit.error(`Feil ved publisering. ${message}`);
-      throw error;
     }
   };
 

diff --git a/packages/bygger/src/context/translations/GlobalTranslationsContext.tsx b/packages/bygger/src/context/translations/GlobalTranslationsContext.tsx
@@ -94,9 +94,7 @@ const GlobalTranslationsProvider = ({ children }) => {
       feedbackEmit.error(getMissingGlobalTranslationsErrorMessage(tagsWithMissingTranslations));
     } else {
       await translationsApi.publish();
-      feedbackEmit.success(
-        'Publisering av globale oversettelser fullført. Endringene vil bli synlige på nav.no/fyllut om noen minutter.',
-      );
+      await loadTranslations();
     }
   };
 

diff --git a/packages/bygger/src/translations/global/GlobalTranslationButtonsColumn.tsx b/packages/bygger/src/translations/global/GlobalTranslationButtonsColumn.tsx
@@ -7,7 +7,7 @@ import { useGlobalTranslations } from '../../context/translations/GlobalTranslat
 const GlobalTranslationButtonsColumn = () => {
   const [isProcessing, setIsProcessing] = useState<'SAVING' | 'PUBLISHING'>();
   const { saveChanges } = useEditGlobalTranslations();
-  const { publish, loadTranslations } = useGlobalTranslations();
+  const { publish } = useGlobalTranslations();
 
   const handleSave = async () => {
     try {
@@ -19,13 +19,9 @@ const GlobalTranslationButtonsColumn = () => {
   };
 
   const handlePublish = async () => {
-    try {
-      setIsProcessing('PUBLISHING');
-      await publish();
-      await loadTranslations();
-    } finally {
-      setIsProcessing(undefined);
-    }
+    setIsProcessing('PUBLISHING');
+    await publish();
+    setIsProcessing(undefined);
   };
 
   return (