diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index 110f97297d..b784411e2c 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -40,7 +40,7 @@ import telegram, { telegramId } from '@hcengineering/telegram' import { templatesId } from '@hcengineering/templates' import tracker, { trackerId } from '@hcengineering/tracker' import uiPlugin from '@hcengineering/ui' -import { viewId } from '@hcengineering/view' +import view, { viewId } from '@hcengineering/view' import workbench, { workbenchId } from '@hcengineering/workbench' import { bitrixId } from '@hcengineering/bitrix' @@ -154,6 +154,8 @@ export async function configurePlatform() { setMetadata(textEditor.metadata.CollaboratorUrl, config.COLLABORATOR_URL ?? 'ws://locahost:3078') setMetadata(uiPlugin.metadata.DefaultApplication, login.component.LoginApp) + + setMetadata(uiPlugin.metadata.SearchPopup, view.component.ActionsPopup) const languages = config.LANGUAGES ? (config.LANGUAGES as string).split(',').map((l) => l.trim()) : ['en', 'ru'] diff --git a/packages/ui/src/components/internal/Root.svelte b/packages/ui/src/components/internal/Root.svelte index 0de51013db..fa7b868ec9 100644 --- a/packages/ui/src/components/internal/Root.svelte +++ b/packages/ui/src/components/internal/Root.svelte @@ -15,6 +15,7 @@ import FontSizeSelector from './FontSizeSelector.svelte' import LangSelector from './LangSelector.svelte' import ThemeSelector from './ThemeSelector.svelte' + import SearchSelector from './SearchSelector.svelte' let application: AnyComponent | undefined @@ -166,8 +167,6 @@ {:else if status.severity !== Severity.OK} - {:else} - {getMetadata(uiPlugin.metadata.PlatformTitle)} {/if}
@@ -175,6 +174,7 @@
+ diff --git a/packages/ui/src/components/internal/SearchSelector.svelte b/packages/ui/src/components/internal/SearchSelector.svelte new file mode 100644 index 0000000000..cf7d4527e3 --- /dev/null +++ b/packages/ui/src/components/internal/SearchSelector.svelte @@ -0,0 +1,25 @@ + + +{#if isLoggedIn} + +{/if} diff --git a/packages/ui/src/components/internal/icons/Search.svelte b/packages/ui/src/components/internal/icons/Search.svelte new file mode 100644 index 0000000000..20308727b1 --- /dev/null +++ b/packages/ui/src/components/internal/icons/Search.svelte @@ -0,0 +1,12 @@ + + + + + diff --git a/packages/ui/src/plugin.ts b/packages/ui/src/plugin.ts index 436b844fba..40df5fed74 100644 --- a/packages/ui/src/plugin.ts +++ b/packages/ui/src/plugin.ts @@ -102,7 +102,8 @@ export const uis = plugin(uiId, { DefaultApplication: '' as Metadata, Routes: '' as Metadata>, Languages: '' as Metadata, - PlatformTitle: '' as Metadata + PlatformTitle: '' as Metadata, + SearchPopup: '' as Metadata } }) diff --git a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte index d4eedca56c..908a9187ef 100644 --- a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte +++ b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte @@ -51,11 +51,6 @@ {#if value}
- {#if shouldShowAvatar && taskType !== undefined} -
- -
- {/if} {#if shouldShowAvatar}
- + {#if taskType !== undefined} + + {:else} + + {/if}
{/if} diff --git a/plugins/view-resources/src/components/ActionsPopup.svelte b/plugins/view-resources/src/components/ActionsPopup.svelte index f854cf2aac..0212286dde 100644 --- a/plugins/view-resources/src/components/ActionsPopup.svelte +++ b/plugins/view-resources/src/components/ActionsPopup.svelte @@ -48,8 +48,9 @@ import ChevronDown from './icons/ChevronDown.svelte' import ChevronUp from './icons/ChevronUp.svelte' + import { contextStore } from '@hcengineering/presentation' - export let viewContext: ViewContext + export let viewContext: ViewContext | undefined = $contextStore.getLastContext() let search: string = '' let actions: Array> = [] @@ -105,7 +106,7 @@ fActions = fActions.filter( (it) => (it.$lookup?.category?.visible ?? true) && - (it.context.application === viewContext.application || it.context.application === undefined) + (it.context.application === viewContext?.application || it.context.application === undefined) ) for (const d of docs) { fActions = filterActions(client, d, fActions) diff --git a/plugins/view-resources/src/plugin.ts b/plugins/view-resources/src/plugin.ts index 3fc8c26817..54c6041a6d 100644 --- a/plugins/view-resources/src/plugin.ts +++ b/plugins/view-resources/src/plugin.ts @@ -28,7 +28,6 @@ export default mergeIds(viewId, view, { StringFilter: '' as AnyComponent, TimestampFilter: '' as AnyComponent, FilterTypePopup: '' as AnyComponent, - ActionsPopup: '' as AnyComponent, ProxyPresenter: '' as AnyComponent }, string: { diff --git a/plugins/view/src/index.ts b/plugins/view/src/index.ts index 2be9d026d9..7df8c832ae 100644 --- a/plugins/view/src/index.ts +++ b/plugins/view/src/index.ts @@ -855,6 +855,7 @@ const view = plugin(viewId, { List: '' as Ref }, component: { + ActionsPopup: '' as AnyComponent, ObjectPresenter: '' as AnyComponent, EditDoc: '' as AnyComponent, SpacePresenter: '' as AnyComponent,