Skip to content

Feature 2893/remove run search button #2895

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
mkimberlin merged 5 commits into from
Feb 27, 2025
Merged

Feature 2893/remove run search button #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c99460
Removed the Run Search button and run the search whenever the skills …
ocielliottc Feb 18, 2025
cf8cce0
Updated the test snapshot.
ocielliottc Feb 18, 2025
f40943d
Merge branch 'develop' into feature-2893/remove-run-search-button
mkimberlin Feb 18, 2025
37def8e
Remove the Run Search button from the Team Skills report.
ocielliottc Feb 18, 2025
1424f7b
Merge branch 'feature-2893/remove-run-search-button' of github.com:ob…
ocielliottc Feb 18, 2025
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
68 changes: 27 additions & 41 deletions web-ui/src/pages/SkillReportPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useRef, useState } from 'react';
import React, { useContext, useRef, useState, useEffect } from 'react';

import { Button, TextField } from '@mui/material';
import Autocomplete from '@mui/material/Autocomplete';
Expand Down Expand Up @@ -54,26 +54,32 @@ const SkillReportPage = props => {
processedQPs
);

const handleSearch = async searchRequestDTO => {
let res = await reportSkills(searchRequestDTO, csrf);
let memberSkillsFound;
if (res && res.payload) {
memberSkillsFound =
!res.error && res.payload.data.teamMembers
? res.payload.data.teamMembers
: undefined;
}
// Filter out skills of terminated members
memberSkillsFound = memberSkillsFound?.filter(memberSkill =>
memberIds.includes(memberSkill.id)
);
if (memberSkillsFound && memberIds) {
let newSort = sortMembersBySkill(memberSkillsFound);
setSearchResults(newSort);
} else {
setSearchResults([]);
}
};
useEffect(() => {
const handleSearch = async () => {
let memberSkillsFound = [];

if (searchSkills.length > 0) {
const searchRequestDTO = createRequestDTO(editedSearchRequest);
const res = await reportSkills(searchRequestDTO, csrf);
if (res && res.payload) {
memberSkillsFound =
!res.error && res.payload.data?.teamMembers
? res.payload.data.teamMembers
: [];
}
// Filter out skills of terminated members
memberSkillsFound = memberSkillsFound.filter(memberSkill =>
memberIds?.includes(memberSkill.id)
);
memberSkillsFound = sortMembersBySkill(memberSkillsFound);
}

setSearchResults(memberSkillsFound);
};

handleSearch();
}, [searchSkills]);


function skillsToSkillLevelDTO(skills) {
return skills.map((skill, index) => {
Expand Down Expand Up @@ -124,26 +130,6 @@ const SkillReportPage = props => {
/>
)}
/>
<div className="SkillsSearch-actions fullWidth">
<Button
onClick={() => {
if (!searchSkills.length) {
window.snackDispatch({
type: UPDATE_TOAST,
payload: {
severity: 'error',
toast: 'Must select a skill'
}
});
} else {
handleSearch(createRequestDTO(editedSearchRequest));
}
}}
color="primary"
>
Run Search
</Button>
</div>
</div>
<SearchResults searchResults={searchResults} />
</div>
Expand Down
79 changes: 33 additions & 46 deletions web-ui/src/pages/TeamSkillReportPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useContext, useRef, useState } from 'react';
import React, { useContext, useRef, useState, useEffect } from 'react';

import { Autocomplete, Button, TextField, Typography } from '@mui/material';

Expand Down Expand Up @@ -72,33 +72,38 @@ const TeamSkillReportPage = () => {
processedQPs
);

const handleSearch = async searchRequestDTO => {
let res = await reportSkills(searchRequestDTO, csrf);
let memberSkillsFound;
if (res && res.payload) {
memberSkillsFound =
!res.error && res.payload.data.teamMembers
? res.payload.data.teamMembers
: undefined;
}
if (memberSkillsFound && memberProfiles) {
// Filter the member skill down to only members that are not terminated.
memberSkillsFound = memberSkillsFound.filter(
mSkill => memberProfiles.find(member => member.id == mSkill.id)
);

setAllSearchResults(memberSkillsFound);
let membersSelected = memberSkillsFound.filter(mSkill =>
selectedMembers.some(member => member.id === mSkill.id)
);
let newSort = sortMembersBySkill(membersSelected);
setSearchResults(newSort);
} else {
setSearchResults([]);
setAllSearchResults([]);
}
setShowRadar(true);
};
useEffect(() => {
const handleSearch = async () => {
if (searchSkills.length > 0) {
const searchRequestDTO = createRequest(editedSearchRequest);
const res = await reportSkills(searchRequestDTO, csrf);
let memberSkillsFound;
if (res && res.payload) {
memberSkillsFound =
!res.error && res.payload.data.teamMembers
? res.payload.data.teamMembers
: [];
}

// Filter the member skill down to only members that are not terminated.
memberSkillsFound = memberSkillsFound.filter(
mSkill => memberProfiles.find(member => member.id == mSkill.id)
);

setAllSearchResults(memberSkillsFound);
const membersSelected = memberSkillsFound.filter(mSkill =>
selectedMembers.some(member => member.id === mSkill.id)
);
setSearchResults(sortMembersBySkill(membersSelected));
setShowRadar(true);
} else {
setSearchResults([]);
setAllSearchResults([]);
setShowRadar(false);
}
};
handleSearch();
}, [selectedMembers, searchSkills]);

function skillsToSkillLevel(skills) {
return skills.map(skill => {
Expand Down Expand Up @@ -194,24 +199,6 @@ const TeamSkillReportPage = () => {
/>
)}
/>
<Button
onClick={() => {
if (!searchSkills.length) {
window.snackDispatch({
type: UPDATE_TOAST,
payload: {
severity: 'error',
toast: 'Must select a skill'
}
});
return;
}
handleSearch(createRequest(editedSearchRequest));
}}
color="primary"
>
Run Search
</Button>
</div>
{showRadar && (
<div>
Expand Down
14 changes: 0 additions & 14 deletions web-ui/src/pages/__snapshots__/SkillReportPage.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,6 @@ exports[`renders correctly 1`] = `
</div>
</div>
</div>
<div
class="SkillsSearch-actions fullWidth"
>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1e6y48t-MuiButtonBase-root-MuiButton-root"
tabindex="0"
type="button"
>
Run Search
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
</div>
</div>
<div
class="results-section"
Expand Down
10 changes: 0 additions & 10 deletions web-ui/src/pages/__snapshots__/TeamSkillReportPage.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,6 @@ exports[`renders correctly 1`] = `
</div>
</div>
</div>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1e6y48t-MuiButtonBase-root-MuiButton-root"
tabindex="0"
type="button"
>
Run Search
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
</div>
</div>
</div>
Expand Down
Loading