fix: fix move issue

Signed-off-by: Scott Dover <[email protected]>

Author: Scott Dover

client/src/components/ContentNavigator/ContentDataProvider.ts

@@ -14,9 +14,6 @@ import {
   FileType,
   Position,
   ProviderResult,
-  Tab,
-  TabInputNotebook,
-  TabInputText,
   TextDocument,
   TextDocumentContentProvider,
   ThemeIcon,
@@ -54,7 +51,11 @@ import {
   ContentNavigatorConfig,
   FileManipulationEvent,
 } from "./types";
-import { getFileStatement, isContainer as getIsContainer } from "./utils";
+import {
+  getEditorTabForItem,
+  getFileStatement,
+  isContainer as getIsContainer,
+} from "./utils";
 
 class ContentDataProvider
   implements
@@ -502,6 +503,27 @@ class ContentDataProvider
     return this.getChildren(selection);
   }
 
+  private async moveItem(
+    item: ContentItem,
+    targetUri: string,
+  ): Promise<boolean> {
+    if (!targetUri) {
+      return false;
+    }
+
+    const closing = closeFileIfOpen(item);
+    if (!(await closing)) {
+      return false;
+    }
+
+    const newUri = await this.model.moveTo(item, targetUri);
+    if (closing !== true) {
+      commands.executeCommand("vscode.open", newUri);
+    }
+
+    return !!newUri;
+  }
+
   private async handleContentItemDrop(
     target: ContentItem,
     item: ContentItem,
@@ -518,10 +540,7 @@ class ContentDataProvider
       success = await this.addToMyFavorites(item);
     } else {
       const targetUri = target.resourceId;
-      if (targetUri) {
-        success = await this.model.moveTo(item, targetUri);
-      }
-
+      success = await this.moveItem(item, targetUri);
       if (success) {
         this.refresh();
       }
@@ -676,14 +695,7 @@ class ContentDataProvider
 export default ContentDataProvider;
 
 const closeFileIfOpen = (item: ContentItem) => {
-  const fileUri = item.vscUri;
-  const tabs: Tab[] = window.tabGroups.all.map((tg) => tg.tabs).flat();
-  const tab = tabs.find(
-    (tab) =>
-      (tab.input instanceof TabInputText ||
-        tab.input instanceof TabInputNotebook) &&
-      tab.input.uri.query === fileUri.query, // compare the file id
-  );
+  const tab = getEditorTabForItem(item);
   if (tab) {
     return window.tabGroups.close(tab);
   }

client/src/components/ContentNavigator/ContentModel.ts

@@ -127,7 +127,7 @@ export class ContentModel {
   public async moveTo(
     item: ContentItem,
     targetParentFolderUri: string,
-  ): Promise<boolean> {
+  ): Promise<boolean | Uri> {
     return await this.contentAdapter.moveItem(item, targetParentFolderUri);
   }
 

client/src/components/ContentNavigator/types.ts

@@ -89,7 +89,7 @@ export interface ContentAdapter {
   moveItem: (
     item: ContentItem,
     targetParentFolderUri: string,
-  ) => Promise<boolean>;
+  ) => Promise<Uri | undefined>;
   recycleItem?: (item: ContentItem) => Promise<{ newUri?: Uri; oldUri?: Uri }>;
   removeItemFromFavorites: (item: ContentItem) => Promise<boolean>;
   renameItem: (

client/src/components/ContentNavigator/utils.ts

@@ -1,6 +1,13 @@
 // Copyright © 2023, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { FileType, SnippetString } from "vscode";
+import {
+  FileType,
+  SnippetString,
+  Tab,
+  TabInputNotebook,
+  TabInputText,
+  window,
+} from "vscode";
 
 import { DEFAULT_FILE_CONTENT_TYPE } from "./const";
 import mimeTypes from "./mime-types";
@@ -76,3 +83,14 @@ export const createStaticFolder = (
     },
   ],
 });
+
+export const getEditorTabForItem = (item: ContentItem) => {
+  const fileUri = item.vscUri;
+  const tabs: Tab[] = window.tabGroups.all.map((tg) => tg.tabs).flat();
+  return tabs.find(
+    (tab) =>
+      (tab.input instanceof TabInputText ||
+        tab.input instanceof TabInputNotebook) &&
+      tab.input.uri.query === fileUri.query, // compare the file id
+  );
+};

client/src/connection/rest/RestSASServerAdapter.ts

@@ -325,7 +325,7 @@ class RestSASServerAdapter implements ContentAdapter {
   public async moveItem(
     item: ContentItem,
     targetParentFolderUri: string,
-  ): Promise<boolean> {
+  ): Promise<Uri | undefined> {
     const currentFilePath = this.trimComputePrefix(item.uri);
     const newFilePath = this.trimComputePrefix(targetParentFolderUri);
     const { etag } = await this.getFileInfo(currentFilePath, true);
@@ -344,7 +344,7 @@ class RestSASServerAdapter implements ContentAdapter {
     delete this.fileMetadataMap[currentFilePath];
     this.updateFileMetadata(newFilePath, response);
 
-    return !!this.filePropertiesToContentItem(response.data);
+    return this.filePropertiesToContentItem(response.data).vscUri;
   }
 
   public async renameItem(

client/src/connection/rest/SASContentAdapter.ts

@@ -187,15 +187,15 @@ class SASContentAdapter implements ContentAdapter {
   public async moveItem(
     item: ContentItem,
     parentFolderUri: string,
-  ): Promise<boolean> {
+  ): Promise<Uri | undefined> {
     const newItemData = { ...item, parentFolderUri };
     const updateLink = getLink(item.links, "PUT", "update");
     try {
-      await this.connection.put(updateLink.uri, newItemData);
+      const response = await this.connection.put(updateLink.uri, newItemData);
+      return this.enrichWithDataProviderProperties(response.data).vscUri;
     } catch (error) {
-      return false;
+      return;
     }
-    return true;
   }
 
   private async generatedMembersUrlForParentItem(