Merge pull request #178 from ty-d/DeleteAfterUserAction

Add AfterUserAction support when deleting files

Author: rajrsingh

src/commands/delete.ts

@@ -7,6 +7,8 @@ import { RootNode } from "../explorer/models/rootNode";
 import { RoutineNode } from "../explorer/models/routineNode";
 import { explorerProvider } from "../extension";
 import { outputChannel } from "../utils";
+import { OtherStudioAction, fireOtherStudioAction } from "./studio";
+import { DocumentContentProvider } from "../providers/DocumentContentProvider";
 
 function deleteList(items: string[], workspaceFolder: string): Promise<any> {
   if (!items || !items.length) {
@@ -16,6 +18,12 @@ function deleteList(items: string[], workspaceFolder: string): Promise<any> {
   const api = new AtelierAPI();
   api.setConnection(workspaceFolder);
   return Promise.all(items.map((item) => api.deleteDoc(item))).then((files) => {
+    files.forEach((file) => {
+      if (file.result.ext) {
+        const uri = DocumentContentProvider.getUri(file.result.name);
+        fireOtherStudioAction(OtherStudioAction.DeletedDocument, uri, file.result.ext);
+      }
+    });
     outputChannel.appendLine(`Deleted items: ${files.filter((el) => el.result).length}`);
     const failed = files.filter((el) => !el.result).map((el) => `${el.file} - ${el.error}`);
     if (files.find((el) => !el.result)) {

src/commands/studio.ts

@@ -340,7 +340,7 @@ class StudioActions {
       .then((action) => this.userAction(action));
   }
 
-  public fireOtherStudioAction(action: OtherStudioAction) {
+  public fireOtherStudioAction(action: OtherStudioAction, userAction?) {
     const actionObject = {
       id: action.toString(),
       label: getOtherStudioActionLabel(action),
@@ -354,6 +354,14 @@ class StudioActions {
           this.userAction(actionObject, false, "", "", 1);
         }
       });
+    } else if (userAction) {
+      this.processUserAction(userAction).then((answer) => {
+        if (answer) {
+          answer.msg || answer.msg === ""
+            ? this.userAction(actionObject, true, answer.answer, answer.msg, 1)
+            : this.userAction(actionObject, true, answer, "", 1);
+        }
+      });
     } else {
       this.userAction(actionObject, false, "", "", 1);
     }
@@ -420,7 +428,7 @@ export async function _contextMenu(sourceControl: boolean, node: PackageNode | C
   return studioActions && studioActions.getMenu(StudioMenuType.Context, sourceControl);
 }
 
-export async function fireOtherStudioAction(action: OtherStudioAction, uri?: vscode.Uri): Promise<void> {
+export async function fireOtherStudioAction(action: OtherStudioAction, uri?: vscode.Uri, userAction?): Promise<void> {
   const studioActions = new StudioActions(uri);
-  return studioActions && studioActions.fireOtherStudioAction(action);
+  return studioActions && studioActions.fireOtherStudioAction(action, userAction);
 }

src/providers/DocumentContentProvider.ts

@@ -28,6 +28,7 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
       vfs = config("serverSideEditing");
     }
     workspaceFolder = workspaceFolder && workspaceFolder !== "" ? workspaceFolder : currentWorkspaceFolder();
+    const isCsp = name.includes("/");
     const wFolderUri = workspaceFolderUri(workspaceFolder);
     let uri: vscode.Uri;
     if (wFolderUri.scheme === FILESYSTEM_SCHEMA) {
@@ -61,7 +62,6 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
         });
       }
     }
-    const isCsp = name.includes("/");
     if (namespace && namespace !== "") {
       if (isCsp) {
         uri = uri.with({