Skip to content

Commit 5f3e084

Browse files
ndom91ndom91
committed
fix: simplify nonArchivedSeries references
1 parent 87fa0cf commit 5f3e084

11 files changed

+43
-36
lines changed

‎apps/desktop/src/lib/branch/BranchLaneContextMenu.svelte

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,15 @@
3737
let isDeleting = $state(false);
3838
3939
const branch = $derived($branchStore);
40-
const commits = $derived(branch.validSeries.flatMap((s) => s.patches));
40+
const commits = $derived(branch.validBranches.flatMap((s) => s.patches));
4141
4242
$effect(() => {
4343
allowRebasing = branch.allowRebasing;
4444
});
4545
46-
const allPrIds = $derived(branch.validSeries.map((series) => series.prNumber).filter(isDefined));
46+
const allPrIds = $derived(
47+
branch.validBranches.map((series) => series.prNumber).filter(isDefined)
48+
);
4749
4850
async function toggleAllowRebasing() {
4951
branchController.updateBranchAllowRebasing(branch.id, !allowRebasing);
@@ -123,13 +125,15 @@
123125
</ContextMenuSection>
124126
{#if $user && $user.role?.includes('admin')}
125127
<!-- TODO: Remove after iterating on the pull request footer. -->
126-
<ContextMenuSection title="Admin only">
128+
<ContextMenuSection>
127129
<ContextMenuItem
128130
label="Update PR footers"
129131
disabled={allPrIds.length === 0}
130132
onclick={() => {
131133
if ($prService && branch) {
132-
const allPrIds = branch.validSeries.map((series) => series.prNumber).filter(isDefined);
134+
const allPrIds = branch.validBranches
135+
.map((series) => series.prNumber)
136+
.filter(isDefined);
133137
updatePrDescriptionTables($prService, allPrIds);
134138
}
135139
contextMenuEl?.close();

‎apps/desktop/src/lib/branch/SeriesHeader.svelte

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,10 @@
5858
const parent = $derived(
5959
parentBranch(
6060
branch,
61-
stack.validSeries.filter((b) => b.archived)
62-
)
63-
);
64-
const child = $derived(
65-
childBranch(
66-
branch,
67-
stack.validSeries.filter((b) => !b.archived)
61+
stack.validBranches.filter((b) => b.archived)
6862
)
6963
);
64+
const child = $derived(childBranch(branch, stack.validNonArchivedBranches));
7065
7166
const aiGenEnabled = projectAiGenEnabled(project.id);
7267
const branchController = getContext(BranchController);
@@ -77,7 +72,7 @@
7772
const upstreamName = $derived(branch.upstreamReference ? branch.name : undefined);
7873
const forgeBranch = $derived(upstreamName ? $forge?.branch(upstreamName) : undefined);
7974
const previousSeriesHavePrNumber = $derived(
80-
allPreviousSeriesHavePrNumber(branch.name, stack.validSeries)
75+
allPreviousSeriesHavePrNumber(branch.name, stack.validBranches)
8176
);
8277
8378
let stackingAddSeriesModal = $state<ReturnType<typeof AddSeriesModal>>();
@@ -279,7 +274,7 @@
279274
leftClickTrigger={kebabContextMenuTrigger}
280275
rightClickTrigger={seriesHeaderEl}
281276
headName={branch.name}
282-
seriesCount={stack.validSeries?.length ?? 0}
277+
seriesCount={stack.validBranches?.length ?? 0}
283278
{isTopBranch}
284279
{toggleDescription}
285280
description={branch.description ?? ''}

‎apps/desktop/src/lib/branch/SeriesHeaderContextMenu.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
const branch = $derived($branchStore);
8383
8484
export function showSeriesRenameModal(seriesName: string) {
85-
renameSeriesModal.show(branch.validSeries.find((s) => s.name === seriesName));
85+
renameSeriesModal.show(branch.validBranches.find((s) => s.name === seriesName));
8686
}
8787
8888
let isOpenedByMouse = $state(false);

‎apps/desktop/src/lib/dragging/stackingReorderDropzoneManager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class StackingReorderDropzoneManager {
5151
private branch: VirtualBranch
5252
) {
5353
const seriesMap = new Map();
54-
this.branch.validSeries.forEach((series) => {
54+
this.branch.validBranches.forEach((series) => {
5555
seriesMap.set(series.name, series);
5656
});
5757
this.series = seriesMap;
@@ -67,7 +67,7 @@ export class StackingReorderDropzoneManager {
6767
this.branch.id,
6868
this.branchController,
6969
currentSeries,
70-
this.branch.validSeries,
70+
this.branch.validBranches,
7171
'top'
7272
);
7373
}
@@ -82,7 +82,7 @@ export class StackingReorderDropzoneManager {
8282
this.branch.id,
8383
this.branchController,
8484
currentSeries,
85-
this.branch.validSeries,
85+
this.branch.validBranches,
8686
commitId
8787
);
8888
}

‎apps/desktop/src/lib/pr/PrDetailsModal.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
}
146146
147147
// All ids that existed prior to creating a new one (including archived).
148-
const prNumbers = branch.validSeries.map((series) => series.prNumber);
148+
const prNumbers = branch.validBranches.map((series) => series.prNumber);
149149
150150
isLoading = true;
151151
try {
@@ -181,7 +181,7 @@
181181
}
182182
183183
// Find the index of the current branch so we know where we want to point the pr.
184-
const branches = branch.validSeries;
184+
const branches = branch.validBranches;
185185
const currentIndex = branches.findIndex((b) => b.name === currentSeries.name);
186186
if (currentIndex === -1) {
187187
throw new Error('Branch index not found.');

‎apps/desktop/src/lib/stack/CollapsedLane.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
const branchStore = getContextStore(VirtualBranch);
1717
const branch = $derived($branchStore);
18-
const nonArchivedSeries = $derived(branch.validSeries.filter((s) => !s.archived));
18+
const nonArchivedSeries = $derived(branch.validNonArchivedBranches);
1919
2020
function expandLane() {
2121
$isLaneCollapsed = false;

‎apps/desktop/src/lib/stack/SeriesList.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
);
3636
3737
// All non-errored non-archived series for consumption elsewhere
38-
const nonArchivedValidSeries = $derived(branch.validSeries.filter((s) => !s.archived));
38+
const validNonArchivedBranches = $derived(branch.validNonArchivedBranches);
3939
4040
const stackingReorderDropzoneManagerFactory = getContext(StackingReorderDropzoneManagerFactory);
4141
const stackingReorderDropzoneManager = $derived(
@@ -77,7 +77,7 @@
7777
<div>
7878
<Dropzone
7979
{accepts}
80-
ondrop={(data) => onDrop(data, nonArchivedValidSeries, currentSeries)}
80+
ondrop={(data) => onDrop(data, validNonArchivedBranches, currentSeries)}
8181
>
8282
{#snippet overlay({ hovered, activated })}
8383
<CardOverlay {hovered} {activated} label="Move here" />

‎apps/desktop/src/lib/stack/Stack.svelte

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
let rsViewport = $state<HTMLElement>();
5959
6060
const branchHasFiles = $derived(branch.files !== undefined && branch.files.length > 0);
61-
const branchHasNoCommits = $derived(branch.validSeries.flatMap((s) => s.patches).length === 0);
61+
const branchHasNoCommits = $derived(branch.validBranches.flatMap((s) => s.patches).length === 0);
6262
6363
$effect(() => {
6464
if ($commitBoxOpen && branch.files.length === 0) {
@@ -79,7 +79,7 @@
7979
const upstreamPatches: DetailedCommit[] = [];
8080
const branchPatches: DetailedCommit[] = [];
8181
82-
branch.validSeries.map((series) => {
82+
branch.validBranches.map((series) => {
8383
upstreamPatches.push(...series.upstreamPatches);
8484
branchPatches.push(...series.patches);
8585
hasConflicts = branchPatches.some((patch) => patch.conflicted);
@@ -111,7 +111,7 @@
111111
}
112112
113113
async function checkMergeable() {
114-
const nonArchivedBranches = branch.validSeries.filter((s) => !s.archived);
114+
const nonArchivedBranches = branch.validNonArchivedBranches;
115115
if (nonArchivedBranches.length <= 1) return false;
116116
117117
const seriesMergeResponse = await Promise.allSettled(
@@ -136,7 +136,7 @@
136136
// started last and therefore complete last.
137137
const forge = getForge();
138138
const checksMonitor = $derived(
139-
$forge?.checksMonitor(branch.validSeries.filter((s) => !s.archived)[0]?.name ?? '')
139+
$forge?.checksMonitor(branch.validNonArchivedBranches[0]?.name ?? '')
140140
);
141141
const checks = $derived(checksMonitor?.status);
142142
@@ -149,7 +149,7 @@
149149
async function mergeAll(method: MergeMethod) {
150150
isMergingSeries = true;
151151
try {
152-
const topBranch = branch.validSeries[0];
152+
const topBranch = branch.validBranches[0];
153153
154154
if (topBranch?.prNumber && $prService) {
155155
const targetBase = $baseBranch.branchName.replace(`${$baseBranch.remoteName}/`, '');
@@ -264,7 +264,7 @@
264264
>
265265
{branch.requiresForce
266266
? 'Force push'
267-
: branch.validSeries.length > 1
267+
: branch.validBranches.length > 1
268268
? 'Push All'
269269
: 'Push'}
270270
</Button>

‎apps/desktop/src/lib/stack/UncommittedChanges.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<BranchFiles
2828
isUnapplied={false}
2929
files={branch.files}
30-
branches={branch.validSeries}
30+
branches={branch.validBranches}
3131
showCheckboxes={$commitBoxOpen}
3232
allowMultiple
3333
commitDialogExpanded={commitBoxOpen}
@@ -53,7 +53,7 @@
5353
bind:this={commitDialog}
5454
projectId={project.id}
5555
expanded={commitBoxOpen}
56-
hasSectionsAfter={branch.validSeries.flatMap((s) => s.patches).length > 0}
56+
hasSectionsAfter={branch.validBranches.flatMap((s) => s.patches).length > 0}
5757
/>
5858
</div>
5959

‎apps/desktop/src/lib/vbranches/types.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ export function isPatchSeries(item: PatchSeries | Error): item is PatchSeries {
129129
return item instanceof PatchSeries;
130130
}
131131

132+
export function isNonArchivedPatchSeries(item: PatchSeries | Error): item is PatchSeries {
133+
return item instanceof PatchSeries && !item.archived;
134+
}
135+
132136
export class VirtualBranch {
133137
id!: string;
134138
name!: string;
@@ -167,15 +171,19 @@ export class VirtualBranch {
167171

168172
/**
169173
* @desc Used in the stacking context where VirtualBranch === Stack
170-
* @warning You probably want 'validSeries' instead
174+
* @warning You probably want 'validBranches' instead
171175
*/
172176
@Transform(({ value }) => transformResultToType(PatchSeries, value))
173177
series!: (PatchSeries | Error)[];
174178

175-
get validSeries(): PatchSeries[] {
179+
get validBranches(): PatchSeries[] {
176180
return this.series.filter(isPatchSeries);
177181
}
178182

183+
get validNonArchivedBranches(): PatchSeries[] {
184+
return this.series.filter(isNonArchivedPatchSeries);
185+
}
186+
179187
get displayName() {
180188
if (this.upstream?.displayName) return this.upstream?.displayName;
181189

0 commit comments

Comments
 (0)