From dce486e2af9190b0e157b45eaa6c1bcefb1011ac Mon Sep 17 00:00:00 2001 From: Lone Iversen <108085781+loivsen@users.noreply.github.com> Date: Thu, 17 Nov 2022 11:14:35 +0100 Subject: [PATCH] nodeName always exposed --- .../views/section-view-examine-overview.ts | 4 +- .../views/section-view-examine-searchers.ts | 47 +++++++++++-------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-overview.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-overview.ts index 390561044b..ea918d4df3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-overview.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-overview.ts @@ -65,7 +65,7 @@ export class UmbDashboardExamineOverviewElement extends UmbContextConsumerMixin( private async _getIndexers() { try { - const indexers = await SearchResource.getSearchIndex({}); + const indexers = await SearchResource.getSearchIndex({ take: 9999, skip: 0 }); this._indexers = indexers.items as Index[]; } catch (e) { if (e instanceof ApiError) { @@ -78,7 +78,7 @@ export class UmbDashboardExamineOverviewElement extends UmbContextConsumerMixin( private async _getSearchers() { try { - const searchers = await SearchResource.getSearchSearcher({}); + const searchers = await SearchResource.getSearchSearcher({ take: 9999, skip: 0 }); this._searchers = searchers.items as Searcher[]; } catch (e) { if (e instanceof ApiError) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-searchers.ts index 4f25944fee..dc17f4a2ff 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-searchers.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/dashboards/examine-management/views/section-view-examine-searchers.ts @@ -20,8 +20,8 @@ import { import '../../../../core/services/modal/layouts/fields-viewer/fields-viewer.element'; import '../../../../core/services/modal/layouts/fields-viewer/fields-settings.element'; -interface ExposedField { - name: string; +interface ExposedSearchResultField { + name?: string | null; exposed: boolean; } @@ -94,7 +94,7 @@ export class UmbDashboardExamineSearcherElement extends UmbContextConsumerMixin( margin-block: var(--uui-size-5, 15px); } - .exposed-head-field uui-button { + .exposed-field uui-button { align-items: center; font-weight: normal; font-size: 10px; @@ -103,7 +103,7 @@ export class UmbDashboardExamineSearcherElement extends UmbContextConsumerMixin( margin-top: -5px; } - .exposed-head-field-container { + .exposed-field-container { display: flex; justify-content: space-between; } @@ -120,7 +120,7 @@ export class UmbDashboardExamineSearcherElement extends UmbContextConsumerMixin( private _searchResults?: SearchResult[]; @state() - private _exposedFields?: ExposedField[]; + private _exposedFields?: ExposedSearchResultField[]; @query('#search-input') private _searchInput!: HTMLInputElement; @@ -150,6 +150,8 @@ export class UmbDashboardExamineSearcherElement extends UmbContextConsumerMixin( const res = await SearchResource.getSearchSearcherBySearcherNameSearch({ searcherName: this.searcherName, query: this._searchInput.value, + take: 9999, + skip: 0, }); const pagedSearchResults = res.items as PagedSearchResult[]; this._searchResults = pagedSearchResults[0].items; @@ -164,19 +166,23 @@ export class UmbDashboardExamineSearcherElement extends UmbContextConsumerMixin( } private _updateFieldFilter() { - this._searchResults?.map((result) => { - const fieldNames = result.fields?.map((field) => { - if (field.name) return { name: field.name, exposed: false } as ExposedField; - return { name: '', exposed: false }; + this._searchResults?.map((doc) => { + const document = doc.fields?.filter((field) => { + return field.name?.toUpperCase() != 'NODENAME'; }); + if (document) { + const newFieldNames = document.map((field) => { + return field.name; + }); - this._exposedFields = fieldNames?.map((field, i) => { - return this._exposedFields - ? this._exposedFields[i].name == field.name - ? { name: this._exposedFields[i].name, exposed: this._exposedFields[i].exposed } - : field - : field; - }); + this._exposedFields = this._exposedFields + ? this._exposedFields.filter((field) => { + return { name: field.name, exposed: field.exposed }; + }) + : newFieldNames?.map((name) => { + return { name, exposed: false }; + }); + } }); } @@ -228,7 +234,10 @@ export class UmbDashboardExamineSearcherElement extends UmbContextConsumerMixin( ${rowData.id} - Document + ${rowData.fields?.find((field) => { + if (field.name?.toUpperCase() == 'NODENAME') return field.values; + else return; + })?.values} @@ -265,8 +274,8 @@ export class UmbDashboardExamineSearcherElement extends UmbContextConsumerMixin( renderHeadCells() { return html`${this._exposedFields?.map((field) => { return field.exposed - ? html` -
+ ? html` +
${field.name}