feat: INT-2283 ensured discarded jobs do not reappear

intuita-webview/src/main/App.css

@@ -60,3 +60,8 @@
 	flex-direction: column;
 	align-items: center;
 }
+
+.clearing-progress-ring {
+	height: 4em;
+	width: 100%;
+}

intuita-webview/src/main/CodemodRuns.tsx

@@ -13,6 +13,8 @@ import { App as FileExplorer } from '../fileExplorer/App';
 import { MainWebviewViewProps } from '../../../src/selectors/selectMainWebviewViewProps';
 import { vscode } from '../shared/utilities/vscode';
 import { useEffect, useMemo, useRef } from 'react';
+import { Command } from '../shared/types';
+import { VSCodeProgressRing } from '@vscode/webview-ui-toolkit/react';
 
 export const CodemodRuns = (
 	props: MainWebviewViewProps & {
@@ -50,6 +52,22 @@ export const CodemodRuns = (
 		[props.panelGroupSettings],
 	);
 
+	const commands: (Command & { icon: string })[] = [];
+
+	if (props.clearingInProgress) {
+		commands.push({
+			icon: 'circle-slash',
+			title: 'Stop clearing',
+			command: 'intuita.stopStateClearing',
+		});
+	} else {
+		commands.push({
+			icon: 'clear-all',
+			title: 'Clear all',
+			command: 'intuita.clearState',
+		});
+	}
+
 	return (
 		<div className="w-full h-full">
 			<PanelGroup
@@ -59,13 +77,7 @@ export const CodemodRuns = (
 			>
 				<SectionHeader
 					title={'Results'}
-					commands={[
-						{
-							icon: 'clear-all',
-							title: 'Clear all',
-							command: 'intuita.clearState',
-						},
-					]}
+					commands={commands}
 					collapsed={props.resultsCollapsed}
 					onClick={(event) => {
 						event.preventDefault();
@@ -92,7 +104,11 @@ export const CodemodRuns = (
 						});
 					}}
 				>
-					<CampaignManager {...props} />
+					{props.clearingInProgress ? (
+						<VSCodeProgressRing className="clearing-progress-ring" />
+					) : (
+						<CampaignManager {...props} />
+					)}
 				</ResizablePanel>
 				<PanelResizeHandle className="resize-handle" />
 				<SectionHeader

package.json

@@ -2,7 +2,7 @@
 	"name": "intuita-vscode-extension",
 	"displayName": "Intuita",
 	"description": " Discover, run & manage codemods faster & easier.",
-	"version": "0.37.1",
+	"version": "0.38.0",
 	"publisher": "Intuita",
 	"icon": "img/intuita_square128.png",
 	"repository": {
@@ -282,7 +282,7 @@
 	},
 	"dependencies": {
 		"@effect/schema": "0.30.3",
-		"@intuita-inc/utilities": "^1.0.1",
+		"@intuita-inc/utilities": "^1.0.2",
 		"@reduxjs/toolkit": "^1.9.5",
 		"@vscode/extension-telemetry": "^0.7.7",
 		"axios": "^1.2.2",

src/commands/clearStateCommand.ts

@@ -0,0 +1,59 @@
+import { FileType, Uri, workspace } from 'vscode';
+import { actions } from '../data/slice';
+import { doesJobAddNewFile } from '../selectors/comparePersistedJobs';
+import { Store } from '../data';
+import { FileService } from '../components/fileService';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+
+type Dependencies = Readonly<{
+	store: Store;
+	fileService: FileService;
+}>;
+
+export const createClearStateCommand =
+	({ fileService, store }: Dependencies) =>
+	async () => {
+		const state = store.getState();
+
+		store.dispatch(actions.clearState());
+
+		try {
+			const uris: Uri[] = [];
+
+			for (const job of Object.values(state.job.entities)) {
+				if (
+					!job ||
+					!doesJobAddNewFile(job.kind) ||
+					job.newContentUri === null ||
+					job.newContentUri.includes('.intuita/cases')
+				) {
+					continue;
+				}
+
+				uris.push(Uri.parse(job.newContentUri));
+			}
+
+			await fileService.deleteFiles({ uris });
+		} catch (error) {
+			console.error(error);
+		}
+
+		try {
+			const casesDirectoryUri = Uri.parse(
+				join(homedir(), '.intuita', 'cases'),
+			);
+
+			const files = await workspace.fs.readDirectory(casesDirectoryUri);
+
+			const caseDirectoryUris = files
+				.filter(([, fileType]) => fileType === FileType.Directory)
+				.map(([name]) => Uri.joinPath(casesDirectoryUri, name));
+
+			await fileService.deleteDirectories({ uris: caseDirectoryUris });
+		} catch (error) {
+			console.error(error);
+		}
+
+		store.dispatch(actions.onStateCleared());
+	};

src/components/webview/MainProvider.ts

@@ -218,7 +218,8 @@ export class MainViewProvider implements WebviewViewProvider {
 
 			if (
 				prevProps.activeTabId !== nextProps.activeTabId &&
-				nextProps.activeTabId === 'codemodRuns'
+				nextProps.activeTabId === 'codemodRuns' &&
+				!nextProps.clearingInProgress
 			) {
 				this.__messageBus.publish({
 					kind: MessageKind.loadHomeDirectoryData,

src/data/slice.ts

@@ -45,6 +45,7 @@ export const jobAdapter = createEntityAdapter<PersistedJob>({
 
 export const getInitialState = (): RootState => {
 	return {
+		clearingInProgress: false,
 		codemod: codemodAdapter.getInitialState(),
 		privateCodemods: privateCodemodAdapter.getInitialState(),
 		case: caseAdapter.getInitialState(),
@@ -142,6 +143,8 @@ const rootSlice = createSlice({
 			jobAdapter.upsertMany(state.job, action.payload);
 		},
 		clearState(state) {
+			state.clearingInProgress = true;
+
 			caseAdapter.removeAll(state.case);
 			jobAdapter.removeAll(state.job);
 
@@ -157,6 +160,9 @@ const rootSlice = createSlice({
 			state.reviewedExplorerNodes = {};
 			state.focusedExplorerNodes = {};
 		},
+		onStateCleared(state) {
+			state.clearingInProgress = false;
+		},
 		setCodemods(state, action: PayloadAction<ReadonlyArray<CodemodEntry>>) {
 			codemodAdapter.setAll(state.codemod, action.payload);
 		},

src/extension.ts

@@ -31,7 +31,6 @@ import {
 	CodemodNodeHashDigest,
 	selectCodemodArguments,
 } from './selectors/selectCodemodTree';
-import { doesJobAddNewFile } from './selectors/comparePersistedJobs';
 import { buildHash, isNeitherNullNorUndefined } from './utilities';
 import { mkdir, readFile, writeFile } from 'fs/promises';
 import { homedir } from 'os';
@@ -47,6 +46,7 @@ import { parsePrivateCodemodsEnvelope } from './data/privateCodemodsEnvelopeSche
 import { GlobalStateTokenStorage, UserService } from './components/userService';
 import { HomeDirectoryService } from './data/readHomeDirectoryCases';
 import { isLeft } from 'fp-ts/lib/Either';
+import { createClearStateCommand } from './commands/clearStateCommand';
 
 export const enum SEARCH_PARAMS_KEYS {
 	ENGINE = 'engine',
@@ -849,30 +849,15 @@ export async function activate(context: vscode.ExtensionContext) {
 	);
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand('intuita.clearState', () => {
-			const state = store.getState();
-
-			const uris: vscode.Uri[] = [];
-
-			for (const job of Object.values(state.job.entities)) {
-				if (
-					!job ||
-					!doesJobAddNewFile(job.kind) ||
-					job.newContentUri === null ||
-					job.newContentUri.includes('.intuita/cases')
-				) {
-					continue;
-				}
-
-				uris.push(vscode.Uri.parse(job.newContentUri));
-			}
-
-			store.dispatch(actions.clearState());
+		vscode.commands.registerCommand(
+			'intuita.clearState',
+			createClearStateCommand({ fileService, store }),
+		),
+	);
 
-			messageBus.publish({
-				kind: MessageKind.deleteDirectories,
-				uris: [vscode.Uri.parse(join(homedir(), '.intuita', 'cases'))],
-			});
+	context.subscriptions.push(
+		vscode.commands.registerCommand('intuita.stopStateClearing', () => {
+			store.dispatch(actions.onStateCleared());
 		}),
 	);
 

src/persistedState/codecs.ts

@@ -53,6 +53,7 @@ export const panelGroupSettingsCodec = t.record(t.string, t.array(t.number));
 export type PanelGroupSettings = t.TypeOf<typeof panelGroupSettingsCodec>;
 
 export const persistedStateCodecNew = buildTypeCodec({
+	clearingInProgress: withFallback(t.boolean, false),
 	case: buildCollectionCodec(caseCodec),
 	codemod: buildCollectionCodec(codemodEntryCodec),
 	privateCodemods: buildCollectionCodec(privateCodemodEntryCodec),

src/selectors/selectMainWebviewViewProps.ts

@@ -39,6 +39,7 @@ export const selectMainWebviewViewProps = (
 
 	if (state.activeTabId === 'codemodRuns') {
 		return {
+			clearingInProgress: state.clearingInProgress,
 			activeTabId: state.activeTabId,
 			toaster: state.toaster,
 			applySelectedInProgress: state.applySelectedInProgress,