From be49938461c47fc9d7d22ddc3fcaf42d1a15bea6 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Fri, 29 Apr 2022 23:47:22 +0700
Subject: [PATCH] Fix activity merge collapse (#1600)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 .github/workflows/main.yml                    | 51 +++++++++++++++++--
 models/chunter/src/index.ts                   |  2 +-
 models/chunter/src/plugin.ts                  |  1 +
 packages/panel/src/components/Panel.svelte    | 10 ++--
 .../presentation/src/components/Card.svelte   |  7 +--
 .../src/components/Members.svelte             |  2 +-
 .../src/components/UsersPopup.svelte          |  2 +-
 packages/ui/src/components/Button.svelte      |  4 +-
 packages/ui/src/components/Panel.svelte       |  9 +++-
 .../ui/src/components/icons/Details.svelte    |  7 ++-
 packages/ui/src/types.ts                      | 11 +++-
 plugins/activity-resources/src/activity.ts    | 36 ++++++-------
 .../src/components/Activity.svelte            | 18 ++++---
 .../src/components/EditCard.svelte            |  2 +-
 .../src/components/ChannelsPresenter.svelte   |  8 +--
 .../src/components/Workbench.svelte           |  2 +-
 16 files changed, 114 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 72e0ce54f1..fab09a5f96 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -53,7 +53,7 @@ jobs:
         run: node common/scripts/install-run-rush.js bump-model-version
 
       - name: Building...
-        run: node common/scripts/install-run-rush.js rebuild -l --verbose
+        run: node common/scripts/install-run-rush.js rebuild -p 16 -l --verbose
 
       - name: Cache build results
         uses: actions/cache@v3
@@ -112,6 +112,40 @@ jobs:
 
       - name: Checking svelte sources...
         run: node common/scripts/install-run-rush.js svelte-check
+  linting:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Cache build results
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-build-results
+        with:
+          path: |
+            cloud
+            common
+            deploy
+            dev
+            models
+            packages
+            plugins
+            pods
+            products
+            server
+            server-plugins
+            templates
+            tests
+            rush.json
+            .prettierrc
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+
+      - name: Linting...
+        run: node common/scripts/install-run-rush.js lint -p 16
   formatting:
     needs: build
     runs-on: ubuntu-latest
@@ -145,8 +179,15 @@ jobs:
           restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
 
       - name: Formatting...
-        run: node common/scripts/install-run-rush.js format
-        
+        run: node common/scripts/install-run-rush.js format -p 16
+      - name: Check files formatting
+        run: |
+          echo '================================================================'
+          echo 'Checking for diff files'
+          echo '================================================================'
+          git diff '*.ts' '*.svelte' | cat
+          [ -z "$(git diff --name-only '*.ts' '*.svelte' | cat)" ]
+          echo '================================================================'        
   test:
     needs: build
     runs-on: ubuntu-latest
@@ -251,7 +292,7 @@ jobs:
           path: ./tests/sanity/playwright-report/
   docker-build:
     if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
-    needs: [ build, uitest, test, formatting, svelte-check ]
+    needs: [ build, uitest, test, linting, svelte-check ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -287,7 +328,7 @@ jobs:
       - name: Setting model version from git release...
         run: node common/scripts/install-run-rush.js bump-model-version
       - name: Build, to include new model version
-        run: node common/scripts/install-run-rush.js build
+        run: node common/scripts/install-run-rush.js build -p 16
       - name: Bundle
         run: node common/scripts/install-run-rush.js bundle
       - name: Docker build
diff --git a/models/chunter/src/index.ts b/models/chunter/src/index.ts
index cf6ec3ec98..ce784f9eb3 100644
--- a/models/chunter/src/index.ts
+++ b/models/chunter/src/index.ts
@@ -408,7 +408,7 @@ export function createModel (builder: Builder): void {
       editable: false,
       hideOnRemove: true
     },
-    chunter.ids.TxCommentCreate
+    chunter.ids.TxBacklinkCreate
   )
 
   // We need to define this one, to hide default attached object removed case
diff --git a/models/chunter/src/plugin.ts b/models/chunter/src/plugin.ts
index 68dcceda5f..4090188957 100644
--- a/models/chunter/src/plugin.ts
+++ b/models/chunter/src/plugin.ts
@@ -65,6 +65,7 @@ export default mergeIds(chunterId, chunter, {
   },
   ids: {
     TxCommentCreate: '' as Ref<TxViewlet>,
+    TxBacklinkCreate: '' as Ref<TxViewlet>,
     TxCommentRemove: '' as Ref<TxViewlet>,
     TxBacklinkRemove: '' as Ref<TxViewlet>
   },
diff --git a/packages/panel/src/components/Panel.svelte b/packages/panel/src/components/Panel.svelte
index 69aaa6a0a3..fb851133c2 100644
--- a/packages/panel/src/components/Panel.svelte
+++ b/packages/panel/src/components/Panel.svelte
@@ -92,9 +92,9 @@
     {/if}
     {#if $$slots['custom-attributes']}
       {#if isSub}<div class="header-row"><slot name="custom-attributes" direction="row" /></div>{/if}
-    {:else}
-      {#if $$slots.attributes && minimize}<div class="header-row"><slot name="attributes" direction="row" /></div>{/if}
-    {/if}
+    {:else if $$slots.attributes && minimize}<div class="header-row">
+        <slot name="attributes" direction="row" />
+      </div>{/if}
   </svelte:fragment>
 
   <svelte:fragment slot="aside">
@@ -109,9 +109,7 @@
       {/if}
       {#if $$slots['custom-attributes']}
         <slot name="custom-attributes" direction="column" />
-      {:else}
-        {#if $$slots.attributes}<slot name="attributes" direction="column" />{/if}
-      {/if}
+      {:else if $$slots.attributes}<slot name="attributes" direction="column" />{/if}
       {#if $$slots.aside}<slot name="aside" />{/if}
     </div>
   </svelte:fragment>
diff --git a/packages/presentation/src/components/Card.svelte b/packages/presentation/src/components/Card.svelte
index fc1d7a55b5..2bf78fe2da 100644
--- a/packages/presentation/src/components/Card.svelte
+++ b/packages/presentation/src/components/Card.svelte
@@ -45,12 +45,7 @@
         {#if $$slots.space}
           <slot name="space" />
         {:else}
-          <SpaceSelect
-            _class={spaceClass}
-            {spaceQuery}
-            label={spaceLabel}
-            bind:value={space}
-          />
+          <SpaceSelect _class={spaceClass} {spaceQuery} label={spaceLabel} bind:value={space} />
         {/if}
         <span class="antiCard-header__divider">›</span>
       {/if}
diff --git a/packages/presentation/src/components/Members.svelte b/packages/presentation/src/components/Members.svelte
index a1cfc1cadb..1305bc939c 100644
--- a/packages/presentation/src/components/Members.svelte
+++ b/packages/presentation/src/components/Members.svelte
@@ -86,7 +86,7 @@
             <div class="flex-row-center" on:click={() => dispatch('addMembers')}>
               <div class="flex-center ml-1 mr-1"><IconAdd size={'large'} /></div>
               <div class="flex-col ml-2 min-w-0 content-accent-color">
-                  <Label label={presentation.string.Add} />
+                <Label label={presentation.string.Add} />
               </div>
             </div>
           </div>
diff --git a/packages/presentation/src/components/UsersPopup.svelte b/packages/presentation/src/components/UsersPopup.svelte
index bb7069694b..941b777d11 100644
--- a/packages/presentation/src/components/UsersPopup.svelte
+++ b/packages/presentation/src/components/UsersPopup.svelte
@@ -117,7 +117,7 @@
     color: var(--caption-color);
     background-color: var(--body-color);
     border: 1px solid var(--button-border-color);
-    border-radius: .25rem;
+    border-radius: 0.25rem;
     box-shadow: none;
   }
 </style>
diff --git a/packages/ui/src/components/Button.svelte b/packages/ui/src/components/Button.svelte
index 3d23a28d95..03c0563158 100644
--- a/packages/ui/src/components/Button.svelte
+++ b/packages/ui/src/components/Button.svelte
@@ -218,7 +218,9 @@
       }
     }
     &.transparent:hover,
-    &.transparent.selected { background-color: var(--button-bg-hover); }
+    &.transparent.selected {
+      background-color: var(--button-bg-hover);
+    }
     &.link {
       padding: 0 0.875rem;
       &:hover {
diff --git a/packages/ui/src/components/Panel.svelte b/packages/ui/src/components/Panel.svelte
index 9d53fcbc76..424053217b 100644
--- a/packages/ui/src/components/Panel.svelte
+++ b/packages/ui/src/components/Panel.svelte
@@ -37,7 +37,14 @@
 <svelte:window bind:innerWidth={docWidth} />
 <div class="popupPanel" bind:clientWidth={panelWidth}>
   <div class="popupPanel-title">
-    <Button icon={IconClose} kind={'transparent'} size={'medium'} on:click={() => { dispatch('close') }} />
+    <Button
+      icon={IconClose}
+      kind={'transparent'}
+      size={'medium'}
+      on:click={() => {
+        dispatch('close')
+      }}
+    />
     <div class="popupPanel-title__content"><slot name="title" /></div>
     <div class="buttons-group xsmall-gap">
       <slot name="utils" />
diff --git a/packages/ui/src/components/icons/Details.svelte b/packages/ui/src/components/icons/Details.svelte
index 4245149f39..4e52bbb0d5 100644
--- a/packages/ui/src/components/icons/Details.svelte
+++ b/packages/ui/src/components/icons/Details.svelte
@@ -13,13 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 -->
-
 <script lang="ts">
   export let size: 'x-small' | 'small' | 'medium' | 'large'
   const fill: string = 'currentColor'
 </script>
 
 <svg class="svg-{size}" {fill} viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M 4.25 2 C 2.45508 2 1 3.45508 1 5.25 V 10.7499 C 1 12.5449 2.45508 13.9999 4.25 13.9999 H 11.75 C 13.5449 13.9999 15 12.5449 15 10.7499 V 5.25 C 15 3.45508 13.5449 2 11.75 2 H 4.25 Z M 2.5 10.4999 C 2.5 11.6045 3.39543 12.4999 4.5 12.4999 H 11.75 C 12.7165 12.4999 13.5 11.7164 13.5 10.7499 V 5.25 C 13.5 4.28351 12.7165 3.5 11.75 3.5 H 4.5 C 3.39543 3.5 2.5 4.39543 2.5 5.5 V 10.4999 Z" />
+  <path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M 4.25 2 C 2.45508 2 1 3.45508 1 5.25 V 10.7499 C 1 12.5449 2.45508 13.9999 4.25 13.9999 H 11.75 C 13.5449 13.9999 15 12.5449 15 10.7499 V 5.25 C 15 3.45508 13.5449 2 11.75 2 H 4.25 Z M 2.5 10.4999 C 2.5 11.6045 3.39543 12.4999 4.5 12.4999 H 11.75 C 12.7165 12.4999 13.5 11.7164 13.5 10.7499 V 5.25 C 13.5 4.28351 12.7165 3.5 11.75 3.5 H 4.5 C 3.39543 3.5 2.5 4.39543 2.5 5.5 V 10.4999 Z"
+  />
   <rect x="9" y="3" width="1.5" height="10" />
 </svg>
diff --git a/packages/ui/src/types.ts b/packages/ui/src/types.ts
index a6f1a0f222..843e32dacd 100644
--- a/packages/ui/src/types.ts
+++ b/packages/ui/src/types.ts
@@ -72,7 +72,16 @@ export interface PopupPositionElement {
     h: HorizontalAlignment
   }
 }
-export type PopupAlignment = PopupPositionElement | null | 'right' | 'top' | 'float' | 'account' | 'full' | 'content' | 'middle'
+export type PopupAlignment =
+  | PopupPositionElement
+  | null
+  | 'right'
+  | 'top'
+  | 'float'
+  | 'account'
+  | 'full'
+  | 'content'
+  | 'middle'
 export type TooltipAlignment = 'top' | 'bottom' | 'left' | 'right'
 export type VerticalAlignment = 'top' | 'bottom'
 export type HorizontalAlignment = 'left' | 'right'
diff --git a/plugins/activity-resources/src/activity.ts b/plugins/activity-resources/src/activity.ts
index 7df05eb92d..f201b0fb1f 100644
--- a/plugins/activity-resources/src/activity.ts
+++ b/plugins/activity-resources/src/activity.ts
@@ -99,6 +99,7 @@ class ActivityImpl implements Activity {
   private readonly txQuery1: LiveQuery
   private readonly txQuery2: LiveQuery
   private readonly hiddenAttributes: Set<string>
+  private editable: Map<Ref<Class<Doc>>, boolean> | undefined
 
   private txes1: Array<TxCUD<Doc>> = []
   private txes2: Array<TxCUD<Doc>> = []
@@ -110,21 +111,18 @@ class ActivityImpl implements Activity {
     this.txQuery2 = createQuery()
   }
 
-  private notify (
-    object: Doc,
-    listener: DisplayTxListener,
-    sort: SortingOrder,
-    editable: Map<Ref<Class<Doc>>, boolean>
-  ): void {
-    this.combineTransactions(object, this.txes1, this.txes2, editable).then(
-      (result) => {
-        const sorted = result.sort((a, b) => (a.tx.modifiedOn - b.tx.modifiedOn) * sort)
-        listener(sorted)
-      },
-      (err) => {
-        console.error(err)
-      }
-    )
+  private notify (object: Doc, listener: DisplayTxListener, sort: SortingOrder): void {
+    if (this.editable != null) {
+      this.combineTransactions(object, this.txes1, this.txes2, this.editable).then(
+        (result) => {
+          const sorted = result.sort((a, b) => (a.tx.modifiedOn - b.tx.modifiedOn) * sort)
+          listener(sorted)
+        },
+        (err) => {
+          console.error(err)
+        }
+      )
+    }
   }
 
   update (object: Doc, listener: DisplayTxListener, sort: SortingOrder, editable: Map<Ref<Class<Doc>>, boolean>): void {
@@ -132,6 +130,8 @@ class ActivityImpl implements Activity {
 
     isAttached = this.client.getHierarchy().isDerived(object._class, core.class.AttachedDoc)
 
+    this.editable = editable
+
     this.txQuery1.query<TxCollectionCUD<Doc, AttachedDoc>>(
       isAttached ? core.class.TxCollectionCUD : core.class.TxCUD,
       isAttached
@@ -144,7 +144,7 @@ class ActivityImpl implements Activity {
           },
       (result) => {
         this.txes1 = result
-        this.notify(object, listener, sort, editable)
+        this.notify(object, listener, sort)
       },
       { sort: { modifiedOn: SortingOrder.Descending } }
     )
@@ -157,10 +157,12 @@ class ActivityImpl implements Activity {
       },
       (result) => {
         this.txes2 = result
-        this.notify(object, listener, sort, editable)
+        this.notify(object, listener, sort)
       },
       { sort: { modifiedOn: SortingOrder.Descending } }
     )
+    // In case editable is changed
+    this.notify(object, listener, sort)
   }
 
   async combineTransactions (
diff --git a/plugins/activity-resources/src/components/Activity.svelte b/plugins/activity-resources/src/components/Activity.svelte
index b28a5a42f3..0aff89389d 100644
--- a/plugins/activity-resources/src/components/Activity.svelte
+++ b/plugins/activity-resources/src/components/Activity.svelte
@@ -16,7 +16,7 @@
 <script lang="ts">
   import activity, { TxViewlet } from '@anticrm/activity'
   import chunter from '@anticrm/chunter'
-  import { Class, Doc, Ref, SortingOrder } from '@anticrm/core'
+  import core, { Doc, SortingOrder } from '@anticrm/core'
   import { createQuery, getClient } from '@anticrm/presentation'
   import { Component, Grid, IconActivity, Label, Scroller } from '@anticrm/ui'
   import { ActivityKey, activityKey, DisplayTx, newActivity } from '../activity'
@@ -35,22 +35,27 @@
   const activityQuery = newActivity(client, attrs)
 
   let viewlets: Map<ActivityKey, TxViewlet>
-  let editable: Map<Ref<Class<Doc>>, boolean> = new Map()
+
+  let allViewlets: TxViewlet[] = []
 
   const descriptors = createQuery()
   $: descriptors.query(activity.class.TxViewlet, {}, (result) => {
-    viewlets = new Map(result.map((r) => [activityKey(r.objectClass, r.txClass), r]))
-
-    editable = new Map(result.map((it) => [it.objectClass, it.editable ?? false]))
+    allViewlets = result
   })
 
+  $: viewlets = new Map(allViewlets.map((r) => [activityKey(r.objectClass, r.txClass), r]))
+
   $: activityQuery.update(
     object,
     (result) => {
       txes = result
     },
     SortingOrder.Descending,
-    editable
+    new Map(
+      allViewlets
+        .filter((tx) => tx.txClass === core.class.TxCreateDoc)
+        .map((it) => [it.objectClass, it.editable ?? false])
+    )
   )
 </script>
 
@@ -119,7 +124,6 @@
   .ref-input {
     flex-shrink: 0;
     padding: 1.5rem 0;
-
   }
   .p-activity {
     padding: 1.5rem 0;
diff --git a/plugins/board-resources/src/components/EditCard.svelte b/plugins/board-resources/src/components/EditCard.svelte
index 6ffbce6f67..3fc49d583c 100644
--- a/plugins/board-resources/src/components/EditCard.svelte
+++ b/plugins/board-resources/src/components/EditCard.svelte
@@ -86,7 +86,7 @@
     on:close={() => dispatch('close')}
   >
     <svelte:fragment slot="navigator">
-      <UpDownNavigator element={object}/>
+      <UpDownNavigator element={object} />
     </svelte:fragment>
 
     <!-- TODO cover -->
diff --git a/plugins/contact-resources/src/components/ChannelsPresenter.svelte b/plugins/contact-resources/src/components/ChannelsPresenter.svelte
index 8b6c890e94..2c6d48f954 100644
--- a/plugins/contact-resources/src/components/ChannelsPresenter.svelte
+++ b/plugins/contact-resources/src/components/ChannelsPresenter.svelte
@@ -31,13 +31,7 @@
     if (ev.detail.presenter !== undefined && Array.isArray(value)) {
       const channel = value[0]
       if (channel !== undefined) {
-        showPanel(
-          ev.detail.presenter,
-          channel.attachedTo,
-          channel.attachedToClass,
-          'float',
-          ev.detail.presenter
-        )
+        showPanel(ev.detail.presenter, channel.attachedTo, channel.attachedToClass, 'float', ev.detail.presenter)
       }
     }
   }
diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte
index 58d051c31b..cb58a1322d 100644
--- a/plugins/workbench-resources/src/components/Workbench.svelte
+++ b/plugins/workbench-resources/src/components/Workbench.svelte
@@ -298,7 +298,7 @@
     }
   }
 
-  let navFloat: boolean = window.innerWidth < 1024 ? false : true
+  let navFloat: boolean = !(window.innerWidth < 1024)
   const windowResize = (): void => {
     if (window.innerWidth < 1024 && !navFloat) {
       visibileNav = false