@raketa-cloud/admin 0.0.24 → 0.0.26

package/src/routeArticlesModule.js

@@ -26,116 +26,107 @@ function routeArticlesModule(
   const baseResource = articleTypePlural;
   const revisionsBaseResource = `${articleType}_revisions`;
 
-  const handlerOpts = {
+  const resourceConfig = {
     articleType,
     articleTypePlural,
   };
 
-  routeCollection(adapter, baseResource, ArticlesHandler, handlerOpts);
+  routeCollection(adapter, baseResource, ArticlesHandler, {
+    ...resourceConfig,
+    viewsFallback: "articles",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     "translations",
     TranslationsHandler,
-    handlerOpts
+    { ...resourceConfig, viewsFallback: "articles/translations" }
   );
+
   routeNestedCollection(
     adapter,
     baseResource,
     revisionsBaseResource,
     ArticleRevisionsHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "general",
-    GeneralHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "visuals",
-    VisualHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "codes",
-    CodeHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "meta",
-    MetaHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "tags",
-    TagHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    revisionsBaseResource,
-    "locks",
-    LocksHandler,
-    handlerOpts
+    { ...resourceConfig, viewsFallback: "articles/article_revisions" }
   );
+
+  routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
+    ...resourceConfig,
+    viewsFallback: "article_revisions/general",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
+    ...resourceConfig,
+    viewsFallback: "article_revisions/visuals",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
+    ...resourceConfig,
+    viewsFallback: "article_revisions/codes",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
+    ...resourceConfig,
+    viewsFallback: "article_revisions/meta",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
+    ...resourceConfig,
+    viewsFallback: "article_revisions/tags",
+  });
+
+  routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
+    ...resourceConfig,
+    viewsFallback: "article_revisions/locks",
+  });
+
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "unlocks",
     UnlocksHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "clones",
-    ClonesHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "urls",
-    URLsHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "deletes",
-    DeletesHandler,
-    handlerOpts
+    { ...resourceConfig, viewsFallback: "article_revisions/unlocks" }
   );
+
+  routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
+    ...resourceConfig,
+    viewsFallback: "articles/clones",
+  });
+
+  routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
+    ...resourceConfig,
+    viewsFallback: "articles/urls",
+  });
+
+  routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
+    ...resourceConfig,
+    viewsFallback: "articles/deletes",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     `${articleType}_changes/reverts`,
     RevertsHandler,
-    handlerOpts
+    { ...resourceConfig, viewsFallback: "article_changes/reverts" }
   );
+
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "publishes",
     PublishesHandler,
-    handlerOpts
+    { ...resourceConfig, viewsFallback: "article_revisions/publishes" }
   );
+
   routeNestedMember(
     adapter,
     `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,116 +26,122 @@ function routeEventsModule(
   const baseResource = eventTypePlural;
   const revisionsBaseResource = `${eventType}_revisions`;
 
-  const handlerOpts = {
+  const resourceConfig = {
     eventType,
     eventTypePlural,
   };
 
-  routeCollection(adapter, baseResource, EventsHandler, handlerOpts);
+  routeCollection(adapter, baseResource, EventsHandler, {
+    ...resourceConfig,
+    viewsFallback: "events",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     "translations",
     TranslationsHandler,
-    handlerOpts
+    {
+      ...resourceConfig,
+      viewsFallback: "events/translations",
+    }
   );
+
   routeNestedCollection(
     adapter,
     baseResource,
     revisionsBaseResource,
     EventRevisionsHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "general",
-    GeneralHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "visuals",
-    VisualHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "codes",
-    CodeHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "meta",
-    MetaHandler,
-    handlerOpts
-  );
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "tags",
-    TagHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    revisionsBaseResource,
-    "locks",
-    LocksHandler,
-    handlerOpts
+    {
+      ...resourceConfig,
+      viewsFallback: "events/event_revisions",
+    }
   );
+
+  routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
+    ...resourceConfig,
+    viewsFallback: "event_revisions/general",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
+    ...resourceConfig,
+    viewsFallback: "event_revisions/visuals",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
+    ...resourceConfig,
+    viewsFallback: "event_revisions/codes",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
+    ...resourceConfig,
+    viewsFallback: "event_revisions/meta",
+  });
+
+  routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
+    ...resourceConfig,
+    viewsFallback: "event_revisions/tags",
+  });
+
+  routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
+    ...resourceConfig,
+    viewsFallback: "event_revisions/locks",
+  });
+
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "unlocks",
     UnlocksHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "clones",
-    ClonesHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "urls",
-    URLsHandler,
-    handlerOpts
-  );
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "deletes",
-    DeletesHandler,
-    handlerOpts
+    {
+      ...resourceConfig,
+      viewsFallback: "event_revisions/unlocks",
+    }
   );
+
+  routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
+    ...resourceConfig,
+    viewsFallback: "events/clones",
+  });
+
+  routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
+    ...resourceConfig,
+    viewsFallback: "events/urls",
+  });
+
+  routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
+    ...resourceConfig,
+    viewsFallback: "events/deletes",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     `${eventType}_changes/reverts`,
     RevertsHandler,
-    handlerOpts
+    {
+      ...resourceConfig,
+      viewsFallback: "event_changes/reverts",
+    }
   );
+
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "publishes",
     PublishesHandler,
-    handlerOpts
+    {
+      ...resourceConfig,
+      viewsFallback: "event_revisions/publishes",
+    }
   );
+
   routeNestedMember(
     adapter,
     `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,18 +26,22 @@ function routePagesModule(
   const baseResource = pageTypePlural;
   const revisionsBaseResource = `${pageType}_revisions`;
 
-  const handlerOpts = {
+  const resourceConfig = {
     pageType,
     pageTypePlural,
   };
 
-  routeCollection(adapter, pageTypePlural, PagesHandler, handlerOpts);
+  routeCollection(adapter, pageTypePlural, PagesHandler, {
+    ...resourceConfig,
+    viewsFallback: "pages",
+  });
+
   routeNestedCollection(
     adapter,
     baseResource,
     "translations",
     TranslationsHandler,
-    handlerOpts
+    { ...resourceConfig, viewsFallback: "pages/translations" }
   );
 
   routeNestedCollection(
@@ -45,94 +49,77 @@ function routePagesModule(
     baseResource,
     revisionsBaseResource,
     PageRevisionsHandler,
-    handlerOpts
+    {
+      ...resourceConfig,
+      viewsFallback: "pages/page_revisions",
+    }
   );
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "general",
-    GeneralHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "general", GeneralHandler, {
+    ...resourceConfig,
+    viewsFallback: "page_revisions/general",
+  });
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "visuals",
-    VisualHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "visuals", VisualHandler, {
+    ...resourceConfig,
+    viewsFallback: "page_revisions/visuals",
+  });
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "codes",
-    CodeHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "codes", CodeHandler, {
+    ...resourceConfig,
+    viewsFallback: "page_revisions/codes",
+  });
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "meta",
-    MetaHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "meta", MetaHandler, {
+    ...resourceConfig,
+    viewsFallback: "page_revisions/meta",
+  });
 
-  routeNestedMember(
-    adapter,
-    revisionsBaseResource,
-    "tags",
-    TagHandler,
-    handlerOpts
-  );
+  routeNestedMember(adapter, revisionsBaseResource, "tags", TagHandler, {
+    ...resourceConfig,
+    viewsFallback: "page_revisions/tags",
+  });
 
-  routeNestedCollection(
-    adapter,
-    revisionsBaseResource,
-    "locks",
-    LocksHandler,
-    handlerOpts
-  );
+  routeNestedCollection(adapter, revisionsBaseResource, "locks", LocksHandler, {
+    ...resourceConfig,
+    viewsFallback: "page_revisions/locks",
+  });
 
   routeNestedCollection(
     adapter,
     revisionsBaseResource,
     "unlocks",
-    UnlocksHandler
+    UnlocksHandler,
+    {
+      ...resourceConfig,
+      viewsFallback: "page_revisions/unlocks",
+    }
   );
 
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "clones",
-    ClonesHandler,
-    handlerOpts
-  );
+  routeNestedCollection(adapter, baseResource, "clones", ClonesHandler, {
+    ...resourceConfig,
+    viewsFallback: "pages/clones",
+  });
 
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "urls",
-    URLsHandler,
-    handlerOpts
-  );
+  routeNestedCollection(adapter, baseResource, "urls", URLsHandler, {
+    ...resourceConfig,
+    viewsFallback: "pages/urls",
+  });
 
-  routeNestedCollection(
-    adapter,
-    baseResource,
-    "deletes",
-    DeletesHandler,
-    handlerOpts
-  );
+  routeNestedCollection(adapter, baseResource, "deletes", DeletesHandler, {
+    ...resourceConfig,
+    viewsFallback: "pages/deletes",
+  });
 
   routeNestedCollection(
     adapter,
     baseResource,
     `${pageType}_changes/reverts`,
     RevertsHandler,
-    handlerOpts
+    {
+      ...resourceConfig,
+      viewsFallback: "page_changes/reverts",
+    }
   );
 
   routeNestedCollection(
@@ -140,7 +127,10 @@ function routePagesModule(
     revisionsBaseResource,
     "publishes",
     PublishesHandler,
-    handlerOpts
+    {
+      ...resourceConfig,
+      viewsFallback: "page_revisions/publishes",
+    }
   );
 
   routeNestedMember(
@@ -148,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");