fix(graph): serve full project graph when navigating from PDV (#33897)

nartc · web-flow · commit 8d5ca12b30cb · 2025-12-17T18:56:32.000+07:00
diff --git a/graph/client/src/app/routes.tsx b/graph/client/src/app/routes.tsx
@@ -30,7 +30,10 @@ export function getRoutesForEnvironment() {
   }
 }
 
-const workspaceDataLoader = async (selectedWorkspaceId: string) => {
+const workspaceDataLoader = async (
+  selectedWorkspaceId: string,
+  requestFull = false
+) => {
   const workspaceInfo = appConfig.workspaces.find(
     (graph) => graph.id === selectedWorkspaceId
   );
@@ -43,7 +46,8 @@ const workspaceDataLoader = async (selectedWorkspaceId: string) => {
 
   const projectGraph: ProjectGraphClientResponse =
     await projectGraphDataService.getProjectGraph(
-      workspaceInfo.projectGraphUrl
+      workspaceInfo.projectGraphUrl,
+      requestFull
     );
 
   const targetsSet = new Set<string>();
@@ -291,7 +295,7 @@ export const devRoutes: RouteObject[] = [
         loader: async ({ params }) => {
           const selectedWorkspaceId =
             params.selectedWorkspaceId ?? appConfig.defaultWorkspaceId;
-          return workspaceDataLoader(selectedWorkspaceId);
+          return workspaceDataLoader(selectedWorkspaceId, true);
         },
         children: childRoutes,
       },
@@ -314,7 +318,7 @@ export const releaseRoutes: RouteObject[] = [
     id: 'selectedWorkspace',
     loader: async () => {
       const selectedWorkspaceId = appConfig.defaultWorkspaceId;
-      return workspaceDataLoader(selectedWorkspaceId);
+      return workspaceDataLoader(selectedWorkspaceId, true);
     },
     shouldRevalidate: () => {
       return false;
diff --git a/graph/shared/src/lib/project-graph-data-service/fetch-project-graph-service.ts b/graph/shared/src/lib/project-graph-data-service/fetch-project-graph-service.ts
@@ -16,8 +16,12 @@ export class FetchProjectGraphService implements ProjectGraphService {
     return response.json();
   }
 
-  async getProjectGraph(url: string): Promise<ProjectGraphClientResponse> {
-    const request = new Request(url, { mode: 'no-cors' });
+  async getProjectGraph(
+    url: string,
+    requestFull = false
+  ): Promise<ProjectGraphClientResponse> {
+    const requestUrl = requestFull ? `${url}?full=true` : url;
+    const request = new Request(requestUrl, { mode: 'no-cors' });
 
     const response = await fetch(request);
 
diff --git a/graph/shared/src/lib/project-graph-data-service/get-project-graph-data-service.ts b/graph/shared/src/lib/project-graph-data-service/get-project-graph-data-service.ts
@@ -12,7 +12,10 @@ let projectGraphService: ProjectGraphService;
 
 export interface ProjectGraphService {
   getHash: () => Promise<string>;
-  getProjectGraph: (url: string) => Promise<ProjectGraphClientResponse>;
+  getProjectGraph: (
+    url: string,
+    requestFull?: boolean
+  ) => Promise<ProjectGraphClientResponse>;
   getTaskGraph: (url: string) => Promise<TaskGraphClientResponse>;
   getSpecificTaskGraph?: (
     url: string,
diff --git a/packages/nx/src/command-line/graph/graph.ts b/packages/nx/src/command-line/graph/graph.ts
@@ -641,6 +641,8 @@ async function startServer(
 
   currentSourceMapsClientResponse = sourceMapResponse;
 
+  isFilteredGraph = !!(focus || exclude.length > 0);
+
   const app = http.createServer(async (req, res) => {
     // parse URL
     const parsedUrl = new URL(req.url, `http://${host}:${port}`);
@@ -653,6 +655,21 @@ async function startServer(
 
     const sanitizePath = basename(parsedUrl.pathname);
     if (sanitizePath === 'project-graph.json') {
+      const requestFull = parsedUrl.searchParams.get('full') === 'true';
+
+      // If client requests full graph and current is filtered, regenerate
+      if (requestFull && isFilteredGraph) {
+        const { projectGraphClientResponse, sourceMapResponse } =
+          await createProjectGraphAndSourceMapClientResponse([], null, []);
+
+        currentProjectGraphClientResponse = projectGraphClientResponse;
+        currentProjectGraphClientResponse.focus = null;
+        currentProjectGraphClientResponse.groupByFolder = false;
+        currentProjectGraphClientResponse.exclude = [];
+        currentSourceMapsClientResponse = sourceMapResponse;
+        isFilteredGraph = false;
+      }
+
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.end(JSON.stringify(currentProjectGraphClientResponse));
       return;
@@ -802,6 +819,7 @@ let currentProjectGraphClientResponse: ProjectGraphClientResponse = {
   errors: [],
 };
 let currentSourceMapsClientResponse: ConfigurationSourceMaps = {};
+let isFilteredGraph = false;
 
 function debounce(fn: (...args) => void, time: number) {
   let timeout: NodeJS.Timeout;
@@ -834,8 +852,8 @@ function createFileWatcher() {
         const { projectGraphClientResponse, sourceMapResponse } =
           await createProjectGraphAndSourceMapClientResponse(
             [],
-            currentProjectGraphClientResponse.focus,
-            currentProjectGraphClientResponse.exclude
+            isFilteredGraph ? currentProjectGraphClientResponse.focus : null,
+            isFilteredGraph ? currentProjectGraphClientResponse.exclude : []
           );
 
         if (
