ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update Arc extension version and fix Controller connectivity status names (#11498)

Browse Source 
* Update connectivity mode names

(cherry picked from commit f0aabcfa86d178cdf74470f9fdeded19718bcea2)

* Bump package version

(cherry picked from commit e08370539006c638d6e25c2f4f23fa2754a3377d)
This commit is contained in:
Charles Gagnon
2020-07-23 16:37:48 -07:00
committed by GitHub
parent 2b132f6b58
commit 188cfdbd20
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/arc/package.json
View File

@@ -2,7 +2,7 @@
"name": "arc", "name": "arc",
"displayName": "%arc.displayName%", "displayName": "%arc.displayName%",
"description": "%arc.description%", "description": "%arc.description%",
"version": "0.1.0", "version": "0.2.0",
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": true, "preview": true,
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",

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

@@ -6,7 +6,7 @@
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import * as azurecore from '../../../azurecore/src/azurecore'; import * as azurecore from '../../../azurecore/src/azurecore';
import * as loc from '../localizedConstants'; import * as loc from '../localizedConstants';
import { IconPathHelper, IconPath, ResourceType, Connectionmode } from '../constants'; import { IconPathHelper, IconPath, ResourceType, ConnectionMode } from '../constants';
export class UserCancelledError extends Error { } export class UserCancelledError extends Error { }
@@ -71,10 +71,10 @@ export function getResourceTypeIcon(resourceType: string | undefined): IconPath
export function getConnectionModeDisplayText(connectionMode: string | undefined): string { export function getConnectionModeDisplayText(connectionMode: string | undefined): string {
connectionMode = connectionMode ?? ''; connectionMode = connectionMode ?? '';
switch (connectionMode) { switch (connectionMode) {
case Connectionmode.connected: case ConnectionMode.direct:
return loc.connected; return loc.direct;
case Connectionmode.disconnected: case ConnectionMode.indirect:
return loc.disconnected; return loc.indirect;
} }
return connectionMode; return connectionMode;
} }

6
extensions/arc/src/constants.ts
View File

@@ -131,9 +131,9 @@ export const enum Endpoints {
controller = 'controller' controller = 'controller'
} }
export const enum Connectionmode { export const enum ConnectionMode {
connected = 'connected', direct = 'direct',
disconnected = 'disconnected' indirect = 'indirect'
} }
export namespace cssStyles { export namespace cssStyles {

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

@@ -68,8 +68,8 @@ export const running = localize('arc.running', "Running");
export const pending = localize('arc.pending', "Pending"); export const pending = localize('arc.pending', "Pending");
export const failed = localize('arc.failed', "Failed"); export const failed = localize('arc.failed', "Failed");
export const unknown = localize('arc.unknown', "Unknown"); export const unknown = localize('arc.unknown', "Unknown");
export const connected = localize('arc.connected', "Connected"); export const direct = localize('arc.direct', "Direct");
export const disconnected = localize('arc.disconnected', "Disconnected"); export const indirect = localize('arc.indirect', "Indirect");
export const loading = localize('arc.loading', "Loading..."); export const loading = localize('arc.loading', "Loading...");
export const refreshToEnterCredentials = localize('arc.refreshToEnterCredentials', "Refresh node to enter credentials"); export const refreshToEnterCredentials = localize('arc.refreshToEnterCredentials', "Refresh node to enter credentials");
export const connectToController = localize('arc.connectToController', "Connect to Existing Controller"); export const connectToController = localize('arc.connectToController', "Connect to Existing Controller");

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

@@ -9,7 +9,7 @@ import 'mocha';
import { resourceTypeToDisplayName, parseEndpoint, parseInstanceName, getAzurecoreApi, getResourceTypeIcon, getConnectionModeDisplayText, getDatabaseStateDisplayText, promptForResourceDeletion, promptAndConfirmPassword, getErrorMessage } from '../../common/utils'; import { resourceTypeToDisplayName, parseEndpoint, parseInstanceName, getAzurecoreApi, getResourceTypeIcon, getConnectionModeDisplayText, getDatabaseStateDisplayText, promptForResourceDeletion, promptAndConfirmPassword, getErrorMessage } from '../../common/utils';
import * as loc from '../../localizedConstants'; import * as loc from '../../localizedConstants';
import { ResourceType, IconPathHelper, Connectionmode as ConnectionMode } from '../../constants'; import { ResourceType, IconPathHelper, ConnectionMode as ConnectionMode } from '../../constants';
import { MockInputBox } from '../stubs'; import { MockInputBox } from '../stubs';
import { HttpError } from '../../controller/generated/v1/api'; import { HttpError } from '../../controller/generated/v1/api';
import { IncomingMessage } from 'http'; import { IncomingMessage } from 'http';
@@ -91,8 +91,8 @@ describe('getResourceTypeIcon Method Tests', function () {
describe('getConnectionModeDisplayText Method Tests', function () { describe('getConnectionModeDisplayText Method Tests', function () {
it('Display Name should be correct for valid ResourceType', function (): void { it('Display Name should be correct for valid ResourceType', function (): void {
should(getConnectionModeDisplayText(ConnectionMode.connected)).equal(loc.connected); should(getConnectionModeDisplayText(ConnectionMode.direct)).equal(loc.direct);
should(getConnectionModeDisplayText(ConnectionMode.disconnected)).equal(loc.disconnected); should(getConnectionModeDisplayText(ConnectionMode.indirect)).equal(loc.indirect);
}); });
it('Display Name should be correct for unknown value', function (): void { it('Display Name should be correct for unknown value', function (): void {