From d92fe5218b4baa17436cc8b8c4c5d59d2f621efc Mon Sep 17 00:00:00 2001 From: phkem Date: Fri, 31 Jan 2025 16:24:57 -0500 Subject: [PATCH 1/2] feat(client): enhance pending requests on engines --- .../settings/PendingMembersTable.tsx | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/packages/client/src/components/settings/PendingMembersTable.tsx b/packages/client/src/components/settings/PendingMembersTable.tsx index 9f8679b205..bf6e475775 100644 --- a/packages/client/src/components/settings/PendingMembersTable.tsx +++ b/packages/client/src/components/settings/PendingMembersTable.tsx @@ -11,8 +11,16 @@ import { RadioGroup, Typography, useNotification, + Stack, } from '@semoss/ui'; -import { Add, Check, Close, ExpandLess, ExpandMore } from '@mui/icons-material'; +import { + Add, + Check, + Close, + ExpandLess, + ExpandMore, + CircleNotifications, +} from '@mui/icons-material'; import { AxiosResponse } from 'axios'; import { useRootStore, usePixel, useSettings } from '@/hooks'; @@ -79,17 +87,17 @@ const StyledTableTitleMemberContainer = styled('div')({ const StyledTableTitleMemberCountContainer = styled('div')({ display: 'flex', - height: '56px', + //height: '56px', padding: '6px 16px 6px 8px', flexDirection: 'column', - justifyContent: 'center', + //justifyContent: 'center', alignItems: 'center', gap: '10px', }); const StyledTableTitleMemberCount = styled('div')({ display: 'flex', - flexDirection: 'column', + //flexDirection: 'column', alignItems: 'flex-start', }); @@ -125,6 +133,10 @@ const StyledAddMemberContainer = styled('div')({ gap: '10px', }); +const StyledCircleNotification = styled(CircleNotifications)({ + color: '#FF5F15', +}); + // maps for permissions, const permissionMapper = { 1: 'Author', // BE: 'DISPLAY' @@ -211,7 +223,6 @@ export const PendingMembersTable = (props: PendingMemberTableProps) => { ...m, PERMISSION: permissionMapper[m.PERMISSION], // comes in as 1,2,3 -> map to Author, Edit, Read-only })); - setRenderedMembers(updatedMembers); }, [pendingUserAccess.status, pendingUserAccess.data]); @@ -416,7 +427,13 @@ export const PendingMembersTable = (props: PendingMemberTableProps) => { - + { + if (renderedMembers.length > 0) { + setOpenTable(!openTable); + } + }} + > Pending Requests @@ -426,11 +443,20 @@ export const PendingMembersTable = (props: PendingMemberTableProps) => { - - {renderedMembers.length < 2 - ? `${renderedMembers.length} pending request` - : `${renderedMembers.length} pending requests`} - + + + {renderedMembers.length == 1 + ? `${renderedMembers.length} pending request` + : `${renderedMembers.length} pending requests`} + + {renderedMembers.length > 0 && ( + + )} + @@ -489,6 +515,7 @@ export const PendingMembersTable = (props: PendingMemberTableProps) => { setOpenTable(!openTable)} + disabled={renderedMembers.length == 0} > {openTable ? : } From 154c0367ecbf411c3316159fff6aab1f9b72d5c9 Mon Sep 17 00:00:00 2001 From: Baxter Date: Wed, 19 Feb 2025 14:49:00 -0500 Subject: [PATCH 2/2] refactor(client): reorganize imports --- .../settings/PendingMembersTable.tsx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/client/src/components/settings/PendingMembersTable.tsx b/packages/client/src/components/settings/PendingMembersTable.tsx index bf6e475775..cfd6720d51 100644 --- a/packages/client/src/components/settings/PendingMembersTable.tsx +++ b/packages/client/src/components/settings/PendingMembersTable.tsx @@ -1,4 +1,14 @@ import { useEffect, useState } from 'react'; +import { AxiosResponse } from 'axios'; +import { + Add, + Check, + Close, + ExpandLess, + ExpandMore, + CircleNotifications, +} from '@mui/icons-material'; + import { styled, Button, @@ -13,15 +23,6 @@ import { useNotification, Stack, } from '@semoss/ui'; -import { - Add, - Check, - Close, - ExpandLess, - ExpandMore, - CircleNotifications, -} from '@mui/icons-material'; -import { AxiosResponse } from 'axios'; import { useRootStore, usePixel, useSettings } from '@/hooks'; import { ALL_TYPES } from '@/types';