diff --git a/src-ts/lib/pagination/infinite-page-handler.model.ts b/src-ts/lib/pagination/infinite-page-handler.model.ts index d9ec9867e..8be39e33e 100644 --- a/src-ts/lib/pagination/infinite-page-handler.model.ts +++ b/src-ts/lib/pagination/infinite-page-handler.model.ts @@ -6,5 +6,6 @@ export interface InfinitePageHandler { data?: ReadonlyArray getAndSetNext: () => void hasMore: boolean + isValidating: boolean mutate: KeyedMutator>> } diff --git a/src-ts/lib/pagination/use-infinite-page.hook.ts b/src-ts/lib/pagination/use-infinite-page.hook.ts index ef3f3b7d2..58b13dad7 100644 --- a/src-ts/lib/pagination/use-infinite-page.hook.ts +++ b/src-ts/lib/pagination/use-infinite-page.hook.ts @@ -8,7 +8,7 @@ import { InfinitePageHandler } from './infinite-page-handler.model' export function useGetInfinitePage(getKey: (index: number, previousPageData: InfinitePageDao) => string | undefined): InfinitePageHandler { - const { data, mutate, setSize, size }: SWRInfiniteResponse> = useSWRInfinite(getKey, { revalidateFirstPage: false }) + const { data, isValidating, mutate, setSize, size }: SWRInfiniteResponse> = useSWRInfinite(getKey, { revalidateFirstPage: false }) // flatten version of badges paginated data const outputData: ReadonlyArray = flatten(map(data, dao => dao.rows)) @@ -21,6 +21,7 @@ export function useGetInfinitePage(getKey: (index: number, previousPageData: data: outputData, getAndSetNext, hasMore: outputData.length < (data?.[0]?.count || 0), + isValidating, mutate, } } diff --git a/src-ts/tools/gamification-admin/pages/badge-detail/AwardedMembersTab/awarded-members-table/member-action-renderer/MemberActionRenderer.tsx b/src-ts/tools/gamification-admin/pages/badge-detail/AwardedMembersTab/awarded-members-table/member-action-renderer/MemberActionRenderer.tsx index d39f75048..dd70da073 100644 --- a/src-ts/tools/gamification-admin/pages/badge-detail/AwardedMembersTab/awarded-members-table/member-action-renderer/MemberActionRenderer.tsx +++ b/src-ts/tools/gamification-admin/pages/badge-detail/AwardedMembersTab/awarded-members-table/member-action-renderer/MemberActionRenderer.tsx @@ -1,32 +1,33 @@ -import { Button, ButtonProps, useCheckIsMobile } from '../../../../../../../lib' +// TODO: enable when unassign feature is ready +// import { Button, ButtonProps, useCheckIsMobile } from '../../../../../../../lib' import { MemberBadgeAward } from '../../../../../game-lib' import styles from './MemberActionRenderer.module.scss' function MemberActionRenderer(memberAward: MemberBadgeAward): JSX.Element { - const isMobile: boolean = useCheckIsMobile() + // const isMobile: boolean = useCheckIsMobile() - const buttonProps: ButtonProps = { - buttonStyle: 'secondary', - size: isMobile ? 'xs' : 'sm', - } + // const buttonProps: ButtonProps = { + // buttonStyle: 'secondary', + // size: isMobile ? 'xs' : 'sm', + // } - const actionButtons: Array<{ - label: string - }> = [ - { - label: 'Unassign', - }, - ] + // const actionButtons: Array<{ + // label: string + // }> = [ + // { + // label: 'Unassign', + // }, + // ] - function onUnassign(): void { - // TODO: unassign feature - } + // function onUnassign(): void { + + // } return (
- {actionButtons.map((button, index) => { + {/* {actionButtons.map((button, index) => { return (
) } diff --git a/src-ts/tools/gamification-admin/pages/badge-detail/AwardedMembersTab/awarded-members-table/member-handle-renderer/MemberHandleRenderer.module.scss b/src-ts/tools/gamification-admin/pages/badge-detail/AwardedMembersTab/awarded-members-table/member-handle-renderer/MemberHandleRenderer.module.scss index 4e335a08f..5ab604390 100644 --- a/src-ts/tools/gamification-admin/pages/badge-detail/AwardedMembersTab/awarded-members-table/member-handle-renderer/MemberHandleRenderer.module.scss +++ b/src-ts/tools/gamification-admin/pages/badge-detail/AwardedMembersTab/awarded-members-table/member-handle-renderer/MemberHandleRenderer.module.scss @@ -4,6 +4,7 @@ .memberAward { display: flex; align-items: center; + min-width: 250px; .memberHandle { font-size: 16px;