From 588ed5d98ce1fbbd1d7d1e2f517d7b6a614b1ac9 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Fri, 21 Oct 2022 11:43:33 +0300
Subject: [PATCH 1/2] GAME-180 #comment fix moving table cols

---
 .../member-handle-renderer/MemberHandleRenderer.module.scss      | 1 +
 1 file changed, 1 insertion(+)

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;

From 9367a2a3ad97e3c7bff6c84a582f36fabfd7b577 Mon Sep 17 00:00:00 2001
From: Kiril Kartunov <kiril.kartunov@gmail.com>
Date: Fri, 21 Oct 2022 12:05:20 +0300
Subject: [PATCH 2/2] GAME-181 #comment remove unassign btn

---
 .../pagination/infinite-page-handler.model.ts |  1 +
 .../lib/pagination/use-infinite-page.hook.ts  |  3 +-
 .../MemberActionRenderer.tsx                  | 37 ++++++++++---------
 3 files changed, 22 insertions(+), 19 deletions(-)

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<T> {
     data?: ReadonlyArray<T>
     getAndSetNext: () => void
     hasMore: boolean
+    isValidating: boolean
     mutate: KeyedMutator<Array<InfinitePageDao<T>>>
 }
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<T>(getKey: (index: number, previousPageData: InfinitePageDao<T>) => string | undefined):
     InfinitePageHandler<T> {
 
-    const { data, mutate, setSize, size }: SWRInfiniteResponse<InfinitePageDao<T>> = useSWRInfinite(getKey, { revalidateFirstPage: false })
+    const { data, isValidating, mutate, setSize, size }: SWRInfiniteResponse<InfinitePageDao<T>> = useSWRInfinite(getKey, { revalidateFirstPage: false })
 
     // flatten version of badges paginated data
     const outputData: ReadonlyArray<T> = flatten(map(data, dao => dao.rows))
@@ -21,6 +21,7 @@ export function useGetInfinitePage<T>(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 (
         <div className={styles['badge-actions']}>
-            {actionButtons.map((button, index) => {
+            {/* {actionButtons.map((button, index) => {
                 return (
                     <Button
                         {...buttonProps}
@@ -35,7 +36,7 @@ function MemberActionRenderer(memberAward: MemberBadgeAward): JSX.Element {
                         onClick={onUnassign}
                     />
                 )
-            })}
+            })} */}
         </div>
     )
 }