From 08442bb7dff8eeb8285ec0b6ef0db0492299fbe3 Mon Sep 17 00:00:00 2001 From: Josh Habdas Date: Fri, 10 May 2024 10:23:45 -0400 Subject: [PATCH 1/3] fix: pre-populate all pdls on load --- web-ui/src/pages/CheckinsReportPage.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web-ui/src/pages/CheckinsReportPage.jsx b/web-ui/src/pages/CheckinsReportPage.jsx index 5e2dcfed9b..990b88416d 100644 --- a/web-ui/src/pages/CheckinsReportPage.jsx +++ b/web-ui/src/pages/CheckinsReportPage.jsx @@ -97,7 +97,7 @@ const CheckinsReportPage = () => { const newPdls = ids .map(id => pdls.find(pdl => pdl.id === id)) .filter(Boolean); - setSelectedPdls(newPdls); + newPdls.length > 0 && setSelectedPdls(newPdls); }, toQP(newPdls) { if (isArrayPresent(newPdls)) { @@ -113,12 +113,12 @@ const CheckinsReportPage = () => { processedQPs ); - // Set the selected PDLs to the mapped PDLs unless they are already set + // Update selected PDLs when processedQPs is updated useEffect(() => { - if (pdls.length > 0) return; - const mapped = selectMappedPdls(state); - setSelectedPdls(mapped); - }, [state]); + if (selectedPdls.length === 0 && processedQPs.current) { + setSelectedPdls(selectMappedPdls(state)); + } + }, [processedQPs.current]); // Set the mapped PDLs to the PDLs with members useEffect(() => { From 3d3cd5bad61ca037bdb57c09cbff96ea1663a9f2 Mon Sep 17 00:00:00 2001 From: Josh Habdas Date: Fri, 10 May 2024 11:35:16 -0400 Subject: [PATCH 2/3] feat: add muted css utility to theme vars --- .../reports-section/checkin-report/TeamMemberMap.css | 4 ++++ .../reports-section/checkin-report/TeamMemberMap.jsx | 3 ++- web-ui/src/styles/variables.css | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.css b/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.css index 4aa40f78ef..016160ae34 100644 --- a/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.css +++ b/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.css @@ -16,6 +16,10 @@ width: 100%; margin: 0 0.75rem; } + + .team-member-map-summmary-latest-activity { + color: var(--muted); + } } } diff --git a/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx b/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx index 514b120d6d..7f9dbf331e 100644 --- a/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx +++ b/web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx @@ -64,8 +64,9 @@ const TeamMemberMap = ({ members, id, closed, planned, reportDate }) => { component={'time'} dateTime={getLastCheckinDate(checkins).toISOString()} sx={{ display: { xs: 'none', sm: 'flex' } }} + className="team-member-map-summmary-latest-activity" > - Activity:{' '} + Latest Activity:{' '} {getLastCheckinDate(checkins).toLocaleDateString( navigator.language, { diff --git a/web-ui/src/styles/variables.css b/web-ui/src/styles/variables.css index 2ac7810453..301449731c 100644 --- a/web-ui/src/styles/variables.css +++ b/web-ui/src/styles/variables.css @@ -36,6 +36,7 @@ --primary-link-dark-hover: #4f5f8c; --action: color-mix(in oklab, var(--black), var(--white) 50%); --action-disabled: color-mix(in oklab, var(--black), var(--white) 5%); + --muted: color-mix(in oklab, var(--black), var(--white) 47%); --checkins-palette-action-disabledOpacity: 0.58; @@ -66,6 +67,7 @@ --primary-text: color-mix(in oklab, var(--white), var(--black) 10%); --action: var(--white); --action-disabled: color-mix(in oklab, var(--white), var(--black) 30%); + --muted: color-mix(in oklab, var(--black), var(--white) 53%); --primary-main: var(--oci-light-blue); --primary-light: color-mix( From b29c3a16a3a08c2944d906a53c45dc57872671be Mon Sep 17 00:00:00 2001 From: Josh Habdas Date: Fri, 10 May 2024 15:33:48 -0400 Subject: [PATCH 3/3] fix: update member selector treatment --- .../src/components/member_selector/MemberSelector.jsx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/web-ui/src/components/member_selector/MemberSelector.jsx b/web-ui/src/components/member_selector/MemberSelector.jsx index 6dc3aba135..508282b11a 100644 --- a/web-ui/src/components/member_selector/MemberSelector.jsx +++ b/web-ui/src/components/member_selector/MemberSelector.jsx @@ -1,19 +1,14 @@ import React, { useCallback, useContext, useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { - Avatar, + Box, Card, CardHeader, - Divider, IconButton, - List, - ListItemIcon, - ListItemText, Tooltip, Typography } from '@mui/material'; import { Add, FileDownload } from '@mui/icons-material'; -import { getAvatarURL } from '../../api/api'; import MemberSelectorDialog, { FilterType @@ -156,7 +151,7 @@ const MemberSelector = ({ } action={ - <> + )} - + } />