From 416dbbed74e6b47eb9c39adb420e42108d6c7551 Mon Sep 17 00:00:00 2001 From: Rishabh Mishra Date: Thu, 18 Jul 2024 17:54:54 +0530 Subject: [PATCH] fix(sdk): avatar overlaping with members table header (#678) * chore: update apsara version * fix: remove negative z-index from avatar --- sdks/js/packages/core/package.json | 2 +- .../organization/members/member.columns.tsx | 40 +++++++++---------- sdks/js/pnpm-lock.yaml | 28 +++++++++++-- 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/sdks/js/packages/core/package.json b/sdks/js/packages/core/package.json index d5dd1a4c1..cbd537694 100644 --- a/sdks/js/packages/core/package.json +++ b/sdks/js/packages/core/package.json @@ -79,7 +79,7 @@ }, "dependencies": { "@hookform/resolvers": "^3.3.1", - "@raystack/apsara": "^0.16.2", + "@raystack/apsara": "^0.17.0", "@tanstack/react-router": "0.0.1-beta.194", "axios": "^1.5.0", "class-variance-authority": "^0.7.0", diff --git a/sdks/js/packages/core/react/components/organization/members/member.columns.tsx b/sdks/js/packages/core/react/components/organization/members/member.columns.tsx index 45b6cd690..b1c92c6a4 100644 --- a/sdks/js/packages/core/react/components/organization/members/member.columns.tsx +++ b/sdks/js/packages/core/react/components/organization/members/member.columns.tsx @@ -24,21 +24,15 @@ import { Role } from '~/src/types'; import { differenceWith, getInitials, isEqualById } from '~/utils'; import styles from '../organization.module.css'; -export const getColumns: ( - id: string, - memberRoles: Record, - roles: Role[], - canDeleteUser?: boolean, - refetch?: () => void -) => ApsaraColumnDef< - V1Beta1User & V1Beta1Invitation & { invited?: boolean } ->[] = ( - organizationId, - memberRoles = {}, - roles = [], +export const getColumns = ( + organizationId: string, + memberRoles: Record = {}, + roles: Role[] = [], canDeleteUser = false, refetch = () => null -) => [ +): ApsaraColumnDef< + V1Beta1User & V1Beta1Invitation & { invited?: boolean } +>[] => [ { header: '', accessorKey: 'avatar', @@ -55,13 +49,10 @@ export const getColumns: ( ); } @@ -176,8 +167,8 @@ const MembersActions = ({ // @ts-ignore data: { policies = [] } } = await client?.frontierServiceListPolicies({ - orgId: organizationId, - userId: member.id + org_id: organizationId, + user_id: member.id }); const deletePromises = policies.map((p: V1Beta1Policy) => client?.frontierServiceDeletePolicy(p.id as string) @@ -185,7 +176,7 @@ const MembersActions = ({ await Promise.all(deletePromises); await client?.frontierServiceCreatePolicy({ - roleId: role.id as string, + role_id: role.id as string, title: role.name as string, resource: resource, principal: principal @@ -211,6 +202,7 @@ const MembersActions = ({
updateRole(role)} className={styles.dropdownActionItem} + data-test-id={`update-role-${role?.name}-dropdown-item`} > Make {role.title} @@ -219,7 +211,11 @@ const MembersActions = ({ ))} -
+
Remove
diff --git a/sdks/js/pnpm-lock.yaml b/sdks/js/pnpm-lock.yaml index 588a77d32..a809fcabe 100644 --- a/sdks/js/pnpm-lock.yaml +++ b/sdks/js/pnpm-lock.yaml @@ -37,8 +37,8 @@ importers: specifier: ^3.3.1 version: 3.3.1(react-hook-form@7.46.2) '@raystack/apsara': - specifier: ^0.16.2 - version: 0.16.2(@types/react-dom@18.2.7)(@types/react@18.2.22)(date-fns@3.6.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2) + specifier: ^0.17.0 + version: 0.17.0(@types/react-dom@18.2.7)(@types/react@18.2.22)(date-fns@3.6.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2) '@tanstack/react-router': specifier: 0.0.1-beta.194 version: 0.0.1-beta.194(react-dom@18.2.0)(react@18.2.0) @@ -2641,6 +2641,28 @@ packages: - typescript dev: false + /@raystack/apsara@0.17.0(@types/react-dom@18.2.7)(@types/react@18.2.22)(date-fns@3.6.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2): + resolution: {integrity: sha512-w7GZ1rBihTC4nK9VDk1hnV2xUnWG0PixRkXYUbVwMXwYY0I01+yIGF0Y1B4Wu0wNknNw9bgy8PqH3/88wvZUpA==} + engines: {node: '>=18'} + dependencies: + '@radix-ui/react-accordion': 1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.22)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toggle-group': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.22)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-tooltip': 1.0.7(@types/react-dom@18.2.7)(@types/react@18.2.22)(react-dom@18.2.0)(react@18.2.0) + react-day-picker: 8.10.1(date-fns@3.6.0)(react@18.2.0) + react-loading-skeleton: 3.4.0(react@18.2.0) + release-it: 16.2.1(typescript@5.2.2) + sonner: 1.5.0(react-dom@18.2.0)(react@18.2.0) + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + - date-fns + - encoding + - react + - react-dom + - supports-color + - typescript + dev: false + /@raystack/frontier@0.22.0(@types/react-dom@18.2.7)(@types/react@18.2.22)(date-fns@3.6.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2): resolution: {integrity: sha512-jpJb0l9nbfmOS08vK+B52lrF8Viwplq0GJWuVSL5ERk+NJ7GELPVJYI9eFqAU+hIPCTc4Z2brZ8u6Jd3xFb2UQ==} peerDependencies: @@ -2659,7 +2681,7 @@ packages: optional: true dependencies: '@hookform/resolvers': 3.3.1(react-hook-form@7.46.2) - '@raystack/apsara': 0.16.1(@types/react-dom@18.2.7)(@types/react@18.2.22)(date-fns@3.6.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2) + '@raystack/apsara': 0.16.2(@types/react-dom@18.2.7)(@types/react@18.2.22)(date-fns@3.6.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2) '@tanstack/react-router': 0.0.1-beta.194(react-dom@18.2.0)(react@18.2.0) axios: 1.5.0 class-variance-authority: 0.7.0