fix(dashboard): api expire (#3613)

* fix(dashboard): api expire * fix: lint --------- Co-authored-by: Siddharth <[email protected]>
GaloyMoney · Nov 28, 2023 · e68d354 · e68d354
1 parent 8dd7aa9
commit e68d354
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/apps/dashboard/app/api-keys/server-actions.ts b/apps/dashboard/app/api-keys/server-actions.ts
@@ -51,8 +51,10 @@ export const createApiKeyServerAction = async (
   _prevState: ApiKeyResponse,
   form: FormData,
 ): Promise<ApiKeyResponse> => {
+  let apiKeyExpiresInDays: number | null = null
   const apiKeyName = form.get("apiKeyName")
   const readOnly = form.get("apiScope") === "readOnly"
+  const apiKeyExpiresInDaysSelect = form.get("apiKeyExpiresInDaysSelect")
 
   if (!apiKeyName || typeof apiKeyName !== "string") {
     return {
@@ -62,10 +64,14 @@ export const createApiKeyServerAction = async (
     }
   }
 
-  const apiKeyExpiresInDaysFormData = form.get("apiKeyExpiresInDays")
-  const apiKeyExpiresInDays = apiKeyExpiresInDaysFormData
-    ? parseInt(String(apiKeyExpiresInDaysFormData))
-    : null
+  if (apiKeyExpiresInDaysSelect === "custom") {
+    const customValue = form.get("apiKeyExpiresInDaysCustom")
+    apiKeyExpiresInDays = customValue ? parseInt(customValue as string, 10) : null
+  } else {
+    apiKeyExpiresInDays = apiKeyExpiresInDaysSelect
+      ? parseInt(apiKeyExpiresInDaysSelect as string, 10)
+      : null
+  }
 
   const session = await getServerSession(authOptions)
   const token = session?.accessToken

diff --git a/apps/dashboard/components/api-keys/create.tsx b/apps/dashboard/components/api-keys/create.tsx
@@ -204,13 +204,10 @@ const ApiKeyCreate = () => {
                     }}
                   >
                     <Typography>Expires In</Typography>
-                    <Input
-                      name="apiKeyExpiresInDays"
-                      id="apiKeyExpiresInDays"
-                      sx={{ display: "none", padding: "0.6em" }}
-                    />
                     <Select
                       data-testid="create-api-expire-select"
+                      name="apiKeyExpiresInDaysSelect"
+                      id="apiKeyExpiresInDaysSelect"
                       sx={{
                         padding: "0.6em",
                       }}
@@ -241,6 +238,8 @@ const ApiKeyCreate = () => {
                       }}
                     >
                       <Input
+                        name="apiKeyExpiresInDaysCustom"
+                        id="apiKeyExpiresInDaysCustom"
                         sx={{
                           width: "100%",
                           padding: "0.6em",

diff --git a/apps/dashboard/services/graphql/generated.ts b/apps/dashboard/services/graphql/generated.ts
@@ -1634,7 +1634,7 @@ export type TxDirection = typeof TxDirection[keyof typeof TxDirection];
 export const TxNotificationType = {
   IntraLedgerPayment: 'IntraLedgerPayment',
   IntraLedgerReceipt: 'IntraLedgerReceipt',
-  LnInvoicePaid: 'LnInvoicePaid',
+  LigtningReceipt: 'LigtningReceipt',
   OnchainPayment: 'OnchainPayment',
   OnchainReceipt: 'OnchainReceipt',
   OnchainReceiptPending: 'OnchainReceiptPending'