maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mobile tabs event types

This commit is contained in:
Alan 2023-09-05 10:40:13 -07:00
parent 5776d8b495
commit 3cdd210ee4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/web/pages/event-types/index.tsx
View File

@ -110,8 +110,9 @@ const MobileTeamsTab: FC<MobileTeamsTabProps> = (props: MobileTeamsTabProps) =>
.map((item) => { .map((item) => {
const [firstElement] = item; const [firstElement] = item;
const teamSlugOrUsername = firstElement?.team?.slug || firstElement?.users[0].username || ""; const [mainUser] = firstElement?.users ?? [];
const teamNameOrUserName = firstElement?.team?.name || firstElement?.users[0].name || ""; const teamSlugOrUsername = firstElement?.team?.slug || mainUser?.username || "";
const teamNameOrUserName = firstElement?.team?.name || mainUser?.name || "";
const teamId = firstElement?.team?.id; const teamId = firstElement?.team?.id;
return { return {
name: teamNameOrUserName, name: teamNameOrUserName,
@ -123,12 +124,13 @@ const MobileTeamsTab: FC<MobileTeamsTabProps> = (props: MobileTeamsTabProps) =>
}); });
const { data } = useTypedQuery(querySchema); const { data } = useTypedQuery(querySchema);
const eventsIndex = teamEventTypes.findIndex((item) => item[0]?.team?.id === data?.teamId); const eventsIndex = teamEventTypes.findIndex((item) => item[0]?.team?.id === data?.teamId);
const events = teamEventTypes[eventsIndex];
const events = teamEventTypes[eventsIndex > -1 ? eventsIndex : 0];
return ( return (
<div> <div>
<HorizontalTabs tabs={tabs} /> <HorizontalTabs tabs={tabs} />
{events.length && <EventTypeList data={events} />} {events && events.length && <EventTypeList data={events} />}
</div> </div>
); );
}; };
@ -909,16 +911,15 @@ const Main = ({ filters }: { filters: ReturnType<typeof getTeamsFiltersFromQuery
const [mainUser] = firstElementPersonalEventTypes?.users || []; const [mainUser] = firstElementPersonalEventTypes?.users || [];
const teamEventTypesForTabs = eventTypePaginate const teamEventTypesForTabs = eventTypePaginate
.filter((item) => item !== undefined)
.map((trpcFetch) => { .map((trpcFetch) => {
const { data } = trpcFetch; const { data } = trpcFetch;
return data ?? []; return data;
}); })
.filter((item) => item && item.length > 0);
return ( return (
<> <>
{isMobile ? ( {isMobile ? (
<MobileTeamsTab teamEventTypes={[data, teamEventTypesForTabs]} /> <MobileTeamsTab teamEventTypes={[data, ...teamEventTypesForTabs]} />
) : ( ) : (
<div className="mt-4 flex flex-col"> <div className="mt-4 flex flex-col">
<EventTypeListHeading <EventTypeListHeading