fix: reset wasAccessed flag if ImperativeError caught

Signed-off-by: Trae Yelovich <[email protected]>
zowe · Nov 14, 2024 · 9166b58 · 9166b58
1 parent d85b493
commit 9166b58
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/packages/zowe-explorer/__tests__/__unit__/utils/AuthUtils.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/utils/AuthUtils.unit.test.ts
@@ -1,3 +1,14 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ */
+
 import { imperative } from "@zowe/zowe-explorer-api";
 import { AuthUtils } from "../../../src/utils/AuthUtils";
 

diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts b/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts
@@ -398,6 +398,7 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem
             //Callers of fetchDatasetAtUri() do not expect it to throw an error
             if (error instanceof imperative.ImperativeError) {
                 AuthUtils.promptForAuthError(error, metadata.profile);
+                dsEntry.wasAccessed = false;
             }
             return null;
         }

diff --git a/packages/zowe-explorer/src/trees/job/JobFSProvider.ts b/packages/zowe-explorer/src/trees/job/JobFSProvider.ts
@@ -25,6 +25,7 @@ import {
     ZoweScheme,
     FsJobsUtils,
     FsAbstractUtils,
+    imperative,
 } from "@zowe/zowe-explorer-api";
 import { IJob, IJobFile } from "@zowe/zos-jobs-for-zowe-sdk";
 import { Profiles } from "../../configuration/Profiles";
@@ -205,7 +206,10 @@ export class JobFSProvider extends BaseProvider implements vscode.FileSystemProv
                 bufBuilder.write(await jesApi.getSpoolContentById(jobEntry.job.jobname, jobEntry.job.jobid, spoolEntry.spool.id));
             }
         } catch (err) {
-            AuthUtils.promptForAuthError(err, spoolEntry.metadata.profile);
+            if (err instanceof imperative.ImperativeError) {
+                AuthUtils.promptForAuthError(err, spoolEntry.metadata.profile);
+                spoolEntry.wasAccessed = false;
+            }
             throw err;
         }
 

diff --git a/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts b/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts
@@ -277,7 +277,10 @@ export class UssFSProvider extends BaseProvider implements vscode.FileSystemProv
             if (err instanceof Error) {
                 ZoweLogger.error(err.message);
             }
-            AuthUtils.promptForAuthError(err, metadata.profile);
+            if (err instanceof imperative.ImperativeError) {
+                AuthUtils.promptForAuthError(err, metadata.profile);
+                file.wasAccessed = false;
+            }
             return;
         }