Merge branch 'main' into test/ccp-5133

Author: nimya-aot

.devcontainer/chefs_local/local.sample.json

@@ -149,7 +149,13 @@
       "enabled": false
     },
     "submitToEmail": {
-      "enabled": false
+      "enabled": true,
+      "batchSize": 25,
+      "delivery": "attachment",
+      "reportSizeLimit": 5000000,
+      "attachmentsSizeLimit": 10000000,
+      "attachmentsCountLimit": 10,
+      "stuckTimeoutMinutes": 30
     },
     "documentGenerationV3": {
       "enabled": false

.devcontainer/devcontainer.json

@@ -62,7 +62,8 @@
   //"remoteUser": "root",
 
   "containerEnv": {
-    "NODE_CONFIG_DIR": "${containerWorkspaceFolder}/.devcontainer/chefs_local"
+    "NODE_CONFIG_DIR": "${containerWorkspaceFolder}/.devcontainer/chefs_local",
+    "APITOKEN": "local-dev-token"
   },
   "portsAttributes": {
     "4222": {

.vscode/launch.json

@@ -29,7 +29,8 @@
       "runtimeExecutable": "npm",
       "type": "node",
       "env": {
-        "NODE_CONFIG_DIR": "${workspaceFolder}/.devcontainer/chefs_local"
+        "NODE_CONFIG_DIR": "${workspaceFolder}/.devcontainer/chefs_local",
+        "APITOKEN": "local-dev-token"
       }
     },
     {

app/app.js

@@ -19,6 +19,7 @@ const DataConnection = require('./src/db/dataConnection');
 const dataConnection = new DataConnection();
 const { eventStreamService } = require('./src/components/eventStreamService');
 const clamAvScanner = require('./src/components/clamAvScanner');
+const uploadCleanup = require('./src/forms/file/uploadCleanup');
 
 const statusService = require('./src/components/statusService');
 statusService.registerConnection('dataConnection', 'Database', dataConnection, 'checkAll', 'checkConnection');
@@ -56,6 +57,10 @@ if (process.env.NODE_ENV !== 'test') {
   // Initialize connections and wait for completion
   statusService.initializeAllConnections();
   app.use(httpLogger);
+
+  if (config.has('files.uploads.cleanup')) {
+    uploadCleanup.startUploadCleanupScheduler(config.get('files.uploads.cleanup'));
+  }
 }
 
 const statusPath = `${config.get('server.basePath')}${config.get('server.apiPath')}/status`;
@@ -203,6 +208,7 @@ function cleanup() {
 
   log.info('Cleaning up...', { function: 'cleanup' });
   clearInterval(probeId);
+  uploadCleanup.stopUploadCleanupScheduler();
 
   eventStreamService.closeConnection();
   dataConnection.close(() => process.exit());

app/config/custom-environment-variables.json

@@ -14,7 +14,13 @@
       "fileKey": "FILES_UPLOADS_FILEKEY",
       "fileMaxSize": "FILES_UPLOADS_FILEMAXSIZE",
       "fileMinSize": "FILES_UPLOADS_FILEMINSIZE",
-      "path": "FILES_UPLOADS_PATH"
+      "path": "FILES_UPLOADS_PATH",
+      "cleanup": {
+        "enabled": "FILES_UPLOADS_CLEANUP_ENABLED",
+        "staleAgeMinutes": "FILES_UPLOADS_CLEANUP_STALEAGEMINUTES",
+        "intervalMinutes": "FILES_UPLOADS_CLEANUP_INTERVALMINUTES",
+        "batchSize": "FILES_UPLOADS_CLEANUP_BATCHSIZE"
+      }
     },
     "permanent": "FILES_PERMANENT",
     "localStorage": {
@@ -128,7 +134,14 @@
       "enabled": "FEATURES_OFFLINEFORMS_ENABLED"
     },
     "submitToEmail": {
-      "enabled": "FEATURES_SUBMITTOEMAIL_ENABLED"
+      "enabled": "FEATURES_SUBMITTOEMAIL_ENABLED",
+      "batchSize": "FEATURES_SUBMITTOEMAIL_BATCHSIZE",
+      "delivery": "FEATURES_SUBMITTOEMAIL_DELIVERY",
+      "reportSizeLimit": "FEATURES_SUBMITTOEMAIL_REPORTSIZELIMIT",
+      "attachmentsSizeLimit": "FEATURES_SUBMITTOEMAIL_ATTACHMENTSSIZELIMIT",
+      "attachmentsCountLimit": "FEATURES_SUBMITTOEMAIL_ATTACHMENTSCOUNTLIMIT",
+      "stuckTimeoutMinutes": "FEATURES_SUBMITTOEMAIL_STUCKTIMEOUTMINUTES",
+      "maxAttempts": "FEATURES_SUBMITTOEMAIL_MAXATTEMPTS"
     },
     "documentGenerationV2": {
       "enabled": "FEATURES_DOCUMENTGENERATIONV2_ENABLED"

app/config/default.json

@@ -13,7 +13,13 @@
       "fileMaxSize": "25MB",
       "fileMaxSizeBytes": "25000000",
       "fileMinSize": "0KB",
-      "path": "files"
+      "path": "files",
+      "cleanup": {
+        "enabled": true,
+        "staleAgeMinutes": 1440,
+        "intervalMinutes": 60,
+        "batchSize": 100
+      }
     },
     "permanent": "objectStorage",
     "localStorage": {
@@ -142,7 +148,14 @@
       "enabled": false
     },
     "submitToEmail": {
-      "enabled": false
+      "enabled": true,
+      "batchSize": 25,
+      "delivery": "attachment",
+      "reportSizeLimit": 5000000,
+      "attachmentsSizeLimit": 10000000,
+      "attachmentsCountLimit": 10,
+      "stuckTimeoutMinutes": 30,
+      "maxAttempts": 3
     },
     "documentGenerationV2": {
       "enabled": true

app/frontend/src/components/designer/FormDesigner.vue

@@ -13,6 +13,7 @@ import formioIl8next from '~/internationalization/trans/formio/formio.json';
 import templateExtensions from '~/plugins/templateExtensions';
 import { formService, userService } from '~/services';
 import { useAuthStore } from '~/store/auth';
+import { useFeatureFlagStore } from '~/store/featureFlags';
 import { useFormStore } from '~/store/form';
 import { useNotificationStore } from '~/store/notification';
 import { FormDesignerBuilderOptions } from '~/utils/constants';
@@ -71,6 +72,7 @@ const savedStatus = ref(properties.isSavedStatus);
 const saving = ref(false);
 
 const authStore = useAuthStore();
+const featureFlagStore = useFeatureFlagStore();
 const formStore = useFormStore();
 const notificationStore = useNotificationStore();
 
@@ -101,6 +103,11 @@ onMounted(async () => {
   if (!properties.formId) {
     // We are creating a new form, so we obtain the original schema here.
     patch.value.originalSchema = deepClone(formSchema.value);
+    // Resolve feature flags with no form context. A brand-new form is not
+    // allowlisted, so allowlist-gated features (e.g. submitToEmail) resolve
+    // inactive. Without this, a stale active map from a previously-opened
+    // allowlisted form would leak in and show gated controls on a new form.
+    await featureFlagStore.resolveForContext({});
   }
 });
 
@@ -411,6 +418,7 @@ async function schemaCreateNew() {
     showAssigneeInSubmissionsTable: form.value.showAssigneeInSubmissionsTable,
     showSubmissionConfirmation: form.value.showSubmissionConfirmation,
     submissionReceivedEmails: form.value.submissionReceivedEmails,
+    submissionPackageSettings: form.value.submissionPackageSettings,
     reminder_enabled: false,
     deploymentLevel: form.value.deploymentLevel,
     ministry: form.value.ministry,

app/frontend/src/components/designer/FormSettings.vue

@@ -34,7 +34,7 @@ const { form, isFormPublished, isRTL } = storeToRefs(useFormStore());
         <FormFunctionalitySettings :disabled="disabled" />
       </v-col>
       <v-col cols="12" md="6">
-        <FormSubmissionSettings />
+        <FormSubmissionSettings :disabled="disabled" />
       </v-col>
       <v-col v-if="form.schedule.enabled && isFormPublished" cols="12" md="6">
         <FormScheduleSettings />

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

@@ -1,26 +1,32 @@
 <script setup>
 import { storeToRefs } from 'pinia';
-import { ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import { useFormStore } from '~/store/form';
 import { Regex } from '~/utils/constants';
+import SubmissionPackageEmailSettings from './SubmissionPackageEmailSettings.vue';
 
 const { t, locale } = useI18n({ useScope: 'global' });
 
 const { form, isRTL } = storeToRefs(useFormStore());
 
 /* c8 ignore start */
-const emailArrayRules = ref([
-  (v) =>
-    !form.value.sendSubmissionReceivedEmail ||
+const makeEmailArrayRules = (enabledRefOrGetter) => [
+  (v = []) =>
+    !enabledRefOrGetter() ||
     v.length > 0 ||
     t('trans.formSettings.atLeastOneEmailReq'),
-  (v) =>
-    !form.value.sendSubmissionReceivedEmail ||
-    v.every((item) => new RegExp(Regex.EMAIL).test(item)) ||
+
+  (v = []) =>
+    !enabledRefOrGetter() ||
+    v.every((item) => new RegExp(Regex.EMAIL).test(String(item).trim())) ||
     t('trans.formSettings.validEmailRequired'),
-]);
+];
+
+const submissionReceivedEmailRules = computed(() =>
+  makeEmailArrayRules(() => form.sendSubmissionReceivedEmail)
+);
 /* c8 ignore stop */
 </script>
 
@@ -100,35 +106,37 @@ const emailArrayRules = ref([
         </div>
       </template>
     </v-checkbox>
+    <div v-if="form.sendSubmissionReceivedEmail">
+      <v-combobox
+        v-model="form.submissionReceivedEmails"
+        :hide-no-data="false"
+        :rules="submissionReceivedEmailRules"
+        solid
+        variant="outlined"
+        hide-selected
+        clearable
+        :hint="$t('trans.formSettings.addMoreValidEmailAddrs')"
+        :label="$t('trans.formSettings.notificationEmailAddrs')"
+        multiple
+        chips
+        closable-chips
+        :delimiters="[' ', ',']"
+        append-icon=""
+        :lang="locale"
+      >
+        <template #no-data>
+          <v-list-item>
+            <v-list-item-title>
+              <span
+                :lang="locale"
+                v-html="$t('trans.formSettings.pressToAddMultiEmail')"
+              />
+            </v-list-item-title>
+          </v-list-item>
+        </template>
+      </v-combobox>
+    </div>
 
-    <v-combobox
-      v-if="form.sendSubmissionReceivedEmail"
-      v-model="form.submissionReceivedEmails"
-      :hide-no-data="false"
-      :rules="emailArrayRules"
-      solid
-      variant="outlined"
-      hide-selected
-      clearable
-      :hint="$t('trans.formSettings.addMoreValidEmailAddrs')"
-      :label="$t('trans.formSettings.notificationEmailAddrs')"
-      multiple
-      chips
-      closable-chips
-      :delimiters="[' ', ',']"
-      append-icon=""
-      :lang="locale"
-    >
-      <template #no-data>
-        <v-list-item>
-          <v-list-item-title>
-            <span
-              :lang="locale"
-              v-html="$t('trans.formSettings.pressToAddMultiEmail')"
-            />
-          </v-list-item-title>
-        </v-list-item>
-      </template>
-    </v-combobox>
+    <SubmissionPackageEmailSettings />
   </BasePanel>
 </template>