Hide activity links for messages in context (#4964)

Signed-off-by: Kristina Fefelova <[email protected]> Signed-off-by: Alex Velichko <[email protected]> Co-authored-by: Alex Velichko <[email protected]>
hcengineering · Mar 15, 2024 · 730437e · 730437e
1 parent 61263c7
commit 730437e
Show file tree

Hide file tree

Showing 20 changed files with 73 additions and 45 deletions.
diff --git a/models/activity/src/index.ts b/models/activity/src/index.ts
@@ -197,7 +197,6 @@ export class TDocUpdateMessageViewlet extends TDoc implements DocUpdateMessageVi
     action!: DocUpdateAction
 
   label?: IntlString
-  labelComponent?: AnyComponent
 
   valueAttr?: string
 

diff --git a/plugins/activity-assets/lang/en.json b/plugins/activity-assets/lang/en.json
@@ -17,6 +17,7 @@
     "For": "For",
     "From": "from",
     "In": "In",
+    "At": "at",
     "LastReply": "Last reply",
     "New": "New",
     "NewestFirst": "Newest first",

diff --git a/plugins/activity-assets/lang/ru.json b/plugins/activity-assets/lang/ru.json
@@ -17,6 +17,7 @@
     "For": "Для",
     "From": "из",
     "In": "В",
+    "At": "В",
     "LastReply": "Последний ответ",
     "New": "Новые",
     "NewestFirst": "Сначала новые",

diff --git a/plugins/activity-resources/src/components/Activity.svelte b/plugins/activity-resources/src/components/Activity.svelte
@@ -102,6 +102,7 @@
             is={activity.component.ActivityMessagePresenter}
             props={{
               value: message,
+              hideLink: true,
               boundary
             }}
           />

diff --git a/...ns/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte b/...ns/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
@@ -42,6 +42,7 @@
   export let actions: Action[] = []
   export let hoverable = true
   export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
+  export let hideLink = false
   export let onClick: (() => void) | undefined = undefined
 
   $: personAccount = $personAccountByIdStore.get((value.createdBy ?? value.modifiedBy) as Ref<PersonAccount>)
@@ -95,6 +96,7 @@
       object={undefined}
       parentObject={undefined}
       isEdited={false}
+      {hideLink}
       label={value.title}
     />
   </svelte:fragment>

diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessageHeader.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessageHeader.svelte
@@ -28,13 +28,15 @@
   export let object: Doc | undefined
   export let parentObject: Doc | undefined
   export let label: IntlString | undefined = undefined
+  export let hideLink = false
   export let isEdited: boolean = false
 
   let linkData: LinkData | undefined = undefined
 
-  $: void getLinkData(message, object, parentObject, person).then((data) => {
-    linkData = data
-  })
+  $: !hideLink &&
+    getLinkData(message, object, parentObject, person).then((data) => {
+      linkData = data
+    })
 </script>
 
 <span class="text-sm lower">

diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
@@ -38,6 +38,7 @@
   export let attachmentImageSize: 'x-large' | undefined = undefined
   export let showLinksPreview = true
   export let videoPreload = true
+  export let hideLink = false
   export let compact = false
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
@@ -71,6 +72,7 @@
       attachmentImageSize,
       showLinksPreview,
       videoPreload,
+      hideLink,
       compact,
       onClick,
       onReply

diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
@@ -53,6 +53,7 @@
   export let skipLabel = false
   export let hoverable = true
   export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
+  export let showDatePreposition = false
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -170,6 +171,13 @@
           {#if !skipLabel}
             <slot name="header" />
           {/if}
+
+          {#if !skipLabel && showDatePreposition}
+            <span class="text-sm lower">
+              <Label label={activity.string.At} />
+            </span>
+          {/if}
+
           <span
             class="text-sm"
             use:tooltip={{

diff --git a/...ns/activity-resources/src/components/activity-reference/ActivityReferencePresenter.svelte b/...ns/activity-resources/src/components/activity-reference/ActivityReferencePresenter.svelte
@@ -42,6 +42,7 @@
   export let excludedActions: string[] = []
   export let hoverable = true
   export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
+  export let hideLink = false
   export let compact = false
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
@@ -121,7 +122,7 @@
       <span class="text-sm lower ml-1">
         <Label label={activity.string.Mentioned} />
       </span>
-      {#if targetDoc}
+      {#if !hideLink && targetDoc}
         <DocNavLink object={targetDoc} component={targetPanel?.component ?? view.component.EditDoc} shrink={0}>
           <span class="text-sm">
             {#if currentAccount.person === targetDoc._id}

diff --git a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessageHeader.svelte b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessageHeader.svelte
@@ -31,14 +31,16 @@
   export let parentObject: Doc | undefined
   export let attributeModel: AttributeModel | undefined = undefined
   export let collectionName: IntlString | undefined = undefined
+  export let hideLink = false
 
   const isOwn = message.objectId === message.attachedTo
 
   let linkData: LinkData | undefined = undefined
 
-  $: void getLinkData(message, object, parentObject, person).then((data) => {
-    linkData = data
-  })
+  $: !hideLink &&
+    getLinkData(message, object, parentObject, person).then((data) => {
+      linkData = data
+    })
 
   function getTitle (): IntlString {
     const { attributeUpdates } = message

diff --git a/...ins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte b/...ins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
@@ -51,6 +51,7 @@
   export let excludedActions: string[] = []
   export let hoverable = true
   export let hoverStyles: 'borderedHover' | 'filledHover' = 'borderedHover'
+  export let hideLink = false
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -161,24 +162,22 @@
   {withFlatActions}
   {hoverable}
   {hoverStyles}
+  showDatePreposition={hideLink}
   {onClick}
   {onReply}
 >
   <svelte:fragment slot="header">
-    {#if viewlet?.labelComponent && object}
-      <Component is={viewlet.labelComponent} props={{ value: object }} />
-    {:else if object}
-      <DocUpdateMessageHeader
-        message={value}
-        {object}
-        {parentObject}
-        {viewlet}
-        {person}
-        {objectName}
-        {collectionName}
-        {attributeModel}
-      />
-    {/if}
+    <DocUpdateMessageHeader
+      message={value}
+      {object}
+      {parentObject}
+      {viewlet}
+      {person}
+      {objectName}
+      {collectionName}
+      {attributeModel}
+      {hideLink}
+    />
   </svelte:fragment>
   <svelte:fragment slot="content">
     {#if viewlet?.component && object}

diff --git a/plugins/activity/src/index.ts b/plugins/activity/src/index.ts
@@ -237,7 +237,6 @@ export interface DocUpdateMessageViewlet extends ActivityMessageViewlet {
   valueAttr?: string
 
   label?: IntlString
-  labelComponent?: AnyComponent
 
   icon?: Asset
   component?: AnyComponent
@@ -345,6 +344,7 @@ export default plugin(activityId, {
     To: '' as IntlString,
     Unset: '' as IntlString,
     In: '' as IntlString,
+    At: '' as IntlString,
     NewestFirst: '' as IntlString,
     Edit: '' as IntlString,
     Updated: '' as IntlString,

diff --git a/plugins/chunter-resources/src/components/ChannelScrollView.svelte b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
@@ -586,6 +586,7 @@
             withShowMore={false}
             attachmentImageSize="x-large"
             showLinksPreview={false}
+            hideLink
           />
         </div>
       {/each}

diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessageHeader.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessageHeader.svelte
@@ -28,12 +28,14 @@
   export let object: Doc | undefined
   export let parentObject: Doc | undefined
   export let skipLabel = false
+  export let hideLink = false
 
   let linkData: LinkData | undefined = undefined
 
-  $: getLinkData(message, object, parentObject, person).then((data) => {
-    linkData = data
-  })
+  $: !hideLink &&
+    getLinkData(message, object, parentObject, person).then((data) => {
+      linkData = data
+    })
 </script>
 
 {#if !skipLabel}

diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePopup.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePopup.svelte
@@ -14,7 +14,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { createEventDispatcher, onMount } from 'svelte'
+  import { createEventDispatcher } from 'svelte'
   import { Doc, Ref, SortingOrder } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
   import activity from '@hcengineering/activity'
@@ -87,7 +87,7 @@
       {#each messages as message}
         <div class="item">
           <Lazy>
-            <ChatMessagePresenter value={message} />
+            <ChatMessagePresenter value={message} hideLink />
           </Lazy>
         </div>
       {/each}
@@ -125,7 +125,7 @@
     .messages {
       overflow: auto;
       flex: 1;
-      padding: 0 1rem;
+      padding: 0.75rem 0.25rem;
       min-width: 0;
       min-height: 0;
 

diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
@@ -49,6 +49,7 @@
   export let attachmentImageSize: AttachmentImageSize = 'auto'
   export let showLinksPreview = true
   export let videoPreload = true
+  export let hideLink = false
   export let compact = false
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
@@ -183,11 +184,13 @@
     {withFlatActions}
     {hoverable}
     {hoverStyles}
+    {skipLabel}
+    showDatePreposition={hideLink}
     {onClick}
     {onReply}
   >
     <svelte:fragment slot="header">
-      <ChatMessageHeader {object} {parentObject} message={value} {viewlet} {person} {skipLabel} />
+      <ChatMessageHeader {object} {parentObject} message={value} {viewlet} {person} {skipLabel} {hideLink} />
     </svelte:fragment>
     <svelte:fragment slot="content">
       {#if !isEditing}

diff --git a/tests/sanity/tests/model/tracker/common-tracker-page.ts b/tests/sanity/tests/model/tracker/common-tracker-page.ts
@@ -160,7 +160,7 @@ export class CommonTrackerPage extends CalendarPage {
   }
 
   async checkCommentExist (comment: string): Promise<void> {
-    await expect(this.textComment.filter({ hasText: comment })).toBeVisible()
+    await expect(this.textComment.filter({ hasText: comment }).first()).toBeVisible()
   }
 
   async checkActivityExist (activity: string): Promise<void> {

diff --git a/tests/sanity/tests/playwright.config.ts b/tests/sanity/tests/playwright.config.ts
@@ -6,18 +6,22 @@ const config: PlaywrightTestConfig = {
   projects: [
     {
       name: 'Platform',
-      use: { ...devices['Desktop Chrome'] }
+      use: {
+        ...devices['Desktop Chrome'],
+        screenshot: 'only-on-failure',
+        viewport: {
+          width: 1440,
+          height: 900
+        },
+        trace: {
+          mode: 'retain-on-failure',
+          snapshots: true,
+          screenshots: true,
+          sources: true
+        }
+      }
     }
   ],
-  use: {
-    screenshot: 'only-on-failure',
-    trace: {
-      mode: 'retain-on-failure',
-      snapshots: true,
-      screenshots: true,
-      sources: true
-    }
-  },
   retries: 1,
   timeout: 60000,
   maxFailures: 5,

diff --git a/tests/sanity/tests/recruiting/vacancies.spec.ts b/tests/sanity/tests/recruiting/vacancies.spec.ts
@@ -165,7 +165,7 @@ test.describe('Vacancy tests', () => {
     const vacancyDetailsPage = new VacancyDetailsPage(page)
     await vacancyDetailsPage.moreActionOn('Archive')
     await vacancyDetailsPage.pressYesForPopup(page)
-    await vacancyDetailsPage.checkActivityExist('changed archived in')
+    await vacancyDetailsPage.checkActivityExist('changed archived at')
 
     await navigationMenuPage.buttonVacancies.click()
     await vacanciesPage.checkVacancyNotExist(

diff --git a/tests/sanity/tests/tracker/milestone.spec.ts b/tests/sanity/tests/tracker/milestone.spec.ts
@@ -62,9 +62,9 @@ test.describe('Tracker milestone tests', () => {
     await milestonesDetailsPage.addComment(commentText)
     await milestonesDetailsPage.checkCommentExist(commentText)
     await milestonesDetailsPage.checkActivityExist('created milestone')
-    await milestonesDetailsPage.checkActivityExist('changed target date in')
-    await milestonesDetailsPage.checkActivityExist('changed status in')
-    await milestonesDetailsPage.checkActivityExist('changed description in')
+    await milestonesDetailsPage.checkActivityExist('changed target date at')
+    await milestonesDetailsPage.checkActivityExist('changed status at')
+    await milestonesDetailsPage.checkActivityExist('changed description at')
   })
 
   test('Delete a Milestone', async ({ page }) => {