Merge pull request #472 from Enterprise-CMCS/master

Release to val

.gitignore

@@ -13,4 +13,5 @@ build_run
 .turbo
 coverage
 lambda_layer.zip
-**/.auth/*.json
+**/.auth/*.json
+.dccache

docs/docs/webforms.md

@@ -31,4 +31,19 @@ These webforms are a replacement for the pdf form uploads previously used in mmd
 ## Things to note
 Some of the fields listed in these webforms are FieldGroups and FieldArrays. This means that they are arrays of values that contain groups of like values (think an array of identicaly typed objects). The items within those arrays will have `Parent` values to indicate which parent they belong to.
 
+## Key structuring of Webforms:
+For our webforms, we are in communication with data connect on our we should pass our json data to their team. We have gone with this approach to help streamline our data, but also make it as easy as possible to hunt down questions if items are added or changed. Our “name” keys are made up of for different parts.
 
+Our agreed upon key structures for the “name” property of form field sections are as follows:
+
+The Four Parts to the name field are:
+- form name '-' instead of dots
+- section title separated by “-” shortened if possible
+- input id/label as close and short as possible with only '-' as separators
+- input type is usually the (rhf) value text/textarea/array/checkgroup/upload/radiogroup/select
+
+> `[form-name]_[section-title]_[question-id]_[input]`
+
+Example: **"abp1_pop-id_abp-pop-name_input"**
+
+**It is imperative that this pattern be followed in all forms.**

src/cli/runner.ts

@@ -47,6 +47,13 @@ export default class LabeledProcessRunner {
     return `\x1b[38;5;${color}m ${prefix.padStart(maxLength)}|\x1b[0m`;
   }
 
+  private sanitizeInput(input) {
+    // A basic pattern that allows letters, numbers, dashes, underscores, and periods
+    // Adjust the pattern to fit the expected input format
+    const sanitizedInput = input.replace(/[^a-zA-Z0-9-_\.]/g, "");
+    return sanitizedInput;
+  }
+
   // run_command_and_output runs the given shell command and interleaves its output with all
   // other commands run via this method.
   //
@@ -64,15 +71,15 @@ export default class LabeledProcessRunner {
       stdout?: boolean;
       stderr?: boolean;
       close?: boolean;
-    } = {}
+    } = {},
   ) {
     silenced = {
       ...{ open: false, stdout: false, stderr: false, close: false },
       ...silenced,
     };
     const proc_opts = cwd ? { cwd } : {};
 
-    const command = cmd[0];
+    const command = this.sanitizeInput(cmd[0]);
     const args = cmd.slice(1);
 
     const proc = spawn(command, args, proc_opts);
@@ -89,10 +96,10 @@ export default class LabeledProcessRunner {
     };
 
     proc.stdout.on("data", (data) =>
-      handleOutput(data, prefix, silenced.stdout!)
+      handleOutput(data, prefix, silenced.stdout!),
     );
     proc.stderr.on("data", (data) =>
-      handleOutput(data, prefix, silenced.stderr!)
+      handleOutput(data, prefix, silenced.stderr!),
     );
 
     return new Promise<void>((resolve, reject) => {

src/packages/shared-types/action-types/new-submission.ts

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { attachmentSchema } from "../attachments";
+import { notificationMetadataSchema } from "../notification-metadata";
 
 // This is the event schema for ne submissions from our system
 export const onemacSchema = z.object({
@@ -13,12 +14,7 @@ export const onemacSchema = z.object({
   submitterEmail: z.string(),
   attachments: z.array(attachmentSchema).nullish(),
   raiWithdrawEnabled: z.boolean().default(false),
-  notificationMetadata: z
-    .object({
-      proposedEffectiveDate: z.number().nullish(),
-      submissionDate: z.number().nullish(),
-    })
-    .nullish(),
+  notificationMetadata: notificationMetadataSchema.nullish(),
   // these are specific to TEs... should be broken into its own schema
   statusDate: z.number().optional(),
   submissionDate: z.number().optional(),

src/packages/shared-types/action-types/respond-to-rai.ts

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { attachmentSchema } from "../attachments";
+import { notificationMetadataSchema } from "../notification-metadata";
 
 export const raiResponseSchema = z.object({
   id: z.string(),
@@ -11,5 +12,6 @@ export const raiResponseSchema = z.object({
   additionalInformation: z.string().nullable().default(null),
   submitterName: z.string(),
   submitterEmail: z.string(),
+  notificationMetadata: notificationMetadataSchema.nullish(),
 });
 export type RaiResponse = z.infer<typeof raiResponseSchema>;

src/packages/shared-types/notification-metadata.ts

@@ -0,0 +1,9 @@
+import { z } from "zod";
+
+// This is addiitonal notification metadata needed for email
+export const notificationMetadataSchema = z.object({
+      proposedEffectiveDate: z.number().nullish(),
+      submissionDate: z.number().nullish(),
+});
+
+export type NotificationMetadata = z.infer<typeof notificationMetadataSchema>;

src/services/api/handlers/packageActions.ts

@@ -30,7 +30,7 @@ import {
 import { produceMessage } from "../libs/kafka";
 import { response } from "../libs/handler";
 import { SEATOOL_STATUS } from "shared-types/statusHelper";
-import { formatSeatoolDate, seaToolFriendlyTimestamp } from "shared-utils";
+import { formatSeatoolDate, seaToolFriendlyTimestamp, getNextBusinessDayTimestamp } from "shared-utils";
 import { buildStatusMemoQuery } from "../libs/statusMemo";
 
 const TOPIC_NAME = process.env.topicName as string;
@@ -171,6 +171,9 @@ export async function withdrawRai(body: RaiWithdraw, document: any) {
       JSON.stringify({
         ...result.data,
         actionType: Action.WITHDRAW_RAI,
+        notificationMetadata: {
+          submissionDate: getNextBusinessDayTimestamp()
+        },
       }),
     );
 
@@ -273,6 +276,9 @@ export async function respondToRai(body: RaiResponse, document: any) {
         ...result.data,
         responseDate: today,
         actionType: Action.RESPOND_TO_RAI,
+        notificationMetadata: {
+          submissionDate: getNextBusinessDayTimestamp()
+        },
       }),
     );
 

src/services/api/handlers/submit.ts

@@ -237,8 +237,8 @@ export const submit = async (event: APIGatewayEvent) => {
     // ${subTypeIdsInsert}
 
     // data for emails
-    body.notificationMetadata = {
-      submissionDate,
+    eventBody.data.notificationMetadata = {
+      submissionDate: submissionDate,
       proposedEffectiveDate: body.proposedEffectiveDate,
     };