Merge pull request #13742 from gitbutlerapp/push-rsyknruzwxms

Lite: add absorb operation mode

Author: OliverJAsh

apps/lite/package.json

@@ -130,7 +130,6 @@
 		"electron-updater": "^6.8.4",
 		"react": "^19.2.4",
 		"react-dom": "^19.2.4",
-		"react-error-boundary": "^6.0.0",
 		"react-redux": "^9.2.0",
 		"react-resizable-panels": "^4.7.3"
 	},

apps/lite/ui/src/operations/operation.ts

@@ -23,10 +23,11 @@ import {
 	commitSquashMutationOptions,
 	commitUncommitChangesMutationOptions,
 	commitUncommitMutationOptions,
+	absorbMutationOptions,
 	moveBranchMutationOptions,
 	tearOffBranchMutationOptions,
 } from "#ui/api/mutations.ts";
-import { InsertSide, RelativeTo } from "@gitbutler/but-sdk";
+import { CommitAbsorption, InsertSide, RelativeTo } from "@gitbutler/but-sdk";
 import { Operand, operandEquals, operandFileParent } from "#ui/operands.ts";
 import { resolveDiffSpecs } from "#ui/operations/diff-specs.ts";
 import { decodeRefName } from "#ui/api/ref-name.ts";
@@ -67,8 +68,13 @@ export type CommitUncommitChangesOperation = Omit<
 export type MoveBranchOperation = Omit<MoveBranchParams, "dryRun" | "projectId">;
 /** @public */
 export type TearOffBranchOperation = Omit<TearOffBranchParams, "dryRun" | "projectId">;
+/** @public */
+export type AbsorbOperation = {
+	absorptionPlan: Array<CommitAbsorption>;
+};
 
 export type Operation =
+	| ({ _tag: "Absorb" } & AbsorbOperation)
 	| ({ _tag: "CommitAmend" } & CommitAmendOperation)
 	| ({ _tag: "CommitCreate" } & CommitCreateOperation)
 	| ({ _tag: "CommitCreateFromCommittedChanges" } & CommitCreateFromCommittedChangesOperation)
@@ -80,6 +86,12 @@ export type Operation =
 	| ({ _tag: "MoveBranch" } & MoveBranchOperation)
 	| ({ _tag: "TearOffBranch" } & TearOffBranchOperation);
 
+/** @public */
+export const absorbOperation = (operation: AbsorbOperation): Operation => ({
+	_tag: "Absorb",
+	...operation,
+});
+
 /** @public */
 export const commitAmendOperation = (operation: CommitAmendOperation): Operation => ({
 	_tag: "CommitAmend",
@@ -149,6 +161,7 @@ export const tearOffBranchOperation = (operation: TearOffBranchOperation): Opera
 export const operationLabel = (operation: Operation): string =>
 	Match.value(operation).pipe(
 		Match.tagsExhaustive({
+			Absorb: () => "Absorb",
 			CommitAmend: () => "Amend",
 			CommitCreate: ({ side }) =>
 				Match.value(side).pipe(
@@ -216,10 +229,24 @@ export const useRunOperation = () => {
 	const commitUncommitChanges = useMutation(commitUncommitChangesMutationOptions);
 	const moveBranch = useMutation(moveBranchMutationOptions);
 	const tearOffBranch = useMutation(tearOffBranchMutationOptions);
+	const absorb = useMutation({
+		...absorbMutationOptions,
+		onSuccess: async (response, input, context, mutation) => {
+			await absorbMutationOptions.onSuccess?.(response, input, context, mutation);
+
+			toastManager.add({ title: "Changes absorbed successfully" });
+		},
+	});
 
 	return (projectId: string, operation: Operation): void => {
 		Match.value(operation).pipe(
 			Match.tagsExhaustive({
+				Absorb: (operation) => {
+					absorb.mutate({
+						projectId,
+						absorptionPlan: operation.absorptionPlan,
+					});
+				},
 				CommitAmend: (operation) => {
 					const changes = resolveDiffSpecs({
 						source: operation.source,

apps/lite/ui/src/outline/mode.ts

@@ -10,7 +10,13 @@ import {
 } from "#ui/operands.ts";
 import { getOperation, getOperations, OperationType } from "#ui/operations/operation.ts";
 import { filterNavigationIndex, NavigationIndex } from "#ui/workspace/navigation-index.ts";
+import { CommitAbsorption } from "@gitbutler/but-sdk";
 
+/** @public */
+export type AbsorbOperationMode = {
+	source: Operand;
+	absorptionPlan: Array<CommitAbsorption>;
+};
 /** @public */
 export type RubOperationMode = { source: Operand };
 /** @public */
@@ -20,11 +26,22 @@ export type MoveOperationMode = { source: Operand };
 /** @public */
 export type DragAndDropOperationMode = { source: Operand; operationType: OperationType | null };
 export type OperationMode =
+	| ({ _tag: "Absorb" } & AbsorbOperationMode)
 	| ({ _tag: "Rub" } & RubOperationMode)
 	| ({ _tag: "Cut" } & CutOperationMode)
 	| ({ _tag: "Move" } & MoveOperationMode)
 	| ({ _tag: "DragAndDrop" } & DragAndDropOperationMode);
 
+/** @public */
+export const absorbOperationMode = ({
+	source,
+	absorptionPlan,
+}: AbsorbOperationMode): OperationMode => ({
+	_tag: "Absorb",
+	source,
+	absorptionPlan,
+});
+
 /** @public */
 export const rubOperationMode = ({ source }: RubOperationMode): OperationMode => ({
 	_tag: "Rub",
@@ -97,6 +114,7 @@ export const operationModeToOperationType = (operationMode: OperationMode): Oper
 	Match.value(operationMode).pipe(
 		Match.withReturnType<OperationType | null>(),
 		Match.tags({
+			Absorb: () => null,
 			Rub: () => "rub",
 			Cut: () => null,
 			// We should have the ability to move either above or below.
@@ -136,6 +154,10 @@ const operationModeHasOperation = ({
 }): boolean =>
 	Match.value(mode).pipe(
 		Match.tagsExhaustive({
+			Absorb: ({ absorptionPlan }) =>
+				absorptionPlan.some(({ stackId, commitId }) =>
+					operandEquals(commitOperand({ stackId, commitId }), operand),
+				),
 			DragAndDrop: ({ source }) => hasAnyOperation(source, operand),
 			Cut: ({ source }) => hasAnyOperation(source, operand),
 			Move: (mode) =>
@@ -168,6 +190,10 @@ export const filterNavigationIndexForOutlineMode = ({
 					navigationIndexUnfiltered,
 					(operand) =>
 						operandContains(operand, operationMode.source) ||
+						(operationMode._tag === "Absorb" &&
+							operationMode.absorptionPlan.some(({ stackId, commitId }) =>
+								operandEquals(commitOperand({ stackId, commitId }), operand),
+							)) ||
 						operationModeHasOperation({ mode: operationMode, operand }),
 				),
 			RenameBranch: (x) =>

apps/lite/ui/src/projects/state.ts

@@ -1,14 +1,13 @@
 import { createSlice, type PayloadAction } from "@reduxjs/toolkit";
 import type { RootState } from "#ui/store.ts";
-import { type AbsorptionTarget } from "@gitbutler/but-sdk";
+import { type CommitAbsorption } from "@gitbutler/but-sdk";
 import { type BranchOperand, type CommitOperand, type Operand } from "#ui/operands.ts";
 import { type Panel } from "#ui/panels.ts";
 import * as panels from "#ui/panels/state.ts";
 import * as workspace from "#ui/projects/workspace/state.ts";
 import { OperationType } from "#ui/operations/operation.ts";
 
 type Dialog =
-	| { _tag: "Absorption"; target: AbsorptionTarget }
 	| { _tag: "None" }
 	| { _tag: "ApplyBranchPicker" }
 	| { _tag: "BranchPicker" }
@@ -89,6 +88,18 @@ const projectSlice = createSlice({
 			const projectState = ensureProjectState(state, projectId);
 			workspace.enterCutMode(projectState.workspace, source);
 		},
+		enterAbsorbMode: (
+			state,
+			action: PayloadAction<{
+				projectId: string;
+				source: Operand;
+				absorptionPlan: Array<CommitAbsorption>;
+			}>,
+		) => {
+			const { projectId, source, absorptionPlan } = action.payload;
+			const projectState = ensureProjectState(state, projectId);
+			workspace.enterAbsorbMode(projectState.workspace, source, absorptionPlan);
+		},
 		enterMoveMode: (state, action: PayloadAction<{ projectId: string; source: Operand }>) => {
 			const { projectId, source } = action.payload;
 			const projectState = ensureProjectState(state, projectId);
@@ -167,16 +178,6 @@ const projectSlice = createSlice({
 				_tag: "ApplyBranchPicker",
 			};
 		},
-		openAbsorptionDialog: (
-			state,
-			action: PayloadAction<{ projectId: string; target: AbsorptionTarget }>,
-		) => {
-			const { projectId, target } = action.payload;
-			ensureProjectState(state, projectId).dialog = {
-				_tag: "Absorption",
-				target,
-			};
-		},
 		closeDialog: (state, action: PayloadAction<{ projectId: string }>) => {
 			ensureProjectState(state, action.payload.projectId).dialog = { _tag: "None" };
 		},

apps/lite/ui/src/projects/workspace/state.ts

@@ -1,4 +1,5 @@
 import { OperationType } from "#ui/operations/operation.ts";
+import { CommitAbsorption } from "@gitbutler/but-sdk";
 import { Match } from "effect";
 import {
 	branchOperand,
@@ -9,6 +10,7 @@ import {
 	type Operand,
 } from "#ui/operands.ts";
 import {
+	absorbOperationMode,
 	cutOperationMode,
 	defaultOutlineMode,
 	dragAndDropOperationMode,
@@ -60,6 +62,14 @@ export const enterCutMode = (state: WorkspaceState, source: Operand) => {
 	state.mode = operationOutlineMode(cutOperationMode({ source }));
 };
 
+export const enterAbsorbMode = (
+	state: WorkspaceState,
+	source: Operand,
+	absorptionPlan: Array<CommitAbsorption>,
+) => {
+	state.mode = operationOutlineMode(absorbOperationMode({ source, absorptionPlan }));
+};
+
 export const enterDragAndDropMode = (state: WorkspaceState, source: Operand) => {
 	state.mode = operationOutlineMode(dragAndDropOperationMode({ source, operationType: null }));
 };