Merge LD sub sub

.github/build_vars.sh

@@ -15,6 +15,7 @@ var_list=(
   COGNITO_TEST_USERS_PASSWORD
   NO_EMAIL_DEBUG
   REACT_APP_GOOGLE_TAG
+  REACT_APP_LD_CLIENT_ID
 )
 
 set_value() {

.github/workflows/deploy.yml

@@ -110,6 +110,11 @@ jobs:
         with:
           role-to-assume: ${{ env.AWS_OIDC_ROLE_TO_ASSUME }}
           aws-region: ${{ env.AWS_DEFAULT_REGION }}
+      - name: Fetch SSM Parameter
+        id: fetch_ssm
+        run: |
+          LdClientId=$(aws ssm get-parameter --name "/configuration/onemacmmdl/LdClientId" --query "Parameter.Value" --output text)
+          echo "REACT_APP_LD_CLIENT_ID=${LdClientId}" >> $GITHUB_ENV
       - uses: actions/setup-node@v3
         with:
           node-version: "20.x"

services/admin/handlers/insertNotification.json

@@ -0,0 +1,10 @@
+{
+  "_comment": "Dates are passed in format YYYY-MM-DD or keywords 'today' or 'x days from now'",
+  "publicationDate": "2024-01-01",
+  "expiryDate": "7 days from now",
+  "header": "New Feature Release",
+  "body": "We have released a new feature. Check it out now!",
+  "buttonText": "Learn More",
+  "buttonLink": "https://example.com/feature",
+  "notificationType": "user"
+}

services/admin/handlers/insertNotification.ts

@@ -0,0 +1,150 @@
+import { DynamoDB } from "aws-sdk";
+import { v4 as uuidv4 } from "uuid"; // Import UUID library
+import { addDays } from "date-fns"; // Import a date manipulation library like date-fns for handling date parsing
+
+const dynamoDb = new DynamoDB.DocumentClient(
+  process.env.IS_OFFLINE
+    ? {
+        endpoint: "http://localhost:8000",
+      }
+    : {}
+);
+const oneMacTableName = process.env.oneMacTableName || "defaultTableName";
+
+// Define types for event and notification record
+interface EventInput {
+  publicationDate?: string;
+  expiryDate?: string;
+  header: string;
+  body: string;
+  buttonText?: string;
+  buttonLink?: string;
+  notificationType: "user" | "system"; // User-friendly notification type input
+}
+
+interface NotificationRecord {
+  pk: string;
+  sk: string;
+  GSI1pk: string;
+  GSI1sk: string;
+  publicationDate: string;
+  expiryDate: string;
+  header: string;
+  body: string;
+  buttonText?: string | null;
+  buttonLink?: string | null;
+  createdAt: string;
+}
+
+// Function to translate notificationType to GSI1pk value
+function mapNotificationType(type: "user" | "system"): string {
+  return type === "user" ? "USER_NOTIFICATION" : "SYSTEM";
+}
+
+// Function to handle flexible date inputs
+function parseDate(input?: string): string {
+  // If no input is provided, default to the current date
+  if (!input) {
+    return new Date().toISOString();
+  }
+
+  if (input === "today") {
+    return new Date().toISOString();
+  }
+
+  if (input.includes("days from now")) {
+    const days = parseInt(input.split(" ")[0], 10);
+    return addDays(new Date(), days).toISOString();
+  }
+
+  // Assuming user passes YYYY-MM-DD format for easier input
+  if (/^\d{4}-\d{2}-\d{2}$/.test(input)) {
+    return new Date(`${input}T00:00:00Z`).toISOString();
+  }
+
+  // Default to current date if input is invalid
+  return new Date().toISOString();
+}
+
+function validateEvent(event: EventInput): void {
+  const missingParams: string[] = [];
+
+  if (!event.header) {
+    missingParams.push("header");
+  }
+  if (!event.body) {
+    missingParams.push("body");
+  }
+  if (!event.notificationType) {
+    missingParams.push("notificationType");
+  }
+  if (missingParams.length > 0) {
+    throw new Error(`Missing event parameters: ${missingParams.join(", ")}`);
+  }
+
+  console.log("Event passed validation");
+}
+
+function generateNotificationId(): string {
+  return uuidv4();
+}
+
+function formatNotificationRecord(event: EventInput): NotificationRecord {
+  const notificationId = generateNotificationId(); // Generate a UUID for the notification ID
+  const pk = "SYSTEM"; // System-wide notification
+  const sk = `NOTIFICATION#${notificationId}`; // Unique notification identifier
+
+  // Default values for publicationDate and expiryDate with more user-friendly inputs
+  const publicationDate = parseDate(event.publicationDate); // Default to current date
+  const expiryDate = event.expiryDate
+    ? parseDate(event.expiryDate)
+    : "9999-12-31T23:59:59Z"; // Default to far future date
+
+  // Use the translated notificationType
+  const GSI1pk = mapNotificationType(event.notificationType);
+  const GSI1sk = `${publicationDate}#${expiryDate}`; // Sort key for GSI based on dates
+  const createdAt = new Date().toISOString(); // Current timestamp
+
+  return {
+    pk,
+    sk,
+    GSI1pk,
+    GSI1sk,
+    publicationDate,
+    expiryDate,
+    header: event.header,
+    body: event.body,
+    buttonText: event.buttonText || null, // Optional field
+    buttonLink: event.buttonLink || null, // Optional field
+    createdAt,
+  };
+}
+
+async function insertNotification(record: NotificationRecord): Promise<void> {
+  const params: DynamoDB.DocumentClient.PutItemInput = {
+    TableName: oneMacTableName,
+    Item: record,
+  };
+
+  console.log("Inserting notification", params);
+
+  await dynamoDb.put(params).promise();
+}
+
+export const main = async (event: EventInput) => {
+  console.log("insertNotification.main", event);
+
+  validateEvent(event);
+
+  const notificationRecord = formatNotificationRecord(event);
+
+  await insertNotification(notificationRecord);
+
+  return {
+    statusCode: 200,
+    body: JSON.stringify({
+      message: "Notification inserted successfully",
+      record: notificationRecord, // Return the full inserted record
+    }),
+  };
+};

services/admin/serverless.yml

@@ -79,3 +79,7 @@ functions:
       - schedule:
           rate: rate(6 hours)
     timeout: 180
+
+  insertNotification:
+    handler: ./handlers/insertNotification.main
+    timeout: 180

services/app-api/getDetail.js

@@ -87,7 +87,7 @@ export const getDetails = async (event) => {
     if (!userRoleObj.isCMSUser && result.Item.reviewTeam)
       delete result.Item.reviewTeam;
 
-    result.Item.actions = getActionsForPackage(
+    result.Item.actions = await getActionsForPackage(
       result.Item.componentType,
       originalStatus,
       !!result.Item.latestRaiResponseTimestamp,

services/app-api/getMyPackages.js

@@ -19,106 +19,102 @@ export const getMyPackages = async (email, group) => {
   if (!email) return RESPONSE_CODE.USER_NOT_FOUND;
   if (!group) return RESPONSE_CODE.DATA_MISSING;
 
-  return getUser(email)
-    .then((user) => {
-      if (!user) throw RESPONSE_CODE.USER_NOT_AUTHORIZED;
+  try {
+    const user = await getUser(email);
+    if (!user) throw RESPONSE_CODE.USER_NOT_AUTHORIZED;
 
-      const userRoleObj = getUserRoleObj(user.roleList);
-      const territoryList = getActiveTerritories(user.roleList);
-      const statusMap = userRoleObj.isCMSUser
-        ? cmsStatusUIMap
-        : stateStatusUIMap;
+    const userRoleObj = getUserRoleObj(user.roleList);
+    const territoryList = getActiveTerritories(user.roleList);
+    const statusMap = userRoleObj.isCMSUser ? cmsStatusUIMap : stateStatusUIMap;
 
-      if (
-        !userRoleObj.canAccessDashboard ||
-        (Array.isArray(territoryList) && territoryList.length === 0)
-      ) {
-        throw RESPONSE_CODE.USER_NOT_AUTHORIZED;
-      }
+    if (
+      !userRoleObj.canAccessDashboard ||
+      (Array.isArray(territoryList) && territoryList.length === 0)
+    ) {
+      throw RESPONSE_CODE.USER_NOT_AUTHORIZED;
+    }
 
-      const baseParams = {
-        TableName: process.env.oneMacTableName,
-        IndexName: "GSI1",
-        ExclusiveStartKey: null,
-        ScanIndexForward: false,
-        ProjectionExpression:
-          "componentId,componentType,currentStatus,submissionTimestamp,latestRaiResponseTimestamp,lastActivityTimestamp,submitterName,submitterEmail,waiverAuthority, cpocName, reviewTeam, subStatus, finalDispositionDate",
-      };
-      const grouppk = "OneMAC#" + group;
-      let paramList = [];
-      if (territoryList[0] !== "N/A") {
-        paramList = territoryList.map((territory) => {
-          return {
-            ...baseParams,
-            KeyConditionExpression: "GSI1pk = :pk AND begins_with(GSI1sk,:t1)",
-            ExpressionAttributeValues: {
-              ":pk": grouppk,
-              ":t1": territory,
-            },
-          };
-        });
-      } else {
-        paramList = [
-          {
-            ...baseParams,
-            KeyConditionExpression: "GSI1pk = :pk",
-            ExpressionAttributeValues: {
-              ":pk": grouppk,
-            },
+    const baseParams = {
+      TableName: process.env.oneMacTableName,
+      IndexName: "GSI1",
+      ExclusiveStartKey: null,
+      ScanIndexForward: false,
+      ProjectionExpression:
+        "componentId,componentType,currentStatus,submissionTimestamp,latestRaiResponseTimestamp,lastActivityTimestamp,submitterName,submitterEmail,waiverAuthority, cpocName, reviewTeam, subStatus, finalDispositionDate",
+    };
+    const grouppk = "OneMAC#" + group;
+    let paramList = [];
+    if (territoryList[0] !== "N/A") {
+      paramList = territoryList.map((territory) => {
+        return {
+          ...baseParams,
+          KeyConditionExpression: "GSI1pk = :pk AND begins_with(GSI1sk,:t1)",
+          ExpressionAttributeValues: {
+            ":pk": grouppk,
+            ":t1": territory,
           },
-        ];
-      }
+        };
+      });
+    } else {
+      paramList = [
+        {
+          ...baseParams,
+          KeyConditionExpression: "GSI1pk = :pk",
+          ExpressionAttributeValues: {
+            ":pk": grouppk,
+          },
+        },
+      ];
+    }
 
-      return Promise.all(
-        paramList.map(async (params) => {
-          const promiseItems = [];
-          do {
-            const results = await dynamoDb.query(params);
-            results.Items.map((oneItem) => {
-              oneItem.actions = getActionsForPackage(
-                oneItem.componentType,
-                oneItem.currentStatus,
-                !!oneItem.latestRaiResponseTimestamp,
-                oneItem.subStatus,
-                userRoleObj,
-                "package"
-              );
-              if (oneItem.waiverAuthority)
-                oneItem.temporaryExtensionType = oneItem.waiverAuthority.slice(
-                  0,
-                  7
-                );
+    // Using a for...of loop to ensure async operations are awaited correctly
+    const allItems = [];
+    for (const params of paramList) {
+      const promiseItems = [];
+      do {
+        const results = await dynamoDb.query(params);
+        for (const oneItem of results.Items) {
+          oneItem.actions = await getActionsForPackage(
+            oneItem.componentType,
+            oneItem.currentStatus,
+            !!oneItem.latestRaiResponseTimestamp,
+            oneItem.subStatus,
+            userRoleObj,
+            "package"
+          );
+          if (oneItem.waiverAuthority)
+            oneItem.temporaryExtensionType = oneItem.waiverAuthority.slice(
+              0,
+              7
+            );
 
-              if (statusMap[oneItem.subStatus]) {
-                oneItem.subStatus = statusMap[oneItem.subStatus];
-              }
+          if (statusMap[oneItem.subStatus]) {
+            oneItem.subStatus = statusMap[oneItem.subStatus];
+          }
 
-              if (!statusMap[oneItem.currentStatus])
-                console.log(
-                  "%s status of %s not mapped!",
-                  oneItem.pk,
-                  oneItem.currentStatus
-                );
-              else {
-                oneItem.currentStatus = statusMap[oneItem.currentStatus];
-                if (
-                  oneItem.currentStatus !== Workflow.ONEMAC_STATUS.INACTIVATED
-                )
-                  promiseItems.push(oneItem);
-              }
-            });
-            params.ExclusiveStartKey = results.LastEvaluatedKey;
-          } while (params.ExclusiveStartKey);
-          return promiseItems;
-        })
-      ).then((values) => {
-        return values.flat();
-      });
-    })
-    .catch((error) => {
-      console.log("error is: ", error);
-      return error;
-    });
+          if (!statusMap[oneItem.currentStatus])
+            console.log(
+              "%s status of %s not mapped!",
+              oneItem.pk,
+              oneItem.currentStatus
+            );
+          else {
+            oneItem.currentStatus = statusMap[oneItem.currentStatus];
+            if (oneItem.currentStatus !== Workflow.ONEMAC_STATUS.INACTIVATED)
+              promiseItems.push(oneItem);
+          }
+        }
+        params.ExclusiveStartKey = results.LastEvaluatedKey;
+      } while (params.ExclusiveStartKey);
+
+      allItems.push(...promiseItems);
+    }
+
+    return allItems; // Flattened list of all items
+  } catch (error) {
+    console.log("error is: ", error);
+    return error;
+  }
 };
 
 // get the approver list for a rols and possibly a territory