Hide permissions if a login doesn't support it (#24888) (#24902)

* Hide permissions if a login doesn't support it (#24888) * Bump STS version
microsoft · Nov 7, 2023 · c7c2b2f · c7c2b2f
1 parent 7d37e4c
commit c7c2b2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/extensions/mssql/config.json b/extensions/mssql/config.json
@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "4.10.1.2",
+	"version": "4.10.1.3",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net7.0.zip",
 		"Windows_64": "win-x64-net7.0.zip",

diff --git a/extensions/mssql/src/objectManagement/ui/loginDialog.ts b/extensions/mssql/src/objectManagement/ui/loginDialog.ts
@@ -13,6 +13,7 @@ import { isValidSQLPassword } from '../utils';
 import { DefaultMaxTableRowCount } from '../../ui/dialogBase';
 import { PrincipalDialogBase } from './principalDialogBase';
 import { AuthenticationType, Login, LoginViewInfo } from '../interfaces';
+import { isUndefinedOrNull } from '../../types';
 
 export class LoginDialog extends PrincipalDialogBase<Login, LoginViewInfo> {
 	private generalSection: azdata.GroupContainer;
@@ -96,7 +97,9 @@ export class LoginDialog extends PrincipalDialogBase<Login, LoginViewInfo> {
 
 		this.initializeServerRolesSection();
 		sections.push(this.serverRoleSection);
-		sections.push(this.securableSection);
+		if (this.options.isNewObject || !isUndefinedOrNull(this.objectInfo.securablePermissions)) {
+			sections.push(this.securableSection);
+		}
 
 		this.formContainer.addItems(sections, this.getSectionItemLayout());
 	}

diff --git a/extensions/mssql/src/objectManagement/ui/principalDialogBase.ts b/extensions/mssql/src/objectManagement/ui/principalDialogBase.ts
@@ -40,7 +40,7 @@ export abstract class PrincipalDialogBase<ObjectInfoType extends SecurityPrincip
 	}
 
 	protected override async initializeUI(): Promise<void> {
-		this.securablePermissions = deepClone(this.objectInfo.securablePermissions);
+		this.securablePermissions = deepClone(this.objectInfo.securablePermissions) ?? [];
 		this.initializeSecurableSection();
 	}