Merge pull request #95 from MaterializeInc/disable-ui-when-loading-co…

…ntext auth: disable ui
MaterializeInc · Sep 15, 2023 · 38715c1 · 38715c1
2 parents 436c8bd + 77a84db
commit 38715c1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/providers/auth.ts b/src/providers/auth.ts
@@ -162,6 +162,10 @@ export default class AuthProvider implements vscode.WebviewViewProvider {
         this.state.isAddNewProfile = false;
         if (appPasswordResponse) {
             const { appPassword, region } = appPasswordResponse;
+
+            // Set the state loading to true. After the new context is loaded
+            // loading will turn false.
+            this.state.isLoading = true;
             this.context.addAndSaveProfile(name, appPassword, region.toString());
         } else {
             // Cancel login process.
@@ -229,6 +233,13 @@ export default class AuthProvider implements vscode.WebviewViewProvider {
                     break;
                 }
                 case "onContinueRemoveProfile": {
+                    this.state.isRemoveProfile = false;
+
+                    // Set the state loading to true. After the new context is loaded
+                    // loading will turn false.
+                    this.state.isLoading = true;
+                    webviewView.webview.html = this._getHtmlForWebview(webviewView.webview);
+
                     const name = this.context.getProfileName();
 
                     if (name) {
@@ -237,8 +248,6 @@ export default class AuthProvider implements vscode.WebviewViewProvider {
                         console.error("[Auth]", "Profile name is not available.");
                     }
 
-                    this.state.isRemoveProfile = false;
-                    webviewView.webview.html = this._getHtmlForWebview(webviewView.webview);
                     break;
                 }
                 case "onRemoveProfile": {
@@ -352,7 +361,7 @@ export default class AuthProvider implements vscode.WebviewViewProvider {
                         <!--  https://github.com/microsoft/vscode-webview-ui-toolkit/tree/main/src/dropdown#with-label -->
                         <div class="dropdown-container">
                             <label for="profiles">Profile</label>
-                            <vscode-dropdown id="profiles">
+                            <vscode-dropdown id="profiles" ${this.state.isLoading ? "disabled=true" :""}>
                                 <vscode-option>${(profileName)}</vscode-option>
                                 ${profileNames.filter(name => name !== profileName).map((name) => `<vscode-option>${name}</vscode-option>`).join('')}
                             </vscode-dropdown>

diff --git a/src/providers/scripts/auth.ts b/src/providers/scripts/auth.ts
@@ -170,6 +170,16 @@
                     break;
                 }
             case "environmentChange": {
+                // Disable profile interactions of any kind.
+                const addProfileButton = document.getElementById("addProfileButton") as HTMLSelectElement;
+                addProfileButton.disabled = true;
+
+                const removeProfileButton = document.getElementById("removeProfileButton") as HTMLSelectElement;
+                removeProfileButton.disabled = true;
+
+                const profiles = document.getElementById("profiles") as HTMLSelectElement;
+                profiles.disabled = true;
+
                 const clusters = document.getElementById("clusters") as HTMLSelectElement;
                 clusters.disabled = true;