diff --git a/src/components/WeeklySummariesReport/BioFunction.jsx b/src/components/WeeklySummariesReport/BioFunction.jsx index 9f1cb870bd..6bd9efd2bd 100644 --- a/src/components/WeeklySummariesReport/BioFunction.jsx +++ b/src/components/WeeklySummariesReport/BioFunction.jsx @@ -1,13 +1,14 @@ /* eslint-disable no-nested-ternary */ import { useState } from 'react'; -import styles from './WeeklySummariesReport.module.scss'; import ToggleSwitch from '../UserProfile/UserProfileEdit/ToggleSwitch'; +import PropTypes from 'prop-types'; +import styles from './WeeklySummariesReport.module.scss'; function BioFunction(props) { const { bioPosted, totalTangibleHrs, - daysInTeam, + totalValidWeeklySummaries, textColors, summary, bioCanEdit, @@ -17,7 +18,8 @@ function BioFunction(props) { const [bioStatus, setBioStatus] = useState(bioPosted); - const isMeetCriteria = totalTangibleHrs > 80 && daysInTeam > 60 && bioPosted !== 'posted'; + const isMeetCriteria = + totalTangibleHrs > 80 && totalValidWeeklySummaries >= 8 && bioPosted !== 'posted'; const style = { color: textColors[summary?.weeklySummaryOption] || textColors.Default, }; @@ -54,4 +56,15 @@ function BioFunction(props) { ); } +BioFunction.propTypes = { + bioPosted: PropTypes.string, + totalTangibleHrs: PropTypes.number, + totalValidWeeklySummaries: PropTypes.number, + textColors: PropTypes.object, + summary: PropTypes.object, + bioCanEdit: PropTypes.bool, + handleProfileChange: PropTypes.func, + userId: PropTypes.string, +}; + export default BioFunction; diff --git a/src/components/WeeklySummariesReport/FormattedReport.jsx b/src/components/WeeklySummariesReport/FormattedReport.jsx index 357f5948a9..47b418f7b1 100644 --- a/src/components/WeeklySummariesReport/FormattedReport.jsx +++ b/src/components/WeeklySummariesReport/FormattedReport.jsx @@ -307,7 +307,7 @@ function ReportDetails({ const isMeetCriteria = canSeeBioHighlight && summary.totalTangibleHrs > 80 && - summary.daysInTeam > 60 && + summary.weeklySummariesCount >= 8 && summary.bioPosted !== 'posted'; return ( @@ -1105,6 +1105,7 @@ Index.propTypes = { startDate: PropTypes.string, endDate: PropTypes.string, trophyFollowedUp: PropTypes.bool, + weeklySummariesCount: PropTypes.number, timeOffFrom: PropTypes.string, timeOffTill: PropTypes.string, }).isRequired, diff --git a/src/components/WeeklySummariesReport/WeeklySummariesReport.jsx b/src/components/WeeklySummariesReport/WeeklySummariesReport.jsx index a8416294a8..a5cc6e1960 100644 --- a/src/components/WeeklySummariesReport/WeeklySummariesReport.jsx +++ b/src/components/WeeklySummariesReport/WeeklySummariesReport.jsx @@ -770,7 +770,7 @@ const WeeklySummariesReport = props => { const isMeetCriteria = summary.totalTangibleHrs > 80 && - summary.daysInTeam > 60 && + summary.weeklySummariesCount >= 8 && summary.bioPosted !== 'posted'; const isBio = !selectedBioStatus || isMeetCriteria; diff --git a/src/components/WeeklySummariesReport/__tests__/BioFunction.test.jsx b/src/components/WeeklySummariesReport/__tests__/BioFunction.test.jsx index f6a5b81cf1..dc68fd7390 100644 --- a/src/components/WeeklySummariesReport/__tests__/BioFunction.test.jsx +++ b/src/components/WeeklySummariesReport/__tests__/BioFunction.test.jsx @@ -9,7 +9,7 @@ const colors = { const baseProps = { bioPosted: 'default', totalTangibleHrs: 100, - daysInTeam: 70, + totalValidWeeklySummaries: 10, textColors: colors, summary: { weeklySummaryOption: 'option1' }, bioCanEdit: true, diff --git a/src/components/WeeklySummariesReport/__tests__/FormattedReport.test.jsx b/src/components/WeeklySummariesReport/__tests__/FormattedReport.test.jsx index 232078823d..87bc339015 100644 --- a/src/components/WeeklySummariesReport/__tests__/FormattedReport.test.jsx +++ b/src/components/WeeklySummariesReport/__tests__/FormattedReport.test.jsx @@ -59,7 +59,7 @@ const dummySummary = { uploadDate: moment().toISOString(), }, ], - weeklySummariesCount: '5', + weeklySummariesCount: 10, teamCode: 'ABC123', mediaUrl: 'http://example.com/media', adminLinks: [{ Name: 'Media Folder', Link: 'http://example.com/folder' }], @@ -71,7 +71,6 @@ const dummySummary = { .add(1, 'days') .format(), totalTangibleHrs: 100, - daysInTeam: 70, bioPosted: 'default', weeklySummaryOption: 'Default', };