chore(misc modals): update props to omit children and remove extra bu…

…tton
isomerpages · Oct 20, 2022 · 8e881fb · 8e881fb
1 parent 7d6129d
commit 8e881fb
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 29 deletions.
diff --git a/src/layouts/ReviewRequest/components/ApprovedModal/ApprovedModal.stories.tsx b/src/layouts/ReviewRequest/components/ApprovedModal/ApprovedModal.stories.tsx
@@ -14,9 +14,7 @@ const Template: Story<never> = () => {
   return (
     <>
       <Button onClick={onOpen}>Open Modal</Button>
-      <ApprovedModal isOpen={isOpen} onClose={onClose}>
-        <Button colorScheme="danger">Click me</Button>
-      </ApprovedModal>
+      <ApprovedModal isOpen={isOpen} onClose={onClose} />
     </>
   )
 }

diff --git a/src/layouts/ReviewRequest/components/ApprovedModal/ApprovedModal.tsx b/src/layouts/ReviewRequest/components/ApprovedModal/ApprovedModal.tsx
@@ -14,9 +14,10 @@ import { Button, ModalCloseButton } from "@opengovsg/design-system-react"
 
 import { ToastImage } from "assets"
 
-export const ApprovedModal = (props: ModalProps): JSX.Element => {
+export const ApprovedModal = (
+  props: Omit<ModalProps, "children">
+): JSX.Element => {
   const { onClose } = props
-
   return (
     <Modal {...props}>
       <ModalOverlay />

diff --git a/src/layouts/ReviewRequest/components/CancelRequestModal/CancelRequestModal.stories.tsx b/src/layouts/ReviewRequest/components/CancelRequestModal/CancelRequestModal.stories.tsx
@@ -14,9 +14,7 @@ const Template: Story<never> = () => {
   return (
     <>
       <Button onClick={onOpen}>Open Modal</Button>
-      <CancelRequestModal isOpen={isOpen} onClose={onClose}>
-        <Button colorScheme="danger">Click me</Button>
-      </CancelRequestModal>
+      <CancelRequestModal isOpen={isOpen} onClose={onClose} />
     </>
   )
 }

diff --git a/src/layouts/ReviewRequest/components/CancelRequestModal/CancelRequestModal.tsx b/src/layouts/ReviewRequest/components/CancelRequestModal/CancelRequestModal.tsx
@@ -10,7 +10,9 @@ import {
 } from "@chakra-ui/react"
 import { Button, ModalCloseButton } from "@opengovsg/design-system-react"
 
-export const CancelRequestModal = (props: ModalProps): JSX.Element => {
+export const CancelRequestModal = (
+  props: Omit<ModalProps, "children">
+): JSX.Element => {
   const { onClose } = props
 
   return (

diff --git a/src/layouts/ReviewRequest/components/EditingBlockedModal/EditingBlockedModal.stories.tsx b/src/layouts/ReviewRequest/components/EditingBlockedModal/EditingBlockedModal.stories.tsx
@@ -14,9 +14,7 @@ const Template: Story<never> = () => {
   return (
     <>
       <Button onClick={onOpen}>Open Modal</Button>
-      <EditingBlockedModal isOpen={isOpen} onClose={onClose}>
-        <Button colorScheme="danger">Click me</Button>
-      </EditingBlockedModal>
+      <EditingBlockedModal isOpen={isOpen} onClose={onClose} />
     </>
   )
 }

diff --git a/src/layouts/ReviewRequest/components/EditingBlockedModal/EditingBlockedModal.tsx b/src/layouts/ReviewRequest/components/EditingBlockedModal/EditingBlockedModal.tsx
@@ -10,7 +10,9 @@ import {
 } from "@chakra-ui/react"
 import { Button, ModalCloseButton } from "@opengovsg/design-system-react"
 
-export const EditingBlockedModal = (props: ModalProps): JSX.Element => {
+export const EditingBlockedModal = (
+  props: Omit<ModalProps, "children">
+): JSX.Element => {
   const { onClose } = props
 
   return (

diff --git a/src/layouts/ReviewRequest/components/ManageReviewerModal/ManageReviewerModal.stories.tsx b/src/layouts/ReviewRequest/components/ManageReviewerModal/ManageReviewerModal.stories.tsx
@@ -29,9 +29,7 @@ const Template: Story<TemplateProps> = ({
         admins={admins}
         isOpen={isOpen}
         onClose={onClose}
-      >
-        <Button colorScheme="danger">Click me</Button>
-      </ManageReviewerModal>
+      />
     </>
   )
 }

diff --git a/src/layouts/ReviewRequest/components/ManageReviewerModal/ManageReviewerModal.tsx b/src/layouts/ReviewRequest/components/ManageReviewerModal/ManageReviewerModal.tsx
@@ -15,7 +15,7 @@ import Select, { PropsValue, useStateManager } from "react-select"
 
 import { User } from "types/reviewRequest"
 
-export interface ManageReviewerModalProps extends ModalProps {
+export interface ManageReviewerModalProps extends Omit<ModalProps, "children"> {
   selectedAdmins: User[]
   admins: User[]
 }

diff --git a/src/layouts/ReviewRequest/components/PendingApprovalModal/PendingApprovalModal.stories.tsx b/src/layouts/ReviewRequest/components/PendingApprovalModal/PendingApprovalModal.stories.tsx
@@ -14,9 +14,7 @@ const Template: Story<never> = () => {
   return (
     <>
       <Button onClick={onOpen}>Open Modal</Button>
-      <PendingApprovalModal isOpen={isOpen} onClose={onClose}>
-        <Button colorScheme="danger">Click me</Button>
-      </PendingApprovalModal>
+      <PendingApprovalModal isOpen={isOpen} onClose={onClose} />
     </>
   )
 }

diff --git a/src/layouts/ReviewRequest/components/PendingApprovalModal/PendingApprovalModal.tsx b/src/layouts/ReviewRequest/components/PendingApprovalModal/PendingApprovalModal.tsx
@@ -10,7 +10,9 @@ import {
 } from "@chakra-ui/react"
 import { Button, ModalCloseButton } from "@opengovsg/design-system-react"
 
-export const PendingApprovalModal = (props: ModalProps): JSX.Element => {
+export const PendingApprovalModal = (
+  props: Omit<ModalProps, "children">
+): JSX.Element => {
   const { onClose } = props
 
   return (

diff --git a/src/layouts/ReviewRequest/components/PublishedModal/PublishedModal.stories.tsx b/src/layouts/ReviewRequest/components/PublishedModal/PublishedModal.stories.tsx
@@ -14,9 +14,7 @@ const Template: Story<never> = () => {
   return (
     <>
       <Button onClick={onOpen}>Open Modal</Button>
-      <PublishedModal isOpen={isOpen} onClose={onClose}>
-        <Button colorScheme="danger">Click me</Button>
-      </PublishedModal>
+      <PublishedModal isOpen={isOpen} onClose={onClose} />
     </>
   )
 }

diff --git a/src/layouts/ReviewRequest/components/PublishedModal/PublishedModal.tsx b/src/layouts/ReviewRequest/components/PublishedModal/PublishedModal.tsx
@@ -14,7 +14,9 @@ import { Button, ModalCloseButton } from "@opengovsg/design-system-react"
 
 import { RocketBlastOffImage } from "assets"
 
-export const PublishedModal = (props: ModalProps): JSX.Element => {
+export const PublishedModal = (
+  props: Omit<ModalProps, "children">
+): JSX.Element => {
   const { onClose } = props
 
   return (

diff --git a/src/layouts/ReviewRequest/components/SendRequestModal/SendRequestModal.stories.tsx b/src/layouts/ReviewRequest/components/SendRequestModal/SendRequestModal.stories.tsx
@@ -31,9 +31,7 @@ const Template: Story<TemplateProps> = ({
         reviewUrl={reviewUrl}
         reviewTitle={reviewTitle}
         siteName={siteName}
-      >
-        <Button colorScheme="danger">Click me</Button>
-      </SendRequestModal>
+      />
     </>
   )
 }

diff --git a/src/layouts/ReviewRequest/components/SendRequestModal/SendRequestModal.tsx b/src/layouts/ReviewRequest/components/SendRequestModal/SendRequestModal.tsx
@@ -50,7 +50,7 @@ View it on IsomerCMS: ${reviewUrl}`
   )}&body=${body}`
 }
 
-export interface SendRequestModalProps extends ModalProps {
+export interface SendRequestModalProps extends Omit<ModalProps, "children"> {
   admins: User[]
   reviewUrl: string
   reviewTitle: string