@raketa-cloud/admin 0.0.25 → 0.0.26

package/src/routeArticlesModule.js

@@ -26,14 +26,14 @@ function routeArticlesModule(
   const baseResource = articleTypePlural;
   const revisionsBaseResource = `${articleType}_revisions`;
 
-  const handlerOpts = {
+  const resourceConfig = {
     articleType,
     articleTypePlural,
   };
 
   routeCollection(adapter, baseResource, ArticlesHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "articles",
+    ...resourceConfig,
+    viewsFallback: "articles",
   });
 
   routeNestedCollection(
@@ -41,7 +41,7 @@ function routeArticlesModule(
     baseResource,
     "translations",
     TranslationsHandler,
-    { ...handlerOpts, packageViewsFallback: "articles/translations" }
+    { ...resourceConfig, viewsFallback: "articles/translations" }
   );
 
   routeNestedCollection(
@@ -49,37 +49,37 @@ function routeArticlesModule(
     baseResource,
     revisionsBaseResource,
     ArticleRevisionsHandler,
-    { ...handlerOpts, packageViewsFallback: "articles/article_revisions" }
+    { ...resourceConfig, viewsFallback: "articles/article_revisions" }
   );
 
   routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "article_revisions/general",
+    ...resourceConfig,
+    viewsFallback: "article_revisions/general",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "article_revisions/visuals",
+    ...resourceConfig,
+    viewsFallback: "article_revisions/visuals",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "article_revisions/codes",
+    ...resourceConfig,
+    viewsFallback: "article_revisions/codes",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "article_revisions/meta",
+    ...resourceConfig,
+    viewsFallback: "article_revisions/meta",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "article_revisions/tags",
+    ...resourceConfig,
+    viewsFallback: "article_revisions/tags",
   });
 
   routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "article_revisions/locks",
+    ...resourceConfig,
+    viewsFallback: "article_revisions/locks",
   });
 
   routeNestedCollection(
@@ -87,22 +87,22 @@ function routeArticlesModule(
     revisionsBaseResource,
     "unlocks",
     UnlocksHandler,
-    { ...handlerOpts, packageViewsFallback: "article_revisions/unlocks" }
+    { ...resourceConfig, viewsFallback: "article_revisions/unlocks" }
   );
 
   routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "articles/clones",
+    ...resourceConfig,
+    viewsFallback: "articles/clones",
   });
 
   routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "articles/urls",
+    ...resourceConfig,
+    viewsFallback: "articles/urls",
   });
 
   routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "articles/deletes",
+    ...resourceConfig,
+    viewsFallback: "articles/deletes",
   });
 
   routeNestedCollection(
@@ -110,7 +110,7 @@ function routeArticlesModule(
     baseResource,
     `${articleType}_changes/reverts`,
     RevertsHandler,
-    { ...handlerOpts, packageViewsFallback: "article_changes/reverts" }
+    { ...resourceConfig, viewsFallback: "article_changes/reverts" }
   );
 
   routeNestedCollection(
@@ -118,7 +118,7 @@ function routeArticlesModule(
     revisionsBaseResource,
     "publishes",
     PublishesHandler,
-    { ...handlerOpts, packageViewsFallback: "article_revisions/publishes" }
+    { ...resourceConfig, viewsFallback: "article_revisions/publishes" }
   );
 
   routeNestedMember(
@@ -126,7 +126,7 @@ function routeArticlesModule(
     `api/${revisionsBaseResource}`,
     "widgets",
     WidgetHandler,
-    handlerOpts
+    resourceConfig
   );
 }
 

package/src/routeCollection.js

@@ -1,4 +1,4 @@
-const routeCollection = (adapter, resource, handler, handlerOpts = {}) => {
+const routeCollection = (adapter, resource, handler, resourceConfig = {}) => {
   const {
     before_filter,
     after_filter,
@@ -84,7 +84,7 @@ const routeCollection = (adapter, resource, handler, handlerOpts = {}) => {
     ],
   ];
 
-  adapter.routeCollection(mapping, handlerOpts);
+  adapter.routeCollection(mapping, resourceConfig);
 };
 
 export default routeCollection;

package/src/routeEventsModule.js

@@ -26,14 +26,14 @@ function routeEventsModule(
   const baseResource = eventTypePlural;
   const revisionsBaseResource = `${eventType}_revisions`;
 
-  const handlerOpts = {
+  const resourceConfig = {
     eventType,
     eventTypePlural,
   };
 
   routeCollection(adapter, baseResource, EventsHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "events",
+    ...resourceConfig,
+    viewsFallback: "events",
   });
 
   routeNestedCollection(
@@ -42,8 +42,8 @@ function routeEventsModule(
     "translations",
     TranslationsHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "events/translations",
+      ...resourceConfig,
+      viewsFallback: "events/translations",
     }
   );
 
@@ -53,39 +53,39 @@ function routeEventsModule(
     revisionsBaseResource,
     EventRevisionsHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "events/event_revisions",
+      ...resourceConfig,
+      viewsFallback: "events/event_revisions",
     }
   );
 
   routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "event_revisions/general",
+    ...resourceConfig,
+    viewsFallback: "event_revisions/general",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "event_revisions/visuals",
+    ...resourceConfig,
+    viewsFallback: "event_revisions/visuals",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "event_revisions/codes",
+    ...resourceConfig,
+    viewsFallback: "event_revisions/codes",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "event_revisions/meta",
+    ...resourceConfig,
+    viewsFallback: "event_revisions/meta",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "event_revisions/tags",
+    ...resourceConfig,
+    viewsFallback: "event_revisions/tags",
   });
 
   routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "event_revisions/locs",
+    ...resourceConfig,
+    viewsFallback: "event_revisions/locks",
   });
 
   routeNestedCollection(
@@ -94,24 +94,24 @@ function routeEventsModule(
     "unlocks",
     UnlocksHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "event_revisions/unlocks",
+      ...resourceConfig,
+      viewsFallback: "event_revisions/unlocks",
     }
   );
 
   routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "events/clones",
+    ...resourceConfig,
+    viewsFallback: "events/clones",
   });
 
   routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "events/urls",
+    ...resourceConfig,
+    viewsFallback: "events/urls",
   });
 
   routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "events/deletes",
+    ...resourceConfig,
+    viewsFallback: "events/deletes",
   });
 
   routeNestedCollection(
@@ -120,8 +120,8 @@ function routeEventsModule(
     `${eventType}_changes/reverts`,
     RevertsHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "event_changes/reverts",
+      ...resourceConfig,
+      viewsFallback: "event_changes/reverts",
     }
   );
 
@@ -131,8 +131,8 @@ function routeEventsModule(
     "publishes",
     PublishesHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "event_revisions/publishes",
+      ...resourceConfig,
+      viewsFallback: "event_revisions/publishes",
     }
   );
 
@@ -141,7 +141,7 @@ function routeEventsModule(
     `api/${revisionsBaseResource}`,
     "widgets",
     WidgetHandler,
-    handlerOpts
+    resourceConfig
   );
 }
 

package/src/routeMember.js

@@ -1,4 +1,4 @@
-const routeMember = (adapter, resource, handler, handlerOpts = {}) => {
+const routeMember = (adapter, resource, handler, resourceConfig = {}) => {
   const { before_filter, after_filter, show, edit_form, update } = handler;
 
   const mapping = [
@@ -34,7 +34,7 @@ const routeMember = (adapter, resource, handler, handlerOpts = {}) => {
     ],
   ];
 
-  adapter.routeMember(mapping, handlerOpts);
+  adapter.routeMember(mapping, resourceConfig);
 };
 
 export default routeMember;

package/src/routeNestedCollection.js

@@ -3,7 +3,7 @@ const routeNestedCollection = (
   parent,
   resource,
   handler,
-  handlerOpts = {}
+  resourceConfig = {}
 ) => {
   const {
     before_filter,
@@ -90,7 +90,7 @@ const routeNestedCollection = (
     ],
   ];
 
-  adapter.routeNestedCollection(mapping, handlerOpts);
+  adapter.routeNestedCollection(mapping, resourceConfig);
 };
 
 export default routeNestedCollection;

package/src/routeNestedMember.js

@@ -3,7 +3,7 @@ const routeNestedMember = (
   parent,
   resource,
   handler,
-  handlerOpts = {}
+  resourceConfig = {}
 ) => {
   const { before_filter, after_filter, show, edit_form, update } = handler;
 
@@ -40,7 +40,7 @@ const routeNestedMember = (
     ],
   ];
 
-  adapter.routeNestedMember(mapping, handlerOpts);
+  adapter.routeNestedMember(mapping, resourceConfig);
 };
 
 export default routeNestedMember;

package/src/routePagesModule.js

@@ -26,14 +26,14 @@ function routePagesModule(
   const baseResource = pageTypePlural;
   const revisionsBaseResource = `${pageType}_revisions`;
 
-  const handlerOpts = {
+  const resourceConfig = {
     pageType,
     pageTypePlural,
   };
 
   routeCollection(adapter, pageTypePlural, PagesHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "pages",
+    ...resourceConfig,
+    viewsFallback: "pages",
   });
 
   routeNestedCollection(
@@ -41,7 +41,7 @@ function routePagesModule(
     baseResource,
     "translations",
     TranslationsHandler,
-    { ...handlerOpts, packageViewsFallback: "pages/translations" }
+    { ...resourceConfig, viewsFallback: "pages/translations" }
   );
 
   routeNestedCollection(
@@ -50,39 +50,39 @@ function routePagesModule(
     revisionsBaseResource,
     PageRevisionsHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "pages/page_revisions",
+      ...resourceConfig,
+      viewsFallback: "pages/page_revisions",
     }
   );
 
   routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "page_revisions/general",
+    ...resourceConfig,
+    viewsFallback: "page_revisions/general",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "page_revisions/visual",
+    ...resourceConfig,
+    viewsFallback: "page_revisions/visuals",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "page_revisions/codes",
+    ...resourceConfig,
+    viewsFallback: "page_revisions/codes",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "page_revisions/meta",
+    ...resourceConfig,
+    viewsFallback: "page_revisions/meta",
   });
 
   routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "page_revisions/tags",
+    ...resourceConfig,
+    viewsFallback: "page_revisions/tags",
   });
 
   routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "page_revisions/locks",
+    ...resourceConfig,
+    viewsFallback: "page_revisions/locks",
   });
 
   routeNestedCollection(
@@ -91,24 +91,24 @@ function routePagesModule(
     "unlocks",
     UnlocksHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "page_revisions/unlocks",
+      ...resourceConfig,
+      viewsFallback: "page_revisions/unlocks",
     }
   );
 
   routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "pages/clones",
+    ...resourceConfig,
+    viewsFallback: "pages/clones",
   });
 
   routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "pages/urls",
+    ...resourceConfig,
+    viewsFallback: "pages/urls",
   });
 
   routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
-    ...handlerOpts,
-    packageViewsFallback: "pages/deletes",
+    ...resourceConfig,
+    viewsFallback: "pages/deletes",
   });
 
   routeNestedCollection(
@@ -117,8 +117,8 @@ function routePagesModule(
     `${pageType}_changes/reverts`,
     RevertsHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "page_changes/reverts",
+      ...resourceConfig,
+      viewsFallback: "page_changes/reverts",
     }
   );
 
@@ -128,8 +128,8 @@ function routePagesModule(
     "publishes",
     PublishesHandler,
     {
-      ...handlerOpts,
-      packageViewsFallback: "page_revisions/publishes",
+      ...resourceConfig,
+      viewsFallback: "page_revisions/publishes",
     }
   );
 
@@ -138,7 +138,7 @@ function routePagesModule(
     `api/${revisionsBaseResource}`,
     "widgets",
     WidgetHandler,
-    handlerOpts
+    resourceConfig
   );
 }
 

package/src/tests/handlers/article_revisions/ArticleRevisionsHandler.test/create.test.js

@@ -10,6 +10,10 @@ function buildCtx(articleID) {
     },
     params: { parent_id: articleID },
     locale: "en",
+    resourceConfig: {
+      articleType: "article",
+      articleTypePlural: "articles",
+    },
   };
 }
 
@@ -26,10 +30,7 @@ describe("Article revisions", () => {
         articleErrors: null,
       }));
 
-    const result = await ArticleRevisionsHandler.create(ctx, {
-      articleType: "article",
-      articleTypePlural: "articles",
-    });
+    const result = await ArticleRevisionsHandler.create(ctx);
 
     expect(mockCreate).toHaveBeenCalledWith(revision.originalId, "en");
 
@@ -51,10 +52,7 @@ describe("Article revisions", () => {
       }));
 
     expect(async () => {
-      await ArticleRevisionsHandler.create(ctx, {
-        articleType: "article",
-        articleTypePlural: "articles",
-      });
+      await ArticleRevisionsHandler.create(ctx);
     }).rejects.toThrow(`Failed to start revision: ${JSON.stringify(errors)}`);
 
     expect(mockCreate).toHaveBeenCalledWith(1, "en");
@@ -73,10 +71,7 @@ describe("Article revisions", () => {
       }));
 
     expect(async () => {
-      await ArticleRevisionsHandler.create(ctx, {
-        articleType: "article",
-        articleTypePlural: "articles",
-      });
+      await ArticleRevisionsHandler.create(ctx);
     }).rejects.toThrow(`Failed to start revision: ${JSON.stringify(errors)}`);
 
     expect(mockCreate).toHaveBeenCalledWith(1, "en");

package/src/tests/handlers/article_revisions/ArticleRevisionsHandler.test/destroy.test.js

@@ -10,6 +10,10 @@ function buildCtx(revisionID) {
     },
     params: { id: revisionID },
     locale: "en",
+    resourceConfig: {
+      articleType: "article",
+      articleTypePlural: "articles",
+    },
   };
 }
 
@@ -22,10 +26,7 @@ describe("Article revisions", () => {
       .spyOn(ctx.client.articleRevisions, "delete")
       .mockImplementation(() => ({ revision, errors: null }));
 
-    const result = await ArticleRevisionsHandler.destroy(ctx, {
-      articleType: "article",
-      articleTypePlural: "articles",
-    });
+    const result = await ArticleRevisionsHandler.destroy(ctx);
 
     expect(mockDelete).toHaveBeenCalledWith(1, "en");
 
@@ -46,10 +47,7 @@ describe("Article revisions", () => {
       .mockImplementation(() => ({ revision: null, errors }));
 
     expect(async () => {
-      await ArticleRevisionsHandler.destroy(ctx, {
-        articleType: "article",
-        articleTypePlural: "articles",
-      });
+      await ArticleRevisionsHandler.destroy(ctx);
     }).rejects.toThrow(
       `Failed to delete revision#${1}: ${JSON.stringify(errors)}`
     );

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

@@ -13,6 +13,10 @@ function buildCtx(revision, updateSettings) {
       code_settings: updateSettings,
     },
     locale: "en",
+    resourceConfig: {
+      articleType: "article",
+      articleTypePlural: "articles",
+    },
   };
 }
 
@@ -38,10 +42,7 @@ describe("Article revision code settings", () => {
         errors: null,
       }));
 
-    const result = await CodeHandler.update(ctx, {
-      articleType: "article",
-      articleTypePlural: "articles",
-    });
+    const result = await CodeHandler.update(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
     expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
@@ -87,10 +88,7 @@ describe("Article revision code settings", () => {
         errors: [{ key: "generalError", message: "some error" }],
       }));
 
-    const result = await CodeHandler.update(ctx, {
-      articleType: "article",
-      articleTypePlural: "articles",
-    });
+    const result = await CodeHandler.update(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
     expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
@@ -137,10 +135,7 @@ describe("Article revision code settings", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await CodeHandler.update(ctx, {
-        articleType: "article",
-        articleTypePlural: "articles",
-      });
+      await CodeHandler.update(ctx);
     }).rejects.toThrow(`Missing revision #${revision.id}`);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");

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

@@ -15,6 +15,10 @@ function buildCtx(revision, updateSettings) {
       general_settings: updateSettings,
     },
     locale: "en",
+    resourceConfig: {
+      articleType: "article",
+      articleTypePlural: "articles",
+    },
   };
 }
 
@@ -44,10 +48,7 @@ describe("Article revision general settings", () => {
         errors: null,
       }));
 
-    const result = await GeneralHandler.update(ctx, {
-      articleType: "article",
-      articleTypePlural: "articles",
-    });
+    const result = await GeneralHandler.update(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
     expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
@@ -97,10 +98,7 @@ describe("Article revision general settings", () => {
         errors: [{ key: "slug", message: "has invalid format" }],
       }));
 
-    const result = await GeneralHandler.update(ctx, {
-      articleType: "article",
-      articleTypePlural: "articles",
-    });
+    const result = await GeneralHandler.update(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
     expect(mockUpdate).toHaveBeenCalledWith(revision.id, "en", {
@@ -148,10 +146,7 @@ describe("Article revision general settings", () => {
       .mockImplementation(() => null);
 
     expect(async () => {
-      await GeneralHandler.update(ctx, {
-        articleType: "article",
-        articleTypePlural: "articles",
-      });
+      await GeneralHandler.update(ctx);
     }).rejects.toThrow(`Missing revision #${revision.id}`);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");