fix Print and other icons not visible for public form submissions

bhuvan-aot · Jan 3, 2025 · 77e58df · 77e58df
1 parent 6276ccf
commit 77e58df
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 28 deletions.
diff --git a/app/frontend/src/components/designer/FormViewer.vue b/app/frontend/src/components/designer/FormViewer.vue
@@ -1201,28 +1201,25 @@ async function uploadFile(file, config = {}) {
 
       <div v-else>
         <div v-if="displayTitle">
-          <div v-if="!isFormPublic(form)">
-            <FormViewerActions
-              :allow-submitter-to-upload-file="form.allowSubmitterToUploadFile"
-              :block="block"
-              :bulk-file="bulkFile"
-              :copy-existing-submission="form.enableCopyExistingSubmission"
-              :draft-enabled="form.enableSubmitterDraft"
-              :form-id="form.id"
-              :is-draft="submissionRecord.draft"
-              :permissions="permissions"
-              :read-only="readOnly"
-              :submission="submission"
-              :submission-id="submissionId"
-              :wide-form-layout="form.wideFormLayout"
-              class="d-print-none"
-              @showdoYouWantToSaveTheDraftModal="
-                showdoYouWantToSaveTheDraftModal
-              "
-              @save-draft="saveDraft"
-              @switchView="switchView"
-            />
-          </div>
+          <FormViewerActions
+            :allow-submitter-to-upload-file="form.allowSubmitterToUploadFile"
+            :block="block"
+            :bulk-file="bulkFile"
+            :copy-existing-submission="form.enableCopyExistingSubmission"
+            :draft-enabled="form.enableSubmitterDraft"
+            :form-id="form.id"
+            :is-draft="submissionRecord.draft"
+            :permissions="permissions"
+            :read-only="readOnly"
+            :submission="submission"
+            :submission-id="submissionId"
+            :wide-form-layout="form.wideFormLayout"
+            :public-form="isFormPublic(form)"
+            class="d-print-none"
+            @showdoYouWantToSaveTheDraftModal="showdoYouWantToSaveTheDraftModal"
+            @save-draft="saveDraft"
+            @switchView="switchView"
+          />
           <h1 class="my-6 text-center">{{ form.name }}</h1>
         </div>
         <div class="form-wrapper">

diff --git a/app/frontend/src/components/designer/FormViewerActions.vue b/app/frontend/src/components/designer/FormViewerActions.vue
@@ -59,6 +59,10 @@ const properties = defineProps({
     type: Boolean,
     default: false,
   },
+  publicForm: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const isWideLayout = ref(properties.wideFormLayout);
@@ -94,7 +98,7 @@ watch(
     class="mt-6 d-flex flex-md-row justify-space-between flex-sm-column-reverse flex-xs-column-reverse gapRow"
     :class="{ 'dir-rtl': isRTL }"
   >
-    <div v-if="formId">
+    <div v-if="formId && !publicForm">
       <v-btn
         color="primary"
         variant="outlined"
@@ -106,9 +110,12 @@ watch(
         }}</span>
       </v-btn>
     </div>
-    <div>
+    <div class="ml-auto d-flex">
       <!-- Bulk button -->
-      <span v-if="allowSubmitterToUploadFile && !block" class="ml-2">
+      <span
+        v-if="allowSubmitterToUploadFile && !block && !publicForm"
+        class="ml-2"
+      >
         <v-tooltip location="bottom">
           <template #activator="{ props }">
             <v-btn
@@ -163,7 +170,10 @@ watch(
       </span>
 
       <!-- Save a draft -->
-      <span v-if="canSaveDraft && draftEnabled && !bulkFile" class="ml-2">
+      <span
+        v-if="canSaveDraft && draftEnabled && !bulkFile && !publicForm"
+        class="ml-2"
+      >
         <v-tooltip location="bottom">
           <template #activator="{ props }">
             <v-btn
@@ -184,7 +194,10 @@ watch(
       </span>
 
       <!-- Go to draft edit -->
-      <span v-if="showEditToggle && isDraft && draftEnabled" class="ml-2">
+      <span
+        v-if="showEditToggle && isDraft && draftEnabled && !publicForm"
+        class="ml-2"
+      >
         <router-link
           :to="{
             name: 'UserFormDraftEdit',
@@ -212,7 +225,7 @@ watch(
       </span>
 
       <!-- Go to draft edit -->
-      <span v-if="submissionId && draftEnabled" class="ml-2">
+      <span v-if="submissionId && draftEnabled && !publicForm" class="ml-2">
         <ManageSubmissionUsers
           :is-draft="isDraft"
           :submission-id="submissionId"

diff --git a/app/frontend/tests/unit/components/designer/FormViewerActions.spec.js b/app/frontend/tests/unit/components/designer/FormViewerActions.spec.js
@@ -210,4 +210,38 @@ describe('FormDisclaimer.vue', () => {
 
     expect(wrapper.html()).toContain('manage-submission-users-stub');
   });
+
+  it('does not render drafts, switch submissions functionality and reders widelayout, print', () => {
+    const wrapper = mount(FormViewerActions, {
+      props: {
+        publicForm: true,
+      },
+      global: {
+        plugins: [pinia],
+        provide: {
+          setWideLayout: vi.fn(),
+        },
+        stubs: STUBS,
+      },
+    });
+
+    expect(wrapper.text()).toContain('trans.formViewerActions.wideLayout');
+    expect(wrapper.text()).toContain('trans.printOptions.print');
+
+    expect(wrapper.text()).not.toContain(
+      'trans.formViewerActions.viewMyDraftOrSubmissions'
+    );
+    expect(wrapper.text()).not.toContain(
+      'trans.formViewerActions.switchSingleSubmssn'
+    );
+    expect(wrapper.text()).not.toContain(
+      'trans.formViewerActions.saveAsADraft'
+    );
+    expect(wrapper.text()).not.toContain(
+      'trans.formViewerActions.editThisDraft'
+    );
+    expect(wrapper.text()).not.toContain(
+      'trans.manageSubmissionUsers.manageTeamMembers'
+    );
+  });
 });