Skip to content

Feature 2212/enhanced checkin warranty #2359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vhscom merged 3 commits into from
May 10, 2024
Merged

Feature 2212/enhanced checkin warranty #2359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08442bb
fix: pre-populate all pdls on load
vhscom May 10, 2024
3d3cd5b
feat: add muted css utility to theme vars
vhscom May 10, 2024
b29c3a1
fix: update member selector treatment
vhscom May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions web-ui/src/components/member_selector/MemberSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -156,7 +151,7 @@ const MemberSelector = ({
</div>
}
action={
<>
<Box sx={{ mr: 2 }}>
<Tooltip title={`Change ${memberDescriptor}`} arrow>
<IconButton
style={{ margin: '4px 8px 0 0' }}
Expand All @@ -177,7 +172,7 @@ const MemberSelector = ({
</IconButton>
</Tooltip>
)}
</>
</Box>
}
/>
</Card>
Expand Down
4 changes: 4 additions & 0 deletions web-ui/src/components/reports-section/checkin-report/TeamMemberMap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
width: 100%;
margin: 0 0.75rem;
}

.team-member-map-summmary-latest-activity {
color: var(--muted);
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion web-ui/src/components/reports-section/checkin-report/TeamMemberMap.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
{
Expand Down
12 changes: 6 additions & 6 deletions web-ui/src/pages/CheckinsReportPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Collaborator

@mvolkmann mvolkmann May 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If newPdls becomes empty, does it to clear out the array of selected PDLs?

Copy link
Contributor Author

@vhscom vhscom May 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For newPdls to become empty I believe we would have a data issue on our hands. This change is to allow us to short-circuit the logic for changing component state as the default state when no pdls are available is controlled in a useEffect queuing off processedQPs.current.

Copy link
Collaborator

@mvolkmann mvolkmann May 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you're saying. This looks good. I actually didn't noticed that this was in code related to the query parameters. Makes sense now.

},
toQP(newPdls) {
if (isArrayPresent(newPdls)) {
Expand All @@ -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(() => {
Expand Down
2 changes: 2 additions & 0 deletions web-ui/src/styles/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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(
Expand Down