Reminders (#1200)

Signed-off-by: Denis Bykhov <[email protected]>

Author: BykhovDenis

models/calendar/package.json

@@ -34,6 +34,7 @@
     "@anticrm/calendar": "~0.6.0",
     "@anticrm/calendar-resources": "~0.6.0",
     "@anticrm/platform": "~0.6.5",
+    "@anticrm/notification": "~0.6.0",
     "@anticrm/model-core": "~0.6.0",
     "@anticrm/model-view": "~0.6.0",
     "@anticrm/model-workbench": "~0.6.1",

models/calendar/src/index.ts

@@ -13,19 +13,21 @@
 // limitations under the License.
 //
 
-import { Calendar, Event } from '@anticrm/calendar'
+import activity from '@anticrm/activity'
+import { Calendar, Event, Reminder } from '@anticrm/calendar'
 import { Employee } from '@anticrm/contact'
 import type { Domain, Markup, Ref, Timestamp } from '@anticrm/core'
 import { IndexKind } from '@anticrm/core'
-import { Builder, Collection, Index, Model, Prop, TypeDate, TypeMarkup, TypeString, UX } from '@anticrm/model'
+import { Builder, Collection, Index, Mixin, Model, Prop, TypeDate, TypeMarkup, TypeString, UX } from '@anticrm/model'
 import attachment from '@anticrm/model-attachment'
 import chunter from '@anticrm/model-chunter'
 import contact from '@anticrm/model-contact'
 import core, { TAttachedDoc } from '@anticrm/model-core'
 import { TSpaceWithStates } from '@anticrm/model-task'
+import view from '@anticrm/model-view'
 import workbench from '@anticrm/model-workbench'
+import notification from '@anticrm/notification'
 import calendar from './plugin'
-import view from '@anticrm/model-view'
 
 export * from '@anticrm/calendar'
 
@@ -42,9 +44,6 @@ export class TEvent extends TAttachedDoc implements Event {
   @Index(IndexKind.FullText)
   title!: string
 
-  @Prop(TypeString(), calendar.string.EventNumber)
-  number!: number
-
   @Prop(TypeMarkup(), calendar.string.Description)
   @Index(IndexKind.FullText)
   description!: Markup
@@ -69,8 +68,19 @@ export class TEvent extends TAttachedDoc implements Event {
   participants!: Ref<Employee>[]
 }
 
+@Mixin(calendar.mixin.Reminder, calendar.class.Event)
+@UX(calendar.string.Reminder, calendar.icon.Calendar)
+export class TReminder extends TEvent implements Reminder {
+  @Prop(TypeDate(true), calendar.string.Shift)
+  shift!: Timestamp
+
+  @Prop(TypeString(), calendar.string.State)
+  @Index(IndexKind.Indexed)
+  state!: 'active' | 'done'
+}
+
 export function createModel (builder: Builder): void {
-  builder.createModel(TCalendar, TEvent)
+  builder.createModel(TCalendar, TEvent, TReminder)
 
   builder.createDoc(workbench.class.Application, core.space.Model, {
     label: calendar.string.ApplicationLabelCalendar,
@@ -88,6 +98,21 @@ export function createModel (builder: Builder): void {
     }
   }, calendar.app.Calendar)
 
+  builder.createDoc(notification.class.NotificationType, core.space.Model, {
+    label: calendar.string.Reminder
+  }, calendar.ids.ReminderNotification)
+
+  builder.createDoc(activity.class.TxViewlet, core.space.Model, {
+    objectClass: calendar.mixin.Reminder,
+    icon: calendar.icon.Reminder,
+    txClass: core.class.TxMixin,
+    label: calendar.string.CreatedReminder,
+    component: calendar.activity.ReminderViewlet,
+    display: 'emphasized',
+    editable: false,
+    hideOnRemove: true
+  }, calendar.ids.ReminderViewlet)
+
   builder.createDoc(
     view.class.ViewletDescriptor,
     core.space.Model,
@@ -99,6 +124,30 @@ export function createModel (builder: Builder): void {
     calendar.viewlet.Calendar
   )
 
+  builder.createDoc(
+    view.class.Action,
+    core.space.Model,
+    {
+      label: calendar.string.RemindMeAt,
+      icon: calendar.icon.Reminder,
+      action: calendar.actionImpl.SaveEventReminder
+    },
+    calendar.action.SaveEventReminder
+  )
+
+  builder.createDoc(view.class.ActionTarget, core.space.Model, {
+    target: calendar.class.Event,
+    action: calendar.action.SaveEventReminder
+  })
+
+  builder.mixin(calendar.mixin.Reminder, core.class.Class, view.mixin.AttributePresenter, {
+    presenter: calendar.component.ReminderPresenter
+  })
+
+  builder.mixin(calendar.class.Event, core.class.Class, view.mixin.ObjectEditor, {
+    editor: calendar.component.EditEvent
+  })
+
   // Use generic child presenter
   builder.mixin(calendar.class.Event, core.class.Class, view.mixin.AttributePresenter, {
     presenter: view.component.ObjectPresenter

models/calendar/src/plugin.ts

@@ -13,24 +13,40 @@
 // limitations under the License.
 //
 
+import { TxViewlet } from '@anticrm/activity'
 import { calendarId } from '@anticrm/calendar'
 import calendar from '@anticrm/calendar-resources/src/plugin'
-import { Ref } from '@anticrm/core'
-import type { IntlString } from '@anticrm/platform'
+import { Doc, Ref } from '@anticrm/core'
+import type { IntlString, Resource } from '@anticrm/platform'
 import { mergeIds } from '@anticrm/platform'
 import { AnyComponent } from '@anticrm/ui'
-import { ViewletDescriptor } from '@anticrm/view'
+import { Action, ViewletDescriptor } from '@anticrm/view'
 
 export default mergeIds(calendarId, calendar, {
   component: {
     CreateCalendar: '' as AnyComponent,
-    CalendarView: '' as AnyComponent
+    CalendarView: '' as AnyComponent,
+    EditEvent: '' as AnyComponent,
+    ReminderPresenter: '' as AnyComponent
+  },
+  action: {
+    SaveEventReminder: '' as Ref<Action>
+  },
+  actionImpl: {
+    SaveEventReminder: '' as Resource<(object: Doc) => Promise<void>>
   },
   string: {
     ApplicationLabelCalendar: '' as IntlString,
-    Event: '' as IntlString
+    Event: '' as IntlString,
+    Reminder: '' as IntlString,
+    Shift: '' as IntlString,
+    State: '' as IntlString,
+    CreatedReminder: '' as IntlString
   },
   viewlet: {
     Calendar: '' as Ref<ViewletDescriptor>
+  },
+  ids: {
+    ReminderViewlet: '' as Ref<TxViewlet>
   }
 })

models/core/src/tx.ts

@@ -13,12 +13,14 @@
 // limitations under the License.
 //
 
-import type {
+import {
   AttachedDoc,
   Class,
   Data,
   Doc,
   DocumentUpdate,
+  DOMAIN_TX,
+  IndexKind,
   Mixin,
   MixinUpdate,
   PropertyType,
@@ -34,8 +36,7 @@ import type {
   TxRemoveDoc,
   TxUpdateDoc
 } from '@anticrm/core'
-import { DOMAIN_TX } from '@anticrm/core'
-import { Model } from '@anticrm/model'
+import { Index, Model } from '@anticrm/model'
 import core from './component'
 import { TDoc } from './core'
 
@@ -48,7 +49,9 @@ export class TTx extends TDoc implements Tx {
 
 @Model(core.class.TxCUD, core.class.Tx)
 export class TTxCUD<T extends Doc> extends TTx implements TxCUD<T> {
+  @Index(IndexKind.Indexed)
   objectId!: Ref<T>
+
   objectClass!: Ref<Class<T>>
 }
 

models/recruit/src/review-model.ts

@@ -24,6 +24,9 @@ export class TReview extends TEvent implements Review {
   @Prop(TypeRef(recruit.mixin.Candidate), recruit.string.Candidate)
   declare attachedTo: Ref<Candidate>
 
+  @Prop(TypeString(), recruit.string.Review)
+  number!: number
+
   @Prop(TypeString(), recruit.string.Verdict)
   @Index(IndexKind.FullText)
   verdict!: string

packages/core/src/memdb.ts

@@ -140,7 +140,7 @@ export abstract class MemDb extends TxProcessor {
       result = this.getObjectsByClass(baseClass)
     }
 
-    result = matchQuery(result, query)
+    result = matchQuery(result, query, _class, this.hierarchy)
 
     if (baseClass !== _class) {
       // We need to filter instances without mixin was set

packages/core/src/query.ts

@@ -1,5 +1,6 @@
 import { DocumentQuery } from '.'
-import { Doc } from './classes'
+import { Class, Doc, Ref } from './classes'
+import { Hierarchy } from './hierarchy'
 import { getObjectValue } from './objvalue'
 import { createPredicates, isPredicate } from './predicate'
 import { SortingOrder, SortingQuery } from './storage'
@@ -71,15 +72,31 @@ function getValue (key: string, obj: any): any {
 /**
  * @public
  */
-export function matchQuery<T extends Doc> (docs: Doc[], query: DocumentQuery<T>): Doc[] {
+export function matchQuery<T extends Doc> (docs: Doc[], query: DocumentQuery<T>, clazz: Ref<Class<T>>, hierarchy: Hierarchy): Doc[] {
   let result = [...docs]
   for (const key in query) {
     if (key === '_id' && ((query._id as any)?.$like === undefined || query._id === undefined)) continue
     const value = (query as any)[key]
-    result = findProperty(result, key, value)
+    const tkey = checkMixinKey(key, clazz, hierarchy)
+    result = findProperty(result, tkey, value)
     if (result.length === 0) {
       break
     }
   }
   return result
 }
+
+function checkMixinKey<T extends Doc> (key: string, clazz: Ref<Class<T>>, hierarchy: Hierarchy): string {
+  if (!key.includes('.')) {
+    try {
+      const attr = hierarchy.getAttribute(clazz, key)
+      if (hierarchy.isMixin(attr.attributeOf)) {
+        // It is mixin
+        key = attr.attributeOf + '.' + key
+      }
+    } catch (err: any) {
+      // ignore, if
+    }
+  }
+  return key
+}

packages/panel/package.json

@@ -39,6 +39,7 @@
     "@anticrm/chunter": "~0.6.1",
     "@anticrm/presentation": "~0.6.2",
     "@anticrm/activity": "~0.6.0",
+    "@anticrm/calendar": "~0.6.0",
     "@anticrm/notification": "~0.6.0"
   }
 }

packages/panel/src/components/Panel.svelte

@@ -17,6 +17,7 @@
   import activity from '@anticrm/activity'
   import type { Doc } from '@anticrm/core'
   import notification from '@anticrm/notification'
+  import calendar from '@anticrm/calendar'
   import type { Asset } from '@anticrm/platform'
   import { ActionIcon,AnyComponent,AnySvelteComponent,Component,Icon,IconClose,IconExpand,IconMoreH,Scroller } from '@anticrm/ui'
   import { createEventDispatcher } from 'svelte'
@@ -43,7 +44,12 @@
             {#if subtitle }<span class="ac-header__description">{subtitle}</span>{/if}
           </div>
         </div>
-        <Component is={notification.component.LastViewEditor} props={{ value: object }} />
+        <div class="flex">
+          <Component is={calendar.component.DocReminder} props={{ value: object, title }} />
+          <div class="ml-2">
+            <Component is={notification.component.LastViewEditor} props={{ value: object }} />
+          </div>
+        </div>
       </div>
       {#if $$slots.subtitle}
         <div class="ac-subtitle">

packages/presentation/src/components/Card.svelte

@@ -25,7 +25,7 @@
   import presentation from '..'
 
   export let spaceClass: Ref<Class<Space>> | undefined = undefined
-  export let space: Ref<Space>
+  export let space: Ref<Space> | undefined = undefined
   export let spaceQuery: DocumentQuery<Space> | undefined = { archived: false }
   export let spaceLabel: IntlString | undefined = undefined
   export let spacePlaceholder: IntlString | undefined = undefined