fix(navigation): show formation-stage projects in lens dropdown (#616)

bramwelt · claude · web-flow · commit 76275ee00273 · 2026-04-29T15:30:45.000-07:00
* fix(navigation): show formation-stage projects in lens Three independent blockers prevented Formation - Engaged projects from appearing in the project lens dropdown for executive directors: 1. LENS_PERSONA_MAP excluded executive-director from the project lens, so EDs never entered eligibleUids. 2. buildQuery used filters: ['stage:Active'], which excluded Formation - Engaged projects upstream. 3. fetchSelectedItem rejected any project whose stage was not 'Active', so UID-based injection also failed. Fix: add executive-director to LENS_PERSONA_MAP.project, switch the project lens to filters_or for stage matching, and allow Formation - Engaged in fetchSelectedItem. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> * fix(review): address PR #616 review feedback Address review comment from coderabbitai[bot]: - navigation.service.ts: scope Formation - Engaged allowance in fetchSelectedItem to the project lens only, keeping the foundation lens strictly Active to prevent formation-stage foundations from being re-injected via selectedUid (per coderabbitai[bot]) Resolves 1 review thread. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> * fix(navigation): show formation foundations in lens A foundation goes Funded+Membership BEFORE going Active. During that window the foundation lens excluded it (upstream query required stage:Active) while filterPageResources also rejected it (computeIsFoundation requires Active). The project appeared only in the project lens, not the foundation lens. Fix by splitting "is a live foundation" (computeIsFoundation, unchanged) from "eligible for the foundation nav dropdown" (new computeIsFoundationEligible, allows Formation - Engaged). The foundation lens buildQuery now uses filters_or for stage (Active OR Formation - Engaged) combined with AND filters for funding/membership. filterPageResources and fetchSelectedItem for the foundation lens use the new helper. Also add ProjectStage enum mirroring the upstream Goa DSL in lfx-v2-project-service (ProjectStageAttribute) and replace bare string literals throughout. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> * refactor(navigation): consolidate to single computeIsFoundation Remove computeIsFoundationEligible. Extend computeIsFoundation to include Formation - Engaged + Membership projects so there is a single source of truth for what constitutes a foundation. Also remove the 'SFDC' reference from ProjectStage enum JSDoc. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> * docs(navigation): document filters vs filters_or semantics Add inline JSDoc to LensItemsQuery clarifying that filters is AND logic and filters_or is OR logic, combined with AND between them — matching the upstream query-service contract. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> * fix(navigation): include Formation - Exploratory in project lens Exploratory-stage projects should be visible to persona-eligible users in the project dropdown, same as Engaged. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> * docs(interfaces): remove misleading JSDoc from stage The `stage` field is required (no `?`), so the "optional to tolerate pre-rollout records" comment was misleading. The `| string` union already handles non-enum values. Fixes copypastedfrom funding? JSDoc on required field. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Issue: LFXV2-2344 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> * refactor(navigation): extract PROJECT_LENS_ALLOWED_STAGES Extract the project-lens stage allowlist into a shared module-level constant to eliminate duplication between fetchSelectedItem and buildQuery, and fix the comment to accurately describe all three included stages. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Issue: LFXV2-3162 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> --------- Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/apps/lfx-one/src/server/services/navigation.service.ts b/apps/lfx-one/src/server/services/navigation.service.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 import { LENS_PERSONA_MAP, NAV_MAX_UPSTREAM_ITERATIONS, NAV_MIN_ITEMS_PER_RESPONSE } from '@lfx-one/shared/constants';
-import { ProjectFunding } from '@lfx-one/shared/enums';
+import { ProjectFunding, ProjectStage } from '@lfx-one/shared/enums';
 import {
   EnrichedPersonaProject,
   GetLensItemsParams,
@@ -22,6 +22,9 @@ import { personaDetectionService } from '../utils/persona-helper';
 import { logger } from './logger.service';
 import { MicroserviceProxyService } from './microservice-proxy.service';
 
+/** Stages eligible for the project lens — Active plus supported pre-launch formation stages. */
+const PROJECT_LENS_ALLOWED_STAGES = new Set<string>([ProjectStage.Active, ProjectStage.FormationEngaged, ProjectStage.FormationExploratory]);
+
 /** Powers the foundation/project lens dropdown. Root writers bypass the persona filter. */
 export class NavigationService {
   private readonly microserviceProxy: MicroserviceProxyService;
@@ -168,8 +171,11 @@ export class NavigationService {
       const project = response?.resources?.[0]?.data;
       if (!project) return null;
       // Mirror the main-pipeline contract so an archived selection doesn't get re-injected.
-      if (project.stage !== 'Active') return null;
-      if (lens === 'foundation' && !computeIsFoundation(project)) return null;
+      if (lens === 'foundation') {
+        if (!computeIsFoundation(project)) return null;
+      } else {
+        if (!PROJECT_LENS_ALLOWED_STAGES.has(project.stage)) return null;
+      }
       return this.toLensItem(project);
     } catch (error) {
       logger.warning(req, 'fetch_selected_item', 'Failed to fetch selected lens item', { err: error, uid, lens });
@@ -191,8 +197,17 @@ export class NavigationService {
 
   private buildQuery(lens: NavLens, pageToken: string | undefined, name: string | undefined): LensItemsQuery {
     // legal_entity_type negation is post-filtered (filter grammar has no exclusions).
-    const filters = lens === 'foundation' ? ['stage:Active', `funding:${ProjectFunding.Funded}`, 'funding_model:Membership'] : ['stage:Active'];
-    const base: LensItemsQuery = { type: 'project', filters, sort: 'name_asc' };
+    const base: LensItemsQuery = { type: 'project', filters: [], sort: 'name_asc' };
+    if (lens === 'foundation') {
+      // Funding + membership required (AND); Active or Formation - Engaged accepted (OR).
+      // This ensures pre-launch foundations appear in the dropdown before they go Active.
+      base.filters = [`funding:${ProjectFunding.Funded}`, 'funding_model:Membership'];
+      base.filters_or = [`stage:${ProjectStage.Active}`, `stage:${ProjectStage.FormationEngaged}`];
+    } else {
+      // Include active projects plus supported pre-launch formation stages so
+      // persona-eligible pre-launch projects appear in the project dropdown.
+      base.filters_or = [...PROJECT_LENS_ALLOWED_STAGES].map((stage) => `stage:${stage}`);
+    }
 
     if (pageToken) base.page_token = pageToken;
     if (name) base.name = name;
diff --git a/packages/shared/src/constants/lens.constants.ts b/packages/shared/src/constants/lens.constants.ts
@@ -63,7 +63,7 @@ export const NAV_LENSES: readonly NavLens[] = ['foundation', 'project'] as const
 
 export const LENS_PERSONA_MAP: Readonly<Record<NavLens, readonly PersonaType[]>> = {
   foundation: ['board-member', 'executive-director'],
-  project: ['contributor', 'maintainer'],
+  project: ['contributor', 'maintainer', 'executive-director'],
 } as const;
 
 export const NAV_MIN_ITEMS_PER_RESPONSE = 15;
diff --git a/packages/shared/src/enums/index.ts b/packages/shared/src/enums/index.ts
@@ -12,3 +12,4 @@ export * from './poll.enum';
 export * from './survey.enum';
 export * from './event.enum';
 export * from './project-funding.enum';
+export * from './project-stage.enum';
diff --git a/packages/shared/src/enums/project-stage.enum.ts b/packages/shared/src/enums/project-stage.enum.ts
@@ -0,0 +1,18 @@
+// Copyright The Linux Foundation and each contributor to LFX.
+// SPDX-License-Identifier: MIT
+
+/**
+ * Project lifecycle stage.
+ * Values mirror the upstream Goa enum declared in `lfx-v2-project-service` at
+ * `api/project/v1/design/types.go` (`ProjectStageAttribute`).
+ */
+export enum ProjectStage {
+  FormationExploratory = 'Formation - Exploratory',
+  FormationEngaged = 'Formation - Engaged',
+  FormationOnHold = 'Formation - On Hold',
+  FormationDisengaged = 'Formation - Disengaged',
+  FormationConfidential = 'Formation - Confidential',
+  Active = 'Active',
+  Archived = 'Archived',
+  Prospect = 'Prospect',
+}
diff --git a/packages/shared/src/interfaces/navigation.interface.ts b/packages/shared/src/interfaces/navigation.interface.ts
@@ -52,7 +52,10 @@ export interface GetLensItemsParams {
 /** Upstream query-service params for lens-item lookups. */
 export interface LensItemsQuery {
   type: 'project';
+  /** AND — all terms must match (e.g. `['funding:Funded', 'funding_model:Membership']`). */
   filters: string[];
+  /** OR — at least one term must match (e.g. `['stage:Active', 'stage:Formation - Engaged']`). Combined with `filters` via AND. */
+  filters_or?: string[];
   sort: 'name_asc';
   page_token?: string;
   name?: string;
diff --git a/packages/shared/src/interfaces/project.interface.ts b/packages/shared/src/interfaces/project.interface.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ProjectFunding } from '../enums/project-funding.enum';
+import { ProjectStage } from '../enums/project-stage.enum';
 
 export interface Project {
   uid: string;
@@ -12,7 +13,7 @@ export interface Project {
   writer?: boolean;
   public: boolean;
   parent_uid: string;
-  stage: string;
+  stage: ProjectStage | string;
   category: string;
   /** Upstream Goa enum — optional to tolerate records indexed before the attribute was rolled out. */
   funding?: ProjectFunding;
diff --git a/packages/shared/src/utils/project.utils.ts b/packages/shared/src/utils/project.utils.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 import { ProjectFunding } from '../enums/project-funding.enum';
+import { ProjectStage } from '../enums/project-stage.enum';
 import type { EnrichedPersonaProject, LensItem, Project, ProjectContext } from '../interfaces';
 
 export function toProjectContext(project: EnrichedPersonaProject): ProjectContext {
@@ -35,7 +36,11 @@ export function isFoundationProject(project: EnrichedPersonaProject): boolean {
 // PCC test-project override (lfx-pcc helper.ts) — kept in sync with hasHealthMetricDashboard.
 const FOUNDATION_NAME_OVERRIDES = new Set(['Test Project Group IT', 'Test Project IT']);
 
-/** Active, membership-funded foundation (Funding === 'Funded'), not an Internal Allocation. PCC test projects also qualify. */
+/**
+ * Membership-funded foundation (Funding === 'Funded'), not an Internal Allocation.
+ * Includes both live (Active) and pre-launch (Formation - Engaged) foundations.
+ * PCC test projects also qualify.
+ */
 export function computeIsFoundation(project: Project | null): boolean {
   if (!project) {
     return false;
@@ -46,7 +51,7 @@ export function computeIsFoundation(project: Project | null): boolean {
   }
 
   return (
-    project.stage === 'Active' &&
+    (project.stage === ProjectStage.Active || project.stage === ProjectStage.FormationEngaged) &&
     project.legal_entity_type !== 'Internal Allocation' &&
     project.funding === ProjectFunding.Funded &&
     Array.isArray(project.funding_model) &&
