UBERF-5595: merge main

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>

models/chunter/src/index.ts

@@ -559,6 +559,19 @@ export function createModel (builder: Builder, options = { addApplication: true
     chunter.ids.BacklinkCreatedActivityViewlet
   )
 
+  builder.createDoc(
+    activity.class.DocUpdateMessageViewlet,
+    core.space.Model,
+    {
+      objectClass: chunter.class.Backlink,
+      action: 'update',
+      component: chunter.component.BacklinkContent,
+      labelComponent: chunter.activity.BacklinkCreatedLabel,
+      hideIfRemoved: true
+    },
+    chunter.ids.BacklinkUpdateActivityViewlet
+  )
+
   builder.createDoc(
     activity.class.DocUpdateMessageViewlet,
     core.space.Model,

models/chunter/src/plugin.ts

@@ -89,6 +89,7 @@ export default mergeIds(chunterId, chunter, {
     TxChatMessageRemove: '' as Ref<TxViewlet>,
     ChunterNotificationGroup: '' as Ref<NotificationGroup>,
     BacklinkCreatedActivityViewlet: '' as Ref<DocUpdateMessageViewlet>,
+    BacklinkUpdateActivityViewlet: '' as Ref<DocUpdateMessageViewlet>,
     BacklinkRemovedActivityViewlet: '' as Ref<DocUpdateMessageViewlet>
   },
   activity: {

packages/text-editor/src/kits/editor-kit.ts

@@ -68,7 +68,22 @@ export const EditorKit = Extension.create<EditorKitOptions>({
       }),
       CodemarkExtension,
       Underline,
-      ListKeymap,
+      ListKeymap.configure({
+        listTypes: [
+          {
+            itemName: 'listItem',
+            wrapperNames: ['bulletList', 'orderedList']
+          },
+          {
+            itemName: 'taskItem',
+            wrapperNames: ['taskList']
+          },
+          {
+            itemName: 'todoItem',
+            wrapperNames: ['todoList']
+          }
+        ]
+      }),
       NodeUuidExtension,
       ...tableExtensions
       // ...taskListExtensions // Disable since tasks are not working properly now.

plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte

@@ -36,6 +36,7 @@
   export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
   export let withShowMore: boolean = true
   export let attachmentImageSize: 'x-large' | undefined = undefined
+  export let showLinksPreview = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -66,6 +67,7 @@
       hoverStyles,
       withShowMore,
       attachmentImageSize,
+      showLinksPreview,
       onClick,
       onReply
     }}

plugins/chunter-resources/src/components/ChannelScrollView.svelte

@@ -343,6 +343,8 @@
       return
     }
 
+    updateSelectedDate()
+
     if (selectedMessageId !== undefined && messages.some(({ _id }) => _id === selectedMessageId)) {
       isScrollInitialized = true
       await wait()
@@ -465,7 +467,7 @@
     {#if startFromBottom}
       <div class="grower" />
     {/if}
-    {#if withDates && selectedDate}
+    {#if withDates && displayMessages.length > 0}
       <div class="ml-2 pr-2">
         <JumpToDateSelector {selectedDate} fixed on:jumpToDate={jumpToDate} />
       </div>
@@ -511,6 +513,7 @@
             shouldScroll={isSelected}
             withShowMore={false}
             attachmentImageSize="x-large"
+            showLinksPreview={false}
           />
         </div>
       {/each}

plugins/chunter-resources/src/components/JumpToDateSelector.svelte

@@ -59,6 +59,7 @@
     position: relative;
     flex-shrink: 0;
     margin: 0.25rem 0;
+    height: 1.875rem;
 
     &:not(:first-child)::after {
       position: absolute;

plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte

@@ -48,6 +48,7 @@
   export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
   export let withShowMore: boolean = true
   export let attachmentImageSize: AttachmentImageSize = 'auto'
+  export let showLinksPreview = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -96,7 +97,7 @@
       parentObject = result
     })
 
-  $: links = getLinks(value?.message)
+  $: links = showLinksPreview ? getLinks(value?.message) : []
 
   function getLinks (content?: string): HTMLLinkElement[] {
     if (!content) {

plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte

@@ -76,6 +76,7 @@
     {hoverStyles}
     {withShowMore}
     {attachmentImageSize}
+    showLinksPreview={false}
     {onClick}
     {onReply}
   />

plugins/chunter-resources/src/components/threads/ThreadParentPresenter.svelte

@@ -19,4 +19,11 @@
   export let message: ActivityMessage
 </script>
 
-<ActivityMessagePresenter value={message} hideFooter hoverStyles="filledHover" withShowMore={false} skipLabel />
+<ActivityMessagePresenter
+  value={message}
+  hideFooter
+  hoverStyles="filledHover"
+  withShowMore={false}
+  skipLabel
+  showLinksPreview={false}
+/>

plugins/task-resources/src/components/StatusSelector.svelte

@@ -61,11 +61,15 @@
   $: updateStatuses($taskTypeStore, $statusStore.byId, kind)
 
   let statuses: Status[] = []
+  let searchQuery: string = ''
+  $: filteredStatuses = !searchQuery
+    ? statuses
+    : statuses.filter((status) => (status.name ?? '').toLowerCase().includes(searchQuery.toLowerCase()))
 </script>
 
 <DocPopup
   {_class}
-  objects={statuses}
+  objects={filteredStatuses}
   allowDeselect={true}
   selected={current}
   on:close={(evt) => {
@@ -76,6 +80,7 @@
   {embedded}
   loading={progress}
   on:changeContent
+  on:search={(e) => (searchQuery = e.detail)}
 >
   <svelte:fragment slot="item" let:item>
     <div class="flex-row-center flex-grow overflow-label">