Clean up dependency initialization

Author: mtsgrd

apps/desktop/src/components/BranchList.svelte

@@ -9,7 +9,7 @@
 	import PushButton from '$components/PushButton.svelte';
 	import ReduxResult from '$components/ReduxResult.svelte';
 	import { getColorFromCommitState, getIconFromCommitState } from '$components/lib';
-	import { STACKING_REORDER_DROPZONE_MANAGER_FACTORY } from '$lib/dragging/stackingReorderDropzoneManager';
+	import { REORDER_DROPZONE_FACTORY } from '$lib/dragging/stackingReorderDropzoneManager';
 	import { editPatch } from '$lib/editMode/editPatchUtils';
 	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
 	import { INTELLIGENT_SCROLLING_SERVICE } from '$lib/intelligentScrolling/service';
@@ -113,9 +113,10 @@
 		}
 	});
 
-	const stackingReorderDropzoneManagerFactory = inject(STACKING_REORDER_DROPZONE_MANAGER_FACTORY);
+	const stackingReorderDropzoneManagerFactory = inject(REORDER_DROPZONE_FACTORY);
 	const stackingReorderDropzoneManager = $derived(
 		stackingReorderDropzoneManagerFactory.build(
+			projectId,
 			laneId,
 			branches.map((s) => ({ name: s.name, commitIds: s.commits.map((p) => p.id) }))
 		)

apps/desktop/src/lib/bootstrap/deps.ts

@@ -8,7 +8,7 @@ export const BRANCH_SERVICE = new InjectionToken<BranchService>('BranchService')
 export class BranchService {
 	private api: ReturnType<typeof injectEndpoints>;
 
-	constructor(private readonly backendApi: BackendApi) {
+	constructor(backendApi: BackendApi) {
 		this.api = injectEndpoints(backendApi);
 	}
 

apps/desktop/src/lib/branches/branchService.svelte.ts

@@ -54,7 +54,7 @@ export class ReorderCommitDzFactory {
 		private projectId: string,
 		private stackService: StackService,
 		private stack: { name: string; commitIds: string[] }[],
-		private stackId: string
+		private laneId: string
 	) {
 		const seriesMap = new Map();
 		this.stack.forEach((series) => {
@@ -71,7 +71,7 @@ export class ReorderCommitDzFactory {
 
 		return new ReorderCommitDzHandler(
 			this.projectId,
-			this.stackId,
+			this.laneId,
 			this.stackService,
 			currentSeries.name,
 			this.stack,
@@ -87,7 +87,7 @@ export class ReorderCommitDzFactory {
 
 		return new ReorderCommitDzHandler(
 			this.projectId,
-			this.stackId,
+			this.laneId,
 			this.stackService,
 			currentSeries.name,
 			this.stack,
@@ -96,19 +96,15 @@ export class ReorderCommitDzFactory {
 	}
 }
 
-export const STACKING_REORDER_DROPZONE_MANAGER_FACTORY =
-	new InjectionToken<StackingReorderDropzoneManagerFactory>(
-		'StackingReorderDropzoneManagerFactory'
-	);
+export const REORDER_DROPZONE_FACTORY = new InjectionToken<ReorderDropzoneFactory>(
+	'ReorderDropzoneFactory'
+);
 
-export class StackingReorderDropzoneManagerFactory {
-	constructor(
-		private projectId: string,
-		private stackService: StackService
-	) {}
+export class ReorderDropzoneFactory {
+	constructor(private stackService: StackService) {}
 
-	build(stackId: string, series: { name: string; commitIds: string[] }[]) {
-		return new ReorderCommitDzFactory(this.projectId, this.stackService, series, stackId);
+	build(projectId: string, laneId: string, series: { name: string; commitIds: string[] }[]) {
+		return new ReorderCommitDzFactory(projectId, this.stackService, series, laneId);
 	}
 }