Rorganize library list with dnd + drop library from browser

Signed-off-by: Seb Julliand <[email protected]>

Reorganize library list with dnd + dnd library from browser

Author: sebjulliand

src/ui/views/LibraryListView.ts

@@ -1,7 +1,8 @@
+import path from "path";
 import vscode, { commands, l10n } from "vscode";
 import IBMi from "../../api/IBMi";
 import { instance } from "../../instantiate";
-import { ConnectionConfig, IBMiObject, LIBRARY_LIST_MIMETYPE, OBJECT_BROWSER_DRAG_MIMETYPE, WithLibrary } from "../../typings";
+import { ConnectionConfig, IBMiObject, LIBRARY_LIST_MIMETYPE, URI_LIST_MIMETYPE, URI_LIST_SEPARATOR, WithLibrary } from "../../typings";
 import { VscodeTools } from "../Tools";
 
 export function initializeLibraryListView(context: vscode.ExtensionContext) {
@@ -86,14 +87,14 @@ export function initializeLibraryListView(context: vscode.ExtensionContext) {
       }
     }),
 
-    vscode.commands.registerCommand(`code-for-ibmi.changeUserLibraryList`, async () => {
+    vscode.commands.registerCommand(`code-for-ibmi.changeUserLibraryList`, async (libraries?: string[]) => {
       const connection = instance.getConnection();
       if (connection) {
         const content = connection.getContent();
         const config = connection.getConfig();
         const libraryList = config.libraryList;
 
-        const newLibraryListStr = await vscode.window.showInputBox({
+        const newLibraryListStr = libraries?.join(",") || await vscode.window.showInputBox({
           prompt: l10n.t(`Changing library list (can use "*reset")`),
           value: libraryList.map(lib => connection.upperCaseName(lib)).join(`, `)
         });
@@ -270,29 +271,58 @@ export function initializeLibraryListView(context: vscode.ExtensionContext) {
 
 class LibraryListDragAndDrop implements vscode.TreeDragAndDropController<LibraryListNode> {
   readonly dragMimeTypes = [];
-  readonly dropMimeTypes = [OBJECT_BROWSER_DRAG_MIMETYPE];
+  readonly dropMimeTypes = [URI_LIST_MIMETYPE];
 
-  handleDrag(source: readonly LibraryListNode[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Thenable<void> | void {
+  handleDrag(source: readonly LibraryListNode[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken) {
     dataTransfer.set(LIBRARY_LIST_MIMETYPE, new vscode.DataTransferItem(source));
   }
 
-  handleDrop(target: LibraryListNode | undefined, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Thenable<void> | void {
-    const libraryItem = dataTransfer.get(LIBRARY_LIST_MIMETYPE)?.value[0] as LibraryListNode;
-    if (libraryItem && libraryItem !== target) {
-      const currentLibrary = libraryItem.contextValue === 'currentLibrary';
+  handleDrop(target: LibraryListNode | undefined, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken) {
+    const libraries = this.getLibraries(dataTransfer)?.map(library => library.toUpperCase());
+    const config = instance.getConnection()?.getConfig();
+    if (config && libraries?.length) {
+      if (target?.contextValue === 'currentLibrary') {
+        //Dropped on current library: change current library
+        vscode.commands.executeCommand(`code-for-ibmi.setCurrentLibrary`, { library: libraries[0] } as WithLibrary);
+      }
+      else {
+        const libraryList = config.libraryList;
+
+        libraries.forEach(library => {
+          const index = libraryList.findIndex(lib => lib === library);
+          if (index > -1) {
+            libraryList.splice(index, 1);
+          }
+        });
 
-      if (target) {
-        if (target?.contextValue === 'currentLibrary') {
-          //Dropped on current library: become current library
-          vscode.commands.executeCommand(`code-for-ibmi.setCurrentLibrary`, libraryItem);
+        if (target) {
+          //Dropped on a library: push it down and move to its position
+          const index = libraryList.findIndex(lib => lib === target.library);
+          const moved = libraryList.splice(index, libraryList.length - index, ...libraries);
+          libraryList.push(...moved);
         }
         else {
-          //Dropped on a library: push it down and move to its position
+          //Dropped at the bottom of the list, after the last item: move to the last position
+          libraryList.push(...libraries);
         }
+        vscode.commands.executeCommand(`code-for-ibmi.changeUserLibraryList`, libraryList);
       }
-      else {
-        //Dropped at the bottom after the last item: move to the last position
-      }
+    }
+  }
+
+  getLibraries(dataTransfer: vscode.DataTransfer) {
+    const libraryListData = dataTransfer.get(LIBRARY_LIST_MIMETYPE);
+    const urisData = dataTransfer.get(URI_LIST_MIMETYPE);
+    if (libraryListData) {
+      return (libraryListData.value as LibraryListNode[]).map(node => node.library);
+    }
+    else if (urisData && urisData.value) {
+      return String(urisData.value).split(URI_LIST_SEPARATOR)
+        .map(uri => vscode.Uri.parse(uri))
+        .filter(uri => uri.scheme === "object")
+        .map(uri => path.parse(uri.path))
+        .filter(path => path.ext?.toUpperCase() === ".LIB")
+        .map(path => path.name);
     }
   }
 }

src/ui/views/ifsBrowser.ts

@@ -8,11 +8,10 @@ import { SortOptions } from "../../api/IBMiContent";
 import { Search } from "../../api/Search";
 import { Tools } from "../../api/Tools";
 import { instance } from "../../instantiate";
-import { FocusOptions, IFSFile, IFS_BROWSER_MIMETYPE, OBJECT_BROWSER_MIMETYPE, SearchHit, SearchResults, URI_LIST_MIMETYPE, WithPath } from "../../typings";
+import { FocusOptions, IFSFile, IFS_BROWSER_MIMETYPE, OBJECT_BROWSER_MIMETYPE, SearchHit, SearchResults, URI_LIST_MIMETYPE, URI_LIST_SEPARATOR, WithPath } from "../../typings";
 import { VscodeTools } from "../Tools";
 import { BrowserItem, BrowserItemParameters } from "../types";
 
-const URI_LIST_SEPARATOR = "\r\n";
 const PROTECTED_DIRS = /^(\/|\/QOpenSys|\/QSYS\.LIB|\/QDLS|\/QOPT|\/QNTC|\/QFileSvr\.400|\/QIBM|\/QSR|\/QTCPTMM|\/bin|\/dev|\/home|\/tmp|\/usr|\/var)$/i;
 const ALWAYS_SHOW_FILES = /^(\.gitignore|\.vscode|\.deployignore)$/i;
 type DragNDropAction = "move" | "copy";
@@ -209,7 +208,7 @@ class IFSBrowserDragAndDrop implements vscode.TreeDragAndDropController<IFSItem>
       .join(URI_LIST_SEPARATOR)));
   }
 
-  async handleDrop(target: IFSItem | undefined, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken) {
+  handleDrop(target: IFSItem | undefined, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken) {
     if (target) {
       const toDirectory = (target.file.type === "streamfile" ? target.parent : target) as IFSDirectoryItem;
       const ifsBrowserItems = dataTransfer.get(IFS_BROWSER_MIMETYPE);
@@ -220,7 +219,7 @@ class IFSBrowserDragAndDrop implements vscode.TreeDragAndDropController<IFSItem>
         const explorerItems = dataTransfer.get(URI_LIST_MIMETYPE);
         if (explorerItems?.value) {
           //URI_LIST_MIMETYPE Mime type is a string with `toString()`ed Uris separated by `\r\n`.
-          const uris = (await explorerItems.asString()).split(URI_LIST_SEPARATOR).map(uri => vscode.Uri.parse(uri));
+          const uris = String(explorerItems.value).split(URI_LIST_SEPARATOR).map(uri => vscode.Uri.parse(uri));
           if (uris.at(0)?.scheme === "member") {
             this.copyMembers(uris, toDirectory)
           }