Merge branch 'main' of https://github.com/linuxfoundation/lfx-self-serve into feat/mentorship-mentor-register-connect

Author: Sameh16

.github/workflows/sync-issue-type.yml

@@ -0,0 +1,43 @@
+# Copyright The Linux Foundation and each contributor to LFX.
+# SPDX-License-Identifier: MIT
+
+name: Sync Issue Type From Label
+
+on:
+  issues:
+    types: [labeled]
+
+permissions:
+  issues: write
+
+jobs:
+  sync-type:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Map label to issue type and update
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          LABEL_NAME: ${{ github.event.label.name }}
+          ISSUE_NODE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          # Issue type IDs are org-level (shared across all linuxfoundation repos with
+          # Issue Types enabled), so they're stable to hardcode rather than look up per run.
+          case "$LABEL_NAME" in
+            bug | type:bug)
+              TYPE_ID="IT_kwDOAA_egs4AAnET" # Bug
+              ;;
+            enhancement | type:enhancement)
+              TYPE_ID="IT_kwDOAA_egs4AAnEX" # Feature
+              ;;
+            *)
+              echo "No issue type mapping for label '$LABEL_NAME' — skipping."
+              exit 0
+              ;;
+          esac
+
+          gh api graphql -f query='
+            mutation($issueId: ID!, $typeId: ID!) {
+              updateIssueIssueType(input: { issueId: $issueId, issueTypeId: $typeId }) {
+                issue { id issueType { name } }
+              }
+            }' -f issueId="$ISSUE_NODE_ID" -f typeId="$TYPE_ID"

apps/lfx-one/e2e/fixtures/mock-data/formation-item.mock.ts

@@ -146,12 +146,13 @@ export const mockFormationActivity: Record<string, FormationActivity[]> = {
   'formation-item:cascade-data-alliance:contribution_agreement_executed': [
     {
       uid: 'formation-activity:1',
-      formation_uid: 'formation:cascade-data-alliance',
       formation_item_uid: 'formation-item:cascade-data-alliance:contribution_agreement_executed',
-      type: 'note_added',
+      action: 'note_changed',
+      action_raw: 'note_changed',
+      set_by: 'user',
       actor: { username: 'sam.chen', name: 'Sam Chen' },
-      message: 'updated notes',
-      metadata: null,
+      before: null,
+      after: null,
       created_at: new Date(0).toISOString(),
     },
   ],

apps/lfx-one/e2e/fixtures/mock-data/formation.mock.ts

@@ -31,7 +31,8 @@ export const mockFormations: Record<string, Formation> = {
     template_uid: SEEDED_FORMATION_TEMPLATE_UID,
     template_version: 1,
     sub_stage: 'engaged',
-    announcement_date: new Date(Date.now() + 3 * 24 * 60 * 60 * 1000).toISOString(),
+    sub_stage_raw: 'Formation - Engaged',
+    announcement_date: new Date(Date.now() + 3 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10),
     is_activating: false,
     // Mirrors mockFormationItems['formation:cascade-data-alliance']: 2 gating items
     // (draft_project_record=done, contribution_agreement_executed=in_progress) — this same fixture
@@ -49,9 +50,12 @@ export const mockFormations: Record<string, Formation> = {
 /**
  * A queue-only list, independent of `mockFormations` — the Formations queue table (GH-1958) is
  * root-scoped, not tied to a single project-page test. Shaped as `FormationQueueRow` (GH-2267 gap
- * 2 — the real indexed queue projection, not the checklist-read `Formation` shape): `progress`
- * replaces `gating_items_open`/`gating_items_total`, and `gates_cleared` mirrors what each row's
- * old `is_activating` value implied (open === 0).
+ * 2 — the BFF's post-normalization queue-row shape, not the checklist-read `Formation` shape and
+ * not the raw upstream `UpstreamFormationQueueRow` the indexer publishes): `progress` replaces
+ * `gating_items_open`/`gating_items_total`, `gates_cleared` mirrors what each row's old
+ * `is_activating` value implied (open === 0), and `sub_stage`/`sub_stage_raw` (GH-2366) carry the
+ * already-normalized short key and its verbatim upstream source, since these mocks stand in for
+ * the BFF response, not the raw projection.
  */
 export const mockFormationsQueue: FormationQueueRow[] = [
   {
@@ -62,6 +66,7 @@ export const mockFormationsQueue: FormationQueueRow[] = [
     is_foundation: mockFormations['cascade-data-alliance'].is_foundation,
     parent_uid: mockFormations['cascade-data-alliance'].parent_uid,
     sub_stage: mockFormations['cascade-data-alliance'].sub_stage,
+    sub_stage_raw: 'Formation - Engaged',
     lifecycle: 'formation',
     gates_cleared: false,
     is_activating: false,
@@ -80,6 +85,7 @@ export const mockFormationsQueue: FormationQueueRow[] = [
     is_foundation: false,
     parent_uid: 'e19f1234-f567-4abc-b890-1234567890de',
     sub_stage: 'on_hold',
+    sub_stage_raw: 'Formation - On Hold',
     lifecycle: 'formation',
     gates_cleared: false,
     is_activating: false,
@@ -96,10 +102,11 @@ export const mockFormationsQueue: FormationQueueRow[] = [
     is_foundation: false,
     parent_uid: 'e19f1234-f567-4abc-b890-1234567890de',
     sub_stage: 'engaged',
+    sub_stage_raw: 'Formation - Engaged',
     lifecycle: 'formation',
     gates_cleared: true,
     is_activating: true,
-    announcement_date: new Date(Date.now() + 10 * 24 * 60 * 60 * 1000).toISOString(),
+    announcement_date: new Date(Date.now() + 10 * 24 * 60 * 60 * 1000).toISOString().slice(0, 10),
     progress: { not_started: 0, in_progress: 0, blocked: 0, awaiting_acceptance: 0, done: 4, skipped: 0 },
     blocked_item_titles: [],
     assignees: [],

apps/lfx-one/e2e/formation-checklist-robust.spec.ts

@@ -187,7 +187,7 @@ test.describe('Formation checklist section — structural contract', () => {
         route.fulfill({
           status: 200,
           contentType: 'application/json',
-          body: JSON.stringify({ formation: FORMATION, template: mockFormationTemplate, items: itemsWithLink, data_source: 'fixture' }),
+          body: JSON.stringify({ formation: FORMATION, template: mockFormationTemplate, items: itemsWithLink }),
         })
       );
       await gotoProjectFormation(page, FORMATION_PROJECT_SLUG);

apps/lfx-one/e2e/formation-checklist.spec.ts

@@ -65,7 +65,7 @@ test.describe('Formation Checklist section (GH-1958)', () => {
 
     const drawer = page.getByTestId('formation-item-drawer');
     await expect(drawer).toBeVisible();
-    await expect(page.getByTestId('formation-item-drawer-history')).toContainText('updated notes');
+    await expect(page.getByTestId('formation-item-drawer-history')).toContainText('updated the note');
   });
 
   test('the "Choose a template" empty state renders when no template has been chosen', async ({ page }) => {
@@ -120,7 +120,7 @@ test.describe('Formation Checklist section (GH-1958)', () => {
       route.fulfill({
         status: 200,
         contentType: 'application/json',
-        body: JSON.stringify({ formation, template: mockFormationTemplate, items, data_source: 'fixture' }),
+        body: JSON.stringify({ formation, template: mockFormationTemplate, items }),
       })
     );
     await gotoProjectFormation(page, FORMATION_PROJECT_SLUG);

apps/lfx-one/e2e/helpers/formation-api-mock.helper.ts

@@ -27,7 +27,7 @@ export class FormationApiMockHelper {
       await route.fulfill({
         status: 200,
         contentType: 'application/json',
-        body: JSON.stringify({ formation, template: mockFormationTemplate, items, data_source: 'fixture' }),
+        body: JSON.stringify({ formation, template: mockFormationTemplate, items }),
       });
     });
   }
@@ -53,7 +53,7 @@ export class FormationApiMockHelper {
       await route.fulfill({
         status: 200,
         contentType: 'application/json',
-        body: JSON.stringify({ item, history: mockFormationActivity[item.uid] ?? [] }),
+        body: JSON.stringify({ item, history: mockFormationActivity[item.uid] ?? [], history_state: 'complete' }),
       });
     });
   }
@@ -93,9 +93,12 @@ export class FormationApiMockHelper {
         // Mirrors formation.service.ts's buildQueueTiles — a bare 'project' entity rolls into the
         // projects count so it isn't dropped from the breakdown while still counting toward total.
         projects: rows.filter((row) => deriveFormationEntityType(row) !== 'foundation').length,
+        // GH-2366 — rows whose sub_stage has no queue-taxonomy equivalent; none of the fixture rows
+        // are unmapped today, so this mirrors the real BFF's shape without changing any mocked count.
+        unmapped: rows.filter((row) => row.sub_stage === null).length,
       };
 
-      await route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify({ tiles, rows: filtered, data_source: 'fixture' }) });
+      await route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify({ tiles, rows: filtered }) });
     });
   }
 

apps/lfx-one/e2e/helpers/formation-checklist.helper.ts

@@ -86,6 +86,7 @@ export async function mockFormationChecklistApis(page: Page, opts: { project: Pr
             template_uid: 'seed',
             template_version: 1,
             sub_stage: 'engaged',
+            sub_stage_raw: 'Formation - Engaged',
             announcement_date: null,
             is_activating: false,
             gating_items_open: 0,
@@ -97,7 +98,6 @@ export async function mockFormationChecklistApis(page: Page, opts: { project: Pr
           },
           template: state === 'no-template' ? null : { uid: 'seed', version: 1, name: 'Project formation', sections: [] },
           items: [],
-          data_source: 'fixture',
         }),
       })
     );

apps/lfx-one/e2e/helpers/org-easycla.helper.ts

@@ -168,6 +168,81 @@ export function searchInput(page: Page): Locator {
   return page.locator('[data-test="org-easycla-search"]');
 }
 
+// ---------------------------------------------------------------------------
+// The self-sign hand-off (GH-1983)
+// ---------------------------------------------------------------------------
+
+/** The CLA Group search behind the picker. */
+export const SIGN_OPTIONS_ROUTE = '**/api/orgs/*/lens/cla-groups/sign-options*';
+
+/** The write. Every spec below stubs it; none may ever let it reach a real CLA service. */
+export const SIGN_ROUTE = '**/api/orgs/*/lens/cla-groups/sign';
+
+/**
+ * Where the hand-off is told to send the signer.
+ *
+ * A synthetic address on a reserved domain, routed and fulfilled locally by `stubHandoff` so the
+ * browser never leaves the app under test. A real signing address here would create a real
+ * envelope against a real agreement on every run.
+ */
+export const STUB_SIGN_URL = 'https://signing.example.org/session/e2e-stub';
+
+/**
+ * The signature the stubbed hand-off says it opened.
+ *
+ * Deliberately the `id` of the default `claGroup()` row, because that is what makes the return
+ * landing observable: the page only navigates to an agreement it can see in the organization's own
+ * list, so a stub signature absent from the stubbed list would leave the signatory on it.
+ */
+export const STUB_SIGNATURE_ID = 'signature-uuid-1';
+
+/** A searchable CLA Group, corporate-signable unless a case says otherwise. */
+export function signOption(overrides: Record<string, unknown> = {}) {
+  return {
+    claGroupId: 'aaaaaaaa-1111-4111-8111-111111111111',
+    claGroupName: 'Cascade CLA',
+    projectName: 'Cascade',
+    projectSfid: 'a09410000182dD2AAI',
+    cclaEnabled: true,
+    iclaEnabled: true,
+    matchTypes: ['project'],
+    organizations: [],
+    ...overrides,
+  };
+}
+
+export function signOptionsResponse(results: ReturnType<typeof signOption>[], truncated = false) {
+  return { searchTerm: 'cascade', resultCount: results.length, truncated, results };
+}
+
+/**
+ * Stubs the whole hand-off chain: the picker's search, the signature request, and the signing
+ * address the request answers with.
+ *
+ * The last one is the important one and is not optional. The component assigns the returned
+ * address to `location.href`, so without a route intercepting it the browser navigates away to
+ * whatever the fixture said — and a fixture that ever named a real signing host would drive a
+ * real DocuSign session from CI. Fulfilling it locally keeps the assertion (did we navigate to
+ * exactly the address the server returned?) while the navigation lands on a blank local page.
+ */
+export async function stubHandoff(page: Page, options: { search?: unknown; sign?: { status: number; body: unknown }; signUrl?: string } = {}): Promise<void> {
+  const signUrl = options.signUrl ?? STUB_SIGN_URL;
+
+  await fulfillJson(page, SIGN_OPTIONS_ROUTE, options.search ?? signOptionsResponse([signOption()]));
+
+  const sign = options.sign ?? { status: 200, body: { signUrl, signatureId: STUB_SIGNATURE_ID } };
+  await page.route(SIGN_ROUTE, (route) => route.fulfill({ status: sign.status, contentType: 'application/json', body: JSON.stringify(sign.body) }));
+
+  await page.route(`${signUrl}**`, (route) =>
+    route.fulfill({ status: 200, contentType: 'text/html', body: '<html><body data-testid="stub-signing-service">stub signing service</body></html>' })
+  );
+}
+
+/** The picker's search box. Same `data-test` quirk as the list's, for the same reason. */
+export function groupSearchInput(page: Page): Locator {
+  return page.locator('[data-test="org-easycla-group-select-search"]');
+}
+
 /** Skips when the shared Playwright credentials are absent, as every authenticated spec does. */
 export function skipWithoutCredentials(): void {
   if (!process.env.TEST_USERNAME || !process.env.TEST_PASSWORD) {

apps/lfx-one/e2e/meeting-card-title-datetime-link.spec.ts

@@ -123,7 +123,9 @@ async function gotoMyMeetings(page: Page): Promise<{ viewerLfid: string }> {
   const viewer = { name: 'E2E Viewer', username: viewerLfid, email: 'viewer-e2e@example.com' };
 
   await page.route('**/api/user/meetings*', (route) => fulfillJson(route, [upcomingMeeting('link-up-1', 'Clickable Upcoming', viewer, { organizer: true })]));
-  await page.route('**/api/user/past-meetings*', (route) => fulfillJson(route, [pastMeeting('link-past-1', 'Clickable Past', viewer, { organizer: true })]));
+  await page.route('**/api/user/past-meetings*', (route) =>
+    fulfillJson(route, [pastMeeting('link-past-1', 'Clickable Past', viewer, { organizer: true, project_slug: 'e2e-project' })])
+  );
 
   await page.goto(MEETINGS_URL, { waitUntil: 'domcontentloaded' });
   skipWhenAuthMissing(page);
@@ -168,7 +170,7 @@ test.describe('Meeting card — clickable title and date/time chip', () => {
     await chipPopup.close();
   });
 
-  test('past card: title and date chip navigate in-app (routerLink), not a new tab', async ({ page }) => {
+  test('past card: organizer (Manage role) title and date chip navigate in-app to the admin details page', async ({ page }) => {
     await gotoMyMeetings(page);
     await pastTab(page).click();
 
@@ -178,20 +180,66 @@ test.describe('Meeting card — clickable title and date/time chip', () => {
     const title = pastCard.getByTestId('meeting-title');
     const chip = pastCard.getByTestId('meeting-datetime');
 
+    // Fixture is seeded with organizer: true and is_foundation: false — Manage-role viewers
+    // route to the admin details page, not the public join page (see #2251). The fixture's
+    // project_slug must also survive onto the link so projectQueryParamGuard (which fails open
+    // and skips seeding project/foundation context when `?project=` is absent) has what it needs.
     await expect(title).toHaveJSProperty('tagName', 'A');
-    await expect(title).toHaveAttribute('href', '/meetings/link-past-1');
+    await expect(title).toHaveAttribute('href', '/project/meetings/link-past-1/details?project=e2e-project');
     await expect(title).not.toHaveAttribute('target', '_blank');
 
     await expect(chip).toHaveJSProperty('tagName', 'A');
-    await expect(chip).toHaveAttribute('href', '/meetings/link-past-1');
+    await expect(chip).toHaveAttribute('href', '/project/meetings/link-past-1/details?project=e2e-project');
     await expect(chip).not.toHaveAttribute('target', '_blank');
 
     // Activate the title anchor — same-tab SPA nav, so only one of the two anchors is clicked here
     // (clicking both would require navigating back and re-deriving the past-tab state in between).
     // Chip's routerLink is already proven equivalent via the identical href assertion above.
     await title.click();
     await page.waitForURL((url) => !/^\/meetings\/?$/.test(url.pathname));
-    expect(page.url()).toContain('/meetings/link-past-1');
+    expect(page.url()).toContain('/project/meetings/link-past-1/details');
+    expect(page.url()).toContain('project=e2e-project');
+  });
+
+  test('past card: non-organizer (View role) title and date chip navigate to the public join/summary page', async ({ page }) => {
+    await seedMeLensCookie(page);
+    await stubMeLensContext(page);
+
+    await page.goto('/', { waitUntil: 'domcontentloaded' });
+    skipWhenAuthMissing(page);
+
+    const viewerLfid = await readViewerLfid(page);
+    if (!viewerLfid) {
+      test.skip(true, 'Could not resolve the signed-in LFID from the SSR auth state');
+      return;
+    }
+
+    const viewer = { name: 'E2E Viewer', username: viewerLfid, email: 'viewer-e2e@example.com' };
+    const otherCreator = { name: 'Other Organizer', username: 'other-organizer-e2e', email: 'other-organizer-e2e@example.com' };
+
+    await page.route('**/api/user/meetings*', (route) => fulfillJson(route, []));
+    await page.route('**/api/user/past-meetings*', (route) =>
+      fulfillJson(route, [pastMeeting('link-past-view-1', 'Clickable Past — View Role', otherCreator, { organizer: false })])
+    );
+
+    await page.goto(MEETINGS_URL, { waitUntil: 'domcontentloaded' });
+    skipWhenAuthMissing(page);
+    await expect(page).not.toHaveURL(/auth0\.com/);
+    if (!page.url().includes('/meetings')) {
+      test.skip(true, 'Me lens is not available for this user — /meetings redirected away');
+      return;
+    }
+
+    await pastTab(page).click();
+
+    const pastCard = card(page, 'link-past-view-1');
+    await expect(pastCard).toBeVisible();
+
+    const title = pastCard.getByTestId('meeting-title');
+    const chip = pastCard.getByTestId('meeting-datetime');
+
+    await expect(title).toHaveAttribute('href', '/meetings/link-past-view-1');
+    await expect(chip).toHaveAttribute('href', '/meetings/link-past-view-1');
   });
 
   test('clicking inner card actions does not trigger a details navigation or open a new tab', async ({ page, context }) => {