@raketa-cloud/admin 1.6.2 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "main": "src/index.js",
   "files": [
     "src/",
@@ -12,19 +12,19 @@
     "prepare": "npx tailwindcss -i ./src/styles/application.css -o ./dist/application.css"
   },
   "devDependencies": {
-    "@babel/core": "7.27.1",
+    "@babel/core": "7.27.4",
     "@babel/preset-env": "7.27.2",
     "@babel/preset-typescript": "7.27.1",
     "@repo/typescript-config": "*",
     "@tailwindcss/forms": "0.5.7",
     "@tailwindcss/typography": "0.5.13",
-    "@types/node": "22.15.19",
+    "@types/node": "22.15.30",
     "jest": "29.7.0",
     "tailwindcss": "3.4.4",
     "typescript": "5.8.3"
   },
   "dependencies": {
     "ejs": "3.1.10",
-    "graphql-request": "7.1.2"
+    "graphql-request": "7.2.0"
   }
 }

package/src/HonoAdapter.js

@@ -16,14 +16,14 @@ import utils from "./helpers/utils";
 
 function escapeHtml(string) {
   const escape = {
-    '"': '"',
-    '&': '&',
-    "'": ''',
-    '<': '&lt;',
-    '>': '&gt;'
+    '"': "&quot;",
+    "&": "&amp;",
+    "'": "&#39;",
+    "<": "&lt;",
+    ">": "&gt;",
   };
 
-  return String(string).replace(/["&'<>]/g, char => escape[char]);
+  return String(string).replace(/["&'<>]/g, (char) => escape[char]);
 }
 
 const renderError = (message, stack) => {
@@ -38,7 +38,8 @@ const renderError = (message, stack) => {
 };
 
 // Convert to array if needed
-const toArray = value => Array.isArray(value) ? value : [value].filter(Boolean);
+const toArray = (value) =>
+  Array.isArray(value) ? value : [value].filter(Boolean);
 
 // Handle nested form values
 function putIn(result, key, value) {
@@ -50,9 +51,8 @@ function putIn(result, key, value) {
 
     if (isLastSegment) {
       // Set value at final segment
-      current[segment] = key.endsWith("[]") || Array.isArray(value)
-        ? toArray(value)
-        : value;
+      current[segment] =
+        key.endsWith("[]") || Array.isArray(value) ? toArray(value) : value;
     } else {
       // Create path to next segment
       current[segment] ??= {};
@@ -62,22 +62,26 @@ function putIn(result, key, value) {
 }
 
 // Normalize paths for consistent handling
-const sanitizePath = filePath => path.normalize(path.join("/", ...filePath.split("/")));
+const sanitizePath = (filePath) =>
+  path.normalize(path.join("/", ...filePath.split("/")));
 
 // Find template path with fallbacks
 function getPartialPath(partialPath, views, viewsFallback) {
   const paths = [
     sanitizePath(`${process.cwd()}/src/views/${views}/${partialPath}`),
     sanitizePath(`${currentPath}/views/${views}/${partialPath}`),
-    viewsFallback && sanitizePath(`${currentPath}/views/${viewsFallback}/${partialPath}`)
+    viewsFallback &&
+      sanitizePath(`${currentPath}/views/${viewsFallback}/${partialPath}`),
   ].filter(Boolean);
 
   // Return first existing path
-  const existingPath = paths.find(path => existsSync(path));
+  const existingPath = paths.find((path) => existsSync(path));
 
   if (existingPath) return existingPath;
 
-  throw new Error(`Template not found: "${partialPath}"\nSearched in:\n${paths.join('\n')}`);
+  throw new Error(
+    `Template not found: "${partialPath}"\nSearched in:\n${paths.join("\n")}`
+  );
 }
 
 // Parse request body based on content type
@@ -109,6 +113,7 @@ export default class HonoAdapter {
     this.globalConfig = config;
     this.globalBeforeFilters = [];
     this.globalAfterFilters = [];
+    this.localRouter = [];
 
     // TODO: Pass in a path to redirect to after login?
     if (config) {
@@ -261,21 +266,44 @@ export default class HonoAdapter {
     });
   }
 
-  async createAction([verb, path, resource, views, action, handler], resourceConfig) {
-    const method = this.getMethod(verb);
+  addRoute(verb, path, handler) {
+    this.localRouter = this.localRouter.filter((routeItem) => {
+      return !(routeItem.verb === verb && routeItem.path === path);
+    });
+
+    this.localRouter.push({
+      verb,
+      path,
+      handler,
+    });
+  }
+
+  link() {
+    this.localRouter.forEach((routeItem) => {
+      const method = this.getMethod(routeItem.verb);
+
+      method(routeItem.path, routeItem.handler);
+    });
+  }
+
+  async createAction(
+    [verb, path, resource, views, action, handler],
+    resourceConfig
+  ) {
     const { i18n } = this.globalConfig;
 
     Object.keys(i18n.locales).forEach((currentLocale) => {
       const completePath = `/${currentLocale}${path}`;
 
-      // Clean up existing routes with same path/verb
-      this.router.routes = this.router.routes.filter(route =>
-        route[0] !== verb || route[1] !== completePath
-      );
-
-      method(completePath, async (routerCtx, next) => {
+      this.addRoute(verb, completePath, async (routerCtx, next) => {
         // Create context with request data
-        const ctx = await this.createContext(routerCtx, next, verb, resource, action);
+        const ctx = await this.createContext(
+          routerCtx,
+          next,
+          verb,
+          resource,
+          action
+        );
 
         // Set context properties
         Object.assign(ctx, {
@@ -285,7 +313,7 @@ export default class HonoAdapter {
           maxOpenRevisions: this.globalConfig?.maxOpenRevisions || 3,
           locale: currentLocale,
           remoteConfig: { ...this.globalConfig.remoteConfig },
-          logger: Logger
+          logger: Logger,
         });
 
         // Build context object
@@ -301,15 +329,17 @@ export default class HonoAdapter {
           resourceConfig,
           adminJwt: ctx.authentication?.token,
           remoteConfig: { ...this.globalConfig.remoteConfig },
-          globalConfig: this.globalConfig
+          globalConfig: this.globalConfig,
         };
 
-        ctx.logger.info(`${ctx.method} "${ctx.rawPath}" -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`);
+        ctx.logger.info(
+          `${ctx.method} "${ctx.rawPath}" -> ${resource}/${action} | ${JSON.stringify(ctx.params)}`
+        );
 
         const assigns = {
           beforeFilterAssigns: {},
           actionAssigns: {},
-          afterFilterAssigns: {}
+          afterFilterAssigns: {},
         };
 
         // Initialize global context
@@ -328,7 +358,7 @@ export default class HonoAdapter {
         }
 
         // Process action handler
-        const result = await handler(ctx, resourceConfig) || {};
+        const result = (await handler(ctx, resourceConfig)) || {};
         assigns.actionAssigns = result.assigns || {};
 
         if (result.headers) this.applyHeaders(result.headers, routerCtx);
@@ -340,10 +370,14 @@ export default class HonoAdapter {
           if (pattern.test(ctx.path)) {
             const afterResult = filter(ctx) || {};
 
-            if (afterResult.redirect) return routerCtx.redirect(afterResult.redirect);
+            if (afterResult.redirect)
+              return routerCtx.redirect(afterResult.redirect);
             if (afterResult.json) return routerCtx.json(afterResult.json);
 
-            Object.assign(assigns.afterFilterAssigns, afterResult.assigns || {});
+            Object.assign(
+              assigns.afterFilterAssigns,
+              afterResult.assigns || {}
+            );
           }
         }
 
@@ -353,16 +387,19 @@ export default class HonoAdapter {
           ...assigns.beforeFilterAssigns,
           ...assigns.actionAssigns,
           ...assigns.afterFilterAssigns,
-          _context
+          _context,
         };
 
         // Render the view
-        const rendered = this.renderAction({
-          views,
-          viewsFallback: resourceConfig.viewsFallback,
-          action,
-          assigns: fullAssigns
-        }, this.globalConfig?.helpers || {});
+        const rendered = this.renderAction(
+          {
+            views,
+            viewsFallback: resourceConfig.viewsFallback,
+            action,
+            assigns: fullAssigns,
+          },
+          this.globalConfig?.helpers || {}
+        );
 
         return routerCtx.html(rendered);
       });
@@ -371,7 +408,9 @@ export default class HonoAdapter {
 
   // Single method to handle all route types
   routeCollection(mapping, resourceConfig) {
-    mapping.forEach(handlerMap => this.createAction(handlerMap, resourceConfig));
+    mapping.forEach((handlerMap) =>
+      this.createAction(handlerMap, resourceConfig)
+    );
   }
 
   // Use the same implementation for all route types
@@ -391,7 +430,9 @@ export default class HonoAdapter {
 
   applyHeaders(headers, router) {
     if (!headers) return;
-    Object.entries(headers).forEach(([key, value]) => router.header(key, value));
+    Object.entries(headers).forEach(([key, value]) =>
+      router.header(key, value)
+    );
   }
 
   formatQuery(queries) {

package/src/handlers/_shared/getArticlesUpdateDestination.js

@@ -0,0 +1,7 @@
+export default function getArticlesUpdateDestination(ctx, revision_id, section) {
+  const base = `/${ctx.locale}/${ctx.resourceConfig.articleType}_revisions/${revision_id}/`
+  const shouldPublish = ctx.body && ctx.body._next === 'publish';
+  return shouldPublish
+    ? `${base}publishes/new`
+    : `${base}${section}/edit?success=1`
+}

package/src/handlers/_shared/getEventsUpdateDestination.js

@@ -0,0 +1,7 @@
+export default function getEventsUpdateDestination(ctx, revision_id, section) {
+  const base = `/${ctx.locale}/${ctx.resourceConfig.eventType}_revisions/${revision_id}/`
+  const shouldPublish = ctx.body && ctx.body._next === 'publish';
+  return shouldPublish
+    ? `${base}publishes/new`
+    : `${base}${section}/edit?success=1`
+}

package/src/handlers/_shared/getPagesUpdateDestination.js

@@ -0,0 +1,8 @@
+export default function getPagesUpdateDestination(ctx, revision_id, section) {
+  const base = `/${ctx.locale}/${ctx.resourceConfig.pageType}_revisions/${revision_id}/`
+  const shouldPublish = ctx.body && ctx.body._next === 'publish';
+  return shouldPublish
+    ? `${base}publishes/new`
+    : `${base}${section}/edit?success=1`
+}
+

package/src/handlers/article_revisions/CodeHandler.js

@@ -1,4 +1,5 @@
 import { toDateInput } from "../../utils";
+import getArticlesUpdateDestination from "../_shared/getArticlesUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -64,7 +65,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleType}_revisions/${revision.id}/codes/edit?success=1`,
+    redirect: getArticlesUpdateDestination(ctx, revision.id, 'codes'),
   };
 };
 

package/src/handlers/article_revisions/GeneralHandler.js

@@ -1,4 +1,5 @@
 import { toDateInput } from "../../utils";
+import getArticlesUpdateDestination from "../_shared/getArticlesUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -66,7 +67,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleType}_revisions/${revision.id}/general/edit?success=1`,
+    redirect: getArticlesUpdateDestination(ctx, revision.id, 'general'),
   };
 };
 

package/src/handlers/article_revisions/MetaHandler.js

@@ -1,4 +1,5 @@
 import { toDateInput } from "../../utils";
+import getArticlesUpdateDestination from "../_shared/getArticlesUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -64,7 +65,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleType}_revisions/${revision.id}/meta/edit?success=1`,
+    redirect: getArticlesUpdateDestination(ctx, revision.id, 'meta'),
   };
 };
 

package/src/handlers/article_revisions/TagHandler.js

@@ -1,4 +1,5 @@
 import { toDateInput } from "../../utils";
+import getArticlesUpdateDestination from "../_shared/getArticlesUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -72,7 +73,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleType}_revisions/${revision.id}/tags/edit?success=1`,
+    redirect: getArticlesUpdateDestination(ctx, revision.id, 'tags'),
   };
 };
 

package/src/handlers/article_revisions/VisualHandler.js

@@ -1,4 +1,5 @@
 import { toDateInput } from "../../utils";
+import getArticlesUpdateDestination from "../_shared/getArticlesUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -64,7 +65,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.articleType}_revisions/${revision.id}/visuals/edit?success=1`,
+    redirect: getArticlesUpdateDestination(ctx, revision.id, 'visuals'),
   };
 };
 

package/src/handlers/event_revisions/CodeHandler.js

@@ -1,4 +1,5 @@
 import { toDateTimeInput, toDateInput } from "../../utils";
+import getEventsUpdateDestination from "../_shared/getEventsUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -62,7 +63,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventType}_revisions/${revision.id}/codes/edit?success=1`,
+    redirect: getEventsUpdateDestination(ctx, revision.id, 'codes'),
   };
 };
 

package/src/handlers/event_revisions/GeneralHandler.js

@@ -1,4 +1,5 @@
 import { toDateTimeInput, toDateInput } from "../../utils";
+import getEventsUpdateDestination from "../_shared/getEventsUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -64,7 +65,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventType}_revisions/${revision.id}/general/edit?success=1`,
+    redirect: getEventsUpdateDestination(ctx, revision.id, 'general'),
   };
 };
 

package/src/handlers/event_revisions/MetaHandler.js

@@ -1,4 +1,5 @@
 import { toDateTimeInput, toDateInput } from "../../utils";
+import getEventsUpdateDestination from "../_shared/getEventsUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -62,7 +63,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventType}_revisions/${revision.id}/meta/edit?success=1`,
+    redirect: getEventsUpdateDestination(ctx, revision.id, 'meta'),
   };
 };
 

package/src/handlers/event_revisions/TagHandler.js

@@ -1,4 +1,5 @@
 import { toDateTimeInput, toDateInput } from "../../utils";
+import getEventsUpdateDestination from "../_shared/getEventsUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -69,7 +70,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventType}_revisions/${revision.id}/tags/edit?success=1`,
+    redirect: getEventsUpdateDestination(ctx, revision.id, 'tags'),
   };
 };
 

package/src/handlers/event_revisions/VisualHandler.js

@@ -1,4 +1,5 @@
 import { toDateTimeInput, toDateInput } from "../../utils";
+import getEventsUpdateDestination from "../_shared/getEventsUpdateDestination";
 
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
@@ -62,7 +63,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.eventType}_revisions/${revision.id}/visuals/edit?success=1`,
+    redirect: getEventsUpdateDestination(ctx, revision.id, 'visuals'),
   };
 };
 

package/src/handlers/page_revisions/CodeHandler.js

@@ -1,3 +1,5 @@
+import getPagesUpdateDestination from "../_shared/getPagesUpdateDestination";
+
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
@@ -47,7 +49,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.pageType}_revisions/${revision.id}/codes/edit?success=1`,
+    redirect: getPagesUpdateDestination(ctx, revision.id, 'codes'),
   };
 };
 

package/src/handlers/page_revisions/GeneralHandler.js

@@ -1,3 +1,5 @@
+import getPagesUpdateDestination from "../_shared/getPagesUpdateDestination";
+
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
@@ -49,7 +51,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.pageType}_revisions/${revision.id}/general/edit?success=1`,
+    redirect: getPagesUpdateDestination(ctx, revision.id, 'general'),
   };
 };
 

package/src/handlers/page_revisions/MetaHandler.js

@@ -1,3 +1,5 @@
+import getPagesUpdateDestination from "../_shared/getPagesUpdateDestination";
+
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
@@ -47,7 +49,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.pageType}_revisions/${revision.id}/meta/edit?success=1`,
+    redirect: getPagesUpdateDestination(ctx, revision.id, 'meta'),
   };
 };
 

package/src/handlers/page_revisions/TagHandler.js

@@ -1,3 +1,5 @@
+import getPagesUpdateDestination from "../_shared/getPagesUpdateDestination";
+
 const fetchDefaultLocaleTags = async (ctx, resource) => {
   if (ctx.locale === ctx.defaultLocale) {
     return { defaultLocaleName: "", defaultLocaleTags: [] };
@@ -95,7 +97,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.pageType}_revisions/${revision.id}/tags/edit?success=1`,
+    redirect: getPagesUpdateDestination(ctx, revision.id, 'tags'),
   };
 };
 

package/src/handlers/page_revisions/VisualHandler.js

@@ -1,3 +1,5 @@
+import getPagesUpdateDestination from "../_shared/getPagesUpdateDestination";
+
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
@@ -48,7 +50,7 @@ const update = async (ctx) => {
   }
 
   return {
-    redirect: `/${ctx.locale}/${ctx.resourceConfig.pageType}_revisions/${revision.id}/visuals/edit?success=1`,
+    redirect: getPagesUpdateDestination(ctx, revision.id, 'visuals'),
   };
 };
 

package/src/index.js

@@ -90,5 +90,9 @@ export { default as EventTranslationsHandler } from "./handlers/events/Translati
 export { default as EventURLsHandler } from "./handlers/events/URLsHandler";
 export { default as EventsHandler } from "./handlers/events/EventsHandler";
 
+export { default as getPagesUpdateDestination } from "./handlers/_shared/getPagesUpdateDestination";
+export { default as getArticlesUpdateDestination } from "./handlers/_shared/getArticlesUpdateDestination";
+export { default as getEventsUpdateDestination } from "./handlers/_shared/getEventsUpdateDestination";
+
 export { default as Factory } from "./tests/support/factory";
 export { default as Logger } from "./Logger";

package/src/tests/HonoAdapter.test.js

@@ -1,9 +1,10 @@
 import HonoAdapter from "../HonoAdapter";
+import RaketaContext from "../RaketaContext";
 
 class HonoMock {
   constructor() {
     this.router = {
-      routes: []
+      routes: [],
     };
     this.get = jest.fn();
     this.post = jest.fn();
@@ -17,12 +18,12 @@ class HonoMock {
 describe("HonoAdapter", () => {
   let app;
   let adapter;
-  
+
   beforeEach(() => {
     app = new HonoMock();
     adapter = new HonoAdapter(app);
   });
-  
+
   // Method tests
   test("getMethod returns Hono's get for invalid verbs", () => {
     expect(adapter.getMethod("not existing")).toBe(app.get);
@@ -78,58 +79,126 @@ describe("HonoAdapter", () => {
       },
     });
   });
-  
+
   test("setGlobalContext sets the global context function", () => {
     const newCtx = () => ({ test: true });
     adapter.setGlobalContext(newCtx);
     expect(adapter.globalCtx).toBe(newCtx);
   });
-  
+
   test("applyHeaders applies headers to router context", () => {
     const headers = {
       "Content-Type": "application/json",
-      "X-Custom-Header": "test-value"
+      "X-Custom-Header": "test-value",
     };
-    
+
     adapter.applyHeaders(headers, app);
-    
+
     expect(app.header).toHaveBeenCalledTimes(2);
     expect(app.header).toHaveBeenCalledWith("Content-Type", "application/json");
     expect(app.header).toHaveBeenCalledWith("X-Custom-Header", "test-value");
   });
-  
+
   test("applyHeaders does nothing when headers is undefined", () => {
     adapter.applyHeaders(undefined, app);
     expect(app.header).not.toHaveBeenCalled();
   });
-  
+
   test("formatQuery formats query parameters correctly", () => {
     const queries = {
       single: ["value"],
-      multiple: ["one", "two"]
+      multiple: ["one", "two"],
     };
-    
+
     const result = adapter.formatQuery(queries);
-    
+
     expect(result).toEqual({
       single: "value",
-      multiple: ["one", "two"]
+      multiple: ["one", "two"],
     });
   });
 
   test("parseFormBody handles array values", () => {
     expect(
       adapter.parseFormBody({
-        "tags[]": ["javascript", "react", "node"]
+        "tags[]": ["javascript", "react", "node"],
       })
     ).toEqual({
-      tags: ["javascript", "react", "node"]
+      tags: ["javascript", "react", "node"],
     });
   });
 
   test("parseFormBody handles empty values", () => {
-    expect(
-      adapter.parseFormBody({})
-    ).toEqual({});
+    expect(adapter.parseFormBody({})).toEqual({});
+  });
+
+  test("renderLayout renders an existing layout template", async () => {
+    const result = await adapter.renderLayout(
+      {
+        _context: {
+          layout: {
+            sidebar: [],
+          },
+          path: "/en/pages",
+          locale: "en",
+          locales: {
+            en: {
+              flag: "",
+              name: "English",
+            },
+          },
+          globalConfig: {
+            cloud: {
+              images_api_key: "api-key",
+            },
+          },
+        },
+      },
+      "<h1>Hi</h1>"
+    );
+
+    expect(typeof result).toBe("string");
+    expect(result.length).toBeGreaterThan(0);
+  });
+
+  test("addRouote - adds a route to the local router", () => {
+    expect(adapter.localRouter).toEqual([]);
+
+    const handler = () => {};
+
+    adapter.addRoute("GET", "/en/pages", handler);
+
+    expect(adapter.localRouter).toEqual([
+      { verb: "GET", path: "/en/pages", handler },
+    ]);
+  });
+
+  test("addRouote - overrides routes if they already exist in the local router", () => {
+    expect(adapter.localRouter).toEqual([]);
+
+    const handler = () => {};
+    const handler2 = () => {};
+
+    adapter.addRoute("GET", "/en/pages", handler);
+
+    expect(adapter.localRouter).toEqual([
+      { verb: "GET", path: "/en/pages", handler },
+    ]);
+
+    adapter.addRoute("GET", "/en/pages", handler2);
+
+    expect(adapter.localRouter).toEqual([
+      { verb: "GET", path: "/en/pages", handler: handler2 },
+    ]);
+  });
+
+  test("link links local routes with the app", () => {
+    const handler = () => {};
+    adapter.addRoute("GET", "/en/pages", handler);
+
+    adapter.link();
+
+    expect(app.get).toHaveBeenCalledTimes(1);
+    expect(app.get).toHaveBeenCalledWith("/en/pages", handler);
   });
-});
+});

package/src/tests/handlers/page_revisions/CodesHandler.test/update.test.js

@@ -17,6 +17,7 @@ function buildCtx(revision, updateSettings) {
       pageType: "page",
       pageTypePlural: "pages",
     },
+    body: {},
   };
 }
 
@@ -70,6 +71,55 @@ describe("Page revision code settings", () => {
     });
   });
 
+  test("update and publish", async () => {
+    const revision = Factory.build("page_revision");
+
+    const updateSettings = {
+      settings: {
+        codes: {
+          scripts: JSON.stringify([{ type: "bla" }]),
+          structured_json: JSON.stringify({ type: "article" }),
+        },
+      },
+    };
+
+    const ctx = { ...buildCtx(revision, updateSettings), body: { _next: 'publish' } };
+
+    const mockFind = jest
+      .spyOn(ctx.client.pageRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockUpdate = jest
+      .spyOn(ctx.client.pageRevisions, "update")
+      .mockImplementation(() => ({
+        revision: {},
+        errors: null,
+      }));
+
+    const result = await CodeHandler.update(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
+      slug: revision.slug,
+      title: revision.title,
+      visibility: revision.visibility,
+      widgets: revision.widgets,
+      tags: revision.tags.map((t) => t.id),
+      categories: revision.categories.map((c) => c.id),
+      settings: {
+        ...revision.settings,
+        codes: {
+          scripts: [{ type: "bla" }],
+          structured_json: { type: "article" },
+        },
+      },
+    });
+
+    expect(result).toEqual({
+      redirect: `/en/page_revisions/${revision.id}/publishes/new`,
+    });
+  });
+
   test("update failed", async () => {
     const revision = Factory.build("page_revision");
 

package/src/tests/handlers/page_revisions/GeneralHandler.test/update.test.js

@@ -19,6 +19,7 @@ function buildCtx(revision, updateSettings) {
       pageType: "page",
       pageTypePlural: "pages",
     },
+    body: {},
   };
 }
 
@@ -75,6 +76,58 @@ describe("Page revision general settings", () => {
     });
   });
 
+  test("update and publish", async () => {
+    const revision = Factory.build("page_revision");
+
+    const updateSettings = {
+      title: "Updated title",
+      slug: "/updated-url",
+      visibility: "protected",
+      settings: {
+        credentials: {
+          user: "user",
+          password: "admin123!@#",
+        },
+      },
+    };
+
+    const ctx = { ...buildCtx(revision, updateSettings), body: { _next: 'publish' } };
+
+    const mockFind = jest
+      .spyOn(ctx.client.pageRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockUpdate = jest
+      .spyOn(ctx.client.pageRevisions, "update")
+      .mockImplementation(() => ({
+        revision: {},
+        errors: null,
+      }));
+
+    const result = await GeneralHandler.update(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
+      slug: updateSettings.slug,
+      title: updateSettings.title,
+      visibility: updateSettings.visibility,
+      widgets: revision.widgets,
+      tags: revision.tags.map((t) => t.id),
+      categories: revision.categories.map((c) => c.id),
+      settings: {
+        ...revision.settings,
+        credentials: {
+          user: updateSettings.settings.credentials.user,
+          password: updateSettings.settings.credentials.password,
+        },
+      },
+    });
+
+    expect(result).toEqual({
+      redirect: `/en/page_revisions/${revision.id}/publishes/new`,
+    });
+  });
+
   test("update failed", async () => {
     const revision = Factory.build("page_revision");
 

package/src/tests/handlers/page_revisions/MetaHandler.test/update.test.js

@@ -17,6 +17,7 @@ function buildCtx(revision, updateSettings) {
       pageType: "page",
       pageTypePlural: "pages",
     },
+    body: {},
   };
 }
 
@@ -72,6 +73,57 @@ describe("Page revision meta settings", () => {
     });
   });
 
+  test("update and publish", async () => {
+    const revision = Factory.build("page_revision");
+
+    const updateSettings = {
+      settings: {
+        meta: {
+          title: "An open graph title",
+          description: "An open graph description",
+          image: JSON.stringify({ id: 42 }),
+        },
+      },
+    };
+
+    const ctx = { ...buildCtx(revision, updateSettings), body: { _next: 'publish' } };
+
+    const mockFind = jest
+      .spyOn(ctx.client.pageRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockUpdate = jest
+      .spyOn(ctx.client.pageRevisions, "update")
+      .mockImplementation(() => ({
+        revision: {},
+        errors: null,
+      }));
+
+    const result = await MetaHandler.update(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
+      slug: revision.slug,
+      title: revision.title,
+      visibility: revision.visibility,
+      widgets: revision.widgets,
+      tags: revision.tags.map((t) => t.id),
+      categories: revision.categories.map((c) => c.id),
+      settings: {
+        ...revision.settings,
+        meta: {
+          title: updateSettings.settings.meta.title,
+          description: updateSettings.settings.meta.description,
+          image: { id: 42 },
+        },
+      },
+    });
+
+    expect(result).toEqual({
+      redirect: `/en/page_revisions/${revision.id}/publishes/new`,
+    });
+  });
+
   test("update failed", async () => {
     const revision = Factory.build("page_revision");
 

package/src/tests/handlers/page_revisions/TagHandler.test/update.test.js

@@ -28,6 +28,7 @@ function buildCtx(revision, updateSettings) {
       pageType: "page",
       pageTypePlural: "pages",
     },
+    body: {},
   };
 }
 
@@ -74,6 +75,48 @@ describe("Page revision tags settings", () => {
     });
   });
 
+  test("update and publish", async () => {
+    const tags = [
+      Factory.build("tag", { id: 42 }),
+      Factory.build("tag", { id: 69 }),
+    ];
+    const revision = Factory.build("page_revision", { tags: [tags[0]] });
+
+    const updateSettings = {
+      tags: [tags.map((t) => t.id)],
+    };
+
+    const ctx = { ...buildCtx(revision, updateSettings), body: { _next: 'publish' } };
+
+    const mockFind = jest
+      .spyOn(ctx.client.pageRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockUpdate = jest
+      .spyOn(ctx.client.pageRevisions, "update")
+      .mockImplementation(() => ({
+        revision: {},
+        errors: null,
+      }));
+
+    const result = await TagHandler.update(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
+      slug: revision.slug,
+      title: revision.title,
+      visibility: revision.visibility,
+      widgets: revision.widgets,
+      tags: updateSettings.tags,
+      categories: revision.categories.map((c) => c.id),
+      settings: revision.settings,
+    });
+
+    expect(result).toEqual({
+      redirect: `/en/page_revisions/${revision.id}/publishes/new`,
+    });
+  });
+
   test("update failed", async () => {
     const tags = [
       Factory.build("tag", { id: 42 }),

package/src/tests/handlers/page_revisions/VisualHandler.test.test/update.test.js

@@ -17,6 +17,7 @@ function buildCtx(revision, updateSettings) {
       pageType: "page",
       pageTypePlural: "pages",
     },
+    body: {},
   };
 }
 
@@ -64,6 +65,49 @@ describe("Page revision visuals settings", () => {
     });
   });
 
+  test("update and publish", async () => {
+    const revision = Factory.build("page_revision");
+
+    const updateSettings = {
+      settings: {
+        layout: "bla",
+      },
+    };
+
+    const ctx = { ...buildCtx(revision, updateSettings), body: { _next: 'publish' } };
+
+    const mockFind = jest
+      .spyOn(ctx.client.pageRevisions, "find")
+      .mockImplementation(() => revision);
+
+    const mockUpdate = jest
+      .spyOn(ctx.client.pageRevisions, "update")
+      .mockImplementation(() => ({
+        revision: {},
+        errors: null,
+      }));
+
+    const result = await VisualHandler.update(ctx);
+
+    expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
+    expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
+      slug: revision.slug,
+      title: revision.title,
+      visibility: revision.visibility,
+      widgets: revision.widgets,
+      tags: revision.tags.map((t) => t.id),
+      categories: revision.categories.map((c) => c.id),
+      settings: {
+        ...revision.settings,
+        layout: "bla",
+      },
+    });
+
+    expect(result).toEqual({
+      redirect: `/en/page_revisions/${revision.id}/publishes/new`,
+    });
+  });
+
   test("update failed", async () => {
     const revision = Factory.build("page_revision");
 

package/src/views/article_revisions/codes/_form.ejs

@@ -5,8 +5,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/article_revisions/general/_form.ejs

@@ -9,8 +9,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/article_revisions/meta/_form.ejs

@@ -7,8 +7,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/article_revisions/tags/_form.ejs

@@ -4,8 +4,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/article_revisions/visuals/_form.ejs

@@ -4,8 +4,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.articleTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/event_revisions/codes/_form.ejs

@@ -5,8 +5,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/event_revisions/general/_form.ejs

@@ -11,8 +11,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/event_revisions/meta/_form.ejs

@@ -7,8 +7,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/event_revisions/tags/_form.ejs

@@ -4,8 +4,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/event_revisions/visuals/_form.ejs

@@ -4,8 +4,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.eventTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/page_revisions/codes/_form.ejs

@@ -5,8 +5,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/page_revisions/general/_form.ejs

@@ -8,8 +8,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/page_revisions/meta/_form.ejs

@@ -7,8 +7,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/page_revisions/tags/_form.ejs

@@ -4,8 +4,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>

package/src/views/page_revisions/visuals/_form.ejs

@@ -4,8 +4,9 @@
 
   <div class="form-actions">
     <div class="btn-toolbar">
-      <%- f.submit('Save changes', { class: 'btn-primary' }) %>
-      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-secondary">Back</a>
+      <%- f.submit('Save', { class: 'btn-primary' }) %>
+      <%- f.submit('Save and publish', { class: 'btn-secondary', name: '_next', value: 'publish' }) %>
+      <a href="<%= `/${_context.locale}/${_context.resourceConfig.pageTypePlural}/${resource.originalId}` %>" class="btn-text">Back</a>
     </div>
   </div>
 </form>