From e167fd5992a6fcf74c143fc7127fa4e78b3a337c Mon Sep 17 00:00:00 2001
From: Philip Fulcher <philip@nrwl.io>
Date: Mon, 24 Jan 2022 11:06:57 -0700
Subject: [PATCH] fix(core): include affected projects when generating dep
 graph HTML file (#8679)

ISSUES CLOSED: #8657
---
 .../src/workspace-aux-commands.test.ts        | 30 +++++++++++++++++++
 .../workspace/src/command-line/dep-graph.ts   | 12 +++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/e2e/workspace-integrations/src/workspace-aux-commands.test.ts b/e2e/workspace-integrations/src/workspace-aux-commands.test.ts
index e337791abb..4ec6ff70dc 100644
--- a/e2e/workspace-integrations/src/workspace-aux-commands.test.ts
+++ b/e2e/workspace-integrations/src/workspace-aux-commands.test.ts
@@ -12,6 +12,7 @@ import {
   runCLIAsync,
   uniq,
   updateFile,
+  runCommand,
 } from '@nrwl/e2e/utils';
 import { classify } from '@nrwl/workspace/src/utils/strings';
 
@@ -207,6 +208,14 @@ describe('dep-graph', () => {
     runCLI(`generate @nrwl/angular:lib ${mylib}`);
     runCLI(`generate @nrwl/angular:lib ${mylib2}`);
 
+    runCommand(`git init`);
+    runCommand(`git config user.email "test@test.com"`);
+    runCommand(`git config user.name "Test"`);
+    runCommand(`git config commit.gpgsign false`);
+    runCommand(
+      `git add . && git commit -am "initial commit" && git checkout -b main`
+    );
+
     updateFile(
       `apps/${myapp}/src/main.ts`,
       `
@@ -385,6 +394,27 @@ describe('dep-graph', () => {
     expect(() => checkFilesExist('static/runtime.esm.js')).not.toThrow();
     expect(() => checkFilesExist('static/polyfills.esm.js')).not.toThrow();
     expect(() => checkFilesExist('static/main.esm.js')).not.toThrow();
+    expect(() => checkFilesExist('static/environment.js')).not.toThrow();
+
+    const environmentJs = readFile('static/environment.js');
+
+    expect(environmentJs).toContain('window.projectGraphResponse');
+    expect(environmentJs).toContain('"affected":[]');
+  });
+
+  it.only('affected:dep-graph should include affected projects in environment file', () => {
+    runCLI(`affected:dep-graph --file=project-graph.html`);
+
+    const environmentJs = readFile('static/environment.js');
+    const affectedProjects = environmentJs
+      .match(/"affected":\[(.*)\],/)[1]
+      ?.split(',');
+
+    expect(affectedProjects).toContain(`"${myapp}"`);
+    expect(affectedProjects).toContain(`"${myappE2e}"`);
+    expect(affectedProjects).toContain(`"${myapp2}"`);
+    expect(affectedProjects).toContain(`"${myapp2E2e}"`);
+    expect(affectedProjects).toContain(`"${mylib}"`);
   });
 });
 
diff --git a/packages/workspace/src/command-line/dep-graph.ts b/packages/workspace/src/command-line/dep-graph.ts
index 3c514f5210..4b8d93c818 100644
--- a/packages/workspace/src/command-line/dep-graph.ts
+++ b/packages/workspace/src/command-line/dep-graph.ts
@@ -227,7 +227,9 @@ export async function generateGraph(
         },
       });
 
-      const depGraphClientResponse = await createDepGraphClientResponse();
+      const depGraphClientResponse = await createDepGraphClientResponse(
+        affectedProjects
+      );
 
       const environmentJs = buildEnvironmentJs(
         args.exclude || [],
@@ -305,8 +307,7 @@ async function startServer(
     startWatcher();
   }
 
-  currentDepGraphClientResponse = await createDepGraphClientResponse();
-  currentDepGraphClientResponse.affected = affected;
+  currentDepGraphClientResponse = await createDepGraphClientResponse(affected);
   currentDepGraphClientResponse.focus = focus;
   currentDepGraphClientResponse.groupByFolder = groupByFolder;
   currentDepGraphClientResponse.exclude = exclude;
@@ -466,7 +467,9 @@ function createFileWatcher(root: string, changeHandler: () => Promise<void>) {
   return { close: () => watcher.close() };
 }
 
-async function createDepGraphClientResponse(): Promise<DepGraphClientResponse> {
+async function createDepGraphClientResponse(
+  affected: string[] = []
+): Promise<DepGraphClientResponse> {
   performance.mark('project graph watch calculation:start');
   await defaultFileHasher.init();
 
@@ -515,5 +518,6 @@ async function createDepGraphClientResponse(): Promise<DepGraphClientResponse> {
     layout,
     projects,
     dependencies,
+    affected,
   };
 }