From 032f63210579d746d317022a7447b7b574db33a9 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Thu, 16 Mar 2023 09:44:21 +0600
Subject: [PATCH] Short link fixes (#2744)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 plugins/chunter-resources/src/utils.ts        |  2 +-
 .../src/components/OrganizationCard.svelte    | 62 ++++++++++++-------
 plugins/contact-resources/src/utils.ts        |  2 +-
 plugins/recruit-resources/src/utils.ts        |  2 +-
 .../projects/ProjectPresenter.svelte          |  1 +
 plugins/tracker-resources/src/issues.ts       |  2 +-
 .../src/components/Workbench.svelte           | 12 +++-
 7 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/plugins/chunter-resources/src/utils.ts b/plugins/chunter-resources/src/utils.ts
index 4b8ae2f18c..b385d33c4d 100644
--- a/plugins/chunter-resources/src/utils.ts
+++ b/plugins/chunter-resources/src/utils.ts
@@ -212,7 +212,7 @@ async function generateLocation (loc: Location, shortLink: string): Promise<Loca
     const panelComponent = hierarchy.as(targetClass, view.mixin.ObjectPanel)
     const component = panelComponent.component ?? view.component.EditDoc
     return {
-      path: [appComponent, workspace, chunterId],
+      path: [appComponent, workspace],
       fragment: getPanelURI(component, comment.attachedTo, comment.attachedToClass, 'content')
     }
   }
diff --git a/plugins/contact-resources/src/components/OrganizationCard.svelte b/plugins/contact-resources/src/components/OrganizationCard.svelte
index ca84afe1a3..e4e10bde5d 100644
--- a/plugins/contact-resources/src/components/OrganizationCard.svelte
+++ b/plugins/contact-resources/src/components/OrganizationCard.svelte
@@ -13,13 +13,28 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Organization } from '@hcengineering/contact'
-  import { Avatar } from '@hcengineering/presentation'
-  import { closePanel, closePopup, closeTooltip, getCurrentLocation, Label, navigate } from '@hcengineering/ui'
+  import attachment from '@hcengineering/attachment'
+  import { Channel, Organization } from '@hcengineering/contact'
+  import { Avatar, createQuery } from '@hcengineering/presentation'
+  import { Component, Label } from '@hcengineering/ui'
+  import { DocNavLink } from '@hcengineering/view-resources'
   import contact from '../plugin'
+  import ChannelsEditor from './ChannelsEditor.svelte'
 
   export let organization: Organization
   export let disabled: boolean = false
+
+  let channels: Channel[] = []
+  const channelsQuery = createQuery()
+  channelsQuery.query(
+    contact.class.Channel,
+    {
+      attachedTo: organization._id
+    },
+    (res) => {
+      channels = res
+    }
+  )
 </script>
 
 <div class="flex-col h-full card-container">
@@ -29,26 +44,29 @@
   </div>
   {#if organization}
     <!-- svelte-ignore a11y-click-events-have-key-events -->
-    <div
-      class="name lines-limit-2"
-      class:over-underline={!disabled}
-      on:click={() => {
-        if (!disabled) {
-          closeTooltip()
-          closePopup()
-          closePanel()
-          const loc = getCurrentLocation()
-          loc.path[3] = organization._id
-          loc.path.length = 4
-          navigate(loc)
-        }
-      }}
-    >
-      {organization.name}
+    <DocNavLink object={organization} disableClick={disabled}>
+      <div class="name lines-limit-2">
+        {organization.name}
+      </div>
+    </DocNavLink>
+    <div class="footer flex flex-reverse flex-grow">
+      <div class="flex-center flex-wrap">
+        <Component
+          is={attachment.component.AttachmentsPresenter}
+          props={{ value: organization.attachments, object: organization, size: 'medium', showCounter: true }}
+        />
+      </div>
+      {#if channels[0]}
+        <div class="flex flex-grow">
+          <ChannelsEditor
+            attachedTo={channels[0].attachedTo}
+            attachedClass={channels[0].attachedToClass}
+            length={'short'}
+            editable={false}
+          />
+        </div>
+      {/if}
     </div>
-    {#if organization}
-      <span class="label">{organization.name}</span>
-    {/if}
   {/if}
 </div>
 
diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts
index 41044b08f4..448c8d59d0 100644
--- a/plugins/contact-resources/src/utils.ts
+++ b/plugins/contact-resources/src/utils.ts
@@ -220,7 +220,7 @@ async function generateLocation (loc: Location, shortLink: string): Promise<Loca
   const appComponent = loc.path[0] ?? ''
   const workspace = loc.path[1] ?? ''
   return {
-    path: [appComponent, workspace, contactId],
+    path: [appComponent, workspace],
     fragment: getPanelURI(view.component.EditDoc, doc._id, doc._class, 'content')
   }
 }
diff --git a/plugins/recruit-resources/src/utils.ts b/plugins/recruit-resources/src/utils.ts
index 2a77e15f6b..6cf8f01f16 100644
--- a/plugins/recruit-resources/src/utils.ts
+++ b/plugins/recruit-resources/src/utils.ts
@@ -69,7 +69,7 @@ async function generateLocation (loc: Location, shortLink: string): Promise<Loca
   const panelComponent = hierarchy.as(targetClass, view.mixin.ObjectPanel)
   const component = panelComponent.component ?? view.component.EditDoc
   return {
-    path: [appComponent, workspace, recruitId],
+    path: [appComponent, workspace],
     fragment: getPanelURI(component, doc._id, doc._class, 'content')
   }
 }
diff --git a/plugins/tracker-resources/src/components/projects/ProjectPresenter.svelte b/plugins/tracker-resources/src/components/projects/ProjectPresenter.svelte
index 58eea58291..f41a5b4b5d 100644
--- a/plugins/tracker-resources/src/components/projects/ProjectPresenter.svelte
+++ b/plugins/tracker-resources/src/components/projects/ProjectPresenter.svelte
@@ -35,6 +35,7 @@
     loc.path[4] = 'projects'
     loc.path[5] = value._id
     loc.path.length = 6
+    loc.fragment = undefined
     navigate(loc)
   }
 </script>
diff --git a/plugins/tracker-resources/src/issues.ts b/plugins/tracker-resources/src/issues.ts
index ce3edfe935..53e5247a3a 100644
--- a/plugins/tracker-resources/src/issues.ts
+++ b/plugins/tracker-resources/src/issues.ts
@@ -78,7 +78,7 @@ export async function generateIssueLocation (loc: Location, issueId: string): Pr
   const appComponent = loc.path[0] ?? ''
   const workspace = loc.path[1] ?? ''
   return {
-    path: [appComponent, workspace, trackerId, team._id, 'issues'],
+    path: [appComponent, workspace],
     fragment: generateIssuePanelUri(issue)
   }
 }
diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte
index feb53c7aef..c0e118c4c3 100644
--- a/plugins/workbench-resources/src/components/Workbench.svelte
+++ b/plugins/workbench-resources/src/components/Workbench.svelte
@@ -220,11 +220,17 @@
     // resolve short links
     const resolvedLocation = await resolveShortLink(loc)
     if (resolvedLocation && !areLocationsEqual(loc, resolvedLocation)) {
-      loc.path[2] = app = resolvedLocation.path[2] ?? app
-      loc.path[3] = space = (resolvedLocation.path[3] as Ref<Space>) ?? space
+      if (app !== resolvedLocation.path[2] && resolvedLocation.path[2] !== undefined) {
+        loc.path[2] = app = resolvedLocation.path[2] ?? app
+        loc.path[3] = space = (resolvedLocation.path[3] as Ref<Space>) ?? space
+        loc.path[4] = special = resolvedLocation.path[4] ?? special
+      } else if (space !== (resolvedLocation.path[3] as Ref<Space>) && resolvedLocation.path[3] !== undefined) {
+        loc.path[3] = space = (resolvedLocation.path[3] as Ref<Space>) ?? space
+        loc.path[4] = special = resolvedLocation.path[4] ?? special
+      }
       loc.path[4] = special = resolvedLocation.path[4] ?? special
       loc.fragment = fragment = resolvedLocation.fragment ?? fragment
-      navigate(resolvedLocation, false)
+      navigate(loc, false)
     }
 
     if (currentAppAlias !== app) {