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

Show message when external endpoint isn't configured (#11962)

Browse Source
This commit is contained in:
Charles Gagnon
2020-08-27 07:35:44 -07:00
committed by GitHub
parent c4e06f4db3
commit fa664bc92f
4 changed files with 77 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import { parseIpAndPort } from '../../../common/utils';
export class MiaaConnectionStringsPage extends DashboardPage {
private _keyValueContainer!: KeyValueContainer;
private _connectionStringsMessage!: azdata.TextComponent;
constructor(modelView: azdata.ModelView, private _controllerModel: ControllerModel, private _miaaModel: MiaaModel) {
super(modelView);
@@ -56,6 +57,12 @@ export class MiaaConnectionStringsPage extends DashboardPage {
this._keyValueContainer = new KeyValueContainer(this.modelView.modelBuilder, this.getConnectionStrings());
this.disposables.push(this._keyValueContainer);
content.addItem(this._keyValueContainer.container);
this._connectionStringsMessage = this.modelView.modelBuilder.text()
.withProperties<azdata.TextComponentProperties>({ CSSStyles: { 'text-align': 'center' } })
.component();
content.addItem(this._connectionStringsMessage);
this.initialized = true;
return root;
}
@@ -90,6 +97,7 @@ $conn = sqlsrv_connect($serverName, $connectionInfo);`),
}
private updateConnectionStrings(): void {
this._connectionStringsMessage.value = !this._miaaModel.config?.status.externalEndpoint ? loc.noExternalEndpoint : '';
this._keyValueContainer.refresh(this.getConnectionStrings());
}
}

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

@@ -24,6 +24,7 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
private _kibanaLink!: azdata.HyperlinkComponent;
private _grafanaLink!: azdata.HyperlinkComponent;
private _databasesTable!: azdata.DeclarativeTableComponent;
private _databasesMessage!: azdata.TextComponent;
private readonly _azdataApi: azdataExt.IExtension;
@@ -34,7 +35,7 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
region: '-',
subscriptionId: '-',
miaaAdmin: '-',
host: '-',
externalEndpoint: '-',
vCores: ''
};
@@ -102,6 +103,10 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
data: []
}).component();
this._databasesMessage = this.modelView.modelBuilder.text()
.withProperties<azdata.TextComponentProperties>({ CSSStyles: { 'text-align': 'center' } })
.component();
// Update loaded components with data
this.handleRegistrationsUpdated();
this.handleMiaaConfigUpdated();
@@ -171,6 +176,7 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
// Databases
rootContainer.addItem(this.modelView.modelBuilder.text().withProperties<azdata.TextComponentProperties>({ value: loc.databases, CSSStyles: titleCSS }).component());
rootContainer.addItem(this._databasesTableLoading, { CSSStyles: { 'margin-bottom': '20px' } });
rootContainer.addItem(this._databasesMessage);
this.initialized = true;
return rootContainer;
@@ -263,8 +269,12 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
}
private handleMiaaConfigUpdated(): void {
this._instanceProperties.status = this._miaaModel.config?.status.state || '-';
this._instanceProperties.host = this._miaaModel.config?.status.externalEndpoint || '-';
if (this._miaaModel.config) {
this._instanceProperties.status = this._miaaModel.config.status.state || '-';
this._instanceProperties.externalEndpoint = this._miaaModel.config.status.externalEndpoint || loc.notConfigured;
this._databasesMessage.value = !this._miaaModel.config.status.externalEndpoint ? loc.noExternalEndpoint : '';
}
this.refreshDisplayedProperties();
}
@@ -320,8 +330,8 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
value: this._instanceProperties.miaaAdmin
},
{
displayName: loc.host,
value: this._instanceProperties.host
displayName: loc.externalEndpoint,
value: this._instanceProperties.externalEndpoint
},
{
displayName: loc.compute,