Merge pull request #9441 from gitbutlerapp/remove-any-file-based-draggers

Remove old drophandler

Author: Caleb-T-Owens

apps/desktop/src/lib/branches/dropHandler.ts

@@ -1,7 +1,5 @@
 import { type BranchStack } from '$lib/branches/branch';
-import { filesToOwnership } from '$lib/branches/ownership';
-import { HunkDropData, FileDropData } from '$lib/dragging/draggables';
-import { LocalFile } from '$lib/files/file';
+import { HunkDropData } from '$lib/dragging/draggables';
 import { StackService } from '$lib/stacks/stackService.svelte';
 import type { DropzoneHandler } from '$lib/dragging/handler';
 /** Handler that moves uncommitted hunks between stacks. */
@@ -30,31 +28,3 @@ export class BranchHunkDzHandler implements DropzoneHandler {
 		});
 	}
 }
-
-/** Handler that moves uncommitted files between stacks. */
-export class BranchFileDzHandler implements DropzoneHandler {
-	constructor(
-		private stackService: StackService,
-		private projectId: string,
-		private stackId: string,
-		private ownership: string
-	) {}
-
-	accepts(data: unknown) {
-		return (
-			data instanceof FileDropData &&
-			data.file instanceof LocalFile &&
-			this.stackId !== data.stackId &&
-			!data.files.some((f) => f.locked)
-		);
-	}
-
-	ondrop(data: FileDropData) {
-		const newOwnership = filesToOwnership(data.files);
-		this.stackService.legacyUpdateBranchOwnership({
-			projectId: this.projectId,
-			stackId: this.stackId,
-			ownership: (newOwnership + '\n' + this.ownership).trim()
-		});
-	}
-}

apps/desktop/src/lib/commits/dropHandler.ts

@@ -1,14 +1,7 @@
 import { changesToDiffSpec } from '$lib/commits/utils';
-import {
-	ChangeDropData,
-	FileDropData,
-	HunkDropData,
-	HunkDropDataV3
-} from '$lib/dragging/draggables';
-import { LocalFile, RemoteFile } from '$lib/files/file';
+import { ChangeDropData, HunkDropData, HunkDropDataV3 } from '$lib/dragging/draggables';
 import { untrack } from 'svelte';
 import type { DropzoneHandler } from '$lib/dragging/handler';
-import type { DiffSpec } from '$lib/hunks/hunk';
 import type { StackService } from '$lib/stacks/stackService.svelte';
 import type { UiState } from '$lib/state/uiState.svelte';
 
@@ -379,57 +372,6 @@ export class AmendCommitWithHunkDzHandler implements DropzoneHandler {
 	}
 }
 
-/**
- * Handler that is able to amend a commit using `AnyFile`.
- */
-export class AmendCommitDzHandler implements DropzoneHandler {
-	constructor(
-		private args: {
-			stackService: StackService;
-			okWithForce: boolean;
-			projectId: string;
-			stackId: string;
-			commit: DzCommitData;
-		}
-	) {}
-
-	accepts(dropData: unknown): boolean {
-		const { stackId, commit, okWithForce } = this.args;
-		if (!okWithForce && commit.isRemote) return false;
-		if (commit.isIntegrated) return false;
-		return (
-			dropData instanceof FileDropData &&
-			dropData.stackId === stackId &&
-			dropData.commit?.id !== commit.id &&
-			!commit.hasConflicts
-		);
-	}
-
-	ondrop(data: FileDropData): void {
-		const { stackService, projectId, stackId, commit } = this.args;
-		if (data.file instanceof LocalFile) {
-			stackService.amendCommitMutation({
-				projectId,
-				stackId,
-				commitId: commit.id,
-				worktreeChanges: filesToDiffSpec(data)
-			});
-		} else if (data.file instanceof RemoteFile) {
-			// this is a file from a commit, rather than an uncommitted file
-			if (data.commit) {
-				stackService.moveChangesBetweenCommits({
-					projectId,
-					destinationStackId: stackId,
-					destinationCommitId: commit.id,
-					sourceStackId: data.stackId,
-					sourceCommitId: data.commit.id,
-					changes: filesToDiffSpec(data)
-				});
-			}
-		}
-	}
-}
-
 /**
  * Handler that is able to squash two commits using `DzCommitData`.
  */
@@ -467,17 +409,6 @@ export class SquashCommitDzHandler implements DropzoneHandler {
 	}
 }
 
-/** Helper function that converts `FileDropData` to `DiffSpec`. */
-function filesToDiffSpec(data: FileDropData): DiffSpec[] {
-	return data.files.map((file) => {
-		return {
-			previousPathBytes: null,
-			pathBytes: file.path as any, // Rust type is BString.
-			hunkHeaders: []
-		};
-	});
-}
-
 function updateUiState(
 	uiState: UiState,
 	stackId: string,

apps/desktop/src/lib/dragging/draggable.ts

@@ -1,6 +1,6 @@
 import { getColorFromCommitState } from '$components/lib';
 import { type CommitStatusType } from '$lib/commits/commit';
-import { FileDropData, ChangeDropData, type DropData } from '$lib/dragging/draggables';
+import { ChangeDropData, type DropData } from '$lib/dragging/draggables';
 import { getFileIcon } from '@gitbutler/ui/file/getFileIcon';
 import { pxToRem } from '@gitbutler/ui/utils/pxToRem';
 import type { DragStateService } from '$lib/dragging/dragStateService.svelte';
@@ -85,27 +85,6 @@ function setupDragHandlers(
 			endDragging = opts.dragStateService.startDragging();
 		}
 
-		// This should be deleted once V3 design has shipped.
-		if (opts.data instanceof FileDropData) {
-			selectedElements = [];
-			for (const file of opts.data.files) {
-				const element = parentNode.querySelector(`[data-file-id="${file.id}"]`);
-				if (element) {
-					if (file.locked) {
-						element.classList.add('locked-file-animation');
-						element.addEventListener(
-							'animationend',
-							() => {
-								element.classList.remove('locked-file-animation');
-							},
-							{ once: true }
-						);
-					}
-					selectedElements.push(element);
-				}
-			}
-		}
-
 		if (opts.data instanceof ChangeDropData) {
 			selectedElements = [];
 			for (const path of opts.data.changedPaths(opts.data.selectionId)) {

apps/desktop/src/lib/dragging/draggables.ts

@@ -1,8 +1,5 @@
 import { key, type SelectionId } from '$lib/selection/key';
-import { get, type Readable } from 'svelte/store';
-import type { AnyCommit } from '$lib/commits/commit';
 import type { CommitDropData } from '$lib/commits/dropHandler';
-import type { AnyFile } from '$lib/files/file';
 import type { TreeChange } from '$lib/hunks/change';
 import type { Hunk, HunkAssignment, HunkHeader, HunkLock } from '$lib/hunks/hunk';
 import type { IdSelection } from '$lib/selection/idSelection.svelte';
@@ -84,38 +81,4 @@ export class ChangeDropData {
 	}
 }
 
-export class FileDropData {
-	constructor(
-		readonly stackId: string,
-		readonly file: AnyFile,
-		readonly commit: AnyCommit | undefined,
-		/**
-		 * When a a file is dragged we compare it to what is already selected,
-		 * if dragged item is part of the selection we consider that to be to
-		 * be dragging all of them. If it is not part of the selection, we
-		 * want to ignore what is selected and only drag the actual file being
-		 * dragged.
-		 */
-		private selection: Readable<AnyFile[]> | undefined
-	) {}
-
-	get files(): AnyFile[] {
-		const selectedFiles = this.selection ? get(this.selection) : undefined;
-		if (selectedFiles?.some((selectedFile) => selectedFile.id === this.file.id)) {
-			return selectedFiles;
-		} else {
-			return [this.file];
-		}
-	}
-
-	get isCommitted(): boolean {
-		return !!this.commit;
-	}
-}
-
-export type DropData =
-	| FileDropData
-	| HunkDropData
-	| CommitDropData
-	| ChangeDropData
-	| HunkDropDataV3;
+export type DropData = HunkDropData | CommitDropData | ChangeDropData | HunkDropDataV3;

apps/desktop/src/lib/stacks/dropHandler.ts

@@ -1,6 +1,5 @@
-import { filesToOwnership } from '$lib/branches/ownership';
 import { changesToDiffSpec } from '$lib/commits/utils';
-import { ChangeDropData, FileDropData, HunkDropData } from '$lib/dragging/draggables';
+import { ChangeDropData, HunkDropData } from '$lib/dragging/draggables';
 import StackMacros from '$lib/stacks/macros';
 import type { DropzoneHandler } from '$lib/dragging/handler';
 import type { DiffService } from '$lib/hunks/diffService.svelte';
@@ -16,23 +15,15 @@ export class NewStackDzHandler implements DropzoneHandler {
 	) {}
 
 	accepts(data: unknown) {
-		if (data instanceof FileDropData) {
-			return !(data.isCommitted || data.files.some((f) => f.locked));
-		}
 		if (data instanceof HunkDropData) {
 			return !(data.isCommitted || data.hunk.locked);
 		}
 		return false;
 	}
 
-	ondrop(data: FileDropData | HunkDropData) {
-		if (data instanceof HunkDropData) {
-			const ownership = `${data.hunk.filePath}:${data.hunk.id}`;
-			this.stackService.newStackMutation({ projectId: this.projectId, branch: { ownership } });
-		} else if (data instanceof FileDropData) {
-			const ownership = filesToOwnership(data.files);
-			this.stackService.newStackMutation({ projectId: this.projectId, branch: { ownership } });
-		}
+	ondrop(data: HunkDropData) {
+		const ownership = `${data.hunk.filePath}:${data.hunk.id}`;
+		this.stackService.newStackMutation({ projectId: this.projectId, branch: { ownership } });
 	}
 }