Add join overlay for public channels (#5630)

Signed-off-by: Kristina Fefelova <[email protected]>
hcengineering · May 21, 2024 · f956b8d · f956b8d
1 parent 66a8fbe
commit f956b8d
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 9 deletions.
diff --git a/plugins/chunter-assets/lang/en.json b/plugins/chunter-assets/lang/en.json
@@ -106,6 +106,8 @@
     "StarChannel": "Star channel",
     "StarConversation": "Star conversation",
     "UnstarChannel": "Unstar channel",
-    "UnstarConversation": "Unstar conversation"
+    "UnstarConversation": "Unstar conversation",
+    "JoinChannelHeader": "Click \"Join\" to get started.",
+    "JoinChannelText": "Once you've joined, you'll be able to read all messages and contribute to the discussion."
   }
 }
diff --git a/plugins/chunter-assets/lang/ru.json b/plugins/chunter-assets/lang/ru.json
@@ -106,6 +106,8 @@
     "StarChannel": "Добавить в избранное",
     "StarConversation": "Добавить в избранное",
     "UnstarChannel": "Удалить из избранного",
-    "UnstarConversation": "Удалить из избранного"
+    "UnstarConversation": "Удалить из избранного",
+    "JoinChannelHeader": "Нажмите \"Присоединиться\", чтобы начать.",
+    "JoinChannelText": "Присоединившись, вы сможете читать все сообщения и участвовать в обсуждении."
   }
 }
diff --git a/plugins/chunter-resources/src/components/ChannelView.svelte b/plugins/chunter-resources/src/components/ChannelView.svelte
@@ -13,12 +13,20 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Doc, Ref } from '@hcengineering/core'
-  import { defineSeparators, location as locationStore, panelSeparators, Separator } from '@hcengineering/ui'
+  import core, { Doc, getCurrentAccount, Ref, Space } from '@hcengineering/core'
+  import {
+    defineSeparators,
+    Label,
+    location as locationStore,
+    ModernButton,
+    panelSeparators,
+    Separator
+  } from '@hcengineering/ui'
   import { DocNotifyContext } from '@hcengineering/notification'
   import { ActivityMessagesFilter } from '@hcengineering/activity'
   import { getClient } from '@hcengineering/presentation'
   import { Channel } from '@hcengineering/chunter'
+  import view from '@hcengineering/view'
 
   import ChannelComponent from './Channel.svelte'
   import ChannelHeader from './ChannelHeader.svelte'
@@ -33,6 +41,7 @@
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
+  const me = getCurrentAccount()._id
 
   let isThreadOpened = false
   let isAsideShown = false
@@ -43,11 +52,27 @@
     isThreadOpened = newLocation.path[4] != null
   })
 
+  $: showJoinOverlay = shouldShowJoinOverlay(object)
   $: isDocChat = !hierarchy.isDerived(object._class, chunter.class.ChunterSpace)
-  $: withAside = !embedded && !isThreadOpened && !hierarchy.isDerived(object._class, chunter.class.DirectMessage)
+  $: withAside =
+    !embedded && !isThreadOpened && !hierarchy.isDerived(object._class, chunter.class.DirectMessage) && !showJoinOverlay
 
-  function toChannel (object?: Doc): Channel | undefined {
-    return object as Channel | undefined
+  function toChannel (object: Doc): Channel {
+    return object as Channel
+  }
+
+  function shouldShowJoinOverlay (object: Doc): boolean {
+    if (hierarchy.isDerived(object._class, core.class.Space)) {
+      const space = object as Space
+
+      return !space.members.includes(me)
+    }
+
+    return false
+  }
+
+  async function join (): Promise<void> {
+    await client.update(object as Space, { $push: { members: me } })
   }
 
   defineSeparators('aside', panelSeparators)
@@ -72,7 +97,27 @@
   <div class="popupPanel-body" class:asideShown={withAside && isAsideShown}>
     <div class="popupPanel-body__main">
       {#key object._id}
-        <ChannelComponent {context} {object} {filters} isAsideOpened={(withAside && isAsideShown) || isThreadOpened} />
+        {#if shouldShowJoinOverlay(object)}
+          <div class="body h-full w-full clear-mins flex-center">
+            <div class="joinOverlay">
+              <div class="an-element__label header">
+                <Label label={chunter.string.JoinChannelHeader} />
+              </div>
+              <span class="an-element__label">
+                <Label label={chunter.string.JoinChannelText} />
+              </span>
+              <span class="mt-4"> </span>
+              <ModernButton label={view.string.Join} kind="primary" on:click={join} />
+            </div>
+          </div>
+        {:else}
+          <ChannelComponent
+            {context}
+            {object}
+            {filters}
+            isAsideOpened={(withAside && isAsideShown) || isThreadOpened}
+          />
+        {/if}
       {/key}
     </div>
 
@@ -91,3 +136,21 @@
     {/if}
   </div>
 </div>
+
+<style lang="scss">
+  .joinOverlay {
+    display: flex;
+    align-self: center;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    height: inherit;
+    width: 35rem;
+  }
+
+  .header {
+    font-weight: 600;
+    margin: 1rem;
+  }
+</style>
diff --git a/plugins/chunter-resources/src/plugin.ts b/plugins/chunter-resources/src/plugin.ts
@@ -107,6 +107,8 @@ export default mergeIds(chunterId, chunter, {
     LoadingHistory: '' as IntlString,
     UnpinChannels: '' as IntlString,
     ArchiveActivityConfirmationTitle: '' as IntlString,
-    ArchiveActivityConfirmationMessage: '' as IntlString
+    ArchiveActivityConfirmationMessage: '' as IntlString,
+    JoinChannelHeader: '' as IntlString,
+    JoinChannelText: '' as IntlString
   }
 })