@raketa-cloud/admin 1.6.3 → 1.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "1.6.3",
+  "version": "1.7.1",
   "main": "src/index.js",
   "files": [
     "src/",
@@ -12,14 +12,14 @@
     "prepare": "npx tailwindcss -i ./src/styles/application.css -o ./dist/application.css"
   },
   "devDependencies": {
-    "@babel/core": "7.27.1",
-    "@babel/preset-env": "7.27.2",
+    "@babel/core": "7.28.0",
+    "@babel/preset-env": "7.28.0",
     "@babel/preset-typescript": "7.27.1",
     "@repo/typescript-config": "*",
     "@tailwindcss/forms": "0.5.7",
     "@tailwindcss/typography": "0.5.13",
-    "@types/node": "22.15.21",
-    "jest": "29.7.0",
+    "@types/node": "24.1.0",
+    "jest": "30.0.5",
     "tailwindcss": "3.4.4",
     "typescript": "5.8.3"
   },

package/src/HonoAdapter.js

@@ -279,10 +279,6 @@ export default class HonoAdapter {
   }
 
   link() {
-    // Clean up all of hono's routes before linking to the adapter locally build routes
-    // this.router.routes = [];
-    // this.router.routes.length = 0;
-
     this.localRouter.forEach((routeItem) => {
       const method = this.getMethod(routeItem.verb);
 

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

@@ -12,7 +12,6 @@ class HonoMock {
     this.delete = jest.fn();
     this.use = jest.fn();
     this.header = jest.fn();
-    // this.routes = [];
   }
 }
 

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>