@raketa-cloud/next 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/next",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "src/index.js",
   "scripts": {
     "check-types": "tsc --noEmit",

package/src/dxp/private/Dxp.js

@@ -1,16 +1,12 @@
 import DxpClient from "./DxpClient";
-import Pages from "./Pages";
-import Articles from "./Articles";
-import Events from "./Events";
+import Resources from "./Resources";
 import Settings from "./Settings";
 import Tags from "./Tags";
 
 export default class Dxp {
   constructor(getConfig, getToken) {
     this.client = new DxpClient(getConfig, getToken);
-    this.pages = new Pages(this.client);
-    this.articles = new Articles(this.client);
-    this.events = new Events(this.client);
+    this.resources = new Resources(this.client);
     this.settings = new Settings(this.client);
     this.tags = new Tags(this.client);
   }

package/src/dxp/private/Resources.js

@@ -0,0 +1,31 @@
+import DxpModel from "./DxpModel";
+import {
+  ResourceChangePreviewDocument,
+  MiniResourcesDocument,
+} from "./documents/resourcesDocuments";
+
+export default class Resources extends DxpModel {
+  async changePreview(locale, id, version, resourceType) {
+    const response = await this.client.query(ResourceChangePreviewDocument, {
+      input: {
+        locale,
+        resourceId: id,
+        version,
+        resourceType,
+      },
+    });
+
+    return response?.resourceChangePreview;
+  }
+
+  async miniResources(locale, input = {}) {
+    const response = await this.client.query(MiniResourcesDocument, {
+      input: {
+        locale,
+        ...input,
+      },
+    });
+
+    return response?.miniResources;
+  }
+}

package/src/dxp/private/documents/common.js

@@ -22,16 +22,6 @@ export function categoryFragment() {
   `;
 }
 
-export function resourceTypeFragment() {
-  return gql`
-    {
-      id
-      slug
-      title
-    }
-  `;
-}
-
 export function paginationFragment() {
   return gql`
     {

package/src/dxp/private/documents/{pagesDocuments.js → resourcesDocuments.js}

@@ -1,12 +1,13 @@
 import { gql } from "../../graphql";
-import { tagFragment, categoryFragment, resourceTypeFragment } from "./common";
+import { tagFragment, categoryFragment } from "./common";
 
-const PageByIdDocument = gql`
-  query PageByID($input: IdInput!) {
-    page(input: $input) {
+const ResourceByIdDocument = gql`
+  query ResourceByID($input: IdInput!) {
+    resource(input: $input) {
       id
       slug
       title
+      resourceType
       widgets
       settings
       visibility
@@ -14,18 +15,18 @@ const PageByIdDocument = gql`
       revisionsCount
       tags ${tagFragment()}
       categories ${categoryFragment()}
-      pageType ${resourceTypeFragment()}
     }
   }
 `;
 
-const PageChangePreviewDocument = gql`
-  query ($input: PageChangePreviewInput!) {
-    pageChangePreview(input: $input) {
-      page {
+const ResourceChangePreviewDocument = gql`
+  query ($input: ResourceChangePreviewInput!) {
+    resourceChangePreview(input: $input) {
+      resource {
         id
         slug
         title
+        resourceType
         widgets
         settings
         visibility
@@ -33,9 +34,8 @@ const PageChangePreviewDocument = gql`
         websiteSettings
         tags ${tagFragment()}
         categories ${categoryFragment()}
-        pageType ${resourceTypeFragment()}
       }
-      pageChange {
+      resourceChange {
         version
         title
         description
@@ -48,9 +48,9 @@ const PageChangePreviewDocument = gql`
   }
 `;
 
-const MiniPagesDocument = gql`
-  query ($input: PagesInput!) {
-    miniPages(input: $input) {
+const MiniResourcesDocument = gql`
+  query ($input: ResourcesInput!) {
+    miniResources(input: $input) {
       list {
         id
         slug
@@ -61,4 +61,4 @@ const MiniPagesDocument = gql`
   }
 `;
 
-export { PageByIdDocument, PageChangePreviewDocument, MiniPagesDocument };
+export { ResourceByIdDocument, ResourceChangePreviewDocument, MiniResourcesDocument };

package/src/dxp/public/Dxp.js

@@ -1,7 +1,5 @@
 import DxpClient from "./DxpClient";
-import Pages from "./Pages";
-import Articles from "./Articles";
-import Events from "./Events";
+import Resources from "./Resources";
 import Settings from "./Settings";
 import Tags from "./Tags";
 import Redirects from "./Redirects";
@@ -9,9 +7,7 @@ import Redirects from "./Redirects";
 export default class Dxp {
   constructor(getConfig, cache) {
     this.client = new DxpClient(getConfig);
-    this.pages = new Pages(this.client, cache);
-    this.articles = new Articles(this.client, cache);
-    this.events = new Events(this.client, cache);
+    this.resources = new Resources(this.client, cache);
     this.setttings = new Settings(this.client, cache);
     this.tags = new Tags(this.client, cache);
     this.redirects = new Redirects(this.client, cache);

package/src/dxp/public/{Pages.js → Resources.js}

@@ -1,18 +1,18 @@
 import DxpModel from "./DxpModel";
-import { PageBySlugDocument, PagesDocument } from "./documents";
+import { ResourceBySlugDocument, ResourcesDocument } from "./documents";
 
-export default class Pages extends DxpModel {
+export default class Resources extends DxpModel {
   async find(locale, slug, resourceType, opts = {}) {
     const response = await this.fetch(
-      `page-${locale}-${slug}`,
+      `${resourceType}-${locale}-${slug}`,
       async () =>
         await this.client.query(
-          PageBySlugDocument,
+          ResourceBySlugDocument,
           {
             input: {
               locale,
               slug,
-              resourceType
+              resourceType,
             },
           },
           opts
@@ -20,20 +20,23 @@ export default class Pages extends DxpModel {
       opts
     );
 
-    return response?.page;
+    return response?.resource;
   }
 
   async list(locale, input = {}, opts = {}) {
+    const resourceType = input?.filters?.resourceType;
+    const cacheKey = `${resourceType}s-${locale}-${JSON.stringify(input)}`;
+
     const response = await this.fetch(
-      `pages-${locale}-${JSON.stringify(input)}`,
+      cacheKey,
       async () =>
         await this.client.query(
-          PagesDocument,
+          ResourcesDocument,
           this.formatPaginationInInput(locale, input),
           opts
         )
     );
 
-    return response?.pages;
+    return response?.resources;
   }
 }

package/src/dxp/public/documents.js

@@ -10,19 +10,6 @@ function tagFragment() {
   `;
 }
 
-function revisionFragment() {
-  return gql`
-    {
-      id
-      title
-      slug
-      settings
-      widgets
-      visibility
-    }
-  `;
-}
-
 function paginationFragment() {
   return gql`
     {
@@ -34,12 +21,15 @@ function paginationFragment() {
   `;
 }
 
-function resourceTypeFragment() {
+function revisionFragment() {
   return gql`
     {
       id
-      slug
       title
+      slug
+      settings
+      widgets
+      visibility
     }
   `;
 }
@@ -64,125 +54,62 @@ const CategoriesDocument = gql`
   }
 `;
 
-const ArticlesDocument = gql`
-  query Articles($input: ArticlesInput!) {
-    articles(input: $input) {
-      list {
-        id
-        slug
-        title
-        widgets
-        settings
-        publishAt
-        visibility
-        tags ${tagFragment()}
-        categories ${categoryFragment()}
-        articleType ${resourceTypeFragment()}
-      }
-
-      pagination ${paginationFragment()}
-    }
-  }
-`;
-
-const PageBySlugDocument = gql`
-  query PageBySlug($input: SlugInput!) {
-    page(input: $input) {
+const ResourceBySlugDocument = gql`
+  query ResourceBySlug($input: SlugTypeInput!) {
+    resource(input: $input) {
       id
       title
       slug
-      settings
+      resourceType
       widgets
-      websiteSettings
-      createdAt
-      updatedAt
+      settings
       visibility
+      tags ${tagFragment()}
       translations
-      pageType ${resourceTypeFragment()}
+      websiteSettings
       categories ${categoryFragment()}
-      tags ${tagFragment()}
-    }
-  }
-`;
-
-const PageRevisionPreviewDocument = gql`
-  query ($input: RevisionPreviewInput!) {
-    pageRevisionPreview(input: $input) {
-      page {
-        id
-        title
-        slug
-        settings
-        widgets
-        websiteSettings
-        createdAt
-        updatedAt
-        visibility
-        translations
-        pageType ${resourceTypeFragment()}
-        categories ${categoryFragment()}
-        tags ${tagFragment()}
-      }
-      revision ${revisionFragment()}
+      createdAt
+      updatedAt
     }
   }
 `;
 
-const PagesDocument = gql`
-  query Pages($input: PagesInput!) {
-    pages(input: $input) {
+const ResourcesDocument = gql`
+  query Resources($input: ResourcesInput!) {
+    resources(input: $input) {
       list {
         id
         slug
         title
+        resourceType
         widgets
         settings
         visibility
-        pageType ${resourceTypeFragment()}
-        categories ${categoryFragment()}
         tags ${tagFragment()}
+        categories ${categoryFragment()}
       }
       pagination ${paginationFragment()}
     }
   }
 `;
 
-const ArticleBySlugDocument = gql`
-  query ArticleBySlug($input: SlugInput!) {
-    article(input: $input) {
-      id
-      title
-      slug
-      settings
-      widgets
-      publishAt
-      updatedAt
-      websiteSettings
-      visibility
-      translations
-      articleType ${resourceTypeFragment()}
-      categories ${categoryFragment()}
-      tags ${tagFragment()}
-    }
-  }
-`;
-
-const ArticleRevisionPreviewDocument = gql`
+const ResourceRevisionPreviewDocument = gql`
   query ($input: RevisionPreviewInput!) {
-    articleRevisionPreview(input: $input) {
-      article {
+    resourceRevisionPreview(input: $input) {
+      resource {
         id
         title
         slug
+        resourceType
         settings
         widgets
-        publishAt
         websiteSettings
+        createdAt
+        updatedAt
         visibility
         translations
-        articleType ${resourceTypeFragment()}
-        categories ${categoryFragment()}
         tags ${tagFragment()}
+        categories ${categoryFragment()}
       }
       revision ${revisionFragment()}
     }
@@ -206,71 +133,6 @@ const TagBySlugDocument = gql`
   }
 `;
 
-const EventsDocument = gql`
-  query Events($input: EventsInput!) {
-    events(input: $input) {
-      list {
-        id
-        slug
-        title
-        widgets
-        settings
-        publishAt
-        startsAt
-        endsAt
-        visibility
-        eventType ${resourceTypeFragment()}
-        categories ${categoryFragment()}
-        tags ${tagFragment()}
-      }
-      pagination ${paginationFragment()}
-    }
-  }
-`;
-
-const EventBySlugDocument = gql`
-  query EventBySlug($input: SlugInput!) {
-    event(input: $input) {
-      id
-      title
-      slug
-      settings
-      widgets
-      publishAt
-      startsAt
-      endsAt
-      websiteSettings
-      visibility
-      translations
-      eventType ${resourceTypeFragment()}
-      categories ${categoryFragment()}
-      tags ${tagFragment()}
-    }
-  }
-`;
-
-const EventRevisionPreviewDocument = gql`
-  query ($input: RevisionPreviewInput!) {
-    eventRevisionPreview(input: $input) {
-      event {
-        id
-        title
-        slug
-        settings
-        widgets
-        publishAt
-        websiteSettings
-        visibility
-        translations
-        eventType ${resourceTypeFragment()}
-        categories ${categoryFragment()}
-        tags ${tagFragment()}
-      }
-      revision ${revisionFragment()}
-    }
-  }
-`;
-
 const RedirectDocument = gql`
   query ($input: UrlInput!) {
     redirect(input: $input) {
@@ -283,15 +145,9 @@ const RedirectDocument = gql`
 `;
 
 export {
-  ArticlesDocument,
-  ArticleBySlugDocument,
-  ArticleRevisionPreviewDocument,
-  PagesDocument,
-  PageBySlugDocument,
-  PageRevisionPreviewDocument,
-  EventsDocument,
-  EventBySlugDocument,
-  EventRevisionPreviewDocument,
+  ResourceBySlugDocument,
+  ResourcesDocument,
+  ResourceRevisionPreviewDocument,
   SettingDocument,
   CategoriesDocument,
   TagBySlugDocument,

package/src/dxp/private/Articles.js

@@ -1,30 +0,0 @@
-import DxpModel from "./DxpModel";
-import {
-  ArticleChangePreviewDocument,
-  MiniArticlesDocument,
-} from "./documents/articlesDocuments";
-
-export default class Pages extends DxpModel {
-  async articleChangePreview(locale, id, version) {
-    const response = await this.client.query(ArticleChangePreviewDocument, {
-      input: {
-        locale,
-        articleId: id,
-        version,
-      },
-    });
-
-    return response?.articleChangePreview;
-  }
-
-  async miniArticles(locale, input = {}) {
-    const response = await this.client.query(MiniArticlesDocument, {
-      input: {
-        locale,
-        ...input,
-      },
-    });
-
-    return response?.miniArticles;
-  }
-}

package/src/dxp/private/Events.js

@@ -1,30 +0,0 @@
-import DxpModel from "./DxpModel";
-import {
-  EventChangePreviewDocument,
-  MiniEventsDocument,
-} from "./documents/eventsDocuments";
-
-export default class Pages extends DxpModel {
-  async eventChangePreview(locale, id, version) {
-    const response = await this.client.query(EventChangePreviewDocument, {
-      input: {
-        locale,
-        eventId: id,
-        version,
-      },
-    });
-
-    return response?.eventChangePreview;
-  }
-
-  async miniEvents(locale, input = {}) {
-    const response = await this.client.query(MiniEventsDocument, {
-      input: {
-        locale,
-        ...input,
-      },
-    });
-
-    return response?.miniEvents;
-  }
-}

package/src/dxp/private/Pages.js

@@ -1,30 +0,0 @@
-import DxpModel from "./DxpModel";
-import {
-  PageChangePreviewDocument,
-  MiniPagesDocument,
-} from "./documents/pagesDocuments";
-
-export default class Pages extends DxpModel {
-  async pageChangePreview(locale, id, version) {
-    const response = await this.client.query(PageChangePreviewDocument, {
-      input: {
-        locale,
-        pageId: id,
-        version,
-      },
-    });
-
-    return response?.pageChangePreview;
-  }
-
-  async miniPages(locale, input = {}) {
-    const response = await this.client.query(MiniPagesDocument, {
-      input: {
-        locale,
-        ...input,
-      },
-    });
-
-    return response?.miniPages;
-  }
-}

package/src/dxp/private/documents/articlesDocuments.js

@@ -1,69 +0,0 @@
-import { gql } from "../../graphql";
-import { tagFragment, categoryFragment, resourceTypeFragment } from "./common";
-
-const ArticleByIdDocument = gql`
-  query ArticleByID($input: IdInput!) {
-    article(input: $input) {
-      id
-      slug
-      title
-      widgets
-      settings
-      visibility
-      publishAt
-      translations
-      tags ${tagFragment()}
-      categories ${categoryFragment()}
-      articleType ${resourceTypeFragment()}
-    }
-  }
-`;
-
-const ArticleChangePreviewDocument = gql`
-  query ($input: ArticleChangePreviewInput!) {
-    articleChangePreview(input: $input) {
-      article {
-        id
-        slug
-        title
-        widgets
-        settings
-        visibility
-        publishAt
-        translations
-        websiteSettings
-        tags ${tagFragment()}
-        categories ${categoryFragment()}
-        articleType ${resourceTypeFragment()}
-      }
-      articleChange {
-        version
-        title
-        description
-        operator
-        operatorMeta
-        source
-        insertedAt
-      }
-    }
-  }
-`;
-
-const MiniArticlesDocument = gql`
-  query ($input: ArticlesInput!) {
-    miniArticles(input: $input) {
-      list {
-        id
-        slug
-        title
-        visibility
-      }
-    }
-  }
-`;
-
-export {
-  ArticleByIdDocument,
-  ArticleChangePreviewDocument,
-  MiniArticlesDocument,
-};

package/src/dxp/private/documents/eventsDocuments.js

@@ -1,69 +0,0 @@
-import { gql } from "../../graphql";
-import { tagFragment, categoryFragment, resourceTypeFragment } from "./common";
-
-const EventByIdDocument = gql`
-  query EventByID($input: IdInput!) {
-    event(input: $input) {
-      id
-      slug
-      title
-      widgets
-      settings
-      visibility
-      publishAt
-      startsAt
-      endsAt
-      translations
-      tags ${tagFragment()}
-      categories ${categoryFragment()}
-      eventType ${resourceTypeFragment()}
-    }
-  }
-`;
-
-const EventChangePreviewDocument = gql`
-  query ($input: EventChangePreviewInput!) {
-    eventChangePreview(input: $input) {
-      event {
-        id
-        slug
-        title
-        widgets
-        settings
-        visibility
-        publishAt
-        startsAt
-        endsAt
-        translations
-        websiteSettings
-        tags ${tagFragment()}
-        categories ${categoryFragment()}
-        eventType ${resourceTypeFragment()}
-      }
-      eventChange {
-        version
-        title
-        description
-        operator
-        operatorMeta
-        source
-        insertedAt
-      }
-    }
-  }
-`;
-
-const MiniEventsDocument = gql`
-  query ($input: EventsInput!) {
-    miniEvents(input: $input) {
-      list {
-        id
-        slug
-        title
-        visibility
-      }
-    }
-  }
-`;
-
-export { EventByIdDocument, EventChangePreviewDocument, MiniEventsDocument };

package/src/dxp/public/Articles.js

@@ -1,39 +0,0 @@
-import DxpModel from "./DxpModel";
-import { ArticleBySlugDocument, ArticlesDocument } from "./documents";
-
-export default class Articles extends DxpModel {
-  async find(locale, slug, resourceType = null, opts = {}) {
-    const response = await this.fetch(
-      `article-${locale}-${slug}`,
-      async () =>
-        await this.client.query(
-          ArticleBySlugDocument,
-          {
-            input: {
-              locale,
-              slug,
-              resourceType
-            },
-          },
-          opts
-        ),
-      opts
-    );
-
-    return response?.article;
-  }
-
-  async list(locale, input = {}, opts = {}) {
-    const response = await this.fetch(
-      `articles-${locale}-${JSON.stringify(input)}`,
-      async () =>
-        await this.client.query(
-          ArticlesDocument,
-          this.formatPaginationInInput(locale, input),
-          opts
-        )
-    );
-
-    return response?.articles;
-  }
-}

package/src/dxp/public/Events.js

@@ -1,39 +0,0 @@
-import DxpModel from "./DxpModel";
-import { EventBySlugDocument, EventsDocument } from "./documents";
-
-export default class Events extends DxpModel {
-  async find(locale, slug, resourceType = null, opts = {}) {
-    const response = await this.fetch(
-      `event-${locale}-${slug}`,
-      async () =>
-        await this.client.query(
-          EventBySlugDocument,
-          {
-            input: {
-              locale,
-              slug,
-              resourceType
-            },
-          },
-          opts
-        ),
-      opts
-    );
-
-    return response?.event;
-  }
-
-  async list(locale, input = {}, opts = {}) {
-    const response = await this.fetch(
-      `events-${locale}-${JSON.stringify(input)}`,
-      async () =>
-        await this.client.query(
-          EventsDocument,
-          this.formatPaginationInInput(locale, input),
-          opts
-        )
-    );
-
-    return response?.events;
-  }
-}