[Fix] Roll back lint coalescing bugs (#11757)

* Fix lint coalescing bugs * type to boolean * type coercion to boolean
GCTC-NTGC · Oct 16, 2024 · 1d9e2f0 · 1d9e2f0
1 parent 837063d
commit 1d9e2f0
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/apps/web/src/components/EmploymentEquity/dialogs/DialogFooter.tsx b/apps/web/src/components/EmploymentEquity/dialogs/DialogFooter.tsx
@@ -18,7 +18,7 @@ const DialogFooter = ({ saveText, disabled }: DialogFooterProps) => {
         type="submit"
         mode="solid"
         color="secondary"
-        disabled={disabled ?? isSubmitting}
+        disabled={disabled || isSubmitting}
       >
         <span>{saveText ?? intl.formatMessage(formMessages.saveChanges)}</span>
       </Button>

diff --git a/apps/web/src/components/Table/ResponsiveTable/ResponsiveTable.tsx b/apps/web/src/components/Table/ResponsiveTable/ResponsiveTable.tsx
@@ -368,7 +368,7 @@ const ResponsiveTable = <TData extends object, TFilters = object>({
                 ))}
               </Table.Body>
             </Table.Table>
-            {(rowSelect ?? download?.all) && (
+            {(!!rowSelect || !!download?.all) && (
               <RowSelection.Actions
                 {...{
                   rowSelect: !!rowSelect,

diff --git a/apps/web/src/components/Table/ResponsiveTable/RowSelection.tsx b/apps/web/src/components/Table/ResponsiveTable/RowSelection.tsx
@@ -301,7 +301,7 @@ const Actions = ({
                   })}
                 </Button>
               </span>
-              {(download?.csv?.enable ?? download?.doc?.enable) && (
+              {(download?.csv?.enable || download?.doc?.enable) && (
                 <span
                   data-h2-align-items="base(center)"
                   data-h2-display="base(flex)"

diff --git a/apps/web/src/components/Table/ResponsiveTable/styles.ts b/apps/web/src/components/Table/ResponsiveTable/styles.ts
@@ -27,7 +27,7 @@ export const getCellStyles: GetCellStyles = ({
   isRowSelect,
   shouldShrink,
 }) => {
-  const shrinkCol = shouldShrink ?? isRowSelect;
+  const shrinkCol = shouldShrink || isRowSelect;
   return {
     td: {
       ...(!isRowTitle &&

diff --git a/apps/web/src/components/UserProfile/ProfileSections/DiversityEquityInclusionSection.tsx b/apps/web/src/components/UserProfile/ProfileSections/DiversityEquityInclusionSection.tsx
@@ -148,7 +148,7 @@ const DiversityEquityInclusionSection = ({
                 </div>
               </div>
             )}
-            {(isWoman ?? isVisibleMinority ?? hasDisability) && (
+            {(isWoman || isVisibleMinority || hasDisability) && (
               <ul
                 data-h2-font-weight="base(700)"
                 data-h2-padding="base(x1, 0, 0, x1)"

diff --git a/apps/web/src/pages/Pools/EditPoolPage/components/SpecialNoteSection/SpecialNoteSection.tsx b/apps/web/src/pages/Pools/EditPoolPage/components/SpecialNoteSection/SpecialNoteSection.tsx
@@ -82,9 +82,8 @@ const SpecialNoteSection = ({
   });
 
   const dataToFormValues = (initialData: Pool): FormValues => ({
-    hasSpecialNote: !!(
-      initialData.specialNote?.en ?? initialData.specialNote?.fr
-    ),
+    hasSpecialNote:
+      !!initialData.specialNote?.en || !!initialData.specialNote?.fr,
     specialNoteEn: initialData.specialNote?.en ?? "",
     specialNoteFr: initialData.specialNote?.fr ?? "",
   });

diff --git a/apps/web/src/pages/Users/UserInformationPage/components/AboutSection.tsx b/apps/web/src/pages/Users/UserInformationPage/components/AboutSection.tsx
@@ -93,7 +93,7 @@ const AboutSection = ({ user }: BasicUserInformationProps) => {
             )}
           </p>
         </div>
-        {(user.currentCity ?? user.currentProvince) && (
+        {(!!user.currentCity || !!user.currentProvince) && (
           <div data-h2-flex-item="base(1of1) p-tablet(1of2) desktop(1of3)">
             <p data-h2-font-weight="base(700)">
               {intl.formatMessage({

diff --git a/packages/ui/src/components/Accordion/Accordion.tsx b/packages/ui/src/components/Accordion/Accordion.tsx
@@ -232,7 +232,7 @@ const Trigger = forwardRef<
               </span>
             </span>
 
-            {(Icon ?? context) && (
+            {(!!Icon || !!context) && (
               <span
                 data-h2-align-items="base(center)"
                 data-h2-display="base(flex)"