From 4e2197331c809999aabf8feec2b59ee67ff6b946 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 18 Jan 2023 18:01:34 +0800
Subject: [PATCH] Fix default expiration to match form

---
 .../components/patterns/ConfirmationModal.tsx |  5 ++---
 packages/web/pages/settings/api.tsx           | 20 ++++---------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/packages/web/components/patterns/ConfirmationModal.tsx b/packages/web/components/patterns/ConfirmationModal.tsx
index a05d7524f..7ff120c77 100644
--- a/packages/web/components/patterns/ConfirmationModal.tsx
+++ b/packages/web/components/patterns/ConfirmationModal.tsx
@@ -6,14 +6,13 @@ import {
 import { VStack, HStack } from '../elements/LayoutPrimitives'
 import { Button } from '../elements/Button'
 import { StyledText } from '../elements/StyledText'
-import { useConfirmListener } from '../../lib/keyboardShortcuts/useKeyboardShortcuts'
-import { useEffect, useRef } from 'react'
 
 type ConfirmationModalProps = {
   message?: string
   richMessage?: React.ReactNode
   icon?: React.ReactNode
   acceptButtonLabel?: string
+  cancelButtonLabel?: string
   onAccept: () => void
   onOpenChange: (open: boolean) => void
 }
@@ -42,7 +41,7 @@ export function ConfirmationModal(props: ConfirmationModalProps): JSX.Element {
                 }
               }}
             >
-              Cancel
+              {props.cancelButtonLabel ? props.cancelButtonLabel : 'Cancel'}
             </Button>
             <Button
               style="ctaDarkYellow"
diff --git a/packages/web/pages/settings/api.tsx b/packages/web/pages/settings/api.tsx
index 93664d1ab..661b5d7e3 100644
--- a/packages/web/pages/settings/api.tsx
+++ b/packages/web/pages/settings/api.tsx
@@ -1,6 +1,5 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useRouter } from 'next/router'
-import { Toaster } from 'react-hot-toast'
 
 import { showErrorToast, showSuccessToast } from '../../lib/toastHelpers'
 import { applyStoredTheme } from '../../lib/themeUpdater'
@@ -8,9 +7,6 @@ import { useGetApiKeysQuery } from '../../lib/networking/queries/useGetApiKeysQu
 import { generateApiKeyMutation } from '../../lib/networking/mutations/generateApiKeyMutation'
 import { revokeApiKeyMutation } from '../../lib/networking/mutations/revokeApiKeyMutation'
 
-import { PrimaryLayout } from '../../components/templates/PrimaryLayout'
-import { Table } from '../../components/elements/Table'
-
 import { FormInputProps } from '../../components/elements/FormElements'
 import { FormModal } from '../../components/patterns/FormModal'
 import { ConfirmationModal } from '../../components/patterns/ConfirmationModal'
@@ -21,14 +17,6 @@ import {
 } from '../../components/templates/settings/SettingsTable'
 import { StyledText } from '../../components/elements/StyledText'
 import { formattedShortDate } from '../../lib/dateFormatting'
-import Link from 'next/link'
-
-interface ApiKey {
-  name: string
-  scopes: string
-  expiresAt: string
-  usedAt: string
-}
 
 export default function Api(): JSX.Element {
   const { apiKeys, revalidate, isValidating } = useGetApiKeysQuery()
@@ -36,12 +24,11 @@ export default function Api(): JSX.Element {
   const [addModalOpen, setAddModalOpen] = useState(false)
   const [name, setName] = useState<string>('')
   const [value, setValue] = useState<string>('')
-  // const [scopes, setScopes] = useState<string[] | undefined>(undefined)
   const [expiresAt, setExpiresAt] = useState<Date>(new Date())
   const [formInputs, setFormInputs] = useState<FormInputProps[]>([])
   const [apiKeyGenerated, setApiKeyGenerated] = useState('')
   // default expiry date is 1 year from now
-  const defaultExpiresAt = new Date(Date.now() + 1000 * 60 * 60 * 24 * 365)
+  const defaultExpiresAt = new Date(Date.now() + 1000 * 60 * 60 * 24 * 7)
     .toISOString()
     .split('T')[0]
   const neverExpiresDate = new Date(8640000000000000)
@@ -195,7 +182,8 @@ export default function Api(): JSX.Element {
           message={`API key generated. Copy the key and use it in your application.
                     You won’t be able to see it again!
                     Key: ${apiKeyGenerated}`}
-          acceptButtonLabel={'Copy'}
+          acceptButtonLabel="Copy"
+          cancelButtonLabel="Close"
           onAccept={async () => {
             await navigator.clipboard.writeText(apiKeyGenerated)
             setApiKeyGenerated('')