fix(api-form-builder): missing formId

webiny · Oct 20, 2021 · a721c8d · a721c8d
1 parent a3407ba
commit a721c8d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/packages/api-form-builder/__tests__/forms.test.ts b/packages/api-form-builder/__tests__/forms.test.ts
@@ -89,7 +89,12 @@ describe('Form Builder "Form" Test', () => {
 
         await until(
             () => listForms().then(([data]) => data),
-            ({ data }) => data.formBuilder.listForms.data[0].name === newData.name
+            ({ data }) => data.formBuilder.listForms.data[0].name === newData.name,
+            {
+                name: "list forms after update revision",
+                wait: 500,
+                tries: 20
+            }
         );
 
         const [get] = await getForm({ revision: id });
@@ -228,7 +233,12 @@ describe('Form Builder "Form" Test', () => {
 
         await until(
             () => listForms().then(([data]) => data),
-            ({ data }) => data.formBuilder.listForms.data[0].id === id
+            ({ data }) => data.formBuilder.listForms.data[0].id === id,
+            {
+                name: "list forms after publish revision",
+                wait: 500,
+                tries: 20
+            }
         );
 
         // Get the published form
@@ -343,7 +353,7 @@ describe('Form Builder "Form" Test', () => {
         );
 
         // Load submissions
-        const [submissions] = await listFormSubmissions({ form: id });
+        const [submissions] = await listFormSubmissions({ form: id, sort: ["createdOn_ASC"] });
         const list = submissions.data.formBuilder.listFormSubmissions;
         expect(list.data.length).toBe(2);
         expect(list.meta.totalCount).toBe(2);

diff --git a/packages/api-form-builder/src/plugins/crud/forms.crud.ts b/packages/api-form-builder/src/plugins/crud/forms.crud.ts
@@ -388,9 +388,11 @@ export const createFormsCrud = (params: Params): FormsCRUD => {
             });
             checkOwnership(form, permission, context);
 
+            const formFormId = form.formId || form.id.split("#").pop();
+
             const revisions = await this.storageOperations.listFormRevisions({
                 where: {
-                    formId: form.formId,
+                    formId: formFormId,
                     tenant: form.tenant,
                     locale: form.locale
                 },
@@ -402,7 +404,7 @@ export const createFormsCrud = (params: Params): FormsCRUD => {
                 /**
                  * Means we're deleting the last revision, so we need to delete the whole form.
                  */
-                return this.deleteForm(form.formId);
+                return this.deleteForm(form.id);
             }
 
             try {
@@ -509,9 +511,11 @@ export const createFormsCrud = (params: Params): FormsCRUD => {
                 auth: false
             });
 
+            const originalFormFormId = original.formId || original.id.split("#").pop();
+
             const latest = await this.storageOperations.getForm({
                 where: {
-                    formId: original.formId,
+                    formId: originalFormFormId,
                     latest: true,
                     tenant: original.tenant,
                     locale: original.locale
@@ -524,7 +528,7 @@ export const createFormsCrud = (params: Params): FormsCRUD => {
             const form: FbForm = {
                 ...original,
                 id: createIdentifier({
-                    id: original.formId,
+                    id: originalFormFormId,
                     version
                 }),
                 version,

diff --git a/packages/api-form-builder/src/plugins/crud/submissions.crud.ts b/packages/api-form-builder/src/plugins/crud/submissions.crud.ts
@@ -75,11 +75,13 @@ export const createSubmissionsCrud = (params: Params): SubmissionsCRUD => {
 
             const { sort: initialSort, after = null, limit = 10 } = options;
 
+            const formFormId = form.formId || form.id.split("#").pop();
+
             const listSubmissionsParams: FormBuilderStorageOperationsListSubmissionsParams = {
                 where: {
                     tenant: form.tenant,
                     locale: form.locale,
-                    formId: form.formId
+                    formId: formFormId
                 },
                 after,
                 limit,
@@ -207,12 +209,13 @@ export const createSubmissionsCrud = (params: Params): SubmissionsCRUD => {
             /**
              * Use model for data validation and default values.
              */
+            const formFormId = form.formId || form.id.split("#").pop();
             const submissionModel = new models.FormSubmissionCreateDataModel().populate({
                 data,
                 meta,
                 form: {
                     id: form.id,
-                    parent: form.formId,
+                    parent: formFormId,
                     name: form.name,
                     version: form.version,
                     fields: form.fields,