Skip to content

fix(clerk-js): Add descriptor for formatted dates in tables #3465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2024
Merged

fix(clerk-js): Add descriptor for formatted dates in tables #3465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
995a22f
fix(clerk-js): Add descriptor for formatted dates in tables
panteliselef May 30, 2024
28b6f6d
Merge branch 'main' into elef/sdk-1769-missing-external-class-on-join…
panteliselef May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/warm-candles-thank.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Add descriptor for formatted dates in tables. Those elements can be identified by the `cl-formattedDate__tableCell` css class.
12 changes: 10 additions & 2 deletions packages/clerk-js/src/ui/components/OrganizationProfile/ActiveMembersList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useOrganization, useUser } from '@clerk/shared/react';
import type { OrganizationMembershipResource } from '@clerk/types';

import { Protect } from '../../common/Gate';
import { Badge, localizationKeys, Td, Text } from '../../customizables';
import { Badge, Box, descriptors, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
import { useFetchRoles, useLocalizeCustomRoles } from '../../hooks/useFetchRoles';
import { handleError } from '../../utils';
Expand Down Expand Up @@ -91,7 +91,15 @@ const MemberRow = (props: {
badge={isCurrentUser && <Badge localizationKey={localizationKeys('badge__you')} />}
/>
</Td>
<Td>{membership.createdAt.toLocaleDateString()}</Td>
<Td>
<Box
as='span'
elementDescriptor={descriptors.formattedDate}
elementId={descriptors.formattedDate.setId('tableCell')}
>
{membership.createdAt.toLocaleDateString()}
</Box>
</Td>
<Td>
<Protect
permission={'org:sys_memberships:manage'}
Expand Down
12 changes: 10 additions & 2 deletions packages/clerk-js/src/ui/components/OrganizationProfile/InvitedMembersList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useOrganization } from '@clerk/shared/react';
import type { OrganizationInvitationResource } from '@clerk/types';

import { localizationKeys, Td, Text } from '../../customizables';
import { Box, descriptors, localizationKeys, Td, Text } from '../../customizables';
import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements';
import { useFetchRoles, useLocalizeCustomRoles } from '../../hooks/useFetchRoles';
import { handleError } from '../../utils';
Expand Down Expand Up @@ -79,7 +79,15 @@ const InvitationRow = (props: {
user={{ primaryEmailAddress: { emailAddress: invitation.emailAddress } } as any}
/>
</Td>
<Td>{invitation.createdAt.toLocaleDateString()}</Td>
<Td>
<Box
as='span'
elementDescriptor={descriptors.formattedDate}
elementId={descriptors.formattedDate.setId('tableCell')}
>
{invitation.createdAt.toLocaleDateString()}
</Box>
</Td>
<Td>
<Text
colorScheme='secondary'
Expand Down
12 changes: 10 additions & 2 deletions packages/clerk-js/src/ui/components/OrganizationProfile/RequestToJoinList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useOrganization } from '@clerk/shared/react';
import type { OrganizationMembershipRequestResource } from '@clerk/types';

import { Button, Flex, localizationKeys, Td } from '../../customizables';
import { Box, Button, descriptors, Flex, localizationKeys, Td } from '../../customizables';
import { useCardState, UserPreview, withCardStateProvider } from '../../elements';
import { handleError } from '../../utils';
import { DataTable, RowContainer } from './MemberListTable';
Expand Down Expand Up @@ -84,7 +84,15 @@ const RequestRow = withCardStateProvider(
user={{ primaryEmailAddress: { emailAddress: request.publicUserData.identifier } } as any}
/>
</Td>
<Td>{request.createdAt.toLocaleDateString()}</Td>
<Td>
<Box
as='span'
elementDescriptor={descriptors.formattedDate}
elementId={descriptors.formattedDate.setId('tableCell')}
>
{request.createdAt.toLocaleDateString()}
</Box>
</Td>

<Td>
<AcceptRejectRequestButtons {...{ onAccept, onReject }} />
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/ui/customizables/elementDescriptors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'formattedPhoneNumberFlag',
'formattedPhoneNumberText',

'formattedDate',

'scrollBox',

'navbar',
Expand Down
2 changes: 2 additions & 0 deletions packages/types/src/appearance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ export type ElementsConfig = {
formattedPhoneNumberFlag: WithOptions;
formattedPhoneNumberText: WithOptions;

formattedDate: WithOptions<'tableCell'>;

scrollBox: WithOptions;

navbar: WithOptions;
Expand Down