From 3e1ecaad76db528f230642e80af8a7ab1fedcdd2 Mon Sep 17 00:00:00 2001
From: Rupin Khandelwal <rupin@omnivore.app>
Date: Wed, 20 Jul 2022 23:35:32 +0200
Subject: [PATCH] Fixing z-index issue on modal

---
 .../components/elements/ModalPrimitives.tsx   |  1 +
 packages/web/components/elements/Table.tsx    | 58 ++++++++++++-------
 packages/web/pages/settings/api.tsx           | 20 +------
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/packages/web/components/elements/ModalPrimitives.tsx b/packages/web/components/elements/ModalPrimitives.tsx
index 876104de3..33006fc8b 100644
--- a/packages/web/components/elements/ModalPrimitives.tsx
+++ b/packages/web/components/elements/ModalPrimitives.tsx
@@ -34,6 +34,7 @@ const Modal = styled(Content, {
   boxShadow: theme.shadows.cardBoxShadow.toString(),
   position: 'fixed',
   '&:focus': { outline: 'none' },
+  zIndex:'1',
 })
 
 export const ModalContent = styled(Modal, {
diff --git a/packages/web/components/elements/Table.tsx b/packages/web/components/elements/Table.tsx
index ccc117b79..e8f9b582c 100644
--- a/packages/web/components/elements/Table.tsx
+++ b/packages/web/components/elements/Table.tsx
@@ -8,6 +8,7 @@ import { InfoLink } from './InfoLink'
 import { Button } from './Button'
 import 'react-super-responsive-table/dist/SuperResponsiveTableStyle.css'
 import { IconButton } from './Button'
+
 interface TableProps {
   heading: string
   infoLink?: string
@@ -25,7 +26,11 @@ const HeaderWrapper = styled(Box, {
   },
 })
 
-export function TableR(props: TableProps): JSX.Element {
+const newThead = {
+  background: '#156'
+}
+
+export function TableNew(props: TableProps): JSX.Element {
   const iconColor = isDarkTheme() ? '#D8D7D5' : '#5F5E58'
 
   return (
@@ -98,26 +103,27 @@ export function TableR(props: TableProps): JSX.Element {
         }}
       >
         <Table>
-          <Thead>
-            <Tr>
-              {props.headers.map((header: string, index: number) => (
-                <Th key={index}>
-                  <SpanBox
-                    css={{
-                      textTransform: 'uppercase',
-                      display: 'flex',
-                      fontWeight: 600,
-                      padding: '20px 10px 20px 40px',
-                      color: '$grayTextContrast',
-                      fontSize: '$2',
-                    }}
-                  >
-                    {header}
-                  </SpanBox>
-                </Th>
-              ))}
-            </Tr>
+          <Thead className={newThead}>
+              <Tr>
+                {props.headers.map((header: string, index: number) => (
+                  <Th key={index}>
+                    <SpanBox
+                      css={{
+                        textTransform: 'uppercase',
+                        display: 'flex',
+                        fontWeight: 600,
+                        padding: '20px 10px 20px 40px',
+                        color: '$grayTextContrast',
+                        fontSize: '$2',
+                      }}
+                    >
+                      {header}
+                    </SpanBox>
+                  </Th>
+                ))}
+              </Tr>
           </Thead>
+
           <Tbody>
             {Array.from(props.rows.keys()).map((key, index) => (
               <Tr key={index}>
@@ -142,7 +148,11 @@ export function TableR(props: TableProps): JSX.Element {
                   <Td>
                     <IconButton
                       style="ctaWhite"
-                      css={{ mr: '$1', background: '$labelButtonsBg', margin: '20px 10px 20px 40px', }}
+                      css={{
+                        mr: '$1',
+                        background: '$labelButtonsBg',
+                        margin: '20px 10px 20px 40px',
+                      }}
                       onClick={() => {
                         props.onDelete && props.onDelete(key)
                       }}
@@ -155,7 +165,11 @@ export function TableR(props: TableProps): JSX.Element {
                   <Td>
                     <IconButton
                       style="ctaWhite"
-                      css={{ mr: '$1', background: '$labelButtonsBg', margin: '20px 10px 20px 40px', }}
+                      css={{
+                        mr: '$1',
+                        background: '$labelButtonsBg',
+                        margin: '20px 10px 20px 40px',
+                      }}
                       onClick={() => {
                         props.onEdit &&
                           props.onEdit({ ...props.rows.get(key), id: key })
diff --git a/packages/web/pages/settings/api.tsx b/packages/web/pages/settings/api.tsx
index 1a9787e4d..4bd9d550a 100644
--- a/packages/web/pages/settings/api.tsx
+++ b/packages/web/pages/settings/api.tsx
@@ -9,7 +9,7 @@ import { generateApiKeyMutation } from '../../lib/networking/mutations/generateA
 import { revokeApiKeyMutation } from '../../lib/networking/mutations/revokeApiKeyMutation'
 
 import { PrimaryLayout } from '../../components/templates/PrimaryLayout'
-import { TableR } from '../../components/elements/Table'
+import { TableNew } from '../../components/elements/Table'
 
 import { FormInputProps } from '../../components/elements/FormElements'
 import { FormModal } from '../../components/patterns/FormModal'
@@ -183,7 +183,7 @@ export default function Api(): JSX.Element {
         />
       )}
 
-      <TableR
+      <TableNew
         heading={'API Keys'}
         headers={headers}
         rows={rows}
@@ -195,22 +195,6 @@ export default function Api(): JSX.Element {
           setAddModalOpen(true)
         }}
       />
-
-      {/* TESTING NEW TABLE */}
-
-      
-      {/* <TableR
-        headers={headers}
-        heading={'API Keys'}
-        rows={rows}
-        onDelete={setOnDeleteId}
-        onAdd={() => {
-          onAdd()
-          setName('')
-          setExpiresAt(new Date(defaultExpiresAt))
-          setAddModalOpen(true)
-        }} */}
-   
     </PrimaryLayout>
   )
 }