wip

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,14 +77,10 @@ export const CodemodRuns = (
 			>
 				<SectionHeader
 					title={'Results'}
-					commands={[
-						{
-							icon: 'clear-all',
-							title: 'Clear all',
-							command: 'intuita.clearState',
-						},
-					]}
-					collapsed={props.resultsCollapsed}
+					commands={commands}
+					collapsed={
+						props.clearingInProgress || props.resultsCollapsed
+					}
 					onClick={(event) => {
 						event.preventDefault();
 
@@ -92,7 +106,13 @@ export const CodemodRuns = (
 						});
 					}}
 				>
-					<CampaignManager {...props} />
+					{props.clearingInProgress ? (
+						<VSCodeProgressRing
+							style={{ height: '4em', width: '100%' }}
+						/>
+					) : (
+						<CampaignManager {...props} />
+					)}
 				</ResizablePanel>
 				<PanelResizeHandle className="resize-handle" />
 				<SectionHeader

package.json

@@ -282,7 +282,6 @@
 	},
 	"dependencies": {
 		"@effect/schema": "0.30.3",
-		"@intuita-inc/utilities": "^1.0.1",
 		"@reduxjs/toolkit": "^1.9.5",
 		"@vscode/extension-telemetry": "^0.7.7",
 		"axios": "^1.2.2",

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

@@ -849,9 +849,11 @@ export async function activate(context: vscode.ExtensionContext) {
 	);
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand('intuita.clearState', () => {
+		vscode.commands.registerCommand('intuita.clearState', async () => {
 			const state = store.getState();
 
+			store.dispatch(actions.clearState());
+
 			const uris: vscode.Uri[] = [];
 
 			for (const job of Object.values(state.job.entities)) {
@@ -867,12 +869,26 @@ export async function activate(context: vscode.ExtensionContext) {
 				uris.push(vscode.Uri.parse(job.newContentUri));
 			}
 
-			store.dispatch(actions.clearState());
+			await fileService.deleteFiles({ uris });
+
+			const casesDirectoryUri = vscode.Uri.parse(
+				join(homedir(), '.intuita', 'cases'),
+			);
+
+			const files = await vscode.workspace.fs.readDirectory(
+				casesDirectoryUri,
+			);
+
+			const directoryNames = files.filter(
+				([, fileType]) => fileType === vscode.FileType.Directory,
+			);
 
 			messageBus.publish({
 				kind: MessageKind.deleteDirectories,
-				uris: [vscode.Uri.parse(join(homedir(), '.intuita', 'cases'))],
+				uris: [],
 			});
+
+			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,