From 6ce307b0a2ad64e123ea5ee3581f52335d23a57f Mon Sep 17 00:00:00 2001
From: Kishore <42832651+kishore03109@users.noreply.github.com>
Date: Wed, 28 Jun 2023 16:00:27 +0800
Subject: [PATCH 1/2] chore(eslint): turn off warning

---
 .eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 05b7ab852..54f759125 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -42,7 +42,7 @@
   "rules": {
     "no-shadow": "off",
     "@typescript-eslint/no-shadow": "error",
-    "react/jsx-props-no-spreading": "warn",
+    "react/jsx-props-no-spreading": "off",
     "react/require-default-props": "off",
     "import/prefer-default-export": "off",
     "react/prop-types": "warn",

From d8cbca3ca39331ca8693f20d702b084ab296c847 Mon Sep 17 00:00:00 2001
From: Kishore <42832651+kishore03109@users.noreply.github.com>
Date: Wed, 28 Jun 2023 16:05:42 +0800
Subject: [PATCH 2/2] chore(eslint): remove redundant warnings

---
 src/assets/icons/BxCopy.tsx                                 | 1 -
 src/assets/icons/BxLifeBuoy.tsx                             | 1 -
 src/assets/icons/BxsClearRocket.tsx                         | 1 -
 src/components/Card/Card.tsx                                | 1 -
 src/components/DisplayCard/DisplayCard.tsx                  | 1 -
 src/components/MediaSettingsModal/MediaSettingsModal.jsx    | 1 -
 src/components/PageSettingsModal/PageSettingsModal.tsx      | 3 ---
 .../PageSettingsModal/ResourcePageSettingsModal.tsx         | 5 -----
 src/components/contact-us/Section.jsx                       | 1 -
 src/components/folders/ReorderingModal.jsx                  | 3 ---
 src/components/homepage/HeroDropdown.jsx                    | 1 -
 src/components/homepage/HeroSection.jsx                     | 1 -
 src/components/media/MediaAltText.jsx                       | 1 -
 src/components/navbar/NavSection.jsx                        | 1 -
 src/components/navbar/NavSublinkSection.jsx                 | 1 -
 src/layouts/EditContactUs.jsx                               | 1 -
 src/layouts/EditHomepage.jsx                                | 1 -
 src/layouts/ResourceRoom/ResourceRoom.tsx                   | 2 --
 src/layouts/SiteLaunchPad/SiteLaunchPad.tsx                 | 1 -
 .../SiteLaunchPad/components/SiteLaunchCheckList.tsx        | 1 -
 .../SiteLaunchPad/components/SiteLaunchInfoGathering.tsx    | 1 -
 src/layouts/components/CreateButton.tsx                     | 1 -
 src/layouts/components/Section/Section.tsx                  | 1 -
 src/layouts/components/Section/SectionCaption.tsx           | 1 -
 src/layouts/layouts/SiteEditLayout/SiteEditLayout.tsx       | 2 --
 src/layouts/layouts/SiteViewLayout/SiteViewLayout.tsx       | 2 --
 src/routing/ProtectedRoute.tsx                              | 6 +-----
 src/routing/ProtectedRouteWithProps.tsx                     | 1 -
 src/routing/RedirectIfLoggedInRoute.jsx                     | 1 -
 29 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/src/assets/icons/BxCopy.tsx b/src/assets/icons/BxCopy.tsx
index 1a7366d60..2756f2b80 100644
--- a/src/assets/icons/BxCopy.tsx
+++ b/src/assets/icons/BxCopy.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 export const BxCopy = (props: React.SVGProps<SVGSVGElement>): JSX.Element => {
   return (
     <svg
diff --git a/src/assets/icons/BxLifeBuoy.tsx b/src/assets/icons/BxLifeBuoy.tsx
index a2e2eb1d1..3de72d369 100644
--- a/src/assets/icons/BxLifeBuoy.tsx
+++ b/src/assets/icons/BxLifeBuoy.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 export const BxLifeBuoy = (
   props: React.SVGProps<SVGSVGElement>
 ): JSX.Element => {
diff --git a/src/assets/icons/BxsClearRocket.tsx b/src/assets/icons/BxsClearRocket.tsx
index ce9294ae1..a4a942cb2 100644
--- a/src/assets/icons/BxsClearRocket.tsx
+++ b/src/assets/icons/BxsClearRocket.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 export const BxsClearRocket = (
   props: React.SVGProps<SVGSVGElement>
 ): JSX.Element => {
diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx
index 366fc36b2..26befaa8a 100644
--- a/src/components/Card/Card.tsx
+++ b/src/components/Card/Card.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import {
   Box,
   BoxProps,
diff --git a/src/components/DisplayCard/DisplayCard.tsx b/src/components/DisplayCard/DisplayCard.tsx
index fdd7b2f67..c5d1e3ef0 100644
--- a/src/components/DisplayCard/DisplayCard.tsx
+++ b/src/components/DisplayCard/DisplayCard.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import {
   Box,
   Divider,
diff --git a/src/components/MediaSettingsModal/MediaSettingsModal.jsx b/src/components/MediaSettingsModal/MediaSettingsModal.jsx
index c99b5172d..52da16623 100644
--- a/src/components/MediaSettingsModal/MediaSettingsModal.jsx
+++ b/src/components/MediaSettingsModal/MediaSettingsModal.jsx
@@ -158,7 +158,6 @@ export const MediaSettingsModal = ({
                 <FormTitle>File name</FormTitle>
                 <FormField
                   placeholder="File name"
-                  // eslint-disable-next-line react/jsx-props-no-spreading
                   {...register("name")}
                   id="name"
                 />
diff --git a/src/components/PageSettingsModal/PageSettingsModal.tsx b/src/components/PageSettingsModal/PageSettingsModal.tsx
index de7ba976c..0b1d708ae 100644
--- a/src/components/PageSettingsModal/PageSettingsModal.tsx
+++ b/src/components/PageSettingsModal/PageSettingsModal.tsx
@@ -158,7 +158,6 @@ export const PageSettingsModal = ({
                 <Input
                   placeholder="Page title"
                   id="title"
-                  // eslint-disable-next-line react/jsx-props-no-spreading
                   {...register("title", { required: true })}
                 />
                 <FormErrorMessage>{errors.title?.message}</FormErrorMessage>
@@ -173,7 +172,6 @@ export const PageSettingsModal = ({
                   </FormLabel.Description>
                 </Box>
                 <Input
-                  // eslint-disable-next-line react/jsx-props-no-spreading
                   {...register("permalink", { required: true })}
                   id="permalink"
                   placeholder="Page URL"
@@ -196,7 +194,6 @@ export const PageSettingsModal = ({
                 <Input
                   placeholder="Meta Description (Optional)"
                   id="description"
-                  // eslint-disable-next-line react/jsx-props-no-spreading
                   {...register("description")}
                 />
                 <FormErrorMessage>
diff --git a/src/components/PageSettingsModal/ResourcePageSettingsModal.tsx b/src/components/PageSettingsModal/ResourcePageSettingsModal.tsx
index 5fd29ab80..957bed467 100644
--- a/src/components/PageSettingsModal/ResourcePageSettingsModal.tsx
+++ b/src/components/PageSettingsModal/ResourcePageSettingsModal.tsx
@@ -250,7 +250,6 @@ export const ResourcePageSettingsModal = ({
                   <FormLabel mb={0}>Resource Type</FormLabel>
                 </Box>
                 <Select
-                  // eslint-disable-next-line react/jsx-props-no-spreading
                   {...register("layout", { required: true })}
                   id="layout"
                   value={watch("layout")}
@@ -268,7 +267,6 @@ export const ResourcePageSettingsModal = ({
                 <Input
                   placeholder="Page title"
                   id="title"
-                  // eslint-disable-next-line react/jsx-props-no-spreading
                   {...register("title", { required: true })}
                 />
                 <FormErrorMessage>{errors.title?.message}</FormErrorMessage>
@@ -289,7 +287,6 @@ export const ResourcePageSettingsModal = ({
                       </FormLabel.Description>
                     </Box>
                     <Input
-                      // eslint-disable-next-line react/jsx-props-no-spreading
                       {...register("permalink", { required: true })}
                       id="permalink"
                       placeholder="Page URL"
@@ -310,7 +307,6 @@ export const ResourcePageSettingsModal = ({
                   </FormLabel.Description>
                 </Box>
                 <Input
-                  // eslint-disable-next-line react/jsx-props-no-spreading
                   {...register("date", { required: true })}
                   id="date"
                   placeholder="Date (YYYY-MM-DD)"
@@ -362,7 +358,6 @@ export const ResourcePageSettingsModal = ({
                     <Input
                       placeholder="Meta Description (Optional)"
                       id="description"
-                      // eslint-disable-next-line react/jsx-props-no-spreading
                       {...register("description")}
                     />
                     <FormErrorMessage>
diff --git a/src/components/contact-us/Section.jsx b/src/components/contact-us/Section.jsx
index 2e5194a99..fc30157f3 100644
--- a/src/components/contact-us/Section.jsx
+++ b/src/components/contact-us/Section.jsx
@@ -49,7 +49,6 @@ const EditorSection = ({
       <>
         <Droppable droppableId={sectionId} type={sectionId}>
           {(droppableProvided) => (
-            /* eslint-disable react/jsx-props-no-spreading */
             <div
               className={styles.card}
               ref={droppableProvided.innerRef}
diff --git a/src/components/folders/ReorderingModal.jsx b/src/components/folders/ReorderingModal.jsx
index e3edf1e38..c26bd1b6f 100644
--- a/src/components/folders/ReorderingModal.jsx
+++ b/src/components/folders/ReorderingModal.jsx
@@ -91,7 +91,6 @@ const ReorderingModal = ({ params, dirData, onProceed, onClose }) => {
                   <div
                     className={`${contentStyles.contentContainerFolderColumn} mb-5`}
                     ref={droppableProvided.innerRef}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...droppableProvided.droppableProps}
                   >
                     {dirOrder.map((folderContentItem, folderContentIndex) => (
@@ -102,9 +101,7 @@ const ReorderingModal = ({ params, dirData, onProceed, onClose }) => {
                       >
                         {(draggableProvided) => (
                           <div
-                            // eslint-disable-next-line react/jsx-props-no-spreading
                             {...draggableProvided.draggableProps}
-                            // eslint-disable-next-line react/jsx-props-no-spreading
                             {...draggableProvided.dragHandleProps}
                             ref={draggableProvided.innerRef}
                           >
diff --git a/src/components/homepage/HeroDropdown.jsx b/src/components/homepage/HeroDropdown.jsx
index 715cc5fce..3bf78a1a4 100644
--- a/src/components/homepage/HeroDropdown.jsx
+++ b/src/components/homepage/HeroDropdown.jsx
@@ -101,7 +101,6 @@ const HeroDropdown = ({
     </FormContext>
     <Droppable droppableId="dropdownelem" type="dropdownelem">
       {(droppableProvided) => (
-        /* eslint-disable react/jsx-props-no-spreading */
         <div
           className={styles.card}
           ref={droppableProvided.innerRef}
diff --git a/src/components/homepage/HeroSection.jsx b/src/components/homepage/HeroSection.jsx
index e02adc6c5..111934562 100644
--- a/src/components/homepage/HeroSection.jsx
+++ b/src/components/homepage/HeroSection.jsx
@@ -156,7 +156,6 @@ const EditorHeroSection = ({
               />
               <Droppable droppableId="highlight" type="highlight">
                 {(droppableProvided) => (
-                  /* eslint-disable react/jsx-props-no-spreading */
                   <div
                     className={styles.card}
                     ref={droppableProvided.innerRef}
diff --git a/src/components/media/MediaAltText.jsx b/src/components/media/MediaAltText.jsx
index 63f79f2d4..b527cd1d0 100644
--- a/src/components/media/MediaAltText.jsx
+++ b/src/components/media/MediaAltText.jsx
@@ -95,7 +95,6 @@ export const MediaAltText = ({ onProceed, onClose, type }) => {
                      */}
                     <FormField
                       placeholder={formTitle}
-                      // eslint-disable-next-line react/jsx-props-no-spreading
                       {...register("altText")}
                       id="altText"
                     />
diff --git a/src/components/navbar/NavSection.jsx b/src/components/navbar/NavSection.jsx
index eb5ec3967..61e80de08 100644
--- a/src/components/navbar/NavSection.jsx
+++ b/src/components/navbar/NavSection.jsx
@@ -218,7 +218,6 @@ const NavSection = ({
     <>
       <Droppable droppableId="link" type="link">
         {(droppableProvided) => (
-          /* eslint-disable react/jsx-props-no-spreading */
           <div
             className={styles.card}
             ref={droppableProvided.innerRef}
diff --git a/src/components/navbar/NavSublinkSection.jsx b/src/components/navbar/NavSublinkSection.jsx
index 9677d5903..501fe8860 100644
--- a/src/components/navbar/NavSublinkSection.jsx
+++ b/src/components/navbar/NavSublinkSection.jsx
@@ -93,7 +93,6 @@ const NavSublinkSection = ({
 }) => (
   <Droppable droppableId={`sublink-${linkIndex}`} type="sublink">
     {(droppableProvided) => (
-      /* eslint-disable react/jsx-props-no-spreading */
       <div
         className={styles.card}
         ref={droppableProvided.innerRef}
diff --git a/src/layouts/EditContactUs.jsx b/src/layouts/EditContactUs.jsx
index a1e004031..1b3b74dcd 100644
--- a/src/layouts/EditContactUs.jsx
+++ b/src/layouts/EditContactUs.jsx
@@ -45,7 +45,6 @@ import { validateContactType, validateLocationType } from "utils/validators"
 
 import { DEFAULT_RETRY_MSG, isEmpty } from "utils"
 
-/* eslint-disable react/jsx-props-no-spreading */
 /* eslint-disable react/no-array-index-key */
 
 // Constants
diff --git a/src/layouts/EditHomepage.jsx b/src/layouts/EditHomepage.jsx
index b4cc30046..225434699 100644
--- a/src/layouts/EditHomepage.jsx
+++ b/src/layouts/EditHomepage.jsx
@@ -40,7 +40,6 @@ import {
 
 import { DEFAULT_RETRY_MSG } from "utils"
 
-/* eslint-disable react/jsx-props-no-spreading */
 /* eslint-disable react/no-array-index-key */
 
 // Constants
diff --git a/src/layouts/ResourceRoom/ResourceRoom.tsx b/src/layouts/ResourceRoom/ResourceRoom.tsx
index 1f32911ca..5e5653297 100644
--- a/src/layouts/ResourceRoom/ResourceRoom.tsx
+++ b/src/layouts/ResourceRoom/ResourceRoom.tsx
@@ -134,7 +134,6 @@ const EmptyResourceRoom = () => {
               <Input
                 marginTop={5}
                 placeholder="Resource room name"
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...register("newDirectoryName", {
                   required: "Please enter resource room name",
                 })}
@@ -362,7 +361,6 @@ const ResourceRoomContent = ({
                 <FormLabel>Resource room title</FormLabel>
                 <Input
                   placeholder="New resource room name"
-                  // eslint-disable-next-line react/jsx-props-no-spreading
                   {...register("newDirectoryName", {
                     required:
                       "Please ensure that you have entered a resource room name!",
diff --git a/src/layouts/SiteLaunchPad/SiteLaunchPad.tsx b/src/layouts/SiteLaunchPad/SiteLaunchPad.tsx
index 9acabb6e5..69bb116e8 100644
--- a/src/layouts/SiteLaunchPad/SiteLaunchPad.tsx
+++ b/src/layouts/SiteLaunchPad/SiteLaunchPad.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import {
   Modal,
   ModalOverlay,
diff --git a/src/layouts/SiteLaunchPad/components/SiteLaunchCheckList.tsx b/src/layouts/SiteLaunchPad/components/SiteLaunchCheckList.tsx
index 29e440480..b6e2814c4 100644
--- a/src/layouts/SiteLaunchPad/components/SiteLaunchCheckList.tsx
+++ b/src/layouts/SiteLaunchPad/components/SiteLaunchCheckList.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import {
   Box,
   Center,
diff --git a/src/layouts/SiteLaunchPad/components/SiteLaunchInfoGathering.tsx b/src/layouts/SiteLaunchPad/components/SiteLaunchInfoGathering.tsx
index 1aa6b6e7d..536431cbc 100644
--- a/src/layouts/SiteLaunchPad/components/SiteLaunchInfoGathering.tsx
+++ b/src/layouts/SiteLaunchPad/components/SiteLaunchInfoGathering.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import { Box, Button, Icon, Text, RadioGroup } from "@chakra-ui/react"
 import { Input, Radio } from "@opengovsg/design-system-react"
 import { useState } from "react"
diff --git a/src/layouts/components/CreateButton.tsx b/src/layouts/components/CreateButton.tsx
index 481309540..b226c6bb8 100644
--- a/src/layouts/components/CreateButton.tsx
+++ b/src/layouts/components/CreateButton.tsx
@@ -10,7 +10,6 @@ export const CreateButton = forwardRef<ButtonProps, "button">(
     return (
       <Button
         variant="outline"
-        /* eslint-disable-next-line react/jsx-props-no-spreading */
         {...props}
         ref={ref}
         iconSpacing="0.5rem"
diff --git a/src/layouts/components/Section/Section.tsx b/src/layouts/components/Section/Section.tsx
index f39da6731..17e16991e 100644
--- a/src/layouts/components/Section/Section.tsx
+++ b/src/layouts/components/Section/Section.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import { VStack, StackProps } from "@chakra-ui/react"
 
 // eslint-disable-next-line import/prefer-default-export
diff --git a/src/layouts/components/Section/SectionCaption.tsx b/src/layouts/components/Section/SectionCaption.tsx
index 78881a063..465bc7b48 100644
--- a/src/layouts/components/Section/SectionCaption.tsx
+++ b/src/layouts/components/Section/SectionCaption.tsx
@@ -17,7 +17,6 @@ export const SectionCaption = ({
         <Text textStyle="subhead-3" as="span">
           {label}
         </Text>
-        {/* eslint-disable-next-line react/jsx-props-no-spreading */}
         <Text textStyle="body-2" as="span" {...rest} />
       </Text>
     </HStack>
diff --git a/src/layouts/layouts/SiteEditLayout/SiteEditLayout.tsx b/src/layouts/layouts/SiteEditLayout/SiteEditLayout.tsx
index f08c96965..fca9ab44e 100644
--- a/src/layouts/layouts/SiteEditLayout/SiteEditLayout.tsx
+++ b/src/layouts/layouts/SiteEditLayout/SiteEditLayout.tsx
@@ -27,7 +27,6 @@ const GRID_LAYOUT: Pick<
 export const SiteEditLayout = ({ children }: StackProps): JSX.Element => {
   return (
     <>
-      {/* eslint-disable-next-line react/jsx-props-no-spreading */}
       <Grid {...GRID_LAYOUT}>
         <GridItem
           area="header"
@@ -67,7 +66,6 @@ export const SiteEditContent = ({
       w="100%"
       h="100%"
       divider={<StackDivider borderColor="border.divider.alt" />}
-      // eslint-disable-next-line react/jsx-props-no-spreading
       {...rest}
     >
       {children}
diff --git a/src/layouts/layouts/SiteViewLayout/SiteViewLayout.tsx b/src/layouts/layouts/SiteViewLayout/SiteViewLayout.tsx
index 1a41ff1bf..7bdebb2f1 100644
--- a/src/layouts/layouts/SiteViewLayout/SiteViewLayout.tsx
+++ b/src/layouts/layouts/SiteViewLayout/SiteViewLayout.tsx
@@ -22,7 +22,6 @@ const GRID_LAYOUT: Pick<
 export const SiteViewLayout = ({ children }: StackProps): JSX.Element => {
   return (
     <>
-      {/* eslint-disable-next-line react/jsx-props-no-spreading */}
       <Grid {...GRID_LAYOUT}>
         <GridItem
           area="header"
@@ -53,7 +52,6 @@ export const SiteViewContent = ({
       w="100%"
       h="100%"
       divider={<StackDivider borderColor="border.divider.alt" />}
-      // eslint-disable-next-line react/jsx-props-no-spreading
       {...rest}
     >
       {children}
diff --git a/src/routing/ProtectedRoute.tsx b/src/routing/ProtectedRoute.tsx
index a03a1d96c..2a8cc66f6 100644
--- a/src/routing/ProtectedRoute.tsx
+++ b/src/routing/ProtectedRoute.tsx
@@ -40,7 +40,6 @@ export const ProtectedRoute = ({
   if (displayedName && WrappedComponent) {
     return (
       <Route
-        // eslint-disable-next-line react/jsx-props-no-spreading
         {...rest}
         render={(props) => {
           const { match } = props
@@ -49,10 +48,7 @@ export const ProtectedRoute = ({
             ...match,
             decodedParams: getDecodedParams(prune(params)),
           }
-          return (
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            <WrappedComponent {...rest} {...props} match={newMatch} />
-          )
+          return <WrappedComponent {...rest} {...props} match={newMatch} />
         }}
       />
     )
diff --git a/src/routing/ProtectedRouteWithProps.tsx b/src/routing/ProtectedRouteWithProps.tsx
index 626b55821..d4b29c340 100644
--- a/src/routing/ProtectedRouteWithProps.tsx
+++ b/src/routing/ProtectedRouteWithProps.tsx
@@ -12,7 +12,6 @@ type RouteProps = {
 export const ProtectedRouteWithProps = (props: RouteProps): JSX.Element => {
   return (
     <Sentry.ErrorBoundary fallback={FallbackComponent}>
-      {/* eslint-disable-next-line react/jsx-props-no-spreading */}
       <ProtectedRoute {...props} />
     </Sentry.ErrorBoundary>
   )
diff --git a/src/routing/RedirectIfLoggedInRoute.jsx b/src/routing/RedirectIfLoggedInRoute.jsx
index ab0239031..0ae42171a 100644
--- a/src/routing/RedirectIfLoggedInRoute.jsx
+++ b/src/routing/RedirectIfLoggedInRoute.jsx
@@ -13,7 +13,6 @@ export default function RedirectIfLoggedInRoute({
     <Redirect to="/sites" />
   ) : (
     children ||
-      // eslint-disable-next-line react/jsx-props-no-spreading
       (WrappedComponent && <Route {...rest} component={WrappedComponent} />)
   )
 }