Auto-update feature branch with changes from the main branch

Author: github-actions[bot]

.github/workflows/deploy-prod.yml

@@ -8,7 +8,7 @@ on:
       - 'v*'
 
 jobs:
-  test:
+  test-unit:
     permissions:
       contents: read
     runs-on: ubuntu-latest
@@ -70,7 +70,7 @@ jobs:
         id: get_version
         run: echo "VITE_BUILD_HASH=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_ENV"
 
-      - name: Run build
+      - name: Run Prod build
         run: make build
         env:
           HUSKY: "0"
@@ -84,10 +84,89 @@ jobs:
           include-hidden-files: true
           name: build-prod
           path: |
-            .aws-sam/
             dist/
             dist_ui/
 
+      - name: Clean and run QA build
+        run: sudo rm -rf dist/ && sudo rm -rf dist_ui/ && make build
+        env:
+          HUSKY: "0"
+          VITE_RUN_ENVIRONMENT: dev
+          RunEnvironment: dev
+
+      - name: Upload Build files
+        uses: actions/upload-artifact@v4
+        with:
+          include-hidden-files: true
+          name: build-qa
+          path: |
+            dist/
+            dist_ui/
+
+  test-e2e:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    name: Run E2E testing
+    concurrency:
+      group: ${{ github.event.repository.name }}-dev-env
+      cancel-in-progress: false
+    permissions:
+      id-token: write
+      contents: read
+    needs:
+      - build
+    environment: "AWS QA"
+    steps:
+      - uses: actions/checkout@v5
+        env:
+          HUSKY: "0"
+
+      - name: Set up Node for testing
+        uses: actions/setup-node@v5
+        with:
+          node-version: 22.x
+          cache: "yarn"
+
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: 1.12.2
+
+      - name: Restore Yarn Cache
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: yarn-modules-${{ runner.arch }}-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-dev
+          restore-keys: |
+            yarn-modules-${{ runner.arch }}-${{ runner.os }}-
+
+      - name: Download Build files
+        uses: actions/download-artifact@v5
+        with:
+          name: build-qa
+
+      - uses: aws-actions/configure-aws-credentials@v5
+        with:
+          role-to-assume: arn:aws:iam::427040638965:role/GitHubActionsRole
+          role-session-name: Core_QA_Deployment_${{ github.run_id }}
+          aws-region: us-east-2
+
+      - name: Publish to AWS
+        run: make deploy_qa
+        env:
+          HUSKY: "0"
+          VITE_RUN_ENVIRONMENT: dev
+
+      - name: Run health check
+        run: make dev_health_check
+
+      - name: Run E2E testing
+        run: make test_e2e
+        env:
+          JWT_KEY: ${{ secrets.JWT_KEY }}
+          PLAYWRIGHT_USERNAME: ${{ secrets.PLAYWRIGHT_USERNAME }}
+          PLAYWRIGHT_PASSWORD: ${{ secrets.PLAYWRIGHT_PASSWORD }}
+
   deploy-prod:
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -99,8 +178,8 @@ jobs:
       id-token: write
       contents: read
     needs:
-      - test
-      - build
+      - test-unit
+      - test-e2e
     environment: "AWS PROD"
     steps:
       - name: Set up Node for testing

.github/workflows/deploy-qa.yml

@@ -80,7 +80,6 @@ jobs:
           include-hidden-files: true
           name: build
           path: |
-            .aws-sam/
             dist/
             dist_ui/
 
@@ -127,7 +126,6 @@ jobs:
         with:
           name: build
 
-
       - uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::427040638965:role/GitHubActionsRole
@@ -143,9 +141,7 @@ jobs:
       - name: Run health check
         run: make dev_health_check
 
-      - name: Run post-deploy testing (Live and E2E)
-        run: make test_post_deploy -j 2
+      - name: Run live integration testing
+        run: make test_live_integration
         env:
-          PLAYWRIGHT_USERNAME: ${{ secrets.PLAYWRIGHT_USERNAME }}
-          PLAYWRIGHT_PASSWORD: ${{ secrets.PLAYWRIGHT_PASSWORD }}
           JWT_KEY: ${{ secrets.JWT_KEY }}

Makefile

@@ -6,7 +6,8 @@ current_active_region = "us-east-2"
 src_directory_root = src/
 dist_ui_directory_root = dist_ui/
 integration_test_directory_root = tests/live_integration/
-npm_install_params = --omit=dev --target_arch=arm64 --target_platform=linux --target_libc=glibc --cpu arm64 --os linux --arch=arm64
+yarn_install_params = --production --frozen-lockfile
+yarn_env = npm_config_arch=arm64 npm_config_platform=linux npm_config_libc=glibc
 GIT_HASH := $(shell git rev-parse --short HEAD)
 
 .PHONY: clean
@@ -32,18 +33,19 @@ build: src/
 	cp -r src/api/resources/ dist/api/resources
 	rm -rf dist/lambda/sqs
 	docker run --rm -v "$(shell pwd)/dist/lambda":/var/task public.ecr.aws/sam/build-nodejs22.x:latest \
-	sh -c "npm install $(npm_install_params) && \
+	sh -c "npm i -g yarn && $(yarn_env) yarn $(yarn_install_params) && \
 			rm -rf node_modules/aws-crt/dist/bin/{darwin*,linux-x64*,linux-arm64-musl} && \
 			rm -rf node_modules/argon2/prebuilds/{darwin*,freebsd*,linux-arm,linux-x64*,win32-x64*} && \
 			rm -rf node_modules/argon2/prebuilds/linux-arm64/argon2.armv8.musl.node"
 
 	docker run --rm -v "$(shell pwd)/dist/sqsConsumer":/var/task public.ecr.aws/sam/build-nodejs22.x:latest \
-	sh -c "npm install $(npm_install_params) && \
+	sh -c "npm i -g yarn && $(yarn_env) yarn $(yarn_install_params) && \
 				rm -rf node_modules/aws-crt/dist/bin/{darwin*,linux-x64*,linux-arm64-musl} && \
 				rm -rf node_modules/argon2/prebuilds/{darwin*,freebsd*,linux-arm,linux-x64*,win32-x64*} && \
 				rm -rf node_modules/argon2/prebuilds/linux-arm64/argon2.armv8.musl.node"
 
 local:
+	mkdir -p dist_devel/
 	VITE_BUILD_HASH=$(GIT_HASH) yarn run dev
 
 deploy_prod:
@@ -85,8 +87,6 @@ test_e2e: install
 	yarn playwright install
 	yarn test:e2e
 
-test_post_deploy: test_live_integration test_e2e
-
 dev_health_check:
 	curl -f https://core.aws.qa.acmuiuc.org/api/v1/healthz && curl -f https://core.aws.qa.acmuiuc.org/
 

package.json

@@ -16,8 +16,7 @@
     "build": "concurrently --names 'api,ui,archival,linkryEdge' 'yarn workspace infra-core-api run build' 'yarn workspace infra-core-ui run build' 'yarn workspace infra-core-archival run build' 'yarn workspace infra-core-linkry-edge run build'",
     "postbuild": "node src/api/createLambdaPackage.js && yarn lockfile-manage",
     "dev": "cross-env DISABLE_AUDIT_LOG=true concurrently --names 'api,ui' 'yarn workspace infra-core-api run dev' 'yarn workspace infra-core-ui run dev'",
-    "lockfile-manage": "synp --with-workspace --source-file yarn.lock",
-    "postlockfile-manage": "cp package-lock.json dist/lambda/ && cp package-lock.json dist/sqsConsumer/ && cp src/api/package.lambda.json dist/lambda/package.json && cp src/api/package.lambda.json dist/sqsConsumer/package.json && rm package-lock.json",
+    "lockfile-manage": "cp src/api/package.lambda.json dist/lambda/package.json && cp src/api/package.lambda.json dist/sqsConsumer/package.json && cp yarn.lock dist/lambda/ && cp yarn.lock dist/sqsConsumer/",
     "prettier": "yarn workspaces run prettier && prettier --check tests/**/*.ts",
     "prettier:write": "yarn workspaces run prettier:write && prettier --write tests/**/*.ts",
     "lint": "yarn workspaces run lint",
@@ -83,7 +82,6 @@
     "stylelint": "^16.23.1",
     "stylelint-config-standard-scss": "^15.0.1",
     "supertest": "^7.1.4",
-    "synp": "^1.9.14",
     "tsx": "^4.20.4",
     "typescript": "^5.9.2",
     "typescript-eslint": "^8.40.0",
@@ -95,4 +93,4 @@
     "pdfjs-dist": "^4.8.69",
     "form-data": "^4.0.4"
   }
-}
+}

playwright.config.ts

@@ -3,13 +3,11 @@ import { defineConfig, devices } from '@playwright/test';
 export default defineConfig({
   testDir: './tests/e2e/',
   /* Run tests in files in parallel */
-  fullyParallel: false,
+  fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */
   retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: process.env.CI ? 'github' : 'html',
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */

src/api/functions/linkry.ts

@@ -5,7 +5,7 @@ import {
 } from "@aws-sdk/client-dynamodb";
 import { unmarshall } from "@aws-sdk/util-dynamodb";
 import { LinkryGroupUUIDToGroupNameMap } from "common/config.js";
-import { LinkRecord } from "common/types/linkry.js";
+import { LinkRecord, OrgLinkRecord } from "common/types/linkry.js";
 import { FastifyRequest } from "fastify";
 
 export async function fetchLinkEntry(
@@ -72,6 +72,40 @@ export async function fetchOwnerRecords(
   });
 }
 
+export async function fetchOrgRecords(
+  orgId: string,
+  tableName: string,
+  dynamoClient: DynamoDBClient,
+) {
+  const fetchAllOwnerRecords = new QueryCommand({
+    TableName: tableName,
+    IndexName: "AccessIndex",
+    KeyConditionExpression: "#access = :accessVal",
+    ExpressionAttributeNames: {
+      "#access": "access",
+    },
+    ExpressionAttributeValues: {
+      ":accessVal": { S: `OWNER#${orgId}` },
+    },
+    ScanIndexForward: false,
+  });
+
+  const result = await dynamoClient.send(fetchAllOwnerRecords);
+
+  // Process the results
+  return (result.Items || []).map((item) => {
+    const unmarshalledItem = unmarshall(item);
+
+    // Strip '#' from access field
+    if (unmarshalledItem.access) {
+      unmarshalledItem.access =
+        unmarshalledItem.access.split("#")[1] || unmarshalledItem.access;
+    }
+
+    return unmarshalledItem as OrgLinkRecord;
+  });
+}
+
 export function extractUniqueSlugs(records: LinkRecord[]) {
   return Array.from(
     new Set(records.filter((item) => item.slug).map((item) => item.slug)),

src/api/functions/organizations.ts

@@ -25,6 +25,7 @@ import { Modules } from "common/modules.js";
 import { retryDynamoTransactionWithBackoff } from "api/utils.js";
 import { Redis, ValidLoggers } from "api/types.js";
 import { createLock, IoredisAdapter, type SimpleLock } from "redlock-universal";
+import { batchGetUserInfo } from "./uin.js";
 
 export interface GetOrgInfoInputs {
   id: string;
@@ -54,7 +55,7 @@ export async function getOrgInfo({
     ConsistentRead: true,
   });
   let response = { leads: [] } as {
-    leads: { name: string; username: string; title: string | undefined }[];
+    leads: { name?: string; username: string; title: string | undefined }[];
   };
   try {
     const responseMarshall = await dynamoClient.send(query);
@@ -98,18 +99,39 @@ export async function getOrgInfo({
         .map(
           (x) =>
             ({
-              name: x.name,
               username: x.username,
               title: x.title,
               nonVotingMember: x.nonVotingMember || false,
             }) as {
-              name: string;
               username: string;
               title: string | undefined;
               nonVotingMember: boolean;
             },
         );
-      response = { ...response, leads: unmarshalledLeads };
+
+      // Resolve usernames to names
+      const emails = unmarshalledLeads.map((lead) => lead.username);
+      const userInfo = await batchGetUserInfo({
+        emails,
+        dynamoClient,
+        logger,
+      });
+
+      // Add names to leads
+      const leadsWithNames = unmarshalledLeads.map((lead) => {
+        const info = userInfo[lead.username];
+        const name =
+          info?.firstName || info?.lastName
+            ? [info.firstName, info.lastName].filter(Boolean).join(" ")
+            : undefined;
+
+        return {
+          ...lead,
+          name,
+        };
+      });
+
+      response = { ...response, leads: leadsWithNames };
     }
   } catch (e) {
     if (e instanceof BaseError) {