hide deleted properties in proposal milestones

components/[pageId]/DocumentPage/DocumentPage.tsx

@@ -198,7 +198,7 @@
         }
       }
     },
     [router.query, showCard]
   );
 
   function onConnectionEvent(event: ConnectionEvent) {
@@ -220,7 +220,7 @@
         dispatch(blockLoad({ blockId: page.parentId as string }));
       }
     }
   }, [page.id]);
 
   // reset error and sidebar state whenever page id changes
   useEffect(() => {
@@ -246,7 +246,7 @@
         printRef
       });
     }
   }, [printRef, _printRef]);
 
   const containerWidthRef = useRef<HTMLDivElement>(null);
   const { width: containerWidth = 0 } = useResizeObserver({ ref: containerWidthRef });
@@ -465,6 +465,7 @@
                       <FormFieldAnswers
                         milestoneProps={{
                           containerWidth,
+                          proposalCreatedAt: new Date(page.createdAt),
                           pendingRewards: proposal.fields?.pendingRewards || [],
                           requiredTemplateId: proposal.fields?.rewardsTemplateId,
                           reviewers: proposal.evaluations.map((e) => e.reviewers.filter((r) => !r.systemRole)).flat(),

components/proposals/ProposalPage/components/ProposalProperties/components/ProposalRewards/ProposalRewardsTable.tsx

@@ -42,6 +42,7 @@
   requiredTemplateId?: string | null;
   variant?: 'solid_button' | 'card_property'; // solid_button is used for form proposals
   isProposalTemplate?: boolean;
+  proposalCreatedAt: Date;
 };
 
 export function ProposalRewardsTable({
@@ -55,13 +56,13 @@
   assignedSubmitters,
   requiredTemplateId,
   variant,
-  isProposalTemplate
+  isProposalTemplate,
+  proposalCreatedAt
 }: ProposalRewardsTableProps) {
   const { space } = useCurrentSpace();
   const { boardBlock, isLoading } = useRewardsBoard();
   const { rewards: allRewards, isLoading: isLoadingRewards } = useRewards();
   const { pages, loadingPages } = usePages();
-  const { navigateToSpacePath } = useCharmRouter();
   const { getFeatureTitle } = useSpaceFeatures();
   const {
     createNewReward,
@@ -88,6 +89,14 @@
   });
   const { showPage } = usePageDialog();
 
+  // the date of the proposal is important for the board view to hide properties that were deleted before the proposal was created
+  const boardWithProposalCreatedAt = useMemo(() => {
+    return {
+      ...boardBlock!,
+      createdAt: proposalCreatedAt.getTime()
+    };
+  }, [boardBlock, proposalCreatedAt]);
+
   const tableView = useMemo(() => {
     const rewardTypesUsed = (pendingRewards || []).reduce<Set<RewardType>>((acc, page) => {
       if (page.reward.rewardType) {
@@ -96,12 +105,12 @@
       return acc;
     }, new Set());
     return getProposalRewardsView({
-      board: boardBlock,
+      board: boardWithProposalCreatedAt,
       spaceId: space?.id,
       rewardTypes: [...rewardTypesUsed],
       includeStatus: rewardIds.length > 0
     });
-  }, [space?.id, boardBlock, pendingRewards, rewardIds.length]);
+  }, [space?.id, pendingRewards, boardWithProposalCreatedAt, rewardIds.length]);
 
   const publishedRewards = useMemo(
     () => rewardIds.map((rId) => allRewards?.find((r) => r.id === rId)).filter(isTruthy),
@@ -112,7 +121,7 @@
       publishedRewards.length > 0
         ? getCardsFromPublishedRewards(publishedRewards, pages, space?.domain)
         : getCardsFromPendingRewards(pendingRewards || [], space?.id, space?.domain),
     [pendingRewards, space?.id, pages, publishedRewards]
   );
 
   const canCreatePendingRewards = !readOnly && !publishedRewards.length;
@@ -158,7 +167,7 @@
                     boardType='rewards'
                     hideCalculations
                     setSelectedPropertyId={() => {}}
-                    board={boardBlock!}
+                    board={boardWithProposalCreatedAt}
                     activeView={tableView}
                     cards={cards}
                     views={[]}

stories/ProposalsPage/ProposalRewards.stories.tsx

@@ -44,6 +44,7 @@ export function ProposalRewards() {
               pendingRewards={pendingRewards}
               reviewers={[]}
               assignedSubmitters={[]}
+              proposalCreatedAt={new Date()}
               variant='solid_button'
               isProposalTemplate={true}
               rewardIds={[]}