@raketa-cloud/admin 0.0.17 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/HonoAdapter.js

@@ -99,6 +99,7 @@ export default class HonoAdapter extends Adapter {
         ctx.locales = this.globalConfig.i18n.locales;
         ctx.defaultLocale = this.globalConfig.i18n.defaultLocale;
         ctx.locale = currentLocale;
+        ctx.remoteConfig = { ...this.globalConfig.remoteConfig };
 
         const _context = {
           locales: ctx.locales,

package/src/handlers/articles/DeletesHandler.js

@@ -31,8 +31,11 @@ const create = async (ctx, opts) => {
 
   if (params.redirect === "301" || params.redirect === "410") {
     redirect = {
-      // TODO: fix url with consideration of locale & defaultLocale in the frontend project
-      url: `/${article.slug}`,
+      url: ctx.remoteConfig.resourcePath(
+        article,
+        article.articleType.slug,
+        ctx.locale
+      ),
       destination: params.redirect === "301" ? params.destination : "/",
       httpResponseCode: Number.parseInt(params.redirect, 10),
       note: "Created via article deletion process",

package/src/handlers/articles/URLsHandler.js

@@ -33,7 +33,11 @@ const create = async (ctx, opts) => {
 
   if (change.redirect) {
     redirectParams = {
-      // TODO: We need some config from the FE project on how to build paths here!
+      url: ctx.remoteConfig.resourcePath(
+        article,
+        article.articleType.slug,
+        ctx.locale
+      ),
       url: `/${article.slug}`,
       destination: change.slug,
       httpResponseCode: 301,

package/src/handlers/events/DeletesHandler.js

@@ -31,8 +31,11 @@ const create = async (ctx, opts) => {
 
   if (params.redirect === "301" || params.redirect === "410") {
     redirect = {
-      // TODO: fix url with consideration of locale & defaultLocale in the frontend project
-      url: `/${event.slug}`,
+      url: ctx.remoteConfig.resourcePath(
+        event,
+        event.eventType.slug,
+        ctx.locale
+      ),
       destination: params.redirect === "301" ? params.destination : "/",
       httpResponseCode: Number.parseInt(params.redirect, 10),
       note: "Created via event deletion process",

package/src/handlers/events/URLsHandler.js

@@ -33,8 +33,11 @@ const create = async (ctx, opts) => {
 
   if (change.redirect) {
     redirectParams = {
-      // TODO: We need some config from the FE project on how to build paths here!
-      url: `/${event.slug}`,
+      url: ctx.remoteConfig.resourcePath(
+        event,
+        event.eventType.slug,
+        ctx.locale
+      ),
       destination: change.slug,
       httpResponseCode: 301,
       note: `Created with changed URL for a resource of type ${opts.eventType}`,

package/src/handlers/pages/DeletesHandler.js

@@ -31,8 +31,7 @@ const create = async (ctx, opts) => {
 
   if (params.redirect === "301" || params.redirect === "410") {
     redirect = {
-      // TODO: fix url with consideration of locale & defaultLocale in the frontend project
-      url: `/${page.slug}`,
+      url: ctx.remoteConfig.resourcePath(page, page.pageType.slug, ctx.locale),
       destination: params.redirect === "301" ? params.destination : "/",
       httpResponseCode: Number.parseInt(params.redirect, 10),
       note: "Created via page deletion process",

package/src/handlers/pages/URLsHandler.js

@@ -33,8 +33,7 @@ const create = async (ctx, opts) => {
 
   if (change.redirect) {
     redirectParams = {
-      // TODO: We need some config from the FE project on how to build paths here!
-      url: `/${page.slug}`,
+      url: ctx.remoteConfig.resourcePath(page, page.pageType.slug, ctx.locale),
       destination: change.slug,
       httpResponseCode: 301,
       note: `Created with changed URL for a ${opts.pageType}`,

package/src/tests/handlers/articles/DeletesHandler.test/create.test.js

@@ -1,7 +1,7 @@
 import DeletesHandler from "../../../../handlers/articles/DeletesHandler";
 import Articles from "../../../../cloud/Articles";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test//handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test//handlersHelper";
 
 function buildCtx(article, updateSettings) {
   return {
@@ -13,6 +13,7 @@ function buildCtx(article, updateSettings) {
       deleteAction: updateSettings,
     },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 
@@ -40,7 +41,7 @@ describe("Article delete", () => {
 
     expect(mockFind).toHaveBeenCalledWith(article.id, "en");
     expect(mockDelete).toHaveBeenCalledWith(article.id, "en", {
-      url: `/${article.slug}`,
+      url: `/en/blog/${article.slug}`,
       destination: updateSettings.destination,
       httpResponseCode: 301,
       note: "Created via article deletion process",
@@ -83,7 +84,7 @@ describe("Article delete", () => {
 
     expect(mockFind).toHaveBeenCalledWith(article.id, "en");
     expect(mockDelete).toHaveBeenCalledWith(article.id, "en", {
-      url: `/${article.slug}`,
+      url: `/en/blog/${article.slug}`,
       destination: "/",
       httpResponseCode: 410,
       note: "Created via article deletion process",

package/src/tests/handlers/articles/DeletesHandler.test/create_form.test.js

@@ -1,7 +1,7 @@
 import DeletesHandler from "../../../../handlers/articles/DeletesHandler";
 import Articles from "../../../../cloud/Articles";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test//handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test//handlersHelper";
 
 function buildCtx(article) {
   return {
@@ -10,6 +10,7 @@ function buildCtx(article) {
     },
     params: { parent_id: article.id },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 

package/src/tests/handlers/articles/URLsHandler.test/create.test.js

@@ -1,7 +1,7 @@
 import URLsHandler from "../../../../handlers/articles/URLsHandler";
 import Articles from "../../../../cloud/Articles";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test/handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test/handlersHelper";
 
 function buildCtx(article, updateSettings) {
   return {
@@ -13,6 +13,7 @@ function buildCtx(article, updateSettings) {
       change: updateSettings,
     },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 

package/src/tests/handlers/events/DeletesHandler.test/create.test.js

@@ -1,7 +1,7 @@
 import DeletesHandler from "../../../../handlers/events/DeletesHandler";
 import Events from "../../../../cloud/Events";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test//handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test//handlersHelper";
 
 function buildCtx(event, updateSettings) {
   return {
@@ -13,6 +13,7 @@ function buildCtx(event, updateSettings) {
       deleteAction: updateSettings,
     },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 
@@ -40,7 +41,7 @@ describe("Event delete", () => {
 
     expect(mockFind).toHaveBeenCalledWith(event.id, "en");
     expect(mockDelete).toHaveBeenCalledWith(event.id, "en", {
-      url: `/${event.slug}`,
+      url: `/en/events/${event.slug}`,
       destination: updateSettings.destination,
       httpResponseCode: 301,
       note: "Created via event deletion process",
@@ -83,7 +84,7 @@ describe("Event delete", () => {
 
     expect(mockFind).toHaveBeenCalledWith(event.id, "en");
     expect(mockDelete).toHaveBeenCalledWith(event.id, "en", {
-      url: `/${event.slug}`,
+      url: `/en/events/${event.slug}`,
       destination: "/",
       httpResponseCode: 410,
       note: "Created via event deletion process",

package/src/tests/handlers/events/DeletesHandler.test/create_form.test.js

@@ -1,7 +1,7 @@
 import DeletesHandler from "../../../../handlers/events/DeletesHandler";
 import Events from "../../../../cloud/Events";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test//handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test//handlersHelper";
 
 function buildCtx(event) {
   return {
@@ -10,6 +10,7 @@ function buildCtx(event) {
     },
     params: { parent_id: event.id },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 

package/src/tests/handlers/events/URLsHandler.test/create.test.js

@@ -1,7 +1,7 @@
 import URLsHandler from "../../../../handlers/events/URLsHandler";
 import Events from "../../../../cloud/Events";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test/handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test/handlersHelper";
 
 function buildCtx(event, updateSettings) {
   return {
@@ -13,6 +13,7 @@ function buildCtx(event, updateSettings) {
       change: updateSettings,
     },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 
@@ -44,7 +45,7 @@ describe("Event change url", () => {
       updateSettings.slug,
       "en",
       {
-        url: `/${event.slug}`,
+        url: `/en/events/${event.slug}`,
         destination: updateSettings.slug,
         httpResponseCode: 301,
         note: "Created with changed URL for a resource of type event",
@@ -132,7 +133,7 @@ describe("Event change url", () => {
       updateSettings.slug,
       "en",
       {
-        url: `/${event.slug}`,
+        url: `/en/events/${event.slug}`,
         destination: updateSettings.slug,
         httpResponseCode: 301,
         note: "Created with changed URL for a resource of type event",

package/src/tests/handlers/pages/DeletesHandler.test/create.test.js

@@ -1,7 +1,7 @@
 import DeletesHandler from "../../../../handlers/pages/DeletesHandler";
 import Pages from "../../../../cloud/Pages";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test//handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test//handlersHelper";
 
 function buildCtx(page, updateSettings) {
   return {
@@ -13,6 +13,7 @@ function buildCtx(page, updateSettings) {
       deleteAction: updateSettings,
     },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 
@@ -40,7 +41,7 @@ describe("Page delete", () => {
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
     expect(mockDelete).toHaveBeenCalledWith(page.id, "en", {
-      url: `/${page.slug}`,
+      url: `/en/${page.slug}`,
       destination: updateSettings.destination,
       httpResponseCode: 301,
       note: "Created via page deletion process",
@@ -83,7 +84,7 @@ describe("Page delete", () => {
 
     expect(mockFind).toHaveBeenCalledWith(page.id, "en");
     expect(mockDelete).toHaveBeenCalledWith(page.id, "en", {
-      url: `/${page.slug}`,
+      url: `/en/${page.slug}`,
       destination: "/",
       httpResponseCode: 410,
       note: "Created via page deletion process",

package/src/tests/handlers/pages/DeletesHandler.test/create_form.test.js

@@ -1,7 +1,7 @@
 import DeletesHandler from "../../../../handlers/pages/DeletesHandler";
 import Pages from "../../../../cloud/Pages";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test//handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test//handlersHelper";
 
 function buildCtx(page) {
   return {
@@ -10,6 +10,7 @@ function buildCtx(page) {
     },
     params: { parent_id: page.id },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 

package/src/tests/handlers/pages/URLsHandler.test/create.test.js

@@ -1,7 +1,7 @@
 import URLsHandler from "../../../../handlers/pages/URLsHandler";
 import Pages from "../../../../cloud/Pages";
 import Factory from "../../../../../test/factory";
-import { testConfig } from "../../../../../test/handlersHelper";
+import { testConfig, remoteConfig } from "../../../../../test/handlersHelper";
 
 function buildCtx(page, updateSettings) {
   return {
@@ -13,6 +13,7 @@ function buildCtx(page, updateSettings) {
       change: updateSettings,
     },
     locale: "en",
+    remoteConfig: remoteConfig(),
   };
 }
 
@@ -44,7 +45,7 @@ describe("Page change url", () => {
       updateSettings.slug,
       "en",
       {
-        url: `/${page.slug}`,
+        url: `/en/${page.slug}`,
         destination: updateSettings.slug,
         httpResponseCode: 301,
         note: "Created with changed URL for a page",
@@ -132,7 +133,7 @@ describe("Page change url", () => {
       updateSettings.slug,
       "en",
       {
-        url: `/${page.slug}`,
+        url: `/en/${page.slug}`,
         destination: updateSettings.slug,
         httpResponseCode: 301,
         note: "Created with changed URL for a page",

package/test/factory.js

@@ -29,7 +29,7 @@ const PAGE = {
   originalId: null,
   insertedAt: "2024-08-30T19:05:00Z",
   tags: [],
-  pageType: {},
+  pageType: { slug: "page" },
   categories: [],
 };
 
@@ -50,7 +50,7 @@ const ARTICLE = {
   originalId: null,
   insertedAt: "2024-08-30T19:05:00Z",
   tags: [],
-  articleType: {},
+  articleType: { slug: "article" },
   categories: [],
 };
 
@@ -73,7 +73,7 @@ const EVENT = {
   originalId: null,
   insertedAt: "2024-08-30T19:05:00Z",
   tags: [],
-  articleType: {},
+  eventType: { slug: "event" },
   categories: [],
 };
 

package/test/handlersHelper.js

@@ -6,4 +6,26 @@ function testConfig() {
   };
 }
 
-export { testConfig };
+function remoteConfig() {
+  return {
+    resourcePath: (resource, resourceType, locale) => {
+      const PREFIX_MAP = {
+        page: "/",
+        article: "/blog",
+        event: "/events",
+      };
+
+      const prefix = PREFIX_MAP[resourceType];
+
+      if (!prefix) {
+        throw new Error(`Unknown resource type: ${resourceType}`);
+      }
+
+      return [`/${locale}`, prefix, "/", resource.slug]
+        .join("")
+        .replace("//", "/");
+    },
+  };
+}
+
+export { testConfig, remoteConfig };