Merge branch 'main' into CCP-4294-Package-Email-Submission

Author: RyanBirtch-aot

.devcontainer/chefs_local/local.sample.json

@@ -98,6 +98,9 @@
         "clientId": "CDOGS_CLIENT_ID",
         "clientSecret": "CDOGS_CLIENT_SECRET"
       },
+      "cdogsV3": {
+        "endpoint": "https://chefs-cdogs.apps.silver.devops.gov.bc.ca/api"
+      },
       "css": {
         "endpoint": "https://api.loginproxy.gov.bc.ca/api",
         "tokenEndpoint": "https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token",

.devcontainer/chefs_local/test.json

@@ -94,6 +94,9 @@
         "tokenEndpoint": "https://dev.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token",
         "clientId": "CDOGS_CLIENT_ID",
         "clientSecret": "CDOGS_CLIENT_SECRET"
+      },
+      "cdogsV3": {
+        "endpoint": "https://chefs-cdogs.apps.silver.devops.gov.bc.ca"
       }
     }
   },

app/config/custom-environment-variables.json

@@ -94,6 +94,9 @@
         "clientId": "SC_CS_CDOGS_CLIENT_ID",
         "clientSecret": "SC_CS_CDOGS_CLIENT_SECRET"
       },
+      "cdogsV3": {
+        "endpoint": "SC_CS_CDOGS_V3_ENDPOINT"
+      },
       "css": {
         "endpoint": "SC_CS_CSS_ENDPOINT",
         "tokenEndpoint": "SC_CS_CSS_TOKEN_ENDPOINT",

app/config/default.json

@@ -98,6 +98,9 @@
         "clientId": "CDOGS_CLIENT_ID",
         "clientSecret": "CDOGS_CLIENT_SECRET"
       },
+      "cdogsV3": {
+        "endpoint": "http://common-document-generation-service-master.a12c97-prod:3000/api"
+      },
       "css": {
         "endpoint": "https://api.loginproxy.gov.bc.ca/api",
         "tokenEndpoint": "https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/token",

app/frontend/src/components/forms/DirectPrintButton.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
 
 import { createDownload } from '~/composables/printOptions';
-import { formService, utilsService } from '~/services';
+import { formService } from '~/services';
 import { useFormStore } from '~/store/form';
 import { useNotificationStore } from '~/store/notification';
 import { NotificationTypes } from '~/utils/constants';
@@ -76,7 +76,7 @@ async function generateDocument(submissionId, body, submission) {
   if (submissionId?.length > 0) {
     return await formService.docGen(submissionId, body);
   }
-  return await utilsService.draftDocGen({
+  return await formService.draftDocGen(formId.value, {
     template: body,
     submission: submission,
   });

app/frontend/src/components/forms/PrintOptions.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { onBeforeUnmount, computed, ref, watch, nextTick } from 'vue';
 
 import { createDownload } from '~/composables/printOptions';
-import { formService, utilsService } from '~/services';
+import { formService } from '~/services';
 import { useFormStore } from '~/store/form';
 import { useNotificationStore } from '~/store/notification';
 import { NotificationTypes } from '~/utils/constants';
@@ -187,7 +187,7 @@ async function generate() {
         template: body,
         submission: properties.submission,
       };
-      response = await utilsService.draftDocGen(draftData);
+      response = await formService.draftDocGen(formId.value, draftData);
     }
     // create file to download
     const filename = getDisposition(response.headers['content-disposition']);

app/frontend/src/services/formService.js

@@ -542,6 +542,25 @@ export default {
     );
   },
 
+  /**
+   * @function draftDocGen
+   * Upload a template and ad-hoc (draft) submission data to render a document for a
+   * form, before any submission has been saved.
+   * @param {string} formId The form identifier
+   * @param {Object} body The request body containing the template and submission data
+   * @returns {Promise} An axios response
+   */
+  draftDocGen(formId, body) {
+    return appAxios().post(
+      `${ApiRoutes.FORMS}/${formId}/template/render`,
+      body,
+      {
+        responseType: 'arraybuffer', // Needed for binaries unless you want pain
+        timeout: 30000, // Override default timeout as this call could take a while
+      }
+    );
+  },
+
   /**
    * @function updateSubmissionStatus
    * Add a new status entry to the submission

app/frontend/src/services/index.js

@@ -5,7 +5,6 @@ export { default as rbacService } from './rbacService';
 export { default as roleService } from './roleService';
 export { default as userService } from './userService';
 export { default as fileService } from './fileService';
-export { default as utilsService } from './utilsService';
 export { default as encryptionKeyService } from './encryptionKeyService';
 export { default as eventStreamConfigService } from './eventStreamConfigService';
 export { default as recordsManagementService } from './recordsManagementService';

app/frontend/src/services/utilsService.js

@@ -13,7 +13,6 @@ export const ApiRoutes = Object.freeze({
   SUBMISSION: '/submissions',
   USERS: '/users',
   FILES: '/files',
-  UTILS: '/utils',
   FILES_API_ACCESS: '/filesApiAccess',
   PROXY: '/proxy',
   EXTERNAL_APIS: '/externalAPIs',