ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when trying to update server or database properties (#23695)

Browse Source
This commit is contained in:
Barbara Valdez
2023-07-11 11:07:09 -07:00
committed by GitHub
parent ba483815b2
commit bfb8536aa6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mssql/src/objectManagement/commands.ts
View File

@@ -124,7 +124,7 @@ async function handleObjectPropertiesDialogCommand(context: azdata.ObjectExplore
return; return;
} }
try { try {
const parentUrn = context.nodeInfo ? await getParentUrn(context) : undefined; const parentUrn = context.isConnectionNode ? undefined : await getParentUrn(context);
const objectType = context.nodeInfo ? context.nodeInfo.nodeType as ObjectManagement.NodeType : (context.connectionProfile.databaseName === '' ? ObjectManagement.NodeType.Server : ObjectManagement.NodeType.Database); const objectType = context.nodeInfo ? context.nodeInfo.nodeType as ObjectManagement.NodeType : (context.connectionProfile.databaseName === '' ? ObjectManagement.NodeType.Server : ObjectManagement.NodeType.Database);
const objectName = context.nodeInfo ? context.nodeInfo.label : (!context.connectionProfile.databaseName ? context.connectionProfile.serverName : context.connectionProfile.databaseName); const objectName = context.nodeInfo ? context.nodeInfo.label : (!context.connectionProfile.databaseName ? context.connectionProfile.serverName : context.connectionProfile.databaseName);
const objectUrn = context.nodeInfo ? context.nodeInfo!.metadata!.urn : (context.connectionProfile.databaseName === '' ? 'Server' : `Server/Database[@Name='${escapeSingleQuotes(context.connectionProfile.databaseName)}']`); const objectUrn = context.nodeInfo ? context.nodeInfo!.metadata!.urn : (context.connectionProfile.databaseName === '' ? 'Server' : `Server/Database[@Name='${escapeSingleQuotes(context.connectionProfile.databaseName)}']`);

4
extensions/mssql/src/objectManagement/utils.ts
View File

@@ -11,7 +11,7 @@ import * as localizedConstants from './localizedConstants';
export async function refreshParentNode(context: azdata.ObjectExplorerContext): Promise<void> { export async function refreshParentNode(context: azdata.ObjectExplorerContext): Promise<void> {
if (context) { if (context) {
try { try {
const node = await azdata.objectexplorer.getNode(context.connectionProfile!.id, context.nodeInfo!.nodePath); const node = await azdata.objectexplorer.getNode(context.connectionProfile!.id, context.nodeInfo?.nodePath);
const parentNode = await node?.getParent(); const parentNode = await node?.getParent();
await parentNode?.refresh(); await parentNode?.refresh();
} }
@@ -24,7 +24,7 @@ export async function refreshParentNode(context: azdata.ObjectExplorerContext):
export async function refreshNode(context: azdata.ObjectExplorerContext): Promise<void> { export async function refreshNode(context: azdata.ObjectExplorerContext): Promise<void> {
if (context) { if (context) {
try { try {
const node = await azdata.objectexplorer.getNode(context.connectionProfile!.id, context.nodeInfo!.nodePath); const node = await azdata.objectexplorer.getNode(context.connectionProfile!.id, context.nodeInfo?.nodePath);
await node?.refresh(); await node?.refresh();
} }
catch (err) { catch (err) {