Added feature to check for unsaved files in a folder upon deletion.

client/src/components/ContentNavigator/ContentDataProvider.ts

@@ -505,6 +505,46 @@ class ContentDataProvider
     }
   }
 
+  public async checkFolderDirty(resource: ContentItem): Promise<boolean> {
+    if (!resource.vscUri) {
+      return false;
+    }
+
+    const descendants: ContentItem[] = [];
+    async function recurse(item: ContentItem) {
+      const kids = await this.model.getChildren(item);
+      for (const kid of kids) {
+        descendants.push(kid);
+        if (getIsContainer(kid)) {
+          await recurse.call(this, kid);
+        }
+      }
+    }
+    await recurse.call(this, resource);
+
+    const dirtyIds = new Set<string>();
+    for (const doc of workspace.textDocuments) {
+      if (!doc.isDirty) {
+        continue;
+      }
+      const id = new URLSearchParams(doc.uri.query).get("id");
+      if (id) {
+        dirtyIds.add(id);
+      }
+    }
+
+    for (const child of descendants) {
+      if (!child.vscUri) {
+        continue;
+      }
+      const childId = new URLSearchParams(child.vscUri.query).get("id");
+      if (childId && dirtyIds.has(childId)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   public async downloadContentItems(
     folderUri: Uri,
     selections: ContentItem[],

client/src/components/ContentNavigator/const.ts

@@ -62,9 +62,13 @@ export const Messages = {
   AddFileToMyFolderSuccess: l10n.t("File added to my folder."),
   AddToFavoritesError: l10n.t("The item could not be added to My Favorites."),
   DeleteButtonLabel: l10n.t("Delete"),
+  MoveToRecycleBinLabel: l10n.t("Move to Recycle Bin"),
   DeleteWarningMessage: l10n.t(
     'Are you sure you want to permanently delete the item "{name}"?',
   ),
+  RecycleDirtyFolderWarning: l10n.t(
+    "This folder contains unsaved files, are you sure you want to delete?",
+  ),
   EmptyRecycleBinError: l10n.t("Unable to empty the recycle bin."),
   EmptyRecycleBinWarningMessage: l10n.t(
     "Are you sure you want to permanently delete all the items? You cannot undo this action.",

client/src/components/ContentNavigator/index.ts

@@ -103,6 +103,9 @@ class ContentNavigator implements SubscriptionProvider {
           this.treeViewSelections(item).forEach(
             async (resource: ContentItem) => {
               const isContainer = getIsContainer(resource);
+              const hasUnsavedFiles = isContainer
+                ? await this.contentDataProvider.checkFolderDirty(resource)
+                : isContainer;
               const moveToRecycleBin =
                 this.contentDataProvider.canRecycleResource(resource);
 
@@ -118,6 +121,18 @@ class ContentNavigator implements SubscriptionProvider {
                   ))
                 ) {
                   return;
+                } else if (moveToRecycleBin && isContainer && hasUnsavedFiles) {
+                  if (
+                    !(await window.showWarningMessage(
+                      l10n.t(Messages.RecycleDirtyFolderWarning, {
+                        name: resource.name,
+                      }),
+                      { modal: true },
+                      Messages.MoveToRecycleBinLabel,
+                    ))
+                  ) {
+                    return;
+                  }
                 }
                 const deleteResult = moveToRecycleBin
                   ? await this.contentDataProvider.recycleResource(resource)
@@ -496,5 +511,4 @@ class ContentNavigator implements SubscriptionProvider {
     );
   }
 }
-
 export default ContentNavigator;