diff --git a/extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardOverviewPage.ts b/extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardOverviewPage.ts index ff7406b9ac..3e56c37cdf 100644 --- a/extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardOverviewPage.ts +++ b/extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardOverviewPage.ts @@ -192,7 +192,7 @@ export class BdcDashboardOverviewPage extends BdcDashboardPage { }, { // view details button displayName: '', - ariaLabel: loc.viewDetails, + ariaLabel: loc.viewErrorDetails, valueType: azdata.DeclarativeDataType.component, isReadOnly: true, width: 150, diff --git a/extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardResourceStatusPage.ts b/extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardResourceStatusPage.ts index 9e675dbe51..9c2a8f972d 100644 --- a/extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardResourceStatusPage.ts +++ b/extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardResourceStatusPage.ts @@ -146,7 +146,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage { }, { // view details button displayName: '', - ariaLabel: loc.viewDetails, + ariaLabel: loc.viewErrorDetails, valueType: azdata.DeclarativeDataType.component, isReadOnly: true, width: 150, @@ -194,7 +194,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage { 'border-bottom': 'solid 1px #ccc', 'border-left': 'none', 'border-right': 'none' - }, + } }, { // node metrics displayName: loc.nodeMetrics, @@ -211,7 +211,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage { 'border-bottom': 'solid 1px #ccc', 'border-left': 'none', 'border-right': 'none' - }, + } } ]; @@ -255,7 +255,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage { 'border-bottom': 'solid 1px #ccc', 'border-left': 'none', 'border-right': 'none' - }, + } }); this.metricsAndLogsRowsTable = this.modelView.modelBuilder.declarativeTable() @@ -312,6 +312,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage { label: loc.view, url: instanceStatus.dashboards.nodeMetricsUrl, title: instanceStatus.dashboards.nodeMetricsUrl, + ariaLabel: loc.viewNodeMetrics(instanceStatus.dashboards.nodeMetricsUrl), CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink } }).component()); } @@ -326,6 +327,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage { label: loc.view, url: instanceStatus.dashboards.sqlMetricsUrl, title: instanceStatus.dashboards.sqlMetricsUrl, + ariaLabel: loc.viewSqlMetrics(instanceStatus.dashboards.sqlMetricsUrl), CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink } }).component()); } @@ -338,6 +340,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage { label: loc.view, url: instanceStatus.dashboards.logsUrl, title: instanceStatus.dashboards.logsUrl, + ariaLabel: loc.viewLogs(instanceStatus.dashboards.logsUrl), CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink } }).component()); } diff --git a/extensions/big-data-cluster/src/bigDataCluster/dialog/commonControls.ts b/extensions/big-data-cluster/src/bigDataCluster/dialog/commonControls.ts index 904dac904d..3446453bbd 100644 --- a/extensions/big-data-cluster/src/bigDataCluster/dialog/commonControls.ts +++ b/extensions/big-data-cluster/src/bigDataCluster/dialog/commonControls.ts @@ -8,7 +8,7 @@ import * as vscode from 'vscode'; import * as loc from '../localizedConstants'; export function createViewDetailsButton(modelBuilder: azdata.ModelBuilder, text: string): azdata.ButtonComponent { - const viewDetailsButton = modelBuilder.button().withProperties({ label: loc.viewDetails }).component(); + const viewDetailsButton = modelBuilder.button().withProperties({ label: loc.viewDetails, ariaLabel: loc.viewErrorDetails }).component(); viewDetailsButton.onDidClick(() => { vscode.window.showErrorMessage(text, { modal: true }); }); diff --git a/extensions/big-data-cluster/src/bigDataCluster/localizedConstants.ts b/extensions/big-data-cluster/src/bigDataCluster/localizedConstants.ts index 81c97e28de..d86a4d287c 100644 --- a/extensions/big-data-cluster/src/bigDataCluster/localizedConstants.ts +++ b/extensions/big-data-cluster/src/bigDataCluster/localizedConstants.ts @@ -19,6 +19,9 @@ export const healthStatus = localize('bdc.dashboard.healthStatus', "Health Statu export const nodeMetrics = localize('bdc.dashboard.nodeMetrics', "Node Metrics"); export const sqlMetrics = localize('bdc.dashboard.sqlMetrics', "SQL Metrics"); export const logs = localize('bdc.dashboard.logs', "Logs"); +export function viewNodeMetrics(uri: string): string { return localize('bdc.dashboard.viewNodeMetrics', "View Node Metrics {0}", uri); } +export function viewSqlMetrics(uri: string): string { return localize('bdc.dashboard.viewSqlMetrics', "View SQL Metrics {0}", uri); } +export function viewLogs(uri: string): string { return localize('bdc.dashboard.viewLogs', "View Kibana Logs {0}", uri); } export function lastUpdated(date?: Date): string { return localize('bdc.dashboard.lastUpdated', "Last Updated : {0}", date ? @@ -53,6 +56,7 @@ export const endpoint = localize('bdc.dashboard.endpoint', "Endpoint"); export function copiedEndpoint(endpointName: string): string { return localize('copiedEndpoint', "Endpoint '{0}' copied to clipboard", endpointName); } export const copy = localize('bdc.dashboard.copy', "Copy"); export const viewDetails = localize('bdc.dashboard.viewDetails', "View Details"); +export const viewErrorDetails = localize('bdc.dashboard.viewErrorDetails', "View Error Details"); export const connectToController = localize('connectController.dialog.title', "Connect to Controller (preview)"); export const mountConfiguration = localize('mount.main.section', "Mount Configuration"); export function mountTask(path: string): string { return localize('mount.task.name', "Mounting HDFS folder on path {0}", path); } diff --git a/src/sql/workbench/browser/modelComponents/hyperlink.component.ts b/src/sql/workbench/browser/modelComponents/hyperlink.component.ts index 7a9a3c469a..d86d97ca0c 100644 --- a/src/sql/workbench/browser/modelComponents/hyperlink.component.ts +++ b/src/sql/workbench/browser/modelComponents/hyperlink.component.ts @@ -15,7 +15,7 @@ import { TitledComponent } from 'sql/workbench/browser/modelComponents/titledCom @Component({ selector: 'modelview-hyperlink', - template: `{{getLabel()}}` + template: `{{getLabel()}}` }) export default class HyperlinkComponent extends TitledComponent implements IComponent, OnDestroy, AfterViewInit { @Input() descriptor: IComponentDescriptor;