From 68cf3fd412bba608a82359309d42e2484289cda3 Mon Sep 17 00:00:00 2001
From: Mike Sawka <mike@commandline.dev>
Date: Wed, 22 Jan 2025 17:42:53 -0800
Subject: [PATCH] fix statfile atom dependencies via formatRemoteUri (#1797)

---
 frontend/app/view/preview/directorypreview.tsx | 16 ++++++++--------
 frontend/app/view/preview/preview.tsx          |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/app/view/preview/directorypreview.tsx b/frontend/app/view/preview/directorypreview.tsx
index 14113ee8f..7ecd4a009 100644
--- a/frontend/app/view/preview/directorypreview.tsx
+++ b/frontend/app/view/preview/directorypreview.tsx
@@ -4,7 +4,7 @@
 import { Button } from "@/app/element/button";
 import { Input } from "@/app/element/input";
 import { ContextMenuModel } from "@/app/store/contextmenu";
-import { PLATFORM, atoms, createBlock, getApi } from "@/app/store/global";
+import { PLATFORM, atoms, createBlock, getApi, globalStore } from "@/app/store/global";
 import { RpcApi } from "@/app/store/wshclientapi";
 import { TabRpcClient } from "@/app/store/wshrpcutil";
 import type { PreviewModel } from "@/app/view/preview/preview";
@@ -296,8 +296,8 @@ function DirectoryTable({
                     console.log(`replacing ${fileName} with ${newName}: ${path}`);
                     fireAndForget(async () => {
                         await RpcApi.FileMoveCommand(TabRpcClient, {
-                            srcuri: await model.formatRemoteUri(path),
-                            desturi: await model.formatRemoteUri(newPath),
+                            srcuri: await model.formatRemoteUri(path, globalStore.get),
+                            desturi: await model.formatRemoteUri(newPath, globalStore.get),
                             opts: {
                                 recursive: true,
                             },
@@ -610,7 +610,7 @@ function TableBody({
                                 meta: {
                                     controller: "shell",
                                     view: "term",
-                                    "cmd:cwd": await model.formatRemoteUri(finfo.path),
+                                    "cmd:cwd": await model.formatRemoteUri(finfo.path, globalStore.get),
                                 },
                             };
                             await createBlock(termBlockDef);
@@ -627,7 +627,7 @@ function TableBody({
                         fireAndForget(async () => {
                             await RpcApi.FileDeleteCommand(TabRpcClient, {
                                 info: {
-                                    path: await model.formatRemoteUri(finfo.path),
+                                    path: await model.formatRemoteUri(finfo.path, globalStore.get),
                                 },
                             }).catch((e) => console.log(e));
                             setRefreshVersion((current) => current + 1);
@@ -726,7 +726,7 @@ function DirectoryPreview({ model }: DirectoryPreviewProps) {
                 TabRpcClient,
                 {
                     info: {
-                        path: await model.formatRemoteUri(dirPath),
+                        path: await model.formatRemoteUri(dirPath, globalStore.get),
                     },
                 },
                 null
@@ -825,7 +825,7 @@ function DirectoryPreview({ model }: DirectoryPreviewProps) {
                         TabRpcClient,
                         {
                             info: {
-                                path: await model.formatRemoteUri(`${dirPath}/${newName}`),
+                                path: await model.formatRemoteUri(`${dirPath}/${newName}`, globalStore.get),
                             },
                         },
                         null
@@ -844,7 +844,7 @@ function DirectoryPreview({ model }: DirectoryPreviewProps) {
                 fireAndForget(async () => {
                     await RpcApi.FileMkdirCommand(TabRpcClient, {
                         info: {
-                            path: await model.formatRemoteUri(`${dirPath}/${newName}`),
+                            path: await model.formatRemoteUri(`${dirPath}/${newName}`, globalStore.get),
                         },
                     });
                     model.refreshCallback();
diff --git a/frontend/app/view/preview/preview.tsx b/frontend/app/view/preview/preview.tsx
index 80c7eb7dc..423075962 100644
--- a/frontend/app/view/preview/preview.tsx
+++ b/frontend/app/view/preview/preview.tsx
@@ -371,7 +371,7 @@ export class PreviewModel implements ViewModel {
             }
             const statFile = await RpcApi.FileInfoCommand(TabRpcClient, {
                 info: {
-                    path: await this.formatRemoteUri(fileName),
+                    path: await this.formatRemoteUri(fileName, get),
                 },
             });
             console.log("stat file", statFile);
@@ -392,7 +392,7 @@ export class PreviewModel implements ViewModel {
             }
             const file = await RpcApi.FileReadCommand(TabRpcClient, {
                 info: {
-                    path: await this.formatRemoteUri(fileName),
+                    path: await this.formatRemoteUri(fileName, get),
                 },
             });
             console.log("full file", file);
@@ -604,7 +604,7 @@ export class PreviewModel implements ViewModel {
         try {
             await RpcApi.FileWriteCommand(TabRpcClient, {
                 info: {
-                    path: await this.formatRemoteUri(filePath),
+                    path: await this.formatRemoteUri(filePath, globalStore.get),
                 },
                 data64: stringToBase64(newFileContent),
             });
@@ -780,7 +780,7 @@ export class PreviewModel implements ViewModel {
         return false;
     }
 
-    async formatRemoteUri(path: string): Promise<string> {
+    async formatRemoteUri(path: string, get: Getter): Promise<string> {
         const conn = (await globalStore.get(this.connection)) ?? "local";
         return `wsh://${conn}/${path}`;
     }