Form Builder - Move backend to HCMS

packages/api-form-builder/__tests__/formSubmissionSecurity.test.ts

@@ -93,8 +93,6 @@ describe("Forms Submission Security Test", () => {
                             createdOn: expect.stringMatching(/^20/),
                             savedOn: expect.stringMatching(/^20/),
                             fields: [],
-                            locked: false,
-                            published: false,
                             publishedOn: null,
                             name: "A1-name",
                             overallStats: {
@@ -194,9 +192,7 @@ describe("Forms Submission Security Test", () => {
                                 }
                             ],
                             status: "published",
-                            published: true,
-                            publishedOn: expect.stringMatching(/^20/),
-                            locked: true
+                            publishedOn: expect.stringMatching(/^20/)
                         },
                         error: null
                     }

packages/api-form-builder/__tests__/forms.test.ts

@@ -254,15 +254,15 @@ describe('Form Builder "Form" Test', () => {
         await publishRevision({ revision: id });
 
         // Get the published form
-        const [{ data: get }] = await getPublishedForm({ revision: id });
+        const [{ data: get }] = await getPublishedForm({ formId: id });
         expect(get.formBuilder.getPublishedForm.data.id).toEqual(id);
 
         // Create a new revision
         const [create2] = await createRevisionFrom({ revision: id });
         const { id: id2 } = create2.data.formBuilder.createRevisionFrom.data;
 
         // Latest published form should still be #1
-        const [latestPublished] = await getPublishedForm({ parent: id.split("#")[0] });
+        const [latestPublished] = await getPublishedForm({ formId: id.split("#")[0] });
         expect(latestPublished.data.formBuilder.getPublishedForm.data.id).toEqual(id);
 
         // Latest revision should be #2
@@ -284,7 +284,7 @@ describe('Form Builder "Form" Test', () => {
         await publishRevision({ revision: id2 });
 
         // Latest published form should now be #2
-        const [latestPublished2] = await getPublishedForm({ parent: id.split("#")[0] });
+        const [latestPublished2] = await getPublishedForm({ formId: id.split("#")[0] });
         expect(latestPublished2.data.formBuilder.getPublishedForm.data.id).toEqual(id2);
 
         // Increment views for #2
@@ -302,7 +302,7 @@ describe('Form Builder "Form" Test', () => {
         await unpublishRevision({ revision: id2 });
 
         // Latest published form should now again be #1
-        const [latestPublished3] = await getPublishedForm({ parent: id.split("#")[0] });
+        const [latestPublished3] = await getPublishedForm({ formId: id.split("#")[0] });
         expect(latestPublished3.data.formBuilder.getPublishedForm.data.id).toEqual(id);
     });
 
@@ -470,7 +470,6 @@ describe('Form Builder "Form" Test', () => {
                     publishRevision: {
                         data: {
                             name: "form 2",
-                            published: true,
                             stats: {
                                 submissions: 0,
                                 views: 0
@@ -496,7 +495,6 @@ describe('Form Builder "Form" Test', () => {
                         data: {
                             id: `${form2.formId}#0002`,
                             version: 2,
-                            published: false,
                             status: "draft"
                         },
                         error: null
@@ -530,7 +528,6 @@ describe('Form Builder "Form" Test', () => {
                     publishRevision: {
                         data: {
                             name: "form 1",
-                            published: true,
                             stats: {
                                 submissions: 0,
                                 views: 0
@@ -556,7 +553,6 @@ describe('Form Builder "Form" Test', () => {
                         data: {
                             id: `${form1.formId}#0002`,
                             version: 2,
-                            published: false,
                             status: "draft"
                         },
                         error: null
@@ -576,7 +572,6 @@ describe('Form Builder "Form" Test', () => {
                     publishRevision: {
                         data: {
                             name: "form 1",
-                            published: true,
                             stats: {
                                 submissions: 0,
                                 views: 0
@@ -599,7 +594,6 @@ describe('Form Builder "Form" Test', () => {
                         data: {
                             id: `${form1.formId}#0003`,
                             version: 3,
-                            published: false,
                             status: "draft"
                         },
                         error: null

packages/api-form-builder/__tests__/formsSecurity.test.ts

@@ -15,8 +15,6 @@ class MockResponse {
     public readonly createdOn: RegExp;
     public readonly savedOn: RegExp;
     public readonly publishedOn: RegExp | null;
-    public readonly locked: boolean;
-    public readonly published: boolean;
     public readonly status: "published" | "draft";
     public readonly version: number;
 
@@ -26,8 +24,6 @@ class MockResponse {
         this.createdOn = /^20/;
         this.savedOn = /^20/;
         this.publishedOn = null;
-        this.locked = false;
-        this.published = false;
         this.status = "draft";
         this.version = 1;
     }
@@ -438,9 +434,7 @@ describe("Forms Security Test", () => {
                                     id: formId
                                 }),
                                 publishedOn: /^20/,
-                                published: true,
-                                status: "published",
-                                locked: true
+                                status: "published"
                             },
                             error: null
                         }
@@ -470,9 +464,7 @@ describe("Forms Security Test", () => {
                                 id: formId
                             }),
                             publishedOn: /^20/,
-                            published: true,
-                            status: "published",
-                            locked: true
+                            status: "published"
                         },
                         error: null
                     }
@@ -540,9 +532,7 @@ describe("Forms Security Test", () => {
                                     id
                                 }),
                                 publishedOn: /^20/,
-                                published: true,
                                 status: "published",
-                                locked: true,
                                 version: i + 2
                             },
                             error: null

packages/api-form-builder/__tests__/graphql/forms.ts

@@ -26,8 +26,6 @@ export const FORM_DATA_FIELD = /* GraphQL */ `
             }
         }
         triggers
-        published
-        locked
         status
         stats {
             views
@@ -58,10 +56,8 @@ export const FORMS_DATA_FIELD = /* GraphQL */ `
         savedOn
         name
         slug
-        published
         publishedOn
         version
-        locked
         status
         createdBy {
             id
@@ -190,9 +186,9 @@ export const GET_FORM_REVISIONS = /* GraphQL */ `
 `;
 
 export const GET_PUBLISHED_FORM = /* GraphQL */ `
-    query GetPublishedForm($revision: ID, $parent: ID) {
+    query GetPublishedForm($formId: ID) {
         formBuilder {
-            getPublishedForm(revision: $revision, parent: $parent) {
+            getPublishedForm(formId: $formId) {
                 data ${FORM_DATA_FIELD}
                 error ${ERROR_FIELD}
             }

packages/api-form-builder/src/cmsFormBuilderStorage/CmsFormsStorage.ts

@@ -1,4 +1,4 @@
-import { CmsEntry, CmsEntryValues, CmsModel, HeadlessCms } from "@webiny/api-headless-cms/types";
+import { CmsEntry, CmsModel, HeadlessCms } from "@webiny/api-headless-cms/types";
 import WebinyError from "@webiny/error";
 import { Security } from "@webiny/api-security/types";
 import { createIdentifier, parseIdentifier } from "@webiny/utils";
@@ -43,17 +43,6 @@ export class CmsFormsStorage implements FormBuilderFormStorageOperations {
         return { ...this.model, tenant, locale };
     }
 
-    private async getSortedFormRevisions(
-        model: CmsModel,
-        formId: string
-    ): Promise<CmsEntry<CmsEntryValues>> {
-        const entries = (await this.cms.getEntryRevisions(model, formId))
-            .filter(entryItem => entryItem.values.published)
-            .sort((a, b) => b.version - a.version);
-
-        return entries[0];
-    }
-
     async getForm(params: FormBuilderStorageOperationsGetFormParams): Promise<FbForm | null> {
         const {
             id,
@@ -75,7 +64,7 @@ export class CmsFormsStorage implements FormBuilderFormStorageOperations {
 
                 return entry;
             } else if (published && !version) {
-                const entry = await this.getSortedFormRevisions(model, formId);
+                const [entry] = await this.cms.getPublishedEntriesByIds(model, [formId]);
 
                 return entry;
             } else if (id || version) {
@@ -116,9 +105,6 @@ export class CmsFormsStorage implements FormBuilderFormStorageOperations {
 
         const entry = await this.security.withoutAuthorization(async () => {
             return await this.cms.createEntryRevisionFrom(model, form.id, {
-                status: "draft",
-                published: false,
-                locked: false,
                 stats: {
                     submissions: 0,
                     views: 0
@@ -198,7 +184,7 @@ export class CmsFormsStorage implements FormBuilderFormStorageOperations {
         const model = this.modelWithContext(form);
 
         const entry = await this.security.withoutAuthorization(async () => {
-            return await this.cms.updateEntry(model, form.id, form);
+            return await this.cms.publishEntry(model, form.id);
         });
 
         return this.getFormFieldValues(entry);
@@ -209,7 +195,7 @@ export class CmsFormsStorage implements FormBuilderFormStorageOperations {
         const model = this.modelWithContext(form);
 
         const entry = await this.security.withoutAuthorization(async () => {
-            return await this.cms.updateEntry(model, form.id, form);
+            return await this.cms.unpublishEntry(model, form.id);
         });
 
         return this.getFormFieldValues(entry);
@@ -222,6 +208,7 @@ export class CmsFormsStorage implements FormBuilderFormStorageOperations {
             createdOn: entry.createdOn,
             savedOn: entry.savedOn,
             publishedOn: entry.publishedOn,
+            status: entry.status,
             locale: entry.locale,
             tenant: entry.tenant,
             webinyVersion: entry.webinyVersion,

packages/api-form-builder/src/cmsFormBuilderStorage/models/form.model.ts

@@ -27,22 +27,6 @@ const nameField = () => {
     });
 };
 
-const publishedField = () => {
-    return createModelField({
-        label: "Published",
-        type: "boolean",
-        validation: [required()]
-    });
-};
-
-const statusField = () => {
-    return createModelField({
-        label: "Status",
-        type: "text",
-        validation: [required()]
-    });
-};
-
 const statsViewsField = () => {
     return createModelField({
         label: "Views",
@@ -86,15 +70,6 @@ const overallStatsField = (fields: CmsModelField[]) => {
     });
 };
 
-const lockedField = () => {
-    return createModelField({
-        label: "Locked",
-        fieldId: "locked",
-        type: "boolean",
-        validation: [required()]
-    });
-};
-
 const field_IdField = () => {
     return createModelField({
         label: "ID",
@@ -413,16 +388,12 @@ const slugField = () => {
 const DEFAULT_FIELDS = [
     "formId",
     "name",
-    "published",
-    "status",
     "stats",
     "overallStats",
-    "locked",
     "fields",
     "steps",
     "settings",
     "triggers",
-    "publishedOn",
     "slug"
 ];
 
@@ -475,8 +446,6 @@ export const createFormDataModelDefinition = (group: CmsModelGroup): CmsPrivateM
         fields: [
             formIdField(),
             nameField(),
-            publishedField(),
-            statusField(),
             statsField([
                 statsViewsField(),
                 statsSubmissionsField(),
@@ -487,7 +456,6 @@ export const createFormDataModelDefinition = (group: CmsModelGroup): CmsPrivateM
                 statsSubmissionsField(),
                 conversionRateStatsSubmissionsField()
             ]),
-            lockedField(),
             fieldsField(FIELD_FIELDS),
             stepsField(STEP_FIELDS),
             settingsField(SETTINGS_FIELDS),