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

Update deletion strings to refer to instances instead of resources (#12332)

Browse Source 
* Update deletion strings to refer to instances instead of resources

* one more

* Remove unused

* More
This commit is contained in:
Charles Gagnon
2020-09-16 07:48:46 -07:00
committed by GitHub
parent ffb81d88fd
commit 78de48391d
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/arc/src/common/utils.ts
View File

@@ -148,15 +148,15 @@ async function promptInputBox(title: string, options: vscode.InputBoxOptions): P
} }
/** /**
* Opens an input box prompting the user to enter in the name of a resource to delete * Opens an input box prompting the user to enter in the name of an instance to delete
* @param name The name of the resource to delete * @param name The name of the instance to delete
* @returns Promise resolving to true if the user confirmed the name, false if the input box was closed for any other reason * @returns Promise resolving to true if the user confirmed the name, false if the input box was closed for any other reason
*/ */
export async function promptForResourceDeletion(name: string): Promise<boolean> { export async function promptForInstanceDeletion(name: string): Promise<boolean> {
const title = loc.resourceDeletionWarning(name); const title = loc.instanceDeletionWarning(name);
const options: vscode.InputBoxOptions = { const options: vscode.InputBoxOptions = {
placeHolder: name, placeHolder: name,
validateInput: input => input !== name ? loc.invalidResourceDeletionName(name) : '' validateInput: input => input !== name ? loc.invalidInstanceDeletionName(name) : ''
}; };
return await promptInputBox(title, options) !== undefined; return await promptInputBox(title, options) !== undefined;

8
extensions/arc/src/localizedConstants.ts
View File

@@ -127,7 +127,7 @@ export const lastUpdated = localize('arc.lastUpdated', "Last updated");
export const noExternalEndpoint = localize('arc.noExternalEndpoint', "No External Endpoint has been configured so this information isn't available."); export const noExternalEndpoint = localize('arc.noExternalEndpoint', "No External Endpoint has been configured so this information isn't available.");
export function databaseCreated(name: string): string { return localize('arc.databaseCreated', "Database {0} created", name); } export function databaseCreated(name: string): string { return localize('arc.databaseCreated', "Database {0} created", name); }
export function resourceDeleted(name: string): string { return localize('arc.resourceDeleted', "Resource '{0}' deleted", name); } export function instanceDeleted(name: string): string { return localize('arc.instanceDeleted', "Instance '{0}' deleted", name); }
export function copiedToClipboard(name: string): string { return localize('arc.copiedToClipboard', "{0} copied to clipboard", name); } export function copiedToClipboard(name: string): string { return localize('arc.copiedToClipboard', "{0} copied to clipboard", name); }
export function clickTheTroubleshootButton(resourceType: string): string { return localize('arc.clickTheTroubleshootButton', "Click the troubleshoot button to open the Azure Arc {0} troubleshooting notebook.", resourceType); } export function clickTheTroubleshootButton(resourceType: string): string { return localize('arc.clickTheTroubleshootButton', "Click the troubleshoot button to open the Azure Arc {0} troubleshooting notebook.", resourceType); }
export function numVCores(vCores: string | undefined): string { export function numVCores(vCores: string | undefined): string {
@@ -148,7 +148,7 @@ export const connectionRequired = localize('arc.connectionRequired', "A connecti
export const couldNotFindControllerRegistration = localize('arc.couldNotFindControllerRegistration', "Could not find controller registration."); export const couldNotFindControllerRegistration = localize('arc.couldNotFindControllerRegistration', "Could not find controller registration.");
export function refreshFailed(error: any): string { return localize('arc.refreshFailed', "Refresh failed. {0}", getErrorMessage(error)); } export function refreshFailed(error: any): string { return localize('arc.refreshFailed', "Refresh failed. {0}", getErrorMessage(error)); }
export function openDashboardFailed(error: any): string { return localize('arc.openDashboardFailed', "Error opening dashboard. {0}", getErrorMessage(error)); } export function openDashboardFailed(error: any): string { return localize('arc.openDashboardFailed', "Error opening dashboard. {0}", getErrorMessage(error)); }
export function resourceDeletionFailed(name: string, error: any): string { return localize('arc.resourceDeletionFailed', "Failed to delete resource {0}. {1}", name, getErrorMessage(error)); } export function instanceDeletionFailed(name: string, error: any): string { return localize('arc.instanceDeletionFailed', "Failed to delete instance {0}. {1}", name, getErrorMessage(error)); }
export function databaseCreationFailed(name: string, error: any): string { return localize('arc.databaseCreationFailed', "Failed to create database {0}. {1}", name, getErrorMessage(error)); } export function databaseCreationFailed(name: string, error: any): string { return localize('arc.databaseCreationFailed', "Failed to create database {0}. {1}", name, getErrorMessage(error)); }
export function connectToControllerFailed(url: string, error: any): string { return localize('arc.connectToControllerFailed', "Could not connect to controller {0}. {1}", url, getErrorMessage(error)); } export function connectToControllerFailed(url: string, error: any): string { return localize('arc.connectToControllerFailed', "Could not connect to controller {0}. {1}", url, getErrorMessage(error)); }
export function connectToSqlFailed(serverName: string, error: any): string { return localize('arc.connectToSqlFailed', "Could not connect to MIAA Instance {0}. {1}", serverName, getErrorMessage(error)); } export function connectToSqlFailed(serverName: string, error: any): string { return localize('arc.connectToSqlFailed', "Could not connect to MIAA Instance {0}. {1}", serverName, getErrorMessage(error)); }
@@ -156,8 +156,8 @@ export function fetchConfigFailed(name: string, error: any): string { return loc
export function fetchEndpointsFailed(name: string, error: any): string { return localize('arc.fetchEndpointsFailed', "An unexpected error occurred retrieving the endpoints for '{0}'. {1}", name, getErrorMessage(error)); } export function fetchEndpointsFailed(name: string, error: any): string { return localize('arc.fetchEndpointsFailed', "An unexpected error occurred retrieving the endpoints for '{0}'. {1}", name, getErrorMessage(error)); }
export function fetchRegistrationsFailed(name: string, error: any): string { return localize('arc.fetchRegistrationsFailed', "An unexpected error occurred retrieving the registrations for '{0}'. {1}", name, getErrorMessage(error)); } export function fetchRegistrationsFailed(name: string, error: any): string { return localize('arc.fetchRegistrationsFailed', "An unexpected error occurred retrieving the registrations for '{0}'. {1}", name, getErrorMessage(error)); }
export function fetchDatabasesFailed(name: string, error: any): string { return localize('arc.fetchDatabasesFailed', "An unexpected error occurred retrieving the databases for '{0}'. {1}", name, getErrorMessage(error)); } export function fetchDatabasesFailed(name: string, error: any): string { return localize('arc.fetchDatabasesFailed', "An unexpected error occurred retrieving the databases for '{0}'. {1}", name, getErrorMessage(error)); }
export function resourceDeletionWarning(name: string): string { return localize('arc.resourceDeletionWarning', "Warning! Deleting a resource is permanent and cannot be undone. To delete the resource '{0}' type the name '{0}' below to proceed.", name); } export function instanceDeletionWarning(name: string): string { return localize('arc.instanceDeletionWarning', "Warning! Deleting an instance is permanent and cannot be undone. To delete the instance '{0}' type the name '{0}' below to proceed.", name); }
export function invalidResourceDeletionName(name: string): string { return localize('arc.invalidResourceDeletionName', "The value '{0}' does not match the instance name. Try again or press escape to exit", name); } export function invalidInstanceDeletionName(name: string): string { return localize('arc.invalidInstanceDeletionName', "The value '{0}' does not match the instance name. Try again or press escape to exit", name); }
export function couldNotFindAzureResource(name: string): string { return localize('arc.couldNotFindAzureResource', "Could not find Azure resource for {0}", name); } export function couldNotFindAzureResource(name: string): string { return localize('arc.couldNotFindAzureResource', "Could not find Azure resource for {0}", name); }
export function passwordResetFailed(error: any): string { return localize('arc.passwordResetFailed', "Failed to reset password. {0}", getErrorMessage(error)); } export function passwordResetFailed(error: any): string { return localize('arc.passwordResetFailed', "Failed to reset password. {0}", getErrorMessage(error)); }
export function errorConnectingToController(error: any): string { return localize('arc.errorConnectingToController', "Error connecting to controller. {0}", getErrorMessage(error)); } export function errorConnectingToController(error: any): string { return localize('arc.errorConnectingToController', "Error connecting to controller. {0}", getErrorMessage(error)); }

8
extensions/arc/src/test/common/utils.test.ts
View File

@@ -7,7 +7,7 @@ import { ResourceType } from 'arc';
import 'mocha'; import 'mocha';
import * as should from 'should'; import * as should from 'should';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import { getAzurecoreApi, getConnectionModeDisplayText, getDatabaseStateDisplayText, getErrorMessage, getResourceTypeIcon, parseEndpoint, parseIpAndPort, promptAndConfirmPassword, promptForResourceDeletion, resourceTypeToDisplayName } from '../../common/utils'; import { getAzurecoreApi, getConnectionModeDisplayText, getDatabaseStateDisplayText, getErrorMessage, getResourceTypeIcon, parseEndpoint, parseIpAndPort, promptAndConfirmPassword, promptForInstanceDeletion, resourceTypeToDisplayName } from '../../common/utils';
import { ConnectionMode as ConnectionMode, IconPathHelper } from '../../constants'; import { ConnectionMode as ConnectionMode, IconPathHelper } from '../../constants';
import * as loc from '../../localizedConstants'; import * as loc from '../../localizedConstants';
import { MockInputBox } from '../stubs'; import { MockInputBox } from '../stubs';
@@ -122,7 +122,7 @@ describe('promptForResourceDeletion Method Tests', function (): void {
}); });
it('Resolves as true when value entered is correct', function (done): void { it('Resolves as true when value entered is correct', function (done): void {
promptForResourceDeletion('myname').then((value: boolean) => { promptForInstanceDeletion('myname').then((value: boolean) => {
value ? done() : done(new Error('Expected return value to be true')); value ? done() : done(new Error('Expected return value to be true'));
}); });
mockInputBox.value = 'myname'; mockInputBox.value = 'myname';
@@ -130,14 +130,14 @@ describe('promptForResourceDeletion Method Tests', function (): void {
}); });
it('Resolves as false when input box is closed early', function (done): void { it('Resolves as false when input box is closed early', function (done): void {
promptForResourceDeletion('myname').then((value: boolean) => { promptForInstanceDeletion('myname').then((value: boolean) => {
!value ? done() : done(new Error('Expected return value to be false')); !value ? done() : done(new Error('Expected return value to be false'));
}); });
mockInputBox.hide(); mockInputBox.hide();
}); });
it('Validation message is set when value entered is incorrect', async function (): Promise<void> { it('Validation message is set when value entered is incorrect', async function (): Promise<void> {
promptForResourceDeletion('myname'); promptForInstanceDeletion('myname');
mockInputBox.value = 'wrong value'; mockInputBox.value = 'wrong value';
await mockInputBox.triggerAccept(); await mockInputBox.triggerAccept();
should(mockInputBox.validationMessage).not.be.equal('', 'Validation message should not be empty after incorrect value entered'); should(mockInputBox.validationMessage).not.be.equal('', 'Validation message should not be empty after incorrect value entered');

8
extensions/arc/src/ui/dashboards/miaa/miaaDashboardOverviewPage.ts
View File

@@ -7,7 +7,7 @@ import * as azdata from 'azdata';
import * as azdataExt from 'azdata-ext'; import * as azdataExt from 'azdata-ext';
import * as azurecore from 'azurecore'; import * as azurecore from 'azurecore';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import { getDatabaseStateDisplayText, promptForResourceDeletion } from '../../../common/utils'; import { getDatabaseStateDisplayText, promptForInstanceDeletion } from '../../../common/utils';
import { cssStyles, Endpoints, IconPathHelper } from '../../../constants'; import { cssStyles, Endpoints, IconPathHelper } from '../../../constants';
import * as loc from '../../../localizedConstants'; import * as loc from '../../../localizedConstants';
import { ControllerModel } from '../../../models/controllerModel'; import { ControllerModel } from '../../../models/controllerModel';
@@ -198,13 +198,13 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
deleteButton.onDidClick(async () => { deleteButton.onDidClick(async () => {
deleteButton.enabled = false; deleteButton.enabled = false;
try { try {
if (await promptForResourceDeletion(this._miaaModel.info.name)) { if (await promptForInstanceDeletion(this._miaaModel.info.name)) {
await this._azdataApi.azdata.arc.sql.mi.delete(this._miaaModel.info.name); await this._azdataApi.azdata.arc.sql.mi.delete(this._miaaModel.info.name);
await this._controllerModel.refreshTreeNode(); await this._controllerModel.refreshTreeNode();
vscode.window.showInformationMessage(loc.resourceDeleted(this._miaaModel.info.name)); vscode.window.showInformationMessage(loc.instanceDeleted(this._miaaModel.info.name));
} }
} catch (error) { } catch (error) {
vscode.window.showErrorMessage(loc.resourceDeletionFailed(this._miaaModel.info.name, error)); vscode.window.showErrorMessage(loc.instanceDeletionFailed(this._miaaModel.info.name, error));
} finally { } finally {
deleteButton.enabled = true; deleteButton.enabled = true;
} }

8
extensions/arc/src/ui/dashboards/postgres/postgresOverviewPage.ts
View File

@@ -11,7 +11,7 @@ import { IconPathHelper, cssStyles, Endpoints } from '../../../constants';
import { DashboardPage } from '../../components/dashboardPage'; import { DashboardPage } from '../../components/dashboardPage';
import { ControllerModel } from '../../../models/controllerModel'; import { ControllerModel } from '../../../models/controllerModel';
import { PostgresModel } from '../../../models/postgresModel'; import { PostgresModel } from '../../../models/postgresModel';
import { promptAndConfirmPassword, promptForResourceDeletion } from '../../../common/utils'; import { promptAndConfirmPassword, promptForInstanceDeletion } from '../../../common/utils';
export class PostgresOverviewPage extends DashboardPage { export class PostgresOverviewPage extends DashboardPage {
@@ -174,13 +174,13 @@ export class PostgresOverviewPage extends DashboardPage {
deleteButton.onDidClick(async () => { deleteButton.onDidClick(async () => {
deleteButton.enabled = false; deleteButton.enabled = false;
try { try {
if (await promptForResourceDeletion(this._postgresModel.info.name)) { if (await promptForInstanceDeletion(this._postgresModel.info.name)) {
await this._azdataApi.azdata.arc.postgres.server.delete(this._postgresModel.info.name); await this._azdataApi.azdata.arc.postgres.server.delete(this._postgresModel.info.name);
await this._controllerModel.refreshTreeNode(); await this._controllerModel.refreshTreeNode();
vscode.window.showInformationMessage(loc.resourceDeleted(this._postgresModel.info.name)); vscode.window.showInformationMessage(loc.instanceDeleted(this._postgresModel.info.name));
} }
} catch (error) { } catch (error) {
vscode.window.showErrorMessage(loc.resourceDeletionFailed(this._postgresModel.info.name, error)); vscode.window.showErrorMessage(loc.instanceDeletionFailed(this._postgresModel.info.name, error));
} finally { } finally {
deleteButton.enabled = true; deleteButton.enabled = true;
} }