From e8df5fff09fea4fd82cdbeea8cab6f0986a58e90 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Thu, 24 Nov 2022 16:42:13 +0100
Subject: [PATCH] optimise examine indexers a bit to wait for the server
---
.../views/section-view-examine-indexers.ts | 118 ++++++++++--------
1 file changed, 68 insertions(+), 50 deletions(-)
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-indexers.ts
index db747c8ef3..e7142bfbdf 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-indexers.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-indexers.ts
@@ -1,5 +1,5 @@
import {UUITextStyles} from '@umbraco-ui/uui-css/lib';
-import {css, html, LitElement} from 'lit';
+import {css, html, LitElement, nothing} from 'lit';
import {customElement, property, state} from 'lit/decorators.js';
import {UUIButtonState} from '@umbraco-ui/uui-button';
@@ -86,23 +86,14 @@ export class UmbDashboardExamineIndexElement extends UmbContextConsumerMixin(Lit
private _buttonState?: UUIButtonState = undefined;
@state()
- private _indexData!: Index;
+ private _indexData?: Index;
+
+ @state()
+ private _loading = true;
private _notificationService?: UmbNotificationService;
private _modalService?: UmbModalService;
- private async _getIndexData() {
- try {
- this._indexData = await IndexerResource.getIndexerByIndexName({indexName: this.indexName});
- } catch (e) {
- if (e instanceof ApiError) {
- const error = e as ProblemDetails;
- const data: UmbNotificationDefaultData = { message: error.message ?? 'Could not fetch index' };
- this._notificationService?.peek('danger', { data });
- }
- }
- }
-
constructor() {
super();
@@ -112,9 +103,25 @@ export class UmbDashboardExamineIndexElement extends UmbContextConsumerMixin(Lit
});
}
- connectedCallback(): void {
+ private async _getIndexData() {
+ try {
+ this._indexData = await IndexerResource.getIndexerByIndexName({indexName: this.indexName});
+ if (!this._indexData?.isHealthy) {
+ this._buttonState = 'waiting';
+ }
+ } catch (e) {
+ if (e instanceof ApiError) {
+ const error = e as ProblemDetails;
+ const data: UmbNotificationDefaultData = { message: error.message ?? 'Could not fetch index' };
+ this._notificationService?.peek('danger', { data });
+ }
+ }
+ this._loading = false;
+ }
+
+ async connectedCallback() {
super.connectedCallback();
- this._getIndexData();
+ await this._getIndexData();
}
private async _onRebuildHandler() {
@@ -135,45 +142,56 @@ export class UmbDashboardExamineIndexElement extends UmbContextConsumerMixin(Lit
}
private async _rebuild() {
this._buttonState = 'waiting';
- if (this._indexData.name)
- try {
- await IndexerResource.postIndexerByIndexNameRebuild({ indexName: this._indexData.name });
- this._buttonState = 'success';
- } catch (e) {
- this._buttonState = 'failed';
- if (e instanceof ApiError) {
- const error = e as ProblemDetails;
- const data: UmbNotificationDefaultData = { message: error.message ?? 'Rebuild error' };
- this._notificationService?.peek('danger', { data });
- }
+ try {
+ await IndexerResource.postIndexerByIndexNameRebuild({ indexName: this.indexName });
+ this._buttonState = 'success';
+ await this._getIndexData();
+ } catch (e) {
+ this._buttonState = 'failed';
+ if (e instanceof ApiError) {
+ const error = e as ProblemDetails;
+ const data: UmbNotificationDefaultData = { message: error.message ?? 'Rebuild error' };
+ this._notificationService?.peek('danger', { data });
}
+ }
}
render() {
- if (this._indexData) {
- return html`
-
- Health Status
- The health status of the ${this._indexData.name} and if it can be read
-
-
-
-
-
-
- ${this._indexData.healthStatus}
-
-
-
- ${this.renderPropertyList()} ${this.renderTools()}`;
- } else return html``;
+ if (!this._indexData || this._loading) return html`
+ `;
+
+ return html`
+
+
+ Health Status
+ The health status of the ${this.indexName} and if it can be read
+
+
+
+
+
+
+ ${this._indexData.healthStatus}
+
+
+ ${this.renderIndexSearch()}
+ ${this.renderPropertyList()}
+ ${this.renderTools()}
+ `;
+ }
+
+ private renderIndexSearch() {
+ if (!this._indexData || !this._indexData.isHealthy) return nothing;
+ return html``;
}
private renderPropertyList() {
+ if (!this._indexData) return nothing;
+
return html`
- Lists the properties of the ${this._indexData.name}
+ Lists the properties of the ${this.indexName}
documentCount
@@ -186,7 +204,7 @@ export class UmbDashboardExamineIndexElement extends UmbContextConsumerMixin(Lit
${this._indexData.providerProperties
? Object.entries(this._indexData.providerProperties).map((entry) => {
return html`
- ${entry[0]}
+ ${entry[0]}
${entry[1]}
`;
})
@@ -197,13 +215,13 @@ export class UmbDashboardExamineIndexElement extends UmbContextConsumerMixin(Lit
private renderTools() {
return html`
- Tools to manage the ${this._indexData.name}
+ Tools to manage the ${this.indexName}
Rebuild