Skip to content

Commit 453b9aa

Browse files
committed
Reconcile dashboard
1 parent f6627fb commit 453b9aa

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

rush-plugins/rush-serve-plugin/dashboard.html

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,10 +1745,10 @@ <h3>Phases</h3>
17451745
}
17461746
parallelismInput.value = managerState.parallelism;
17471747
managerStateEl.innerHTML = '';
1748-
// Highlight execute button if a pass is queued
1748+
// Highlight execute button if an iteration is scheduled
17491749
const executeBtn = document.getElementById('execute-btn');
17501750
if (executeBtn) {
1751-
if (managerState.hasQueuedPass) {
1751+
if (managerState.hasScheduledIteration) {
17521752
executeBtn.classList.add('queued');
17531753
executeBtn.title = 'Run once (changes detected)';
17541754
executeBtn.setAttribute('aria-label', 'Run once (changes detected)');
@@ -1901,7 +1901,7 @@ <h3>Phases</h3>
19011901
// Mirror dynamic fields that affect depiction
19021902
op.isActive = s.isActive;
19031903
op.status = s.status || op.status;
1904-
op.runInThisPass = s.runInThisPass;
1904+
op.runInThisIteration = s.runInThisIteration;
19051905
op.logFileURLs = s.logFileURLs;
19061906
}
19071907
});
@@ -1937,7 +1937,7 @@ <h3>Phases</h3>
19371937
managerState = msg.managerState;
19381938
break;
19391939
}
1940-
case 'pass-queued': {
1940+
case 'iteration-scheduled': {
19411941
queuedStates.clear();
19421942
msg.queuedStates.forEach((s) => queuedStates.set(s.name, s));
19431943
break;
@@ -2161,8 +2161,8 @@ <h3>Phases</h3>
21612161
const visible = [];
21622162
for (const op of operations.values()) {
21632163
const state = executionStates.get(op.name) || {};
2164-
// merge dynamic fields so existing UI logic can still reference op.runInThisPass etc.
2165-
op.runInThisPass = state.runInThisPass;
2164+
// merge dynamic fields so existing UI logic can still reference op.runInThisIteration etc.
2165+
op.runInThisIteration = state.runInThisIteration;
21662166
op.status = state.status || op.status;
21672167
op.isActive = state.isActive;
21682168
op.logFileURLs = state.logFileURLs;
@@ -2815,8 +2815,8 @@ <h3>Phases</h3>
28152815
// prefer dynamic execution state status if available
28162816
const state = executionStates.get(op.name);
28172817
let displayStatus = (state && state.status) || op.status;
2818-
const runInThisPass = state ? state.runInThisPass : op.runInThisPass;
2819-
if (runInThisPass === false) {
2818+
const runInThisIteration = state ? state.runInThisIteration : op.runInThisIteration;
2819+
if (runInThisIteration === false) {
28202820
const prev = lastExecutionResults.get(op.name);
28212821
if (prev && prev.status) displayStatus = prev.status;
28222822
else displayStatus = 'Skipped';
@@ -2871,10 +2871,10 @@ <h3>Phases</h3>
28712871
const displayStatus = computeDisplayStatus(op);
28722872
const prevStatus = graphState.nodeStatus.get(name);
28732873
const state = executionStates.get(name);
2874-
const runInThisPass = state ? state.runInThisPass : op.runInThisPass;
2875-
const notRunning = runInThisPass === false || op.noop;
2874+
const runInThisIteration = state ? state.runInThisIteration : op.runInThisIteration;
2875+
const notRunning = runInThisIteration === false || op.noop;
28762876
const queuedState = queuedStates.get(name);
2877-
const isQueuedNext = !!(queuedState && queuedState.runInThisPass === true);
2877+
const isQueuedNext = !!(queuedState && queuedState.runInThisIteration === true);
28782878
const isFilteredOut = filteredOutNames.has(name);
28792879
const isSearchFiltered = searchFilteredOutNames.has(name);
28802880
const emojiSpan = div.querySelector('.emoji');
@@ -2982,8 +2982,10 @@ <h3>Phases</h3>
29822982
rec.path.classList.remove('dashed', 'dotted', 'filtered-out', 'not-running');
29832983
rec.path.classList.remove('filtered-out-search');
29842984
const fromState = fromOp ? executionStates.get(rec.from) : undefined;
2985-
const fromRunInThisPass = fromState ? fromState.runInThisPass : fromOp?.runInThisPass;
2986-
const fromNotRunning = fromOp && (fromRunInThisPass === false || fromOp.noop);
2985+
const fromRunInThisIteration = fromState
2986+
? fromState.runInThisIteration
2987+
: fromOp?.runInThisIteration;
2988+
const fromNotRunning = fromOp && (fromRunInThisIteration === false || fromOp.noop);
29872989
const edgeStatusFiltered = filteredOutNames.has(rec.from) || filteredOutNames.has(rec.to);
29882990
const edgeSearchFiltered =
29892991
searchFilteredOutNames.has(rec.from) || searchFilteredOutNames.has(rec.to);

0 commit comments

Comments
 (0)