@raketa-cloud/admin 0.0.59 → 0.0.64

package/package.json

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

package/src/cloud/Articles.js

@@ -7,7 +7,7 @@ import {
   DeleteArticleDocument,
   TranslateArticleDocument,
   ChangeArticleSlugDocument,
-  MinimalArticlesDocument,
+  MiniArticlesDocument,
 } from "./documents/articlesDocuments";
 import { toDateTimeInput, toUTCISO8601String } from "../utils";
 
@@ -42,19 +42,6 @@ export default class Articles extends RaketaClient {
     ];
   }
 
-  async minimal(query, locale, articleTypeSlug) {
-    const vars = this.buildListInput(query, locale);
-
-    const { articles: items } = await this.query(MinimalArticlesDocument, {
-      input: {
-        ...vars.input,
-        filters: { ...vars.input.filters, articleTypeSlug },
-      },
-    });
-
-    return items;
-  }
-
   async find(id, locale) {
     const { article: item } = await this.query(ArticleByIdDocument, {
       input: {
@@ -66,36 +53,10 @@ export default class Articles extends RaketaClient {
     return item;
   }
 
-  async minimalAll(query, locale, articleTypeSlug) {
-    const vars = this.buildAllInput(query, locale);
-
-    const { articles: items } = await this.query(MinimalArticlesDocument, {
-      input: {
-        ...vars.input,
-        filters: { ...vars.input.filters, articleTypeSlug },
-      },
-    });
-
-    return items;
-  }
-
-  async minimalList(query, locale, articleTypeSlug) {
-    const vars = this.buildListInput(query, locale);
-
-    const { articles: items } = await this.query(MinimalArticlesDocument, {
-      input: {
-        ...vars.input,
-        filters: { ...vars.input.filters, articleTypeSlug },
-      },
-    });
-
-    return items;
-  }
-
-  async all(query, locale, articleTypeSlug) {
+  async listAll(query, locale, articleTypeSlug) {
     const vars = this.buildAllInput(query, locale);
 
-    const { articles: items } = await this.query(ArticlesDocument, {
+    const { miniArticles: items } = await this.query(MiniArticlesDocument, {
       input: {
         ...vars.input,
         filters: { ...vars.input.filters, articleTypeSlug },

package/src/cloud/Events.js

@@ -7,7 +7,7 @@ import {
   DeleteEventDocument,
   TranslateEventDocument,
   ChangeEventSlugDocument,
-  MinimalEventsDocument,
+  MiniEventsDocument,
 } from "./documents/eventsDocuments";
 import { toDateTimeInput, toUTCISO8601String } from "../utils";
 
@@ -63,36 +63,10 @@ export default class Events extends RaketaClient {
     return item;
   }
 
-  async minimalAll(query, locale, eventTypeSlug) {
+  async listAll(query, locale, eventTypeSlug) {
     const vars = this.buildAllInput(query, locale);
 
-    const { events: items } = await this.query(MinimalEventsDocument, {
-      input: {
-        ...vars.input,
-        filters: { ...vars.input.filters, eventTypeSlug },
-      },
-    });
-
-    return items;
-  }
-
-  async minimalList(query, locale, eventTypeSlug) {
-    const vars = this.buildListInput(query, locale);
-
-    const { events: items } = await this.query(MinimalEventsDocument, {
-      input: {
-        ...vars.input,
-        filters: { ...vars.input.filters, eventTypeSlug },
-      },
-    });
-
-    return items;
-  }
-
-  async all(query, locale, eventTypeSlug) {
-    const vars = this.buildAllInput(query, locale);
-
-    const { events: items } = await this.query(EventsDocument, {
+    const { miniEvents: items } = await this.query(MiniEventsDocument, {
       input: {
         ...vars.input,
         filters: { ...vars.input.filters, eventTypeSlug },

package/src/cloud/Pages.js

@@ -7,7 +7,7 @@ import {
   DeletePageDocument,
   TranslatePageDocument,
   ChangePageSlugDocument,
-  MinimalPagesDocument,
+  MiniPagesDocument,
 } from "./documents/pagesDocuments";
 
 export default class Pages extends RaketaClient {
@@ -43,36 +43,10 @@ export default class Pages extends RaketaClient {
     return item;
   }
 
-  async minimalAll(query, locale, pageTypeSlug) {
+  async listAll(query, locale, pageTypeSlug) {
     const vars = this.buildAllInput(query, locale);
 
-    const { pages: items } = await this.query(MinimalPagesDocument, {
-      input: {
-        ...vars.input,
-        filters: { ...vars.input.filters, pageTypeSlug },
-      },
-    });
-
-    return items;
-  }
-
-  async minimalList(query, locale, pageTypeSlug) {
-    const vars = this.buildListInput(query, locale);
-
-    const { pages: items } = await this.query(MinimalPagesDocument, {
-      input: {
-        ...vars.input,
-        filters: { ...vars.input.filters, pageTypeSlug },
-      },
-    });
-
-    return items;
-  }
-
-  async all(query, locale, pageTypeSlug) {
-    const vars = this.buildAllInput(query, locale);
-
-    const { pages: items } = await this.query(PagesDocument, {
+    const { miniPages: items } = await this.query(MiniPagesDocument, {
       input: {
         ...vars.input,
         filters: { ...vars.input.filters, pageTypeSlug },

package/src/cloud/documents/articlesDocuments.js

@@ -6,6 +6,7 @@ import {
   paginationFragment,
   revisionMetaFragment,
   tagFragment,
+  summaryChangeFragment,
 } from "./common";
 
 function minimalArticleFragment() {
@@ -14,6 +15,8 @@ function minimalArticleFragment() {
       id
       slug
       title
+      visibility
+      publishAt
     }
   `;
 }
@@ -31,6 +34,9 @@ function articleFragment() {
       originalId
       translations
       revisionsCount
+      insertedAt
+      updatedAt
+      changes ${summaryChangeFragment()}
       tags ${tagFragment()}
       articleType ${articleTypeFragment()}
       categories ${categoryFragment()}
@@ -67,24 +73,15 @@ const ArticleByIdDocument = gql`
 const ArticleChangesDocument = gql`
   query ArticleChanges($input: IdInput!) {
     articleChanges(input: $input) {
-      list {
-        version
-        title
-        description
-        operator
-        operatorMeta
-        source
-        insertedAt
-      }
+      list ${summaryChangeFragment()}
     }
   }
 `;
 
-const MinimalArticlesDocument = gql`
-  query Articles($input: ArticlesInput!) {
-    articles(input: $input) {
+const MiniArticlesDocument = gql`
+  query MiniArticles($input: ArticlesInput!) {
+    miniArticles(input: $input) {
       list ${minimalArticleFragment()}
-      pagination ${paginationFragment()}
     }
   }
 `;
@@ -248,7 +245,7 @@ const UnlockArticleRevisionDocument = gql`
 export {
   ArticleByIdDocument,
   ArticlesDocument,
-  MinimalArticlesDocument,
+  MiniArticlesDocument,
   CreateArticleDocument,
   UpdateArticleDocument,
   UpdateArticleWidgetsDocument,

package/src/cloud/documents/common.js

@@ -102,3 +102,17 @@ export function categoryFragment() {
     }
   `;
 }
+
+export function summaryChangeFragment() {
+  return gql`
+    {
+      version
+      title
+      description
+      operator
+      operatorMeta
+      source
+      insertedAt
+    }
+  `;
+}

package/src/cloud/documents/eventsDocuments.js

@@ -6,6 +6,7 @@ import {
   paginationFragment,
   revisionMetaFragment,
   tagFragment,
+  summaryChangeFragment,
 } from "./common";
 
 function minimalEventFragment() {
@@ -14,6 +15,10 @@ function minimalEventFragment() {
       id
       slug
       title
+      visibility
+      publishAt
+      startsAt
+      endsAt
     }
   `;
 }
@@ -33,6 +38,9 @@ function eventFragment() {
       originalId
       translations
       revisionsCount
+      insertedAt
+      updatedAt
+      changes ${summaryChangeFragment()}
       tags ${tagFragment()}
       eventType ${eventTypeFragment()}
       categories ${categoryFragment()}
@@ -71,24 +79,15 @@ const EventByIdDocument = gql`
 const EventChangesDocument = gql`
   query EventChanges($input: IdInput!) {
     eventChanges(input: $input) {
-      list {
-        version
-        title
-        description
-        operator
-        operatorMeta
-        source
-        insertedAt
-      }
+      list ${summaryChangeFragment()}
     }
   }
 `;
 
-const MinimalEventsDocument = gql`
-  query MinimalEvents($input: EventsInput!) {
-    events(input: $input) {
+const MiniEventsDocument = gql`
+  query MiniEvents($input: EventsInput!) {
+    miniEvents(input: $input) {
       list ${minimalEventFragment()}
-      pagination ${paginationFragment()}
     }
   }
 `;
@@ -254,7 +253,7 @@ const UnlockEventRevisionDocument = gql`
 export {
   EventByIdDocument,
   EventsDocument,
-  MinimalEventsDocument,
+  MiniEventsDocument,
   CreateEventDocument,
   UpdateEventDocument,
   UpdateEventWidgetsDocument,

package/src/cloud/documents/pagesDocuments.js

@@ -6,6 +6,7 @@ import {
   paginationFragment,
   revisionMetaFragment,
   tagFragment,
+  summaryChangeFragment,
 } from "./common";
 
 function minimalPageFragment() {
@@ -14,6 +15,7 @@ function minimalPageFragment() {
       id
       slug
       title
+      visibility
     }
   `;
 }
@@ -30,9 +32,12 @@ function pageFragment() {
       originalId
       translations
       revisionsCount
+      insertedAt
+      updatedAt
       tags ${tagFragment()}
       pageType ${pageTypeFragment()}
       categories ${categoryFragment()}
+      changes ${summaryChangeFragment()}
     }
   `;
 }
@@ -65,24 +70,15 @@ const PageByIdDocument = gql`
 const PageChangesDocument = gql`
   query PageChanges($input: IdInput!) {
     pageChanges(input: $input) {
-      list {
-        version
-        title
-        description
-        operator
-        operatorMeta
-        source
-        insertedAt
-      }
+      list ${summaryChangeFragment()}
     }
   }
 `;
 
-const MinimalPagesDocument = gql`
-  query Pages($input: PagesInput!) {
-    pages(input: $input) {
+const MiniPagesDocument = gql`
+  query MiniPages($input: PagesInput!) {
+    miniPages(input: $input) {
       list ${minimalPageFragment()}
-      pagination ${paginationFragment()}
     }
   }
 `;
@@ -245,7 +241,7 @@ const UnlockPageRevisionDocument = gql`
 export {
   PageByIdDocument,
   PagesDocument,
-  MinimalPagesDocument,
+  MiniPagesDocument,
   CreatePageDocument,
   UpdatePageDocument,
   UpdatePageWidgetsDocument,

package/src/handlers/articles/DeletesHandler.js

@@ -8,6 +8,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
+      article,
       resource: {
         id: article.id,
         redirect: "",

package/src/handlers/articles/URLsHandler.js

@@ -10,6 +10,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
+      article,
       resource: {
         id: article.id,
         slug: article.slug,

package/src/handlers/events/DeletesHandler.js

@@ -8,6 +8,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
+      event,
       resource: {
         id: event.id,
         redirect: "",

package/src/handlers/events/URLsHandler.js

@@ -10,6 +10,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
+      event,
       resource: {
         id: event.id,
         slug: event.slug,

package/src/handlers/page_revisions/TagHandler.js

@@ -1,5 +1,33 @@
 import { checkboxesToArray } from "../../utils";
 
+const fetchDefaultLocaleTags = async (ctx, resource) => {
+  if (ctx.locale === ctx.defaultLocale) {
+    return { defaultLocaleName: "", defaultLocaleTags: [] };
+  }
+
+  const originalPage = await ctx.client.pages.find(
+    resource.originalId,
+    ctx.locale
+  );
+
+  if (
+    Object.keys(originalPage.translations).length === 0 ||
+    !originalPage.translations[ctx.defaultLocale]
+  ) {
+    return { defaultLocaleName: "", defaultLocaleTags: [] };
+  }
+
+  const defaultLocale = ctx.locales[ctx.defaultLocale];
+  const defaultLocalePage = await ctx.client.pages.find(
+    originalPage.translations[ctx.defaultLocale].id,
+    ctx.defaultLocale
+  );
+
+  const defaultLocaleTags = defaultLocalePage?.tags || [];
+
+  return { defaultLocaleName: defaultLocale.name, defaultLocaleTags };
+};
+
 const edit_form = async (ctx) => {
   const { parent_id } = ctx.params;
 
@@ -13,12 +41,19 @@ const edit_form = async (ctx) => {
 
   resource.tags = resource.tags.map((t) => t.id);
 
+  const { defaultLocaleName, defaultLocaleTags } = await fetchDefaultLocaleTags(
+    ctx,
+    resource
+  );
+
   return {
     assigns: {
       resource,
       tags: tags.list,
       errors: {},
       _translations: [],
+      defaultLocaleTags,
+      defaultLocaleName,
     },
   };
 };
@@ -46,6 +81,9 @@ const update = async (ctx) => {
   if (errors) {
     const tags = await ctx.client.tags.all(ctx.locale);
 
+    const { defaultLocaleName, defaultLocaleTags } =
+      await fetchDefaultLocaleTags(ctx, resource);
+
     return {
       assigns: {
         resource,
@@ -54,6 +92,8 @@ const update = async (ctx) => {
           resource: ctx.client.pageRevisions.formatErrors(errors),
         },
         _translations: [],
+        defaultLocaleTags,
+        defaultLocaleName,
       },
     };
   }

package/src/handlers/pages/DeletesHandler.js

@@ -8,6 +8,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
+      page,
       resource: {
         id: page.id,
         redirect: "",

package/src/handlers/pages/URLsHandler.js

@@ -10,6 +10,7 @@ const create_form = async (ctx) => {
 
   return {
     assigns: {
+      page,
       resource: {
         id: page.id,
         slug: page.slug,

package/src/helpers/FormBuilder.js

@@ -234,8 +234,8 @@ export default class FormBuilder extends HTMLBuilder {
         renderedOpts.length
           ? renderedOpts.join("")
           : this.tag("div", "No items available.", {
-              class: "italic opacity-50",
-            }),
+            class: "italic opacity-50",
+          }),
 
         {
           ...rest,

package/src/styles/application.css

@@ -25,6 +25,10 @@ body {
   @apply text-raketa-foreground bg-raketa-background;
 }
 
+.markdown {
+  @apply prose text-raketa-foreground text-sm;
+}
+
 @layer components {
 
   /* Utils */

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

@@ -1,5 +1,5 @@
-import DeletesHandler from "../../../../handlers/articles/DeletesHandler";
 import Articles from "../../../../cloud/Articles";
+import DeletesHandler from "../../../../handlers/articles/DeletesHandler";
 import Factory from "../../../support/factory";
 import { remoteConfig } from "../../../support/handlersHelper";
 
@@ -33,6 +33,7 @@ describe("Article delete", () => {
 
     expect(result).toEqual({
       assigns: {
+        article,
         resource: {
           id: article.id,
           redirect: "",

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

@@ -1,5 +1,5 @@
-import URLsHandler from "../../../../handlers/articles/URLsHandler";
 import Articles from "../../../../cloud/Articles";
+import URLsHandler from "../../../../handlers/articles/URLsHandler";
 import Factory from "../../../support/factory";
 
 function buildCtx(article) {
@@ -31,6 +31,7 @@ describe("Article change url", () => {
 
     expect(result).toEqual({
       assigns: {
+        article,
         resource: { slug: article.slug, id: article.id, redirect: null },
         errors: {},
         _translations: [],

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

@@ -1,5 +1,5 @@
-import DeletesHandler from "../../../../handlers/events/DeletesHandler";
 import Events from "../../../../cloud/Events";
+import DeletesHandler from "../../../../handlers/events/DeletesHandler";
 import Factory from "../../../support/factory";
 import { remoteConfig } from "../../../support/handlersHelper";
 
@@ -33,6 +33,7 @@ describe("Event delete", () => {
 
     expect(result).toEqual({
       assigns: {
+        event,
         resource: {
           id: event.id,
           redirect: "",

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

@@ -1,5 +1,5 @@
-import URLsHandler from "../../../../handlers/events/URLsHandler";
 import Events from "../../../../cloud/Events";
+import URLsHandler from "../../../../handlers/events/URLsHandler";
 import Factory from "../../../support/factory";
 
 function buildCtx(event) {
@@ -31,6 +31,7 @@ describe("Event change url", () => {
 
     expect(result).toEqual({
       assigns: {
+        event,
         resource: { slug: event.slug, id: event.id, redirect: null },
         errors: {},
         _translations: [],

package/src/tests/handlers/page_revisions/TagHandler.test/edit_form.test.js

@@ -1,6 +1,7 @@
-import TagHandler from "../../../../handlers/page_revisions/TagHandler";
 import PageRevisions from "../../../../cloud/PageRevisions";
+import Pages from "../../../../cloud/Pages";
 import Tags from "../../../../cloud/Tags";
+import TagHandler from "../../../../handlers/page_revisions/TagHandler";
 
 import Factory from "../../../support/factory";
 
@@ -9,9 +10,17 @@ function buildCtx(revision) {
     client: {
       pageRevisions: new PageRevisions(() => ({}), "token"),
       tags: new Tags(() => ({}), "token"),
+      pages: new Pages(() => ({}), "token"),
     },
     params: { parent_id: revision.id },
     locale: "en",
+    defaultLocale: "es",
+    locales: {
+      es: {
+        name: "Spanish",
+        code: "es",
+      },
+    },
   };
 }
 
@@ -21,23 +30,47 @@ describe("Page revision tags settings", () => {
       Factory.build("tag", { id: 42 }),
       Factory.build("tag", { id: 69 }),
     ];
+    const spanishTags = [Factory.build("tag", { id: 100 })];
     const revision = Factory.build("page_revision", { tags: [tags[0]] });
+    const originalPage = Factory.build("page", {
+      id: "original-123",
+      translations: {
+        en: { id: "translated-123" },
+        es: { id: "es-translated-123" },
+      },
+    });
+    const spanishPage = Factory.build("page", {
+      id: "es-translated-123",
+      tags: spanishTags,
+    });
+
     const ctx = buildCtx(revision);
 
     const mockFind = jest
       .spyOn(ctx.client.pageRevisions, "find")
       .mockImplementation(() => revision);
 
+    const mockPageFind = jest
+      .spyOn(ctx.client.pages, "find")
+      .mockImplementation((id, locale) => {
+        if (locale === "es") {
+          return spanishPage;
+        }
+        return originalPage;
+      });
+
     const mockTags = jest
       .spyOn(ctx.client.tags, "all")
-      .mockImplementation(() => ({
-        list: tags,
+      .mockImplementation((locale) => ({
+        list: locale === "es" ? spanishTags : tags,
       }));
 
     const result = await TagHandler.edit_form(ctx);
 
     expect(mockFind).toHaveBeenCalledWith(revision.id, "en");
     expect(mockTags).toHaveBeenCalledWith("en");
+    expect(mockPageFind).toHaveBeenCalledWith(revision.originalId, "en");
+    expect(mockPageFind).toHaveBeenCalledWith("es-translated-123", "es");
 
     expect(result).toEqual({
       assigns: {
@@ -45,6 +78,8 @@ describe("Page revision tags settings", () => {
         tags: tags,
         errors: {},
         _translations: [],
+        defaultLocaleTags: spanishTags,
+        defaultLocaleName: "Spanish",
       },
     });
   });