fix: incorrect banner's display rule

RocketChat · May 23, 2024 · e8f84b7 · e8f84b7
1 parent e3c2fb6
commit e8f84b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 27 deletions.
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx
@@ -17,6 +17,7 @@ import RetentionPolicyCallout from '../../../../components/InfoPanel/RetentionPo
 import MarkdownText from '../../../../components/MarkdownText';
 import type { Action } from '../../../hooks/useActionSpread';
 import { useActionSpread } from '../../../hooks/useActionSpread';
+import { useRetentionPolicy } from '../../../room/hooks/useRetentionPolicy';
 
 type RetentionPolicy = {
 	retentionPolicyEnabled: boolean;
@@ -40,7 +41,6 @@ type TeamsInfoProps = {
 
 const TeamsInfo = ({
 	room,
-	retentionPolicy,
 	onClickHide,
 	onClickClose,
 	onClickLeave,
@@ -51,7 +51,7 @@ const TeamsInfo = ({
 }: TeamsInfoProps): ReactElement => {
 	const t = useTranslation();
 
-	const { retentionPolicyEnabled, filesOnlyDefault, excludePinnedDefault, maxAgeDefault } = retentionPolicy;
+	const retentionPolicy = useRetentionPolicy(room);
 
 	const memoizedActions = useMemo(
 		() => ({
@@ -199,8 +199,12 @@ const TeamsInfo = ({
 							</InfoPanel.Field>
 						)}
 
-						{retentionPolicyEnabled && (
-							<RetentionPolicyCallout filesOnly={filesOnlyDefault} excludePinned={excludePinnedDefault} maxAge={maxAgeDefault} />
+						{retentionPolicy?.isActive && (
+							<RetentionPolicyCallout
+								filesOnly={retentionPolicy.filesOnly}
+								excludePinned={retentionPolicy.excludePinned}
+								maxAge={retentionPolicy.maxAge}
+							/>
 						)}
 					</InfoPanel.Section>
 				</InfoPanel>

diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.js b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.js
@@ -3,7 +3,6 @@ import {
 	useSetModal,
 	useToastMessageDispatch,
 	useUserId,
-	useSetting,
 	usePermission,
 	useMethod,
 	useTranslation,
@@ -23,33 +22,12 @@ import ConvertToChannelModal from '../../ConvertToChannelModal';
 import LeaveTeam from './LeaveTeam';
 import TeamsInfo from './TeamsInfo';
 
-const retentionPolicyMaxAge = {
-	c: 'RetentionPolicy_MaxAge_Channels',
-	p: 'RetentionPolicy_MaxAge_Groups',
-	d: 'RetentionPolicy_MaxAge_DMs',
-};
-
-const retentionPolicyAppliesTo = {
-	c: 'RetentionPolicy_AppliesToChannels',
-	p: 'RetentionPolicy_AppliesToGroups',
-	d: 'RetentionPolicy_AppliesToDMs',
-};
-
 const TeamsInfoWithLogic = ({ openEditing }) => {
 	const room = useRoom();
 	const { openTab, closeTab } = useRoomToolbox();
 	const t = useTranslation();
 	const userId = useUserId();
 
-	const retentionPolicyEnabled = useSetting('RetentionPolicy_Enabled');
-	const retentionPolicy = {
-		retentionPolicyEnabled,
-		maxAgeDefault: useSetting(retentionPolicyMaxAge[room.t]) || 30,
-		retentionEnabledDefault: useSetting(retentionPolicyAppliesTo[room.t]),
-		excludePinnedDefault: useSetting('RetentionPolicy_DoNotPrunePinned'),
-		filesOnlyDefault: useSetting('RetentionPolicy_FilesOnly'),
-	};
-
 	const dontAskHideRoom = useDontAskAgain('hideRoom');
 
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -153,7 +131,6 @@ const TeamsInfoWithLogic = ({ openEditing }) => {
 	return (
 		<TeamsInfo
 			room={room}
-			retentionPolicy={retentionPolicyEnabled && retentionPolicy}
 			onClickEdit={canEdit && openEditing}
 			onClickClose={closeTab}
 			onClickDelete={canDeleteRoom && handleDelete}