Make links more descriptive (#8591)

This commit is contained in:
Charles Gagnon
2019-12-06 13:06:49 -08:00
committed by GitHub
parent 794f7a14c0
commit d1c7370f1c
5 changed files with 14 additions and 7 deletions

View File

@@ -192,7 +192,7 @@ export class BdcDashboardOverviewPage extends BdcDashboardPage {
}, },
{ // view details button { // view details button
displayName: '', displayName: '',
ariaLabel: loc.viewDetails, ariaLabel: loc.viewErrorDetails,
valueType: azdata.DeclarativeDataType.component, valueType: azdata.DeclarativeDataType.component,
isReadOnly: true, isReadOnly: true,
width: 150, width: 150,

View File

@@ -146,7 +146,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
}, },
{ // view details button { // view details button
displayName: '', displayName: '',
ariaLabel: loc.viewDetails, ariaLabel: loc.viewErrorDetails,
valueType: azdata.DeclarativeDataType.component, valueType: azdata.DeclarativeDataType.component,
isReadOnly: true, isReadOnly: true,
width: 150, width: 150,
@@ -194,7 +194,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
'border-bottom': 'solid 1px #ccc', 'border-bottom': 'solid 1px #ccc',
'border-left': 'none', 'border-left': 'none',
'border-right': 'none' 'border-right': 'none'
}, }
}, },
{ // node metrics { // node metrics
displayName: loc.nodeMetrics, displayName: loc.nodeMetrics,
@@ -211,7 +211,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
'border-bottom': 'solid 1px #ccc', 'border-bottom': 'solid 1px #ccc',
'border-left': 'none', 'border-left': 'none',
'border-right': 'none' 'border-right': 'none'
}, }
} }
]; ];
@@ -255,7 +255,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
'border-bottom': 'solid 1px #ccc', 'border-bottom': 'solid 1px #ccc',
'border-left': 'none', 'border-left': 'none',
'border-right': 'none' 'border-right': 'none'
}, }
}); });
this.metricsAndLogsRowsTable = this.modelView.modelBuilder.declarativeTable() this.metricsAndLogsRowsTable = this.modelView.modelBuilder.declarativeTable()
@@ -312,6 +312,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
label: loc.view, label: loc.view,
url: instanceStatus.dashboards.nodeMetricsUrl, url: instanceStatus.dashboards.nodeMetricsUrl,
title: instanceStatus.dashboards.nodeMetricsUrl, title: instanceStatus.dashboards.nodeMetricsUrl,
ariaLabel: loc.viewNodeMetrics(instanceStatus.dashboards.nodeMetricsUrl),
CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink } CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink }
}).component()); }).component());
} }
@@ -326,6 +327,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
label: loc.view, label: loc.view,
url: instanceStatus.dashboards.sqlMetricsUrl, url: instanceStatus.dashboards.sqlMetricsUrl,
title: instanceStatus.dashboards.sqlMetricsUrl, title: instanceStatus.dashboards.sqlMetricsUrl,
ariaLabel: loc.viewSqlMetrics(instanceStatus.dashboards.sqlMetricsUrl),
CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink } CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink }
}).component()); }).component());
} }
@@ -338,6 +340,7 @@ export class BdcDashboardResourceStatusPage extends BdcDashboardPage {
label: loc.view, label: loc.view,
url: instanceStatus.dashboards.logsUrl, url: instanceStatus.dashboards.logsUrl,
title: instanceStatus.dashboards.logsUrl, title: instanceStatus.dashboards.logsUrl,
ariaLabel: loc.viewLogs(instanceStatus.dashboards.logsUrl),
CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink } CSSStyles: { ...cssStyles.text, ...cssStyles.hyperlink }
}).component()); }).component());
} }

View File

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
import * as loc from '../localizedConstants'; import * as loc from '../localizedConstants';
export function createViewDetailsButton(modelBuilder: azdata.ModelBuilder, text: string): azdata.ButtonComponent { export function createViewDetailsButton(modelBuilder: azdata.ModelBuilder, text: string): azdata.ButtonComponent {
const viewDetailsButton = modelBuilder.button().withProperties<azdata.ButtonProperties>({ label: loc.viewDetails }).component(); const viewDetailsButton = modelBuilder.button().withProperties<azdata.ButtonProperties>({ label: loc.viewDetails, ariaLabel: loc.viewErrorDetails }).component();
viewDetailsButton.onDidClick(() => { viewDetailsButton.onDidClick(() => {
vscode.window.showErrorMessage(text, { modal: true }); vscode.window.showErrorMessage(text, { modal: true });
}); });

View File

@@ -19,6 +19,9 @@ export const healthStatus = localize('bdc.dashboard.healthStatus', "Health Statu
export const nodeMetrics = localize('bdc.dashboard.nodeMetrics', "Node Metrics"); export const nodeMetrics = localize('bdc.dashboard.nodeMetrics', "Node Metrics");
export const sqlMetrics = localize('bdc.dashboard.sqlMetrics', "SQL Metrics"); export const sqlMetrics = localize('bdc.dashboard.sqlMetrics', "SQL Metrics");
export const logs = localize('bdc.dashboard.logs', "Logs"); 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 { export function lastUpdated(date?: Date): string {
return localize('bdc.dashboard.lastUpdated', "Last Updated : {0}", return localize('bdc.dashboard.lastUpdated', "Last Updated : {0}",
date ? 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 function copiedEndpoint(endpointName: string): string { return localize('copiedEndpoint', "Endpoint '{0}' copied to clipboard", endpointName); }
export const copy = localize('bdc.dashboard.copy', "Copy"); export const copy = localize('bdc.dashboard.copy', "Copy");
export const viewDetails = localize('bdc.dashboard.viewDetails', "View Details"); 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 connectToController = localize('connectController.dialog.title', "Connect to Controller (preview)");
export const mountConfiguration = localize('mount.main.section', "Mount Configuration"); 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); } export function mountTask(path: string): string { return localize('mount.task.name', "Mounting HDFS folder on path {0}", path); }

View File

@@ -15,7 +15,7 @@ import { TitledComponent } from 'sql/workbench/browser/modelComponents/titledCom
@Component({ @Component({
selector: 'modelview-hyperlink', selector: 'modelview-hyperlink',
template: `<a [href]="getUrl()" [title]="title" target="blank" (click)="onClick()">{{getLabel()}}</a>` template: `<a [href]="getUrl()" [title]="title" [attr.aria-label]="ariaLabel" target="blank" (click)="onClick()">{{getLabel()}}</a>`
}) })
export default class HyperlinkComponent extends TitledComponent implements IComponent, OnDestroy, AfterViewInit { export default class HyperlinkComponent extends TitledComponent implements IComponent, OnDestroy, AfterViewInit {
@Input() descriptor: IComponentDescriptor; @Input() descriptor: IComponentDescriptor;