wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-05 15:02:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

UBERF-4324: While indexing is still in progress we see undefined (#4017)

Browse Source 
Signed-off-by: Maxim Karmatskikh <mkarmatskih@gmail.com>
This commit is contained in:
Maksim Karmatskikh 2023-11-20 16:09:02 +01:00 committed by GitHub
parent 7621bccf22
commit dc94123e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/server-core/src/index.ts
View File

@ -63,7 +63,7 @@ export class TObjectDDParticipant extends TClass implements ObjectDDParticipant
@Mixin(serverCore.mixin.SearchPresenter, core.class.Class) @Mixin(serverCore.mixin.SearchPresenter, core.class.Class)
export class TSearchPresenter extends TClass implements SearchPresenter { export class TSearchPresenter extends TClass implements SearchPresenter {
searchConfig!: ClassSearchConfig searchConfig!: ClassSearchConfig
getSearchObjectId!: Resource<SearchPresenterFunc> getSearchShortTitle!: Resource<SearchPresenterFunc>
getSearchTitle!: Resource<SearchPresenterFunc> getSearchTitle!: Resource<SearchPresenterFunc>
} }

68
packages/text-editor/src/components/MentionPopup.svelte
View File

@ -164,39 +164,43 @@
$: updateItems(query) $: updateItems(query)
</script> </script>
<form class="antiPopup mentionPoup" on:keydown={onKeyDown} use:resizeObserver={() => dispatch('changeSize')}> {#if (items.length === 0 && query !== '') || items.length > 0}
<div class="ap-scroll" bind:this={scrollContainer}> <form class="antiPopup mentionPoup" on:keydown={onKeyDown} use:resizeObserver={() => dispatch('changeSize')}>
<div class="ap-box"> <div class="ap-scroll" bind:this={scrollContainer}>
{#if items.length === 0 && query !== ''} <div class="ap-box">
<div class="noResults"><Label label={presentation.string.NoResults} /></div> {#if items.length === 0 && query !== ''}
{/if} <div class="noResults"><Label label={presentation.string.NoResults} /></div>
<!-- svelte-ignore a11y-click-events-have-key-events --> {/if}
<ListView bind:this={list} bind:selection count={items.length}> {#if items.length > 0}
<svelte:fragment slot="category" let:item={num}> <!-- svelte-ignore a11y-click-events-have-key-events -->
{@const item = items[num]} <ListView bind:this={list} bind:selection count={items.length}>
{#if item.num === 0} <svelte:fragment slot="category" let:item={num}>
<div class="mentonCategory"> {@const item = items[num]}
<Label label={item.category.title} /> {#if item.num === 0}
</div> <div class="mentonCategory">
{/if} <Label label={item.category.title} />
</svelte:fragment> </div>
<svelte:fragment slot="item" let:item={num}> {/if}
{@const item = items[num]} </svelte:fragment>
{@const doc = item.item} <svelte:fragment slot="item" let:item={num}>
<div {@const item = items[num]}
class="ap-menuItem withComp" {@const doc = item.item}
on:click={() => { <div
dispatchItem(doc) class="ap-menuItem withComp"
}} on:click={() => {
> dispatchItem(doc)
<MentionResult value={doc} /> }}
</div> >
</svelte:fragment> <MentionResult value={doc} />
</ListView> </div>
</svelte:fragment>
</ListView>
{/if}
</div>
</div> </div>
</div> <div class="ap-space x2" />
<div class="ap-space x2" /> </form>
</form> {/if}
<style lang="scss"> <style lang="scss">
.noResults { .noResults {

2
server/core/src/mapper.ts
View File

@ -85,7 +85,7 @@ export async function updateDocWithPresenter (hierarchy: Hierarchy, doc: Indexed
props.push({ props.push({
name: 'searchShortTitle', name: 'searchShortTitle',
config: searchPresenter.searchConfig.shortTitle, config: searchPresenter.searchConfig.shortTitle,
provider: searchPresenter.getSearchObjectId provider: searchPresenter.getSearchShortTitle
}) })
} }

2
server/core/src/types.ts
View File

@ -365,6 +365,6 @@ export interface ClassSearchConfig {
*/ */
export interface SearchPresenter extends Class<Doc> { export interface SearchPresenter extends Class<Doc> {
searchConfig: ClassSearchConfig searchConfig: ClassSearchConfig
getSearchObjectId?: Resource<SearchPresenterFunc> getSearchShortTitle?: Resource<SearchPresenterFunc>
getSearchTitle?: Resource<SearchPresenterFunc> getSearchTitle?: Resource<SearchPresenterFunc>
} }

7
server/elastic/src/adapter.ts
View File

@ -128,7 +128,12 @@ class ElasticAdapter implements FullTextAdapter {
size: options.limit ?? DEFAULT_LIMIT size: options.limit ?? DEFAULT_LIMIT
} }
const filter = [] const filter: any = [
{
exists: { field: 'searchTitle' }
}
]
if (query.spaces !== undefined) { if (query.spaces !== undefined) {
filter.push({ filter.push({
terms: { 'space.keyword': query.spaces } terms: { 'space.keyword': query.spaces }