Fix request section visibility and hide card activity for guests

models/process/src/index.ts

@@ -734,7 +734,6 @@ export function createModel (builder: Builder): void {
     {
       label: process.string.ApproveRequest,
       component: process.component.RequestsCardSection,
-      checkVisibility: process.function.CheckRequestsSectionVisibility,
       order: 360,
       navigation: []
     },

plugins/card-resources/src/components/EditCardNewContent.svelte

@@ -17,7 +17,7 @@
   import { Card } from '@hcengineering/card'
   import communication from '@hcengineering/communication'
   import { NotificationContext } from '@hcengineering/communication-types'
-  import { Ref } from '@hcengineering/core'
+  import { AccountRole, getCurrentAccount, hasAccountRole, Ref } from '@hcengineering/core'
   import { resizeObserver } from '@hcengineering/ui'
 
   import { MessageInput } from '@hcengineering/communication-resources'
@@ -57,7 +57,7 @@
     <EditCardTableOfContents bind:this={content} bind:scrollDiv {doc} {readonly} {context} {isContextLoaded} />
   {/key}
 {/if}
-{#if !readonly && getMetadata(communication.metadata.Enabled) === true}
+{#if !readonly && getMetadata(communication.metadata.Enabled) === true && hasAccountRole(getCurrentAccount(), AccountRole.User)}
   <div class="message-input" use:resizeObserver={onInputResize}>
     <MessageInput
       card={doc}

plugins/card-resources/src/utils.ts

@@ -659,10 +659,18 @@ export function cardCustomLinkEncode (doc: Card): Location {
 }
 
 export async function checkOldMessagesSectionVisibility (doc: Card): Promise<boolean> {
+  if (!hasAccountRole(getCurrentAccount(), AccountRole.User)) {
+    return false
+  }
+
   return getMetadata(communication.metadata.Enabled) !== true
 }
 
 export async function checkCommunicationMessagesSectionVisibility (doc: Card): Promise<boolean> {
+  if (!hasAccountRole(getCurrentAccount(), AccountRole.User)) {
+    return false
+  }
+
   return getMetadata(communication.metadata.Enabled) === true
 }
 

plugins/process-resources/src/components/RequestsCardSection.svelte

@@ -14,14 +14,30 @@
 -->
 <script lang="ts">
   import { Card } from '@hcengineering/card'
+  import { createQuery } from '@hcengineering/presentation'
+  import process from '../plugin'
 
   import RequestsExtension from './RequestsExtension.svelte'
 
   export let doc: Card
   export let hidden: boolean = false
+
+  const query = createQuery()
+  let hasRequests = false
+
+  $: {
+    if (doc) {
+      query.query(process.class.ApproveRequest, { card: doc._id }, (res) => {
+        hasRequests = res.length > 0
+      })
+    } else {
+      query.unsubscribe()
+      hasRequests = false
+    }
+  }
 </script>
 
-{#if !hidden}
+{#if !hidden && hasRequests}
   <div class="requests__section">
     <RequestsExtension card={doc} on:loaded />
   </div>

plugins/process-resources/src/index.ts

@@ -101,7 +101,6 @@ import {
   approveRequestApproved,
   approveRequestRejected,
   checkProcessSectionVisibility,
-  checkRequestsSectionVisibility,
   continueExecution,
   eventCheck,
   fieldChangesCheck,
@@ -224,7 +223,6 @@ export default async (): Promise<Resources> => ({
     ImportProcess: importProcess,
     ShowDoneQuery: showDoneQuery,
     CheckProcessSectionVisibility: checkProcessSectionVisibility,
-    CheckRequestsSectionVisibility: checkRequestsSectionVisibility,
     // eslint-disable-next-line @typescript-eslint/unbound-method
     CreateMiddleware: ProcessMiddleware.create
   }

plugins/process-resources/src/utils.ts

@@ -877,9 +877,3 @@ export async function checkProcessSectionVisibility (doc: Card): Promise<boolean
   const processes = client.getModel().findAllSync(process.class.Process, { masterTag: { $in: anc } })
   return processes.length > 0
 }
-
-export async function checkRequestsSectionVisibility (doc: Card): Promise<boolean> {
-  const client = getClient()
-  const requests = await client.findOne(process.class.ApproveRequest, { card: doc._id })
-  return requests !== undefined
-}

plugins/process/src/index.ts

@@ -375,7 +375,6 @@ export default plugin(processId, {
     EmptyArray: '' as Ref<ProcessFunction>,
     CurrentDate: '' as Ref<ProcessFunction>,
     ExportProcess: '' as Resource<ExportFunc>,
-    CheckProcessSectionVisibility: '' as Resource<(doc: Card) => Promise<boolean>>,
-    CheckRequestsSectionVisibility: '' as Resource<(doc: Card) => Promise<boolean>>
+    CheckProcessSectionVisibility: '' as Resource<(doc: Card) => Promise<boolean>>
   }
 })