#59

scale-tone · Feb 28, 2021 · 7dec515 · 7dec515
1 parent e981d48
commit 7dec515
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 93 deletions.
diff --git a/durablefunctionsmonitor-vscodeext/resources/storageAccount.svg b/durablefunctionsmonitor-vscodeext/resources/storageAccount.svg
diff --git a/durablefunctionsmonitor-vscodeext/resources/storageAccountAttached.svg b/durablefunctionsmonitor-vscodeext/resources/storageAccountAttached.svg
diff --git a/durablefunctionsmonitor-vscodeext/src/BackendProcess.ts b/durablefunctionsmonitor-vscodeext/src/BackendProcess.ts
@@ -223,8 +223,9 @@ export class StorageConnectionSettings {
     get hubName(): string { return this._hubName; };
     get connStringHashKey(): string { return this._connStringHashKey; }
     get hashKey(): string { return this._hashKey; }
+    get isFromLocalSettingsJson(): boolean { return this._fromLocalSettingsJson; }
 
-    constructor(private _connString: string, private _hubName: string) {
+    constructor(private _connString: string, private _hubName: string, private _fromLocalSettingsJson: boolean = false) {
 
         this._connStringHashKey = StorageConnectionSettings.GetConnStringHashKey(this._connString);
         this._hashKey = this._connStringHashKey + this._hubName.toLowerCase();

diff --git a/durablefunctionsmonitor-vscodeext/src/MonitorViewList.ts b/durablefunctionsmonitor-vscodeext/src/MonitorViewList.ts
@@ -79,7 +79,7 @@ export class MonitorViewList {
             return null;
         }
 
-        return new StorageConnectionSettings(ConnStringUtils.ExpandEmulatorShortcutIfNeeded(storageConnString), hubName);
+        return new StorageConnectionSettings(ConnStringUtils.ExpandEmulatorShortcutIfNeeded(storageConnString), hubName, true);
     }
 
     // Stops all backend processes and closes all views

diff --git a/durablefunctionsmonitor-vscodeext/src/StorageAccountTreeItem.ts b/durablefunctionsmonitor-vscodeext/src/StorageAccountTreeItem.ts
@@ -11,7 +11,8 @@ export class StorageAccountTreeItem extends vscode.TreeItem {
         accountName: string,
         private _resourcesFolderPath: string,
         private _getBackendUrl: () => string,
-        private _isTaskHubAttached: (hubName: string) => boolean) {
+        private _isTaskHubAttached: (hubName: string) => boolean,
+        private _fromLocalSettingsJson: boolean = false) {
 
         super(accountName, vscode.TreeItemCollapsibleState.Expanded);
     }
@@ -37,6 +38,11 @@ export class StorageAccountTreeItem extends vscode.TreeItem {
     }
 
     get tooltip(): string {
+
+        if (this._fromLocalSettingsJson) {
+            return `from local.settings.json`;
+        }
+
         return StorageConnectionSettings.MaskStorageConnString(this._connString);
     }
 

diff --git a/durablefunctionsmonitor-vscodeext/src/StorageAccountTreeItems.ts b/durablefunctionsmonitor-vscodeext/src/StorageAccountTreeItems.ts
@@ -63,7 +63,8 @@ export class StorageAccountTreeItems {
                 storageAccountName,
                 this._resourcesFolderPath,
                 () => this._monitorViewList.getBackendUrl(storageConnString),
-                (h) => this._monitorViewList.isMonitorViewVisible(new StorageConnectionSettings(storageConnString, h))
+                (h) => this._monitorViewList.isMonitorViewVisible(new StorageConnectionSettings(storageConnString, h)),
+                connSettings.isFromLocalSettingsJson
             );
 
             this._storageAccountItems.push(node);