filter hidden blocks and properties if you do not have edit access to…

… a proposal source board (#4876) * update to subtree logic * remove gray coloring
charmverse · Oct 23, 2024 · 46267ef · 46267ef
1 parent 13473f4
commit 46267ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/components/common/Icons/VisibilityIcon.tsx b/components/common/Icons/VisibilityIcon.tsx
@@ -22,9 +22,9 @@ export function VisibilityIcon({
   }
 
   const icon = visible ? (
-    <MuiVisibilityIcon color='gray' fontSize={size} onClick={handleClick} />
+    <MuiVisibilityIcon fontSize={size} onClick={handleClick} />
   ) : (
-    <VisibilityOffIcon color='gray' fontSize={size} onClick={handleClick} />
+    <VisibilityOffIcon fontSize={size} onClick={handleClick} />
   );
 
   const tooltip = visible ? visibleTooltip : hiddenTooltip;

diff --git a/lib/databases/getSubtree.ts b/lib/databases/getSubtree.ts
@@ -11,7 +11,7 @@ import { permissionsApiClient } from 'lib/permissions/api/client';
 import { DataNotFoundError } from 'lib/utils/errors';
 import { isTruthy } from 'lib/utils/types';
 
-export async function getSubtree({ pageId, userId }: { pageId: string; userId: string }) {
+export async function getSubtree({ pageId, userId }: { pageId: string; userId?: string }) {
   const page = await prisma.page.findFirstOrThrow({
     where: {
       id: pageId
@@ -44,13 +44,12 @@ export async function getSubtree({ pageId, userId }: { pageId: string; userId: s
   if (block?.type === 'board') {
     (block as any as Board).isLocked = !!page.isLocked;
   }
-
   // Hydrate and filter blocks based on proposal permissions
   if (block && (block.fields as BoardFields).sourceType === 'proposals') {
     let result = await getBlocksAndRefresh(block, blocks);
 
     // Only edit
-    if (page.isLocked && block?.type === 'board' && !computed.edit_lock && block) {
+    if (((page.isLocked && !computed.edit_lock) || !computed.edit_content) && block?.type === 'board' && block) {
       const views = result.filter((b) => b.type === 'view');
       const cards = result.filter((b) => b.type === 'card');
       const filteredCards = filterLockedDatabaseCards({
@@ -120,7 +119,6 @@ export async function getSubtree({ pageId, userId }: { pageId: string; userId: s
     let filtered = blocks.filter(
       (b) => !proposalBlocksMap[b.id] && (typeof b.pageId === 'undefined' || !!permissionsById[b.pageId]?.read)
     );
-
     const cardsWithProposalProps = [...filtered, ...refreshedBlocks];
 
     // Only edit