Rydder

navikt · May 15, 2024 · 400e777 · 400e777
1 parent 529b071
commit 400e777
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 8 deletions.
diff --git a/packages/client/src/views/main-menu.ts b/packages/client/src/views/main-menu.ts
@@ -1,6 +1,6 @@
 import { Context } from "decorator-shared/params";
 import { CustomEvents } from "../events";
-import { StaleWhileRevalidateResponseCache } from "../../../server/src/lib/response-cache";
+import { StaleWhileRevalidateResponseCache } from "decorator-shared/response-cache";
 import { param } from "../params";
 import { endpointUrlWithParams } from "../helpers/urls";
 

diff --git a/packages/server/src/menu/main-menu.test.ts b/packages/server/src/menu/main-menu.test.ts
@@ -11,7 +11,7 @@ import { HttpResponse, http } from "msw";
 import { SetupServerApi, setupServer } from "msw/node";
 import testData from "./main-menu-mock.json";
 import { env } from "../env/server";
-import { clearCache } from "../lib/response-cache";
+import { clearCache } from "decorator-shared/response-cache";
 import { getSimpleFooterLinks } from "./main-menu";
 
 describe("getSimpleFooterLinks", () => {

diff --git a/packages/server/src/menu/main-menu.ts b/packages/server/src/menu/main-menu.ts
@@ -1,4 +1,4 @@
-import { StaleWhileRevalidateResponseCache } from "../lib/response-cache";
+import { StaleWhileRevalidateResponseCache } from "decorator-shared/response-cache";
 import { Context, Language } from "decorator-shared/params";
 import { Link, LinkGroup, MainMenuContextLink } from "decorator-shared/types";
 import { clientEnv, env } from "../env/server";
@@ -35,7 +35,6 @@ const fetchMenu = async (): Promise<MainMenu> => {
     const menuFromService = await menuCache.get("menu", () =>
         fetchAndValidateJson(MENU_SERVICE_URL, undefined, mainmenuSchema).then(
             (res) => {
-                console.log("Fetched");
                 if (!res.ok) {
                     console.log(
                         `Error fetching menu from Enonic - ${res.error}`,

diff --git a/packages/server/src/ops-msgs.ts b/packages/server/src/ops-msgs.ts
@@ -1,4 +1,4 @@
-import { StaleWhileRevalidateResponseCache } from "./lib/response-cache";
+import { StaleWhileRevalidateResponseCache } from "decorator-shared/response-cache";
 import { OpsMessage } from "decorator-shared/types";
 import { env } from "./env/server";
 

diff --git a/packages/server/src/render-index.test.ts b/packages/server/src/render-index.test.ts
@@ -7,7 +7,7 @@ import {
     test,
     describe,
 } from "bun:test";
-import { clearCache } from "./lib/response-cache";
+import { clearCache } from "decorator-shared/response-cache";
 import { HttpResponse, http } from "msw";
 import { SetupServerApi, setupServer } from "msw/node";
 import testData from "./menu/main-menu-mock.json";

diff --git a/packages/server/src/request-handler.test.ts b/packages/server/src/request-handler.test.ts
@@ -7,7 +7,7 @@ import {
     expect,
     test,
 } from "bun:test";
-import { clearCache } from "./lib/response-cache";
+import { clearCache } from "decorator-shared/response-cache";
 import { HttpResponse, http } from "msw";
 import { SetupServerApi, setupServer } from "msw/node";
 import testData from "./menu/main-menu-mock.json";

diff --git a/packages/server/src/task-analytics-config.ts b/packages/server/src/task-analytics-config.ts
@@ -1,7 +1,7 @@
 import { contextSchema, languageSchema } from "decorator-shared/params";
 import { z } from "zod";
 import { Result, ResultType } from "./result";
-import { StaleWhileRevalidateResponseCache } from "./lib/response-cache";
+import { StaleWhileRevalidateResponseCache } from "decorator-shared/response-cache";
 
 const configSchema = z.array(
     z.object({

diff --git a/packages/server/src/lib/response-cache.ts → packages/shared/response-cache.ts b/packages/server/src/lib/response-cache.ts → packages/shared/response-cache.ts