Merge branch 'main' into FORMS-2094-Approver-Keyboard

Author: RyanBirtch-aot

app/frontend/src/components/designer/settings/FormAccessSettings.vue

@@ -78,6 +78,7 @@ function userTypeChanged() {
       ...form.value,
       enableSubmitterDraft: false,
       enableCopyExistingSubmission: false,
+      allowSubmitterToUploadFile: false,
     };
   }
   if (form.value.userType !== 'team') {

app/frontend/src/components/designer/settings/FormFunctionalitySettings.vue

@@ -119,6 +119,7 @@ defineExpose({
       data-test="canUploadDraftCheckbox"
       hide-details="auto"
       class="my-0"
+      :disabled="form.userType === ID_MODE.PUBLIC"
       @update:model-value="allowSubmitterToUploadFileChanged"
     >
       <template #label>

app/src/forms/form/service.js

@@ -171,6 +171,11 @@ const service = {
   _setAssigneeInSubmissionsTable: (formData) => {
     return formData.showAssigneeInSubmissionsTable === true && formData.enableStatusUpdates;
   },
+  _setAllowSubmitterToUploadFile: (formData) => {
+    // do not allow submitter to upload files if the form is public, or if allowSubmitterToUploadFile is false.
+    const isPublicForm = formData.identityProviders && Array.isArray(formData.identityProviders) && formData.identityProviders.some((idp) => idp.code === 'public');
+    return !isPublicForm && !falsey(formData.allowSubmitterToUploadFile);
+  },
   _findFileIds: (schema, data) => {
     const findFiles = (currentData) => {
       let fileIds = [];
@@ -228,7 +233,7 @@ const service = {
       obj.enableStatusUpdates = data.enableStatusUpdates;
       obj.enableSubmitterDraft = data.enableSubmitterDraft;
       obj.createdBy = currentUser?.usernameIdp || 'public';
-      obj.allowSubmitterToUploadFile = data.allowSubmitterToUploadFile;
+      obj.allowSubmitterToUploadFile = service._setAllowSubmitterToUploadFile(data);
       obj.schedule = data.schedule;
       obj.subscribe = data.subscribe;
       obj.reminder_enabled = data.reminder_enabled;
@@ -312,7 +317,7 @@ const service = {
         enableStatusUpdates: data.enableStatusUpdates,
         enableSubmitterDraft: data.enableSubmitterDraft,
         updatedBy: currentUser.usernameIdp,
-        allowSubmitterToUploadFile: data.allowSubmitterToUploadFile,
+        allowSubmitterToUploadFile: service._setAllowSubmitterToUploadFile(data),
         schedule: data.schedule,
         subscribe: data.subscribe,
         reminder_enabled: validatedReminderEnabled,

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

@@ -2581,3 +2581,66 @@ describe('listFormComponentsProactiveHelp', () => {
     expect(result).toEqual({});
   });
 });
+
+describe('_setAllowSubmitterToUploadFile', () => {
+  it('returns true if identityProviders does not include public', () => {
+    const formData = {
+      identityProviders: [{ code: 'idir' }],
+      allowSubmitterToUploadFile: true,
+    };
+    expect(service._setAllowSubmitterToUploadFile(formData)).toBe(true);
+  });
+
+  it('returns false if identityProviders includes public and allowSubmitterToUploadFile is truthy', () => {
+    const formData = {
+      identityProviders: [{ code: 'public' }],
+      allowSubmitterToUploadFile: true,
+    };
+    expect(service._setAllowSubmitterToUploadFile(formData)).toBe(false);
+  });
+
+  it('returns false if allowSubmitterToUploadFile is false', () => {
+    const formData = {
+      identityProviders: [{ code: 'idir' }],
+      allowSubmitterToUploadFile: false,
+    };
+    expect(service._setAllowSubmitterToUploadFile(formData)).toBe(false);
+  });
+
+  it('returns true if identityProviders is missing (team protected) and allow is true', () => {
+    const formData = {
+      allowSubmitterToUploadFile: true,
+    };
+    expect(service._setAllowSubmitterToUploadFile(formData)).toBe(true);
+  });
+
+  it('returns false if identityProviders is missing (team protected) and allow is false', () => {
+    const formData = {
+      allowSubmitterToUploadFile: false,
+    };
+    expect(service._setAllowSubmitterToUploadFile(formData)).toBe(false);
+  });
+
+  it('returns true if identityProviders is empty and allow is true', () => {
+    const formData = {
+      identityProviders: [],
+      allowSubmitterToUploadFile: true,
+    };
+    expect(service._setAllowSubmitterToUploadFile(formData)).toBe(true);
+  });
+
+  it('returns false if identityProviders is empty and allow is false', () => {
+    const formData = {
+      identityProviders: [],
+      allowSubmitterToUploadFile: false,
+    };
+    expect(service._setAllowSubmitterToUploadFile(formData)).toBe(false);
+  });
+
+  it('returns false if allowSubmitterToUploadFile is missing', () => {
+    const formData = {
+      identityProviders: [{ code: 'idir' }],
+    };
+    expect(service._setAllowSubmitterToUploadFile(formData)).toBe(false);
+  });
+});