Rename stuff

Author: janfaracik

src/main/frontend/common/status-icon.scss …ntend/common/components/status-icon.scsssrc/main/frontend/common/status-icon.scss renamed to src/main/frontend/common/components/status-icon.scss src/main/frontend/common/status-icon.scss renamed to src/main/frontend/common/components/status-icon.scss

@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
 import { getRunStatusFromPath } from "./RestClient";
 import { StageInfo } from "../pipeline-graph-view/pipeline-graph/main";
 import startPollingPipelineStatus from "../pipeline-graph-view/pipeline-graph/main/support/startPollingPipelineStatus";
-import PreviousRunThing from "../pipeline-graph-view/pipeline-graph/main/support/PreviousRunThing";
+import { mergeStageInfos } from "./utils/stage-merge";
 
 /**
  * Polls a run, stopping once the run has completed
@@ -23,7 +23,7 @@ export default function useRunPoller({
           complete: boolean;
         }) => {
           setRun({
-            stages: mergeStageInfos(markSkeleton(r!.stages), data.stages),
+            stages: mergeStageInfos(r!.stages, data.stages),
           });
         };
 
@@ -78,45 +78,3 @@ interface RunPollerProps {
   currentRunPath: string;
   previousRunPath?: string;
 }
-
-export const markSkeleton = (stages: StageInfo[]): StageInfo[] =>
-  stages.map((s) => ({
-    ...s,
-    skeleton: true,
-    completePercent: 0,
-    children: markSkeleton(s.children ?? []),
-  }));
-
-export const mergeStageInfos = (
-  skeletons: StageInfo[],
-  incoming: StageInfo[],
-): StageInfo[] => {
-  const previous: PreviousRunThing = new PreviousRunThing(skeletons);
-  const merged = incoming.map((incomingItem) => {
-    const match = skeletons.find((s) => s.name === incomingItem.name);
-
-    return {
-      ...(match ?? {}),
-      ...incomingItem,
-      skeleton: false,
-      completePercent: previous.estimateCompletion(incomingItem),
-      children: mergeStageInfos(
-        match?.children ?? [],
-        incomingItem.children ?? [],
-      ),
-    };
-  });
-
-  const unmatchedSkeletons = skeletons.filter(
-    (s) => !incoming.some((i) => i.name === s.name),
-  );
-
-  return [...merged, ...unmatchedSkeletons];
-};
-
-export const stripSkeleton = (stage: StageInfo): StageInfo => ({
-  ...stage,
-  skeleton: false,
-  completePercent: 0,
-  children: stage.children?.map(stripSkeleton) ?? [],
-});

src/main/frontend/common/status-icon.tsx …ontend/common/components/status-icon.tsxsrc/main/frontend/common/status-icon.tsx renamed to src/main/frontend/common/components/status-icon.tsx src/main/frontend/common/status-icon.tsx renamed to src/main/frontend/common/components/status-icon.tsx

@@ -1,6 +1,9 @@
-import { Result, StageInfo } from "../PipelineGraphModel";
+import {
+  Result,
+  StageInfo,
+} from "../../pipeline-graph-view/pipeline-graph/main";
 
-export default class PreviousRunThing {
+export default class RunEstimator {
   private stagesLookup: Map<String, StageInfo>;
 
   constructor(stages: StageInfo[]) {

src/main/frontend/common/tree-api.ts

@@ -1,5 +1,8 @@
-import { Result, StageInfo } from "./PipelineGraphModel";
-import { mergeStageInfos } from "../../../common/tree-api";
+import {
+  Result,
+  StageInfo,
+} from "../../pipeline-graph-view/pipeline-graph/main";
+import { mergeStageInfos } from "./stage-merge";
 
 describe("mergeStageInfos", () => {
   it("merges matching items by name", () => {
@@ -57,7 +60,7 @@ describe("mergeStageInfos", () => {
     expect(result[0].name).toBe("Build");
     expect(result[0].state).toBe("running");
     expect(result[0].skeleton).toBe(false); // Comes from incoming
-    expect(result[1].skeleton).toBe(false); // Comes from incoming
+    expect(result[1].skeleton).toBe(true);
   });
 
   it("recursively merges children", () => {

…e-graph/main/support/PreviousRunThing.ts …n/frontend/common/utils/run-estimator.tssrc/main/frontend/pipeline-graph-view/pipeline-graph/main/support/PreviousRunThing.ts renamed to src/main/frontend/common/utils/run-estimator.ts src/main/frontend/pipeline-graph-view/pipeline-graph/main/support/PreviousRunThing.ts renamed to src/main/frontend/common/utils/run-estimator.ts

@@ -0,0 +1,45 @@
+import { StageInfo } from "../../pipeline-graph-view/pipeline-graph/main";
+import RunEstimator from "./run-estimator";
+
+export const mergeStageInfos = (
+  skeletons: StageInfo[],
+  incoming: StageInfo[],
+): StageInfo[] => {
+  skeletons = markSkeleton(skeletons);
+  const previous = new RunEstimator(skeletons);
+  const merged = incoming.map((incomingItem) => {
+    const match = skeletons.find((s) => s.name === incomingItem.name);
+
+    return {
+      ...(match ?? {}),
+      ...incomingItem,
+      skeleton: false,
+      completePercent: previous.estimateCompletion(incomingItem),
+      children: mergeStageInfos(
+        match?.children ?? [],
+        incomingItem.children ?? [],
+      ),
+    };
+  });
+
+  const unmatchedSkeletons = skeletons.filter(
+    (s) => !incoming.some((i) => i.name === s.name),
+  );
+
+  return [...merged, ...unmatchedSkeletons];
+};
+
+const markSkeleton = (stages: StageInfo[]): StageInfo[] =>
+  stages.map((s) => ({
+    ...s,
+    skeleton: true,
+    completePercent: 0,
+    children: markSkeleton(s.children ?? []),
+  }));
+
+const stripSkeleton = (stage: StageInfo): StageInfo => ({
+  ...stage,
+  skeleton: false,
+  completePercent: 0,
+  children: stage.children?.map(stripSkeleton) ?? [],
+});