info/developer-roadmap
1
0
Fork 0
mirror of https://github.com/kamranahmedse/developer-roadmap.git synced 2025-08-20 08:02:35 +02:00
Code Issues Releases Wiki Activity

fix: empty buttons in profile update (#7717)

Browse Source 
* Empty buttons in profile update

* fix: filtering in one call

---------

Co-authored-by: Arik Chakma <arikchangma@gmail.com>
This commit is contained in:
Rudin Maxim
2024-11-12 00:21:36 +05:00
committed by GitHub
parent 76474bd604
commit d5fae890a6
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/RoadCard/RoadmapSelect.tsx
View File

@@ -16,7 +16,7 @@ export function RoadmapSelect(props: RoadmapSelectProps) {
const fetchProgress = async () => { const fetchProgress = async () => {
const { response, error } = await httpGet<UserProgressResponse>( const { response, error } = await httpGet<UserProgressResponse>(
`${import.meta.env.PUBLIC_API_URL}/v1-get-user-all-progress` `${import.meta.env.PUBLIC_API_URL}/v1-get-user-all-progress`,
); );
if (error || !response) { if (error || !response) {
@@ -34,16 +34,21 @@ export function RoadmapSelect(props: RoadmapSelectProps) {
const canSelectMore = selectedRoadmaps.length < 4; const canSelectMore = selectedRoadmaps.length < 4;
const allProgress = const allProgress =
progressList?.filter((progress) => progress.resourceType === 'roadmap') || progressList?.filter(
[]; (progress) =>
progress.resourceType === 'roadmap' &&
progress.resourceId &&
progress.resourceTitle,
) || [];
return ( return (
<div className="flex flex-wrap gap-1"> <div className="flex flex-wrap gap-1">
{allProgress?.length === 0 && ( {allProgress?.length === 0 && (
<p className={'text-sm italic text-gray-400'}> <p className="text-sm italic text-gray-400">
No progress tracked so far. No progress tracked so far.
</p> </p>
)} )}
{allProgress?.map((progress) => { {allProgress?.map((progress) => {
const isSelected = selectedRoadmaps.includes(progress.resourceId); const isSelected = selectedRoadmaps.includes(progress.resourceId);
const canSelect = isSelected || canSelectMore; const canSelect = isSelected || canSelectMore;
@@ -58,8 +63,8 @@ export function RoadmapSelect(props: RoadmapSelectProps) {
if (isSelected) { if (isSelected) {
setSelectedRoadmaps( setSelectedRoadmaps(
selectedRoadmaps.filter( selectedRoadmaps.filter(
(roadmap) => roadmap !== progress.resourceId (roadmap) => roadmap !== progress.resourceId,
) ),
); );
} else if (selectedRoadmaps.length < 4) { } else if (selectedRoadmaps.length < 4) {
setSelectedRoadmaps([...selectedRoadmaps, progress.resourceId]); setSelectedRoadmaps([...selectedRoadmaps, progress.resourceId]);

8
src/components/UpdateProfile/UpdatePublicProfileForm.tsx
View File

@@ -186,9 +186,11 @@ export function UpdatePublicProfileForm() {
}, []); }, []);
const publicCustomRoadmaps = profileRoadmaps.filter( const publicCustomRoadmaps = profileRoadmaps.filter(
(r) => r.isCustomResource, (r) => r.isCustomResource && r.id && r.title,
);
const publicRoadmaps = profileRoadmaps.filter(
(r) => !r.isCustomResource && r.id && r.title,
); );
const publicRoadmaps = profileRoadmaps.filter((r) => !r.isCustomResource);
return ( return (
<div> <div>
@@ -622,7 +624,7 @@ export function UpdatePublicProfileForm() {
)} )}
</button> </button>
<a <a
className='flex shrink-0 flex-row items-center gap-1 rounded-lg border border-black py-1.5 pl-2.5 pr-3.5 text-xs uppercase text-black transition-colors hover:bg-black hover:text-white' className="flex shrink-0 flex-row items-center gap-1 rounded-lg border border-black py-1.5 pl-2.5 pr-3.5 text-xs uppercase text-black transition-colors hover:bg-black hover:text-white"
href={publicProfileUrl} href={publicProfileUrl}
target="_blank" target="_blank"
> >