mirror of
https://github.com/hcengineering/platform.git
synced 2024-11-30 02:37:46 +03:00
EZQMS-306: add extensions for chunter message version (#3882)
* EZQMS-306: add extensions for chunter message version Signed-off-by: Anna No <anna.no@xored.com> * EZQMS-306: add extensions for chunter message version Signed-off-by: Anna No <anna.no@xored.com> * EZQMS-306: add extensions for chunter message version Signed-off-by: Anna No <anna.no@xored.com> * EZQMS-306: add extensions for chunter message version Signed-off-by: Anna No <anna.no@xored.com> --------- Signed-off-by: Anna No <anna.no@xored.com>
This commit is contained in:
Anna No
GitHub
parent
f64901cfd5
commit
73e927876c
@ -19,6 +19,7 @@ import {
|
||||
Channel,
|
||||
chunterId,
|
||||
ChunterMessage,
|
||||
ChunterMessageExtension,
|
||||
ChunterSpace,
|
||||
Comment,
|
||||
DirectMessage,
|
||||
@ -101,6 +102,9 @@ export class TChunterMessage extends TAttachedDoc implements ChunterMessage {
|
||||
reactions?: number
|
||||
}
|
||||
|
||||
@Mixin(chunter.mixin.ChunterMessageExtension, chunter.class.ChunterMessage)
|
||||
export class TChunterMessageExtension extends TChunterMessage implements ChunterMessageExtension {}
|
||||
|
||||
@Model(chunter.class.ThreadMessage, chunter.class.ChunterMessage)
|
||||
@UX(chunter.string.ThreadMessage, undefined, 'TMSG')
|
||||
export class TThreadMessage extends TChunterMessage implements ThreadMessage {
|
||||
@ -173,6 +177,7 @@ export function createModel (builder: Builder, options = { addApplication: true
|
||||
TMessage,
|
||||
TThreadMessage,
|
||||
TChunterMessage,
|
||||
TChunterMessageExtension,
|
||||
TComment,
|
||||
TBacklink,
|
||||
TDirectMessage,
|
||||
|
||||
@ -15,16 +15,15 @@
|
||||
<script lang="ts">
|
||||
import { Attachment } from '@hcengineering/attachment'
|
||||
import { AttachmentList, AttachmentRefInput } from '@hcengineering/attachment-resources'
|
||||
import type { ChunterMessage, Message, Reaction } from '@hcengineering/chunter'
|
||||
import type { ChunterMessage, ChunterMessageExtension, Message, Reaction } from '@hcengineering/chunter'
|
||||
import { PersonAccount } from '@hcengineering/contact'
|
||||
import { Avatar, personByIdStore, EmployeePresenter } from '@hcengineering/contact-resources'
|
||||
import { getCurrentAccount, Ref, WithLookup } from '@hcengineering/core'
|
||||
import { getCurrentAccount, Mixin, Ref, WithLookup } from '@hcengineering/core'
|
||||
import { getResource } from '@hcengineering/platform'
|
||||
import { getClient, MessageViewer } from '@hcengineering/presentation'
|
||||
import { EmojiPopup } from '@hcengineering/ui'
|
||||
import ui, { ActionIcon, Button, IconMoreH, Label, showPopup, tooltip } from '@hcengineering/ui'
|
||||
import ui, { ActionIcon, Button, EmojiPopup, IconMoreV, Label, showPopup, tooltip } from '@hcengineering/ui'
|
||||
import { Action } from '@hcengineering/view'
|
||||
import { LinkPresenter, Menu } from '@hcengineering/view-resources'
|
||||
import { LinkPresenter, Menu, ObjectPresenter } from '@hcengineering/view-resources'
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import { AddMessageToSaved, DeleteMessageFromSaved, UnpinMessage } from '../index'
|
||||
import chunter from '../plugin'
|
||||
@ -52,14 +51,14 @@
|
||||
$: attachments = (message.$lookup?.attachments ?? []) as Attachment[]
|
||||
|
||||
const client = getClient()
|
||||
const hieararchy = client.getHierarchy()
|
||||
const hierarchy = client.getHierarchy()
|
||||
const dispatch = createEventDispatcher()
|
||||
const me = getCurrentAccount()._id
|
||||
|
||||
$: reactions = message.$lookup?.reactions as Reaction[] | undefined
|
||||
|
||||
$: subscribed = (
|
||||
hieararchy.as(message, notification.mixin.Collaborators) as any as Collaborators
|
||||
hierarchy.as(message, notification.mixin.Collaborators) as any as Collaborators
|
||||
).collaborators?.includes(me)
|
||||
$: subscribeAction = subscribed
|
||||
? ({
|
||||
@ -83,6 +82,16 @@
|
||||
|
||||
$: isEditing = false
|
||||
|
||||
let extensions: Ref<Mixin<ChunterMessageExtension>>[] = []
|
||||
$: if (message) {
|
||||
extensions = []
|
||||
for (const extension of hierarchy.getDescendants(chunter.mixin.ChunterMessageExtension)) {
|
||||
if (hierarchy.hasMixin(message, extension)) {
|
||||
extensions.push(extension as Ref<Mixin<ChunterMessageExtension>>)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const editAction = {
|
||||
label: chunter.string.EditMessage,
|
||||
action: () => (isEditing = true)
|
||||
@ -255,21 +264,14 @@
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
<div class="buttons clear-mins flex flex-gap-1 items-center" class:menuShowed>
|
||||
{#each extensions as mixinClass}
|
||||
<ObjectPresenter _class={mixinClass} value={hierarchy.as(message, mixinClass)} exact />
|
||||
{/each}
|
||||
{#if !readOnly}
|
||||
<div class="buttons clear-mins" class:menuShowed>
|
||||
<div class="tool">
|
||||
<ActionIcon
|
||||
icon={IconMoreH}
|
||||
size={'medium'}
|
||||
action={(e) => {
|
||||
showMenu(e)
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
{#if !thread}
|
||||
<div class="tool"><ActionIcon icon={Thread} size={'medium'} action={openThread} /></div>
|
||||
{/if}
|
||||
<div class="tool book">
|
||||
<ActionIcon icon={Emoji} size={'medium'} action={openEmojiPalette} />
|
||||
<div class="book">
|
||||
<ActionIcon
|
||||
icon={Bookmark}
|
||||
size={'medium'}
|
||||
@ -277,10 +279,19 @@
|
||||
label={isSaved ? chunter.string.RemoveFromSaved : chunter.string.AddToSaved}
|
||||
/>
|
||||
</div>
|
||||
<!-- <div class="tool"><ActionIcon icon={Share} size={'medium'}/></div> -->
|
||||
<div class="tool"><ActionIcon icon={Emoji} size={'medium'} action={openEmojiPalette} /></div>
|
||||
</div>
|
||||
{#if !thread}
|
||||
<ActionIcon icon={Thread} size={'medium'} action={openThread} />
|
||||
{/if}
|
||||
|
||||
<ActionIcon
|
||||
icon={IconMoreV}
|
||||
size={'medium'}
|
||||
action={(e) => {
|
||||
showMenu(e)
|
||||
}}
|
||||
/>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
@ -343,13 +354,8 @@
|
||||
visibility: hidden;
|
||||
top: 0.5rem;
|
||||
right: 1rem;
|
||||
display: flex;
|
||||
flex-direction: row-reverse;
|
||||
user-select: none;
|
||||
|
||||
.tool + .tool {
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
color: var(--theme-halfcontent-color);
|
||||
|
||||
&.menuShowed {
|
||||
visibility: visible;
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
// limitations under the License.
|
||||
-->
|
||||
<script lang="ts">
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import attachment, { Attachment } from '@hcengineering/attachment'
|
||||
import { AttachmentRefInput } from '@hcengineering/attachment-resources'
|
||||
import chunter, { type ChunterSpace, type Message, type ThreadMessage } from '@hcengineering/chunter'
|
||||
@ -42,6 +43,7 @@
|
||||
let commentId = generateId() as Ref<ThreadMessage>
|
||||
|
||||
const notificationClient = NotificationClientImpl.getClient()
|
||||
const dispatch = createEventDispatcher()
|
||||
|
||||
const lookup = {
|
||||
_id: { attachments: attachment.class.Attachment },
|
||||
@ -142,6 +144,7 @@
|
||||
},
|
||||
commentId
|
||||
)
|
||||
dispatch('added', commentId)
|
||||
|
||||
commentId = generateId()
|
||||
loading = false
|
||||
|
||||
@ -68,7 +68,7 @@ import { getDmName, getLink, getTitle, resolveLocation } from './utils'
|
||||
|
||||
export { default as Header } from './components/Header.svelte'
|
||||
export { classIcon } from './utils'
|
||||
export { CommentPopup, CommentsPresenter }
|
||||
export { CommentPopup, CommentsPresenter, Thread }
|
||||
|
||||
async function MarkUnread (object: Message): Promise<void> {
|
||||
const client = NotificationClientImpl.getClient()
|
||||
|
||||
@ -62,6 +62,11 @@ export interface ChunterMessage extends AttachedDoc {
|
||||
reactions?: number
|
||||
}
|
||||
|
||||
/**
|
||||
* @public
|
||||
*/
|
||||
export interface ChunterMessageExtension extends ChunterMessage {}
|
||||
|
||||
/**
|
||||
* @public
|
||||
*/
|
||||
@ -167,7 +172,8 @@ export default plugin(chunterId, {
|
||||
Reaction: '' as Ref<Class<Reaction>>
|
||||
},
|
||||
mixin: {
|
||||
DirectMessageInput: '' as Ref<Mixin<DirectMessageInput>>
|
||||
DirectMessageInput: '' as Ref<Mixin<DirectMessageInput>>,
|
||||
ChunterMessageExtension: '' as Ref<Mixin<ChunterMessageExtension>>
|
||||
},
|
||||
space: {
|
||||
Backlinks: '' as Ref<Space>
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
export let disabled: boolean = false
|
||||
export let shouldShowName: boolean = true
|
||||
export let shrink: number = 0
|
||||
export let exact = false
|
||||
|
||||
const client = getClient()
|
||||
let presenter: AttributeModel | undefined
|
||||
@ -56,7 +57,7 @@
|
||||
}
|
||||
|
||||
$: if (doc !== undefined) {
|
||||
getObjectPresenter(client, doc._class, { key: '' })
|
||||
getObjectPresenter(client, exact && _class ? _class : doc._class, { key: '' })
|
||||
.then((p) => {
|
||||
presenter = p
|
||||
})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user