Merge branch 'main' into Admin-Panel-Fixes

Author: usingtechnology

app/frontend/src/components/forms/manage/ExternalAPIs.vue

@@ -25,7 +25,7 @@ export default {
       externalAPIStatusCodes: [],
       items: [],
       techdocsLink:
-        'https://developer.gov.bc.ca/docs/default/component/chefs-techdocs/Capabilities/Integrations/Calling-External-API/',
+        'https://developer.gov.bc.ca/docs/default/component/chefs-techdocs/Capabilities/Integrations/Getting-Live-Data-in-Your-Forms/',
       editDialog: {
         title: '',
         item: {

app/src/forms/form/service.js

@@ -563,9 +563,8 @@ const service = {
 
   _validateSortBy: (params, selection, fields) => {
     if (params.sortBy?.column && !selection.includes(params.sortBy.column) && !fields.includes(params.sortBy.column)) {
-      throw new Problem(400, {
-        details: `orderBy column '${params.sortBy.column}' not in selected columns`,
-      });
+      // don't throw an error, just remove the sortBy column, user can choose a different column
+      delete params.sortBy;
     }
   },
 
@@ -575,9 +574,9 @@ const service = {
 
     // Determine if assignee data should be included in response
     const shouldIncludeAssignee = service._shouldIncludeAssignee(form);
-    const query = service._initFormSubmissionsListQuery(formId, params, currentUser, shouldIncludeAssignee);
     const { selection, fields } = service._buildSelectionAndFields(params, shouldIncludeAssignee);
     service._validateSortBy(params, selection, fields);
+    const query = service._initFormSubmissionsListQuery(formId, params, currentUser, shouldIncludeAssignee);
 
     query.select(
       selection,

app/tests/unit/forms/form/service.spec.js

@@ -643,15 +643,14 @@ describe('listFormSubmissions', () => {
     MockModel.mockResolvedValue([]);
   });
 
-  describe('400 response when', () => {
+  describe('should not error when sortBy column is not in select', () => {
     test('sort by column not in select', async () => {
-      await expect(
-        service.listFormSubmissions(formId, {
-          sortBy: {
-            column: 'x',
-          },
-        })
-      ).rejects.toThrow('400');
+      await service.listFormSubmissions(formId, {
+        sortBy: {
+          column: 'x',
+        },
+      });
+      expect(MockModel.select).toBeCalledTimes(1);
     });
   });
 
@@ -1781,17 +1780,10 @@ describe('listFormSubmission helpers', () => {
     const { fields } = service._buildSelectionAndFields(params, true);
     expect(fields).toContain('lateEntry');
   });
-  it('should throw 400 if sortBy column not in selection or fields', () => {
+  it('should remove sortBy if column not in selection or fields', () => {
     const params = { sortBy: { column: 'notAColumn' } };
-    try {
-      service._validateSortBy(params, ['a'], ['b']);
-      // If no error is thrown, fail the test
-      throw new Error('Did not throw');
-    } catch (err) {
-      expect(err).toBeInstanceOf(require('api-problem'));
-      expect(err.status).toBe(400);
-      expect(err.details).toMatch(/orderBy column/);
-    }
+    service._validateSortBy(params, ['a'], ['b']);
+    expect(params.sortBy).toBeUndefined();
   });
 });
 
@@ -2226,21 +2218,27 @@ describe('Branch coverage for assignee and selection helpers', () => {
     it('does not throw if sortBy.column is in selection', () => {
       const params = { sortBy: { column: 'foo' } };
       expect(() => service._validateSortBy(params, ['foo'], ['bar'])).not.toThrow();
+      expect(params.sortBy).toBeDefined();
     });
 
     it('does not throw if sortBy.column is in fields', () => {
       const params = { sortBy: { column: 'bar' } };
       expect(() => service._validateSortBy(params, ['foo'], ['bar'])).not.toThrow();
+      expect(params.sortBy).toBeDefined();
     });
 
-    it('throws Problem 400 if sortBy.column is not in selection or fields', () => {
+    it('does not throw if sortBy.column is not in selection or fields, removes sortBy', () => {
       const params = { sortBy: { column: 'baz' } };
-      expect(() => service._validateSortBy(params, ['foo'], ['bar'])).toThrow(expect.any(require('api-problem')));
+      expect(params.sortBy).toBeDefined();
+      expect(() => service._validateSortBy(params, ['foo'], ['bar'])).not.toThrow();
+      expect(params.sortBy).toBeUndefined();
     });
 
-    it('does not throw if sortBy is missing', () => {
+    it('does not throw if sortBy is missing, removes sortBy', () => {
       const params = {};
+      expect(params.sortBy).toBeUndefined();
       expect(() => service._validateSortBy(params, ['foo'], ['bar'])).not.toThrow();
+      expect(params.sortBy).toBeUndefined();
     });
   });
 });

tests/functional/cypress/e2e/form-design-advancedfield.cy.js

@@ -257,7 +257,8 @@ describe('Form Designer', () => {
         // for print option verification
         cy.get(':nth-child(2) > .d-print-none > :nth-child(1) > .v-btn').should('be.visible');
         cy.get('.mdi-printer').should('be.visible');
-        cy.get('.ml-auto > :nth-child(3) > .v-btn').should('be.visible');
+        //Wide form layout button
+        cy.get(':nth-child(2) > .v-btn').should('be.visible');
         cy.waitForLoad();
         cy.waitForLoad();
         cy.get('input[type="radio"]').click();
@@ -284,11 +285,8 @@ describe('Form Designer', () => {
         //verify file uploads to object storage
         cy.get('.col-md-9 > a').should('have.attr', 'ref').and('include', 'fileLink');
         cy.get('div.col-md-2').contains('61.48 kB');
-        cy.get('.ml-auto > :nth-child(3) > .v-btn').click();
         cy.waitForLoad();
         cy.wait(2000);
-        //Close the upload warning message
-        //cy.get('.v-alert__close > .v-btn').click();
         cy.wait(2000);
         //form submission
         cy.get('button').contains('Submit').click();
@@ -300,7 +298,6 @@ describe('Form Designer', () => {
         cy.get('.choices__inner > .choices__list > .choices__item').contains('hello');
         cy.get('.col-md-9 > a').contains('add1.png');
         cy.get('.ui > .choices__list > .choices__item').contains('THRIFTY FOODS');
-
         //Delete form after test run
         cy.visit(`/${depEnv}/form/manage?f=${arrayValues[0]}`);
         cy.waitForLoad();

tests/functional/cypress/e2e/form-draft-submission-management.cy.js

@@ -3,21 +3,15 @@ import { formsettings } from '../support/login.js';
 
 const depEnv = Cypress.env('depEnv');
 
-
 Cypress.Commands.add('waitForLoad', () => {
   const loaderTimeout = 60000;
 
   cy.get('.nprogress-busy', { timeout: loaderTimeout }).should('not.exist');
 });
-
-
-
 describe('Form Designer', () => {
 
   beforeEach(()=>{
 
-    
-    
     cy.on('uncaught:exception', (err, runnable) => {
       // Form.io throws an uncaught exception for missing projectid
       // Cypress catches it as undefined: undefined so we can't get the text
@@ -42,7 +36,7 @@ it('Verify draft submission', () => {
       cy.get('span.btn').contains('Text Field')
 
       .trigger('mousedown', { which: 1}, { force: true })
-      .trigger('mousemove', coords.x, -50, { force: true })
+      .trigger('mousemove', coords.x, -110, { force: true })
       .trigger('mouseup', { force: true });
       cy.get('button').contains('Save').click();
     });
@@ -106,7 +100,7 @@ it('Verify draft submission', () => {
     cy.get('[data-test="save-btn"] > .v-btn__content').click();
     cy.get('.v-data-table__tr > :nth-child(4)').contains('DRAFT').should('not.exist');
     cy.get('.mdi-pencil').click();
-    cy.get('.ml-auto > :nth-child(3) > .v-btn').click();
+    cy.get(':nth-child(4) > .v-btn').click();
     cy.waitForLoad();
     cy.get('.v-alert__content > div').contains('Draft Saved');
     // Edit draft submission
@@ -125,16 +119,51 @@ it('Verify draft submission', () => {
     cy.location('pathname').should('eq', `/${depEnv}/form/success`);
     cy.contains('h1', 'Your form has been submitted successfully');
     cy.get('.mt-6 > :nth-child(1) > .v-btn > .v-btn__content > span').click();
-    //cy.get('div > .bg-primary').click();
+    //Verify status column removed
     cy.get('.v-data-table__tr > :nth-child(4)').contains('SUBMITTED').should('not.exist');
+    //Verify multiple draft upload functionality
+    cy.visit(`/${depEnv}/form/submit?f=${arrayValues[0]}`);
+    cy.waitForLoad();
+    cy.get('button').contains('Submit').should('be.visible');
+    cy.waitForLoad();
+    cy.waitForLoad();
+    cy.get('button[title="Switch to multiple submissions"]').click();
+    cy.get('h1').contains('Select JSON file to upload').click();
+    let fileUploadInputField = cy.get('input[type=file]');
+    cy.get('input[type=file]').should('not.to.be.null');
+    fileUploadInputField.attachFile('test_schema.json');
+    cy.get('.v-alert__content').contains('Wrong json file format').should('be.visible');
+    cy.get('h1').contains('Select JSON file to upload').click();
+    cy.get('input[type=file]').attachFile('test_submissions.json');
+    cy.wait(1000);
+    //Upload sucessful message
+    cy.get('.v-alert__content').contains('Your multiple draft upload has been successful!').should('be.visible');
+    cy.wait(1000);
+    //Verify download template link
+    cy.get('i[class="mdi-download mdi v-icon notranslate v-theme--chefsTheme v-icon--size-default mr-1"]').should('exist');
+    //Verify Draft upload
+    cy.contains('p',' Your multiple draft upload has been successful!').should('exist');
+    cy.get('.mt-6 > :nth-child(1) > .v-btn > .v-btn__content > span').click();
+    //Verify draft uploaded
+    cy.get('button[title="Edit This Draft"]').then($el => {
+      const rem=$el[0];
+      cy.get(rem).click();
+    })
+    //Edit the uploaded draft
+    cy.get('input[name="data[simpletextfield]"]').should('have.value', 'simple').should('exist');
+    cy.contains('Text Field').type('{selectall}{backspace}');
+    cy.contains("Text Field").type("Edit uploaded draft");
+      //form submission
+    cy.get("button").contains("Submit").click();
+    cy.waitForLoad();
+    cy.get('[data-test="continue-btn-continue"]').click({ force: true });
+    cy.wait(2000);
     //Delete form after test run
     cy.visit(`/${depEnv}/form/manage?f=${arrayValues[0]}`);
     cy.waitForLoad();
     cy.get('.mdi-delete').click();
     cy.get('[data-test="continue-btn-continue"]').click();
     cy.get('#logoutButton > .v-btn__content > span').click();
-   
-
     });
 
   });

tests/functional/cypress/e2e/form-submission-assign-revise-status.cy.js

@@ -96,12 +96,12 @@ it('Submission revise status Assignment', () => {
         let arr = search.split('=');
         let arrayValues = arr[1].split('&');
         cy.log(arrayValues[0]);
-    //Manage  members for draft management
     cy.get('.mdi-pencil').click();
-    cy.get('.ml-auto > :nth-child(3) > .v-btn').click();
+    cy.get(':nth-child(4) > .v-btn').click();
     cy.waitForLoad();
     cy.get('.v-alert__content > div').contains('Draft Saved');
-    cy.get(':nth-child(2) > :nth-child(4) > :nth-child(1) > .v-btn').click();
+    //Manage  members for draft management
+    cy.get('.mdi-account-multiple').click();
     cy.get('form > .v-input > .v-input__control > .v-field > .v-field__field > .v-field__input').click();
     cy.get('.v-card-actions > .v-btn > .v-btn__content > span').click();
     cy.waitForLoad();

tests/functional/cypress/fixtures/test_submissions.json

@@ -0,0 +1 @@
+[{"simpletextfield":"simple","submit":false,"lateEntry":false},{"simpletextfield":"simple","submit":false,"lateEntry":false}]

tests/functional/cypress/support/login.js

@@ -54,7 +54,10 @@ export function formsettings(){
     });
     //validate share draft with team is not enabled
     cy.get('[data-test="enableTeamMemberDraftShare"]').should('not.be.enabled');
+    //Save and edit draft
     cy.get('[data-test="canSaveAndEditDraftsCheckbox"]').click();
+    //Upload draft
+    cy.get('[data-test="canUploadDraftCheckbox"]').click();
      //validate share draft with team is enabled
     cy.get('[data-test="enableTeamMemberDraftShare"]').should('be.visible').and('not.be.disabled');
     cy.get('[data-test="canUpdateStatusOfFormCheckbox"]').click();//Update the status of the form