From 7b885aeb348d011673e3f24657ae253453a86d11 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 18 Jan 2023 16:57:21 +0800 Subject: [PATCH] Dont use children= --- packages/web/pages/settings/api.tsx | 141 ++++++++++++++-------------- 1 file changed, 68 insertions(+), 73 deletions(-) diff --git a/packages/web/pages/settings/api.tsx b/packages/web/pages/settings/api.tsx index aa6401a32..c4010b50c 100644 --- a/packages/web/pages/settings/api.tsx +++ b/packages/web/pages/settings/api.tsx @@ -142,83 +142,78 @@ export default function Api(): JSX.Element { setExpiresAt(new Date(neverExpiresDate)) setAddModalOpen(true) }} - children={ - <> - {apiKeys.length > 0 ? ( - apiKeys.map((apiKey, i) => { - return ( - setOnDeleteId(apiKey.id)} - deleteTitle="Delete" - sublineElement={ - - {`Last used: ${ - apiKey.usedAt - ? formattedShortDate(apiKey.usedAt) - : 'Never' - }, `} - {apiKey.expiresAt && - apiKey.expiresAt != neverExpiresDate.toISOString() - ? `expires: ${formattedShortDate(apiKey.expiresAt)}` - : 'never expires'} - - } - titleElement={<>} - extraElement={<>} - /> - ) - }) - ) : ( - - )} - - {addModalOpen && ( - + {apiKeys.length > 0 ? ( + apiKeys.map((apiKey, i) => { + return ( + setOnDeleteId(apiKey.id)} + deleteTitle="Delete" + sublineElement={ + + {`Last used: ${ + apiKey.usedAt ? formattedShortDate(apiKey.usedAt) : 'Never' + }, `} + {apiKey.expiresAt && + apiKey.expiresAt != neverExpiresDate.toISOString() + ? `expires: ${formattedShortDate(apiKey.expiresAt)}` + : 'never expires'} + + } + titleElement={<>} + extraElement={<>} /> - )} + ) + }) + ) : ( + + )} - {apiKeyGenerated && ( - + )} + + {apiKeyGenerated && ( + { - await navigator.clipboard.writeText(apiKeyGenerated) - setApiKeyGenerated('') - }} - onOpenChange={() => setApiKeyGenerated('')} - /> - )} + acceptButtonLabel={'Copy'} + onAccept={async () => { + await navigator.clipboard.writeText(apiKeyGenerated) + setApiKeyGenerated('') + }} + onOpenChange={() => setApiKeyGenerated('')} + /> + )} - {onDeleteId && ( - { - await onDelete(onDeleteId) - setOnDeleteId('') - }} - onOpenChange={() => setOnDeleteId('')} - /> - )} - - } - /> + {onDeleteId && ( + { + await onDelete(onDeleteId) + setOnDeleteId('') + }} + onOpenChange={() => setOnDeleteId('')} + /> + )} + ) }