feat: support fetching at activation for saved files in-editor

Signed-off-by: Trae Yelovich <[email protected]>
zowe · Sep 6, 2024 · bf910c5 · bf910c5
1 parent ba17684
commit bf910c5
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 9 deletions.
diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts b/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts
@@ -220,11 +220,13 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem
 
         const entryExists = entry != null;
         let entryIsDir = entry != null ? entry.type === vscode.FileType.Directory : false;
+        const uriPath = uri.path.substring(uriInfo.slashAfterProfilePos + 1).split("/");
+        const pdsMember = uriPath.length === 2;
         if (!entryExists) {
-            const resp = await ZoweExplorerApiRegister.getMvsApi(uriInfo.profile).dataSet(path.posix.basename(uri.path), { attributes: true });
+            const resp = await ZoweExplorerApiRegister.getMvsApi(uriInfo.profile).dataSet(uriPath[0], { attributes: true });
             if (resp.success) {
                 const dsorg: string = resp.apiResponse?.items?.[0]?.dsorg;
-                entryIsDir = dsorg?.startsWith("PO") ?? false;
+                entryIsDir = pdsMember ? false : dsorg?.startsWith("PO") ?? false;
             } else {
                 throw vscode.FileSystemError.FileNotFound(uri);
             }
@@ -237,8 +239,13 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem
             }
             await this.fetchEntriesForDataset(entry as PdsEntry, uri, uriInfo);
         } else if (!entryExists) {
-            await this.writeFile(uri, new Uint8Array(), { create: true, overwrite: false });
-            entry = this._lookupAsFile(uri) as DsEntry;
+            this.createDirectory(uri.with({ path: path.posix.join(uri.path, "..") }));
+            const parentDir = this._lookupParentDirectory(uri);
+            const dsname = uriPath[Number(pdsMember)];
+            const ds = new DsEntry(dsname, pdsMember);
+            ds.metadata = new DsEntryMetadata({ path: path.posix.join(parentDir.metadata.path, dsname), profile: parentDir.metadata.profile });
+            parentDir.entries.set(dsname, ds);
+            entry = parentDir.entries.get(dsname) as DsEntry;
         }
 
         return entry;
@@ -382,7 +389,28 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem
      * @returns The data set's contents as an array of bytes
      */
     public async readFile(uri: vscode.Uri): Promise<Uint8Array> {
-        const file = this._lookupAsFile(uri);
+        let ds: DsEntry | DirEntry;
+        try {
+            ds = this._lookupAsFile(uri) as DsEntry;
+        } catch (err) {
+            if (!(err instanceof vscode.FileSystemError) || err.code !== "FileNotFound") {
+                throw err;
+            }
+
+            // check if parent directory exists; if not, do a remote lookup
+            const parent = this._lookupParentDirectory(uri, true);
+            if (parent == null) {
+                ds = await this.remoteLookupForResource(uri);
+            }
+        }
+
+        if (ds == null) {
+            throw vscode.FileSystemError.FileNotFound(uri);
+        }
+        if (FsAbstractUtils.isDirectoryEntry(ds)) {
+            throw vscode.FileSystemError.FileIsADirectory(uri);
+        }
+
         const profInfo = this._getInfoFromUri(uri);
 
         if (profInfo.profile == null) {
@@ -393,14 +421,14 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem
         const isConflict = urlQuery.has("conflict");
 
         // we need to fetch the contents from the mainframe if the file hasn't been accessed yet
-        if ((!file.wasAccessed && !urlQuery.has("inDiff")) || isConflict) {
+        if ((!ds.wasAccessed && !urlQuery.has("inDiff")) || isConflict) {
             await this.fetchDatasetAtUri(uri, { isConflict });
             if (!isConflict) {
-                file.wasAccessed = true;
+                ds.wasAccessed = true;
             }
         }
 
-        return isConflict ? file.conflictData.contents : file.data;
+        return isConflict ? ds.conflictData.contents : ds.data;
     }
 
     public makeEmptyDsWithEncoding(uri: vscode.Uri, encoding: ZosEncoding, isMember?: boolean): void {

diff --git a/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts b/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts
@@ -306,7 +306,28 @@ export class UssFSProvider extends BaseProvider implements vscode.FileSystemProv
      * @returns The file's contents as an array of bytes
      */
     public async readFile(uri: vscode.Uri): Promise<Uint8Array> {
-        const file = this._lookupAsFile(uri, { silent: false });
+        let file: UssFile | UssDirectory;
+        try {
+            file = this._lookupAsFile(uri) as UssFile;
+        } catch (err) {
+            if (!(err instanceof vscode.FileSystemError) || err.code !== "FileNotFound") {
+                throw err;
+            }
+
+            // check if parent directory exists; if not, do a remote lookup
+            const parent = this._lookupParentDirectory(uri, true);
+            if (parent == null) {
+                file = await this.remoteLookupForResource(uri);
+            }
+        }
+
+        if (file == null) {
+            throw vscode.FileSystemError.FileNotFound(uri);
+        }
+        if (FsAbstractUtils.isDirectoryEntry(file)) {
+            throw vscode.FileSystemError.FileIsADirectory(uri);
+        }
+
         const profInfo = this._getInfoFromUri(uri);
 
         if (profInfo.profile == null) {