refactor: store diff in action object (#1693)

src/proxy/actions/Action.ts

@@ -62,6 +62,7 @@ class Action {
   commitData?: CommitData[] = [];
   commitFrom?: string;
   commitTo?: string;
+  diff?: string;
   branch?: string;
   message?: string;
   author?: string;

src/proxy/processors/push-action/getDiff.ts

@@ -49,6 +49,7 @@ const exec = async (_req: Request, action: Action): Promise<Action> => {
     step.log(`Executing "git diff ${commitFrom} ${action.commitTo}" in ${path}`);
     const revisionRange = `${commitFrom}..${action.commitTo}`;
     const diff = await git.diff([revisionRange]);
+    action.diff = diff;
     step.log(diff);
     step.setContent(diff);
   } catch (error: unknown) {

src/proxy/processors/push-action/scanDiff.ts

@@ -179,11 +179,10 @@ const exec = async (_req: Request, action: Action): Promise<Action> => {
 
   const { steps, commitFrom, commitTo } = action;
   step.log(`Scanning diff: ${commitFrom}:${commitTo}`);
+  const diff = action.diff ?? steps.find((s) => s.stepName === 'diff')?.content;
 
-  const diff = steps.find((s) => s.stepName === 'diff')?.content;
-
-  step.log(diff);
-  const diffViolations = getDiffViolations(diff, action.project, step);
+  step.log(diff as string);
+  const diffViolations = getDiffViolations(diff as string, action.project, step);
 
   if (diffViolations) {
     const formattedMatches = Array.isArray(diffViolations)

src/ui/services/git-push.ts

@@ -30,7 +30,10 @@ const getPush = async (id: string): Promise<ServiceResult<PushActionView>> => {
     const data: Action = response.data;
     const actionView: PushActionView = {
       ...data,
-      diff: data.steps.find((x: Step) => x.stepName === 'diff')!,
+      diff:
+        typeof data.diff == 'string'
+          ? data.diff
+          : data.steps.find((x: Step) => x.stepName === 'diff')!,
     };
     return successResult(actionView);
   } catch (error: unknown) {

src/ui/types.ts

@@ -54,7 +54,7 @@ export interface BackendResponse {
 }
 
 export interface PushActionView extends Omit<Action, ActionMethods> {
-  diff: Step;
+  diff: Step | string;
 }
 
 export interface RepoView extends Repo {

src/ui/views/PushDetails/PushDetails.tsx

@@ -232,7 +232,11 @@ const PushDetails = () => {
   if (!push) return <div>No push data found</div>;
 
   const commitCount = push.commitData?.length ?? 0;
-  const changeFileCount = countDiffFiles(push.diff?.content ?? '');
+  const diffText =
+    typeof push.diff === 'string'
+      ? push.diff
+      : (push.diff?.content ?? push.steps?.find((s) => s.stepName === 'diff')?.content ?? '');
+  const changeFileCount = countDiffFiles(diffText);
   const stepCount = push.steps?.length ?? 0;
 
   let statusTitle: PushStatusTitle = 'Pending';
@@ -456,7 +460,7 @@ const PushDetails = () => {
             </Stack>
           </GitProxyUnderlinePanels.Panel>
           <GitProxyUnderlinePanels.Panel>
-            <Diff diff={push.diff?.content || ''} />
+            <Diff diff={diffText} />
           </GitProxyUnderlinePanels.Panel>
           <GitProxyUnderlinePanels.Panel>
             <StepsTimeline steps={push.steps ?? []} />

test/integration/forcePush.integration.test.ts

@@ -116,6 +116,10 @@ describe('Force Push Integration Test', () => {
       expect(typeof diffStep.content).toBe('string');
       expect(diffStep.content.length).toBeGreaterThan(0);
 
+      expect(typeof afterGetDiff.diff).toBe('string');
+      expect((afterGetDiff.diff as string).length).toBeGreaterThan(0);
+      expect(afterGetDiff.diff).toEqual(diffStep.content);
+
       const afterScanDiff = await scanDiff(req, afterGetDiff);
       const scanStep = afterScanDiff.steps.find((s: Step) => s.stepName === 'scanDiff');
 

test/processors/getDiff.test.ts

@@ -73,8 +73,8 @@ describe('getDiff', () => {
     const result = await exec({} as Request, action);
 
     expect(result.steps[0].error).toBe(false);
-    expect(result.steps[0].content).toContain('modified content');
-    expect(result.steps[0].content).toContain('initial content');
+    expect(result.diff).toContain('modified content');
+    expect(result.diff).toContain('initial content');
   });
 
   it('should get diff between commits with no changes', async () => {