Merge pull request #32 from RyanBirtch-aot/main

Sync with main branch
RyanBirtch-aot · Nov 21, 2024 · afb3639 · afb3639
2 parents 2110031 + 68bd7c3
commit afb3639
Show file tree

Hide file tree

Showing 7 changed files with 534 additions and 131 deletions.
diff --git a/app/frontend/src/components/designer/FormViewer.vue b/app/frontend/src/components/designer/FormViewer.vue
@@ -128,7 +128,9 @@ const { authenticated, keycloak, tokenParsed, user } = storeToRefs(authStore);
 const { downloadedFile, isRTL } = storeToRefs(formStore);
 
 const formScheduleExpireMessage = computed(() =>
-  t('trans.formViewer.formScheduleExpireMessage')
+  form?.value?.schedule?.message
+    ? form.value.schedule.message
+    : t('trans.formViewer.formScheduleExpireMessage')
 );
 
 const formUnauthorizedMessage = computed(() =>

diff --git a/app/frontend/tests/unit/components/designer/FormViewer.spec.js b/app/frontend/tests/unit/components/designer/FormViewer.spec.js
@@ -170,7 +170,7 @@ describe('FormViewer.vue', () => {
     getDispositionSpy.mockImplementation(() => {});
   });
 
-  it('formScheduleExpireMessage returns the formScheduleExpireMessage translation', async () => {
+  it('formScheduleExpireMessage returns the formScheduleExpireMessage translation or custom message', async () => {
     const wrapper = shallowMount(FormViewer, {
       props: {
         formId: formId,
@@ -187,9 +187,19 @@ describe('FormViewer.vue', () => {
 
     await flushPromises();
 
+    wrapper.vm.form = {};
+
     expect(wrapper.vm.formScheduleExpireMessage).toEqual(
       'trans.formViewer.formScheduleExpireMessage'
     );
+
+    wrapper.vm.form = {
+      schedule: {
+        message: 'custom message',
+      },
+    };
+
+    expect(wrapper.vm.formScheduleExpireMessage).toEqual('custom message');
   });
 
   it('formUnauthorizedMessage returns the formUnauthorizedMessage translation', async () => {

diff --git a/app/package-lock.json b/app/package-lock.json