mirror of
https://github.com/hcengineering/platform.git
synced 2025-04-25 18:02:04 +00:00
TSK-1046 Gmail/telegram messages collaborators TSK-1097 Inbox scroll (#2928)
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
parent
d353c0e42d
commit
2c714e33fe
@ -13,13 +13,14 @@
|
||||
// limitations under the License.
|
||||
//
|
||||
|
||||
import activity from '@hcengineering/activity'
|
||||
import {
|
||||
AvatarProvider,
|
||||
AvatarType,
|
||||
Channel,
|
||||
ChannelProvider,
|
||||
Contact,
|
||||
contactId,
|
||||
ContactsTab,
|
||||
Employee,
|
||||
EmployeeAccount,
|
||||
GetAvatarUrl,
|
||||
@ -29,10 +30,9 @@ import {
|
||||
Person,
|
||||
Persons,
|
||||
Status,
|
||||
ContactsTab
|
||||
contactId
|
||||
} from '@hcengineering/contact'
|
||||
import activity from '@hcengineering/activity'
|
||||
import { Class, DateRangeMode, Domain, DOMAIN_MODEL, IndexKind, Ref, Timestamp } from '@hcengineering/core'
|
||||
import { Class, DOMAIN_MODEL, DateRangeMode, Domain, IndexKind, Ref, Timestamp } from '@hcengineering/core'
|
||||
import {
|
||||
Builder,
|
||||
Collection,
|
||||
@ -51,13 +51,13 @@ import attachment from '@hcengineering/model-attachment'
|
||||
import chunter from '@hcengineering/model-chunter'
|
||||
import core, { TAccount, TAttachedDoc, TDoc, TSpace } from '@hcengineering/model-core'
|
||||
import presentation from '@hcengineering/model-presentation'
|
||||
import view, { createAction, ViewAction, Viewlet } from '@hcengineering/model-view'
|
||||
import view, { ViewAction, Viewlet, createAction } from '@hcengineering/model-view'
|
||||
import workbench from '@hcengineering/model-workbench'
|
||||
import notification from '@hcengineering/notification'
|
||||
import type { Asset, IntlString, Resource } from '@hcengineering/platform'
|
||||
import setting from '@hcengineering/setting'
|
||||
import { AnyComponent } from '@hcengineering/ui'
|
||||
import notification from '@hcengineering/notification'
|
||||
import templates from '@hcengineering/templates'
|
||||
import { AnyComponent } from '@hcengineering/ui'
|
||||
import contact from './plugin'
|
||||
|
||||
export const DOMAIN_CONTACT = 'contact' as Domain
|
||||
@ -327,6 +327,18 @@ export function createModel (builder: Builder): void {
|
||||
fields: []
|
||||
})
|
||||
|
||||
builder.mixin(contact.class.Channel, core.class.Class, view.mixin.ObjectPanel, {
|
||||
component: contact.component.ChannelPanel
|
||||
})
|
||||
|
||||
builder.mixin(contact.class.Channel, core.class.Class, notification.mixin.ClassCollaborators, {
|
||||
fields: []
|
||||
})
|
||||
|
||||
builder.mixin(contact.class.Channel, core.class.Class, notification.mixin.NotificationObjectPresenter, {
|
||||
presenter: contact.component.ActivityChannelPresenter
|
||||
})
|
||||
|
||||
builder.mixin(contact.class.Member, core.class.Class, view.mixin.ObjectPresenter, {
|
||||
presenter: contact.component.MemberPresenter
|
||||
})
|
||||
|
@ -50,7 +50,9 @@ export default mergeIds(contactId, contact, {
|
||||
AccountArrayEditor: '' as AnyComponent,
|
||||
ChannelFilter: '' as AnyComponent,
|
||||
MergeEmployee: '' as AnyComponent,
|
||||
ActivityChannelMessage: '' as AnyComponent
|
||||
ActivityChannelMessage: '' as AnyComponent,
|
||||
ChannelPanel: '' as AnyComponent,
|
||||
ActivityChannelPresenter: '' as AnyComponent
|
||||
},
|
||||
string: {
|
||||
Persons: '' as IntlString,
|
||||
|
@ -31,9 +31,9 @@ import {
|
||||
import attachment from '@hcengineering/model-attachment'
|
||||
import contact from '@hcengineering/model-contact'
|
||||
import core, { TAttachedDoc, TDoc } from '@hcengineering/model-core'
|
||||
import view, { createAction } from '@hcengineering/model-view'
|
||||
import setting from '@hcengineering/setting'
|
||||
import gmail from './plugin'
|
||||
import view, { createAction } from '@hcengineering/model-view'
|
||||
|
||||
export const DOMAIN_GMAIL = 'gmail' as Domain
|
||||
|
||||
|
@ -43,6 +43,10 @@ export function createModel (builder: Builder): void {
|
||||
trigger: serverContact.trigger.OnContactDelete
|
||||
})
|
||||
|
||||
builder.createDoc(serverCore.class.Trigger, core.space.Model, {
|
||||
trigger: serverContact.trigger.OnChannelUpdate
|
||||
})
|
||||
|
||||
builder.createDoc(serverCore.class.AsyncTrigger, core.space.Model, {
|
||||
trigger: serverContact.trigger.OnEmployeeUpdate,
|
||||
classes: [contact.class.Employee]
|
||||
|
@ -32,6 +32,7 @@
|
||||
"@hcengineering/model-core": "^0.6.0",
|
||||
"@hcengineering/model-attachment": "^0.6.0",
|
||||
"@hcengineering/model-contact": "^0.6.1",
|
||||
"@hcengineering/view": "^0.6.3",
|
||||
"@hcengineering/contact": "^0.6.12",
|
||||
"@hcengineering/telegram": "^0.6.5",
|
||||
"@hcengineering/telegram-resources": "^0.6.0",
|
||||
|
@ -14,31 +14,32 @@
|
||||
// limitations under the License.
|
||||
//
|
||||
|
||||
import {
|
||||
Builder,
|
||||
Model,
|
||||
TypeString,
|
||||
TypeBoolean,
|
||||
Prop,
|
||||
ArrOf,
|
||||
Index,
|
||||
Collection,
|
||||
TypeTimestamp
|
||||
} from '@hcengineering/model'
|
||||
import core, { TAttachedDoc } from '@hcengineering/model-core'
|
||||
import contact from '@hcengineering/model-contact'
|
||||
import telegram from './plugin'
|
||||
import type {
|
||||
TelegramMessage,
|
||||
NewTelegramMessage,
|
||||
SharedTelegramMessage,
|
||||
SharedTelegramMessages
|
||||
} from '@hcengineering/telegram'
|
||||
import { Class, Domain, IndexKind, Ref, Timestamp, Type } from '@hcengineering/core'
|
||||
import setting from '@hcengineering/setting'
|
||||
import activity from '@hcengineering/activity'
|
||||
import { Channel } from '@hcengineering/contact'
|
||||
import { Class, Domain, IndexKind, Ref, Timestamp, Type } from '@hcengineering/core'
|
||||
import {
|
||||
ArrOf,
|
||||
Builder,
|
||||
Collection,
|
||||
Index,
|
||||
Model,
|
||||
Prop,
|
||||
TypeBoolean,
|
||||
TypeString,
|
||||
TypeTimestamp
|
||||
} from '@hcengineering/model'
|
||||
import attachment from '@hcengineering/model-attachment'
|
||||
import contact from '@hcengineering/model-contact'
|
||||
import core, { TAttachedDoc } from '@hcengineering/model-core'
|
||||
import setting from '@hcengineering/setting'
|
||||
import type {
|
||||
NewTelegramMessage,
|
||||
SharedTelegramMessage,
|
||||
SharedTelegramMessages,
|
||||
TelegramMessage
|
||||
} from '@hcengineering/telegram'
|
||||
import telegram from './plugin'
|
||||
import view from '@hcengineering/view'
|
||||
|
||||
export const DOMAIN_TELEGRAM = 'telegram' as Domain
|
||||
|
||||
@ -87,6 +88,23 @@ export class TSharedTelegramMessages extends TAttachedDoc implements SharedTeleg
|
||||
export function createModel (builder: Builder): void {
|
||||
builder.createModel(TTelegramMessage, TSharedTelegramMessages, TNewTelegramMessage)
|
||||
|
||||
builder.mixin(telegram.class.Message, core.class.Class, view.mixin.ObjectPresenter, {
|
||||
presenter: telegram.component.MessagePresenter
|
||||
})
|
||||
|
||||
builder.createDoc(
|
||||
activity.class.TxViewlet,
|
||||
core.space.Model,
|
||||
{
|
||||
objectClass: telegram.class.Message,
|
||||
icon: contact.icon.Telegram,
|
||||
txClass: core.class.TxCreateDoc,
|
||||
component: telegram.activity.TxMessage,
|
||||
display: 'inline'
|
||||
},
|
||||
telegram.ids.TxMessage
|
||||
)
|
||||
|
||||
builder.createDoc(
|
||||
contact.class.ChannelProvider,
|
||||
core.space.Model,
|
||||
|
@ -33,9 +33,11 @@ export default mergeIds(telegramId, telegram, {
|
||||
Status: '' as IntlString
|
||||
},
|
||||
ids: {
|
||||
TxMessage: '' as Ref<TxViewlet>,
|
||||
TxSharedCreate: '' as Ref<TxViewlet>
|
||||
},
|
||||
activity: {
|
||||
TxMessage: '' as AnyComponent,
|
||||
TxSharedCreate: '' as AnyComponent
|
||||
}
|
||||
})
|
||||
|
@ -203,7 +203,7 @@
|
||||
{/if}
|
||||
<span class="time ml-1"><TimeSince value={tx.tx.modifiedOn} /></span>
|
||||
{:else if viewlet && viewlet.label}
|
||||
<span class="lower">
|
||||
<span class="lower whitespace-nowrap">
|
||||
<Label label={viewlet.label} params={viewlet.labelParams ?? {}} />
|
||||
</span>
|
||||
{/if}
|
||||
|
45
plugins/contact-resources/src/components/ChannelPanel.svelte
Normal file
45
plugins/contact-resources/src/components/ChannelPanel.svelte
Normal file
@ -0,0 +1,45 @@
|
||||
<!--
|
||||
// Copyright © 2023 Hardcore Engineering Inc.
|
||||
//
|
||||
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License. You may
|
||||
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
//
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
-->
|
||||
<script lang="ts">
|
||||
import contact, { Channel } from '@hcengineering/contact'
|
||||
import { Class, Ref } from '@hcengineering/core'
|
||||
import { createQuery, getClient } from '@hcengineering/presentation'
|
||||
import { AnyComponent, Component } from '@hcengineering/ui'
|
||||
|
||||
export let _id: Ref<Channel>
|
||||
export let _class: Ref<Class<Channel>>
|
||||
export let embedded = false
|
||||
|
||||
const client = getClient()
|
||||
|
||||
let channel: Channel | undefined = undefined
|
||||
|
||||
const query = createQuery()
|
||||
$: query.query(_class, { _id }, (res) => {
|
||||
;[channel] = res
|
||||
})
|
||||
|
||||
async function getPresenter (channel: Channel | undefined): Promise<AnyComponent | undefined> {
|
||||
if (channel === undefined) return
|
||||
const provider = await client.findOne(contact.class.ChannelProvider, { _id: channel.provider })
|
||||
return provider?.presenter
|
||||
}
|
||||
</script>
|
||||
|
||||
{#await getPresenter(channel) then presenter}
|
||||
{#if presenter}
|
||||
<Component is={presenter} props={{ embedded, _id: channel?.attachedTo, _class: channel?.attachedToClass }} />
|
||||
{/if}
|
||||
{/await}
|
@ -0,0 +1,43 @@
|
||||
<!--
|
||||
// Copyright © 2023 Hardcore Engineering Inc.
|
||||
//
|
||||
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License. You may
|
||||
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
//
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
-->
|
||||
<script lang="ts">
|
||||
import contact, { Channel, ChannelProvider, Contact, getName } from '@hcengineering/contact'
|
||||
import { Ref } from '@hcengineering/core'
|
||||
import { getEmbeddedLabel } from '@hcengineering/platform'
|
||||
import { createQuery } from '@hcengineering/presentation'
|
||||
import { CircleButton, tooltip } from '@hcengineering/ui'
|
||||
import { DocNavLink } from '@hcengineering/view-resources'
|
||||
|
||||
export let value: Channel
|
||||
let provider: ChannelProvider | undefined
|
||||
const providerQuery = createQuery()
|
||||
$: providerQuery.query(contact.class.ChannelProvider, { _id: value.provider }, (res) => ([provider] = res))
|
||||
let target: Contact | undefined
|
||||
const query = createQuery()
|
||||
$: query.query(contact.class.Contact, { _id: value.attachedTo as Ref<Contact> }, (res) => ([target] = res))
|
||||
</script>
|
||||
|
||||
<div class="flex-row-center" use:tooltip={{ label: getEmbeddedLabel(value.value) }}>
|
||||
{#if provider}
|
||||
<CircleButton icon={provider.icon} size={'small'} />
|
||||
{/if}
|
||||
{#if target}
|
||||
<div class="ml-1">
|
||||
<DocNavLink object={target}>
|
||||
{getName(target)}
|
||||
</DocNavLink>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
@ -70,6 +70,9 @@ import UsersPopup from './components/UsersPopup.svelte'
|
||||
import ActivityChannelMessage from './components/activity/ActivityChannelMessage.svelte'
|
||||
import ExpandRightDouble from './components/icons/ExpandRightDouble.svelte'
|
||||
import IconMembers from './components/icons/Members.svelte'
|
||||
import ChannelPresenter from './components/ChannelPresenter.svelte'
|
||||
import ChannelPanel from './components/ChannelPanel.svelte'
|
||||
import ActivityChannelPresenter from './components/activity/ActivityChannelPresenter.svelte'
|
||||
|
||||
import contact from './plugin'
|
||||
import {
|
||||
@ -276,7 +279,10 @@ export default async (): Promise<Resources> => ({
|
||||
MergeEmployee,
|
||||
Avatar,
|
||||
UserBoxList,
|
||||
ActivityChannelMessage
|
||||
ActivityChannelMessage,
|
||||
ChannelPresenter,
|
||||
ChannelPanel,
|
||||
ActivityChannelPresenter
|
||||
},
|
||||
completion: {
|
||||
EmployeeQuery: async (
|
||||
|
@ -182,7 +182,8 @@ export const contactPlugin = plugin(contactId, {
|
||||
ChannelsPresenter: '' as AnyComponent,
|
||||
MembersPresenter: '' as AnyComponent,
|
||||
Avatar: '' as AnyComponent,
|
||||
UserBoxList: '' as AnyComponent
|
||||
UserBoxList: '' as AnyComponent,
|
||||
ChannelPresenter: '' as AnyComponent
|
||||
},
|
||||
channelProvider: {
|
||||
Email: '' as Ref<ChannelProvider>,
|
||||
|
@ -35,6 +35,7 @@
|
||||
|
||||
export let _id: Ref<Contact>
|
||||
export let _class: Ref<Class<Contact>>
|
||||
export let embedded = false
|
||||
export let message: Message | undefined = undefined
|
||||
|
||||
let object: Contact
|
||||
@ -112,6 +113,7 @@
|
||||
isHeader={true}
|
||||
isAside={false}
|
||||
isFullSize
|
||||
{embedded}
|
||||
on:fullsize
|
||||
on:close={() => {
|
||||
dispatch('close')
|
||||
|
@ -29,4 +29,4 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<span class="over-underline overflow-label max-w-80" on:click={click}>{value.subject}</span>
|
||||
<span class="over-underline overflow-label" on:click={click}>{value.subject}</span>
|
||||
|
@ -83,7 +83,7 @@
|
||||
<Label label={notification.string.Inbox} />
|
||||
</span>
|
||||
</div>
|
||||
<div class="top-divider">
|
||||
<div class="top-divider clear-mins h-full">
|
||||
<Scroller>
|
||||
{#if loading}
|
||||
<Loading />
|
||||
|
@ -104,8 +104,8 @@
|
||||
|
||||
{#if (viewlet !== undefined && !((viewlet?.hideOnRemove ?? false) && ptx?.removed)) || model.length > 0}
|
||||
<div class="msgactivity-container">
|
||||
<div class="msgactivity-content" class:content={isColumn} class:comment={isComment}>
|
||||
<div class="msgactivity-content__header">
|
||||
<div class="msgactivity-content clear-mins" class:content={isColumn} class:comment={isComment}>
|
||||
<div class="msgactivity-content__header clear-mins">
|
||||
<div class="msgactivity-content__title labels-row">
|
||||
{#if viewlet && viewlet?.editable}
|
||||
{#if viewlet.label}
|
||||
@ -115,12 +115,12 @@
|
||||
<span class="lower"><Label label={activity.string.Edited} /></span>
|
||||
{/if}
|
||||
{:else if viewlet && viewlet.label}
|
||||
<span class="lower">
|
||||
<span class="lower whitespace-nowrap">
|
||||
<Label label={viewlet.label} params={viewlet.labelParams ?? {}} />
|
||||
</span>
|
||||
{#if viewlet.labelComponent}
|
||||
<Component is={viewlet.labelComponent} {props} />
|
||||
{/if}
|
||||
{/if}
|
||||
{#if viewlet && viewlet.labelComponent}
|
||||
<Component is={viewlet.labelComponent} {props} />
|
||||
{/if}
|
||||
|
||||
{#if viewlet === undefined && model.length > 0 && ptx?.updateTx}
|
||||
@ -248,6 +248,7 @@
|
||||
}
|
||||
.msgactivity-content__title {
|
||||
display: inline-flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: baseline;
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
@ -51,6 +51,7 @@
|
||||
|
||||
export let _id: Ref<Contact>
|
||||
export let _class: Ref<Class<Contact>>
|
||||
export let embedded = false
|
||||
|
||||
let object: Contact
|
||||
let channel: Channel | undefined = undefined
|
||||
@ -245,6 +246,7 @@
|
||||
<Panel
|
||||
isHeader={true}
|
||||
isAside={false}
|
||||
{embedded}
|
||||
isFullSize
|
||||
on:fullsize
|
||||
on:close={() => {
|
||||
|
@ -0,0 +1,29 @@
|
||||
<!--
|
||||
// Copyright © 2023 Hardcore Engineering Inc.
|
||||
//
|
||||
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License. You may
|
||||
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
//
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
-->
|
||||
<script lang="ts">
|
||||
import { MessageViewer } from '@hcengineering/presentation'
|
||||
import { TelegramMessage } from '@hcengineering/telegram'
|
||||
export let value: TelegramMessage
|
||||
</script>
|
||||
|
||||
<div class="overflow-label content">
|
||||
<MessageViewer message={value.content} />
|
||||
</div>
|
||||
|
||||
<style lang="scss">
|
||||
.content {
|
||||
height: 1rem;
|
||||
}
|
||||
</style>
|
@ -20,6 +20,7 @@ import presentation from '@hcengineering/presentation'
|
||||
import Chat from './components/Chat.svelte'
|
||||
import Connect from './components/Connect.svelte'
|
||||
import Reconnect from './components/Reconnect.svelte'
|
||||
import TxMessage from './components/activity/TxMessage.svelte'
|
||||
import IconTelegram from './components/icons/TelegramColor.svelte'
|
||||
import TxSharedCreate from './components/activity/TxSharedCreate.svelte'
|
||||
import { concatLink } from '@hcengineering/core'
|
||||
@ -32,7 +33,8 @@ export default async (): Promise<Resources> => ({
|
||||
IconTelegram
|
||||
},
|
||||
activity: {
|
||||
TxSharedCreate
|
||||
TxSharedCreate,
|
||||
TxMessage
|
||||
},
|
||||
handler: {
|
||||
DisconnectHandler: async () => {
|
||||
|
@ -17,6 +17,7 @@
|
||||
import { IntlString, mergeIds } from '@hcengineering/platform'
|
||||
|
||||
import telegram, { telegramId } from '@hcengineering/telegram'
|
||||
import { AnyComponent } from '@hcengineering/ui'
|
||||
|
||||
export default mergeIds(telegramId, telegram, {
|
||||
string: {
|
||||
@ -35,5 +36,8 @@ export default mergeIds(telegramId, telegram, {
|
||||
Share: '' as IntlString,
|
||||
PublishSelected: '' as IntlString,
|
||||
MessagesSelected: '' as IntlString
|
||||
},
|
||||
component: {
|
||||
MessagePresenter: '' as AnyComponent
|
||||
}
|
||||
})
|
||||
|
@ -33,6 +33,7 @@
|
||||
"@hcengineering/view": "^0.6.3",
|
||||
"@hcengineering/login": "^0.6.2",
|
||||
"@hcengineering/workbench": "^0.6.3",
|
||||
"@hcengineering/minio": "^0.6.0"
|
||||
"@hcengineering/minio": "^0.6.0",
|
||||
"@hcengineering/notification": "^0.6.9"
|
||||
}
|
||||
}
|
||||
|
@ -15,6 +15,7 @@
|
||||
//
|
||||
|
||||
import contact, {
|
||||
Channel,
|
||||
Contact,
|
||||
contactId,
|
||||
Employee,
|
||||
@ -38,6 +39,7 @@ import core, {
|
||||
TxUpdateDoc,
|
||||
updateAttribute
|
||||
} from '@hcengineering/core'
|
||||
import notification, { Collaborators } from '@hcengineering/notification'
|
||||
import { getMetadata } from '@hcengineering/platform'
|
||||
import serverCore, { AsyncTriggerControl, TriggerControl } from '@hcengineering/server-core'
|
||||
import { workbenchId } from '@hcengineering/workbench'
|
||||
@ -275,6 +277,54 @@ export async function OnEmployeeUpdate (tx: Tx, control: AsyncTriggerControl): P
|
||||
return result
|
||||
}
|
||||
|
||||
/**
|
||||
* @public
|
||||
*/
|
||||
export async function OnChannelUpdate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
|
||||
if (tx._class !== core.class.TxUpdateDoc) {
|
||||
return []
|
||||
}
|
||||
|
||||
const uTx = tx as TxUpdateDoc<Channel>
|
||||
|
||||
if (!control.hierarchy.isDerived(uTx.objectClass, contact.class.Channel)) {
|
||||
return []
|
||||
}
|
||||
|
||||
const result: Tx[] = []
|
||||
|
||||
if (uTx.operations.$inc?.items !== undefined) {
|
||||
const doc = (await control.findAll(uTx.objectClass, { _id: uTx.objectId }, { limit: 1 }))[0]
|
||||
if (doc !== undefined) {
|
||||
if (control.hierarchy.hasMixin(doc, notification.mixin.Collaborators)) {
|
||||
const collab = control.hierarchy.as(doc, notification.mixin.Collaborators) as Doc as Collaborators
|
||||
if (collab.collaborators.includes(tx.modifiedBy)) {
|
||||
result.push(
|
||||
control.txFactory.createTxMixin(doc._id, doc._class, doc.space, notification.mixin.Collaborators, {
|
||||
$push: {
|
||||
collaborators: tx.modifiedBy
|
||||
}
|
||||
})
|
||||
)
|
||||
}
|
||||
} else {
|
||||
control.txFactory.createTxMixin<Doc, Collaborators>(
|
||||
doc._id,
|
||||
doc._class,
|
||||
doc.space,
|
||||
notification.mixin.Collaborators,
|
||||
{
|
||||
collaborators: [tx.modifiedBy]
|
||||
}
|
||||
)
|
||||
result.push()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
/**
|
||||
* @public
|
||||
*/
|
||||
@ -317,7 +367,8 @@ export function organizationTextPresenter (doc: Doc): string {
|
||||
export default async () => ({
|
||||
trigger: {
|
||||
OnContactDelete,
|
||||
OnEmployeeUpdate
|
||||
OnEmployeeUpdate,
|
||||
OnChannelUpdate
|
||||
},
|
||||
function: {
|
||||
PersonHTMLPresenter: personHTMLPresenter,
|
||||
|
@ -30,6 +30,7 @@ export const serverContactId = 'server-contact' as Plugin
|
||||
export default plugin(serverContactId, {
|
||||
trigger: {
|
||||
OnContactDelete: '' as Resource<TriggerFunc>,
|
||||
OnChannelUpdate: '' as Resource<TriggerFunc>,
|
||||
OnEmployeeUpdate: '' as Resource<AsyncTriggerFunc>
|
||||
},
|
||||
function: {
|
||||
|
@ -29,6 +29,7 @@
|
||||
"@hcengineering/core": "^0.6.22",
|
||||
"@hcengineering/platform": "^0.6.8",
|
||||
"@hcengineering/server-core": "^0.6.1",
|
||||
"@hcengineering/notification": "^0.6.9",
|
||||
"@hcengineering/contact": "^0.6.12",
|
||||
"@hcengineering/gmail": "^0.6.5"
|
||||
}
|
||||
|
@ -23,11 +23,13 @@ import core, {
|
||||
Hierarchy,
|
||||
Ref,
|
||||
Tx,
|
||||
TxCUD,
|
||||
TxCreateDoc,
|
||||
TxProcessor
|
||||
} from '@hcengineering/core'
|
||||
import gmail, { Message } from '@hcengineering/gmail'
|
||||
import { TriggerControl } from '@hcengineering/server-core'
|
||||
import notification from '@hcengineering/notification'
|
||||
|
||||
/**
|
||||
* @public
|
||||
@ -54,6 +56,7 @@ export async function FindMessages (
|
||||
* @public
|
||||
*/
|
||||
export async function OnMessageCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
|
||||
const res: Tx[] = []
|
||||
const actualTx = TxProcessor.extractTx(tx)
|
||||
if (actualTx._class !== core.class.TxCreateDoc) {
|
||||
return []
|
||||
@ -67,16 +70,51 @@ export async function OnMessageCreate (tx: Tx, control: TriggerControl): Promise
|
||||
const message = TxProcessor.createDoc2Doc<Message>(createTx)
|
||||
|
||||
const channel = (await control.findAll(contact.class.Channel, { _id: message.attachedTo }, { limit: 1 }))[0]
|
||||
if (channel === undefined) {
|
||||
return []
|
||||
if (channel !== undefined) {
|
||||
if (channel.lastMessage === undefined || channel.lastMessage < message.sendOn) {
|
||||
const tx = control.txFactory.createTxUpdateDoc(channel._class, channel.space, channel._id, {
|
||||
lastMessage: message.sendOn
|
||||
})
|
||||
res.push(tx)
|
||||
}
|
||||
if (message.incoming) {
|
||||
const docs = await control.findAll(notification.class.DocUpdates, {
|
||||
attachedTo: channel._id,
|
||||
user: message.modifiedBy
|
||||
})
|
||||
for (const doc of docs) {
|
||||
res.push(
|
||||
control.txFactory.createTxUpdateDoc(doc._class, doc.space, doc._id, {
|
||||
$push: {
|
||||
txes: [tx._id as Ref<TxCUD<Doc>>, tx.modifiedOn]
|
||||
}
|
||||
})
|
||||
)
|
||||
res.push(
|
||||
control.txFactory.createTxUpdateDoc(doc._class, doc.space, doc._id, {
|
||||
lastTx: tx._id as Ref<TxCUD<Doc>>,
|
||||
lastTxTime: tx.modifiedOn,
|
||||
hidden: false
|
||||
})
|
||||
)
|
||||
}
|
||||
if (docs.length === 0) {
|
||||
res.push(
|
||||
control.txFactory.createTxCreateDoc(notification.class.DocUpdates, notification.space.Notifications, {
|
||||
user: tx.modifiedBy,
|
||||
attachedTo: channel._id,
|
||||
attachedToClass: channel._class,
|
||||
hidden: false,
|
||||
lastTx: tx._id as Ref<TxCUD<Doc>>,
|
||||
lastTxTime: tx.modifiedOn,
|
||||
txes: [[tx._id as Ref<TxCUD<Doc>>, tx.modifiedOn]]
|
||||
})
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
if (channel.lastMessage === undefined || channel.lastMessage < message.sendOn) {
|
||||
const tx = control.txFactory.createTxUpdateDoc(channel._class, channel.space, channel._id, {
|
||||
lastMessage: message.sendOn
|
||||
})
|
||||
return [tx]
|
||||
}
|
||||
return []
|
||||
|
||||
return res
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
||||
|
@ -30,6 +30,7 @@
|
||||
"@hcengineering/platform": "^0.6.8",
|
||||
"@hcengineering/server-core": "^0.6.1",
|
||||
"@hcengineering/contact": "^0.6.12",
|
||||
"@hcengineering/notification": "^0.6.9",
|
||||
"@hcengineering/telegram": "^0.6.5"
|
||||
}
|
||||
}
|
||||
|
@ -23,11 +23,13 @@ import core, {
|
||||
Hierarchy,
|
||||
Ref,
|
||||
Tx,
|
||||
TxCUD,
|
||||
TxCreateDoc,
|
||||
TxProcessor
|
||||
} from '@hcengineering/core'
|
||||
import { TriggerControl } from '@hcengineering/server-core'
|
||||
import telegram, { TelegramMessage } from '@hcengineering/telegram'
|
||||
import notification from '@hcengineering/notification'
|
||||
|
||||
/**
|
||||
* @public
|
||||
@ -54,6 +56,7 @@ export async function FindMessages (
|
||||
* @public
|
||||
*/
|
||||
export async function OnMessageCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
|
||||
const res: Tx[] = []
|
||||
const actualTx = TxProcessor.extractTx(tx)
|
||||
if (actualTx._class !== core.class.TxCreateDoc) {
|
||||
return []
|
||||
@ -67,16 +70,52 @@ export async function OnMessageCreate (tx: Tx, control: TriggerControl): Promise
|
||||
const message = TxProcessor.createDoc2Doc<TelegramMessage>(createTx)
|
||||
|
||||
const channel = (await control.findAll(contact.class.Channel, { _id: message.attachedTo }, { limit: 1 }))[0]
|
||||
if (channel === undefined) {
|
||||
return []
|
||||
if (channel !== undefined) {
|
||||
if (channel.lastMessage === undefined || channel.lastMessage < message.sendOn) {
|
||||
const tx = control.txFactory.createTxUpdateDoc(channel._class, channel.space, channel._id, {
|
||||
lastMessage: message.sendOn
|
||||
})
|
||||
res.push(tx)
|
||||
}
|
||||
|
||||
if (message.incoming) {
|
||||
const docs = await control.findAll(notification.class.DocUpdates, {
|
||||
attachedTo: channel._id,
|
||||
user: message.modifiedBy
|
||||
})
|
||||
for (const doc of docs) {
|
||||
res.push(
|
||||
control.txFactory.createTxUpdateDoc(doc._class, doc.space, doc._id, {
|
||||
$push: {
|
||||
txes: [tx._id as Ref<TxCUD<Doc>>, tx.modifiedOn]
|
||||
}
|
||||
})
|
||||
)
|
||||
res.push(
|
||||
control.txFactory.createTxUpdateDoc(doc._class, doc.space, doc._id, {
|
||||
lastTx: tx._id as Ref<TxCUD<Doc>>,
|
||||
lastTxTime: tx.modifiedOn,
|
||||
hidden: false
|
||||
})
|
||||
)
|
||||
}
|
||||
if (docs.length === 0) {
|
||||
res.push(
|
||||
control.txFactory.createTxCreateDoc(notification.class.DocUpdates, notification.space.Notifications, {
|
||||
user: tx.modifiedBy,
|
||||
attachedTo: channel._id,
|
||||
attachedToClass: channel._class,
|
||||
hidden: false,
|
||||
lastTx: tx._id as Ref<TxCUD<Doc>>,
|
||||
lastTxTime: tx.modifiedOn,
|
||||
txes: [[tx._id as Ref<TxCUD<Doc>>, tx.modifiedOn]]
|
||||
})
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
if (channel.lastMessage === undefined || channel.lastMessage < message.sendOn) {
|
||||
const tx = control.txFactory.createTxUpdateDoc(channel._class, channel.space, channel._id, {
|
||||
lastMessage: message.sendOn
|
||||
})
|
||||
return [tx]
|
||||
}
|
||||
return []
|
||||
|
||||
return res
|
||||
}
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
||||
|
Loading…
Reference in New Issue
Block a user