lint

pennlabs · Mar 5, 2021 · b2ec735 · b2ec735
1 parent 6eb0b83
commit b2ec735
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 65 deletions.
diff --git a/frontend/components/ClubEditPage/EventsCard.tsx b/frontend/components/ClubEditPage/EventsCard.tsx
@@ -292,7 +292,12 @@ const eventTableFields = [
   {
     name: 'is_ics_event',
     label: 'ICS',
-    converter: (a: boolean): ReactElement => <Icon className={`has-text-${a ? 'has-text-success' : 'has-text-danger'}`} name={a ? 'check' : 'x'} />,
+    converter: (a: boolean): ReactElement => (
+      <Icon
+        className={`has-text-${a ? 'has-text-success' : 'has-text-danger'}`}
+        name={a ? 'check' : 'x'}
+      />
+    ),
   },
 ]
 

diff --git a/frontend/components/ClubEditPage/MembersCard.tsx b/frontend/components/ClubEditPage/MembersCard.tsx
@@ -104,7 +104,7 @@ export default function MembersCard({ club }: MembersCardProps): ReactElement {
             filterFunction: (selection, object) => object.active === selection,
           },
         ]}
-        searchableColumns = {["name", "email"]}
+        searchableColumns={['name', 'email']}
         currentTitle={(obj) =>
           obj != null ? `${obj.name} (${obj.email})` : 'Kicked Member'
         }

diff --git a/frontend/components/ModelForm.tsx b/frontend/components/ModelForm.tsx
@@ -159,9 +159,7 @@ export const ModelTable = ({
             ? objects?.filter((item) => item.id === id)[0]
             : objects?.[id]
           const value = obj?.[column.name]
-          return obj && !(value === null)
-            ? renderFunction(value, obj)
-            : 'None'
+          return obj && !(value === null) ? renderFunction(value, obj) : 'None'
         },
       }
     } else return column

diff --git a/frontend/components/PaginatedClubDisplay.tsx b/frontend/components/PaginatedClubDisplay.tsx
@@ -40,7 +40,7 @@ const PaginatedClubDisplay = ({
     if (nextUrl == null) {
       return null
     }
-    
+
     setLoading(true)
 
     // fetch the entry

diff --git a/frontend/components/common/Table.tsx b/frontend/components/common/Table.tsx
@@ -195,7 +195,7 @@ const Table = ({
   }
 
   const handleColumnsSort = (target) => {
-    if (sortedColumn && (sortedColumn.name === target)) {
+    if (sortedColumn && sortedColumn.name === target) {
       if (sortedColumn.status === 'asc') {
         setSortedColumn({ name: target, status: 'desc' })
       } else {
@@ -218,7 +218,7 @@ const Table = ({
 
   return (
     <Styles>
-      <Toolbar className = "is-clearfix">
+      <Toolbar className="is-clearfix">
         <div className="is-pulled-right">
           <SearchWrapper>
             <Input
@@ -231,39 +231,41 @@ const Table = ({
             />
           </SearchWrapper>
         </div>
-        <div className="is-pulled-left is-clearfix" style={{ width: '70%'}}>
-            {filterOptions &&
-              filterOptions.map((filterOption) => (
-                <span style={{ marginRight: '10px', width:"40%", float:"left"}}>
-                  <Select
-                    value={
-                      selectedFilter[filterOption.label]
-                        ? {
-                            label: selectedFilter[filterOption.label].label,
-                            value: selectedFilter[filterOption.label].key,
-                          }
-                        : null
-                    }
-                    styles={styles}
-                    components={components}
-                    onChange={(value) =>
-                      handleFilterChange({
-                        value: value || null,
-                        label: filterOption.label ? filterOption.label : null,
-                      })
-                    }
-                    isClearable={true}
-                    placeholder={`Filter by ${titleize(filterOption.label)}`}
-                    options={filterOption.options.map((option) => {
-                      return { value: option.key, label: option.label }
-                    })}
-                  />
-                </span>
-              ))}
+        <div className="is-pulled-left is-clearfix" style={{ width: '70%' }}>
+          {filterOptions &&
+            filterOptions.map((filterOption) => (
+              <span
+                style={{ marginRight: '10px', width: '40%', float: 'left' }}
+              >
+                <Select
+                  value={
+                    selectedFilter[filterOption.label]
+                      ? {
+                          label: selectedFilter[filterOption.label].label,
+                          value: selectedFilter[filterOption.label].key,
+                        }
+                      : null
+                  }
+                  styles={styles}
+                  components={components}
+                  onChange={(value) =>
+                    handleFilterChange({
+                      value: value || null,
+                      label: filterOption.label ? filterOption.label : null,
+                    })
+                  }
+                  isClearable={true}
+                  placeholder={`Filter by ${titleize(filterOption.label)}`}
+                  options={filterOption.options.map((option) => {
+                    return { value: option.key, label: option.label }
+                  })}
+                />
+              </span>
+            ))}
         </div>
       </Toolbar>
 
-      {tableData.length > 0 ? (
+      {headerGroups.length > 0 ? (
         <table className="table is-fullwidth" {...getTableProps()}>
           <thead>
             {headerGroups.map((headerGroup) => (
@@ -291,35 +293,41 @@ const Table = ({
               </tr>
             ))}
           </thead>
-          <tbody {...getTableBodyProps()}>
-            {page.map((row) => {
-              prepareRow(row)
-              return (
-                <tr key={row.id} {...row.getRowProps()}>
-                  {columns.map((column, i) => {
-                    return (
-                      <td key={i}>
-                        {column.render ? (
-                          column.render(row.original.id) ? (
-                            column.render(row.original.id)
+          {tableData.length > 0 ? (
+            <tbody {...getTableBodyProps()}>
+              {page.map((row) => {
+                prepareRow(row)
+                return (
+                  <tr key={row.id} {...row.getRowProps()}>
+                    {columns.map((column, i) => {
+                      return (
+                        <td key={i}>
+                          {column.render ? (
+                            column.render(row.original.id) ? (
+                              column.render(row.original.id)
+                            ) : (
+                              <GreyText>None</GreyText>
+                            )
+                          ) : row.original[column.name] ? (
+                            row.original[column.name]
                           ) : (
                             <GreyText>None</GreyText>
-                          )
-                        ) : row.original[column.name] ? (
-                          row.original[column.name]
-                        ) : (
-                          <GreyText>None</GreyText>
-                        )}
-                      </td>
-                    )
-                  })}
-                </tr>
-              )
-            })}
-          </tbody>
+                          )}
+                        </td>
+                      )
+                    })}
+                  </tr>
+                )
+              })}
+            </tbody>
+          ) : data.length === 0 ? (
+            <h1>No items to show</h1>
+          ) : (
+            <h1>No matches were found. Please change your filters.</h1>
+          )}
         </table>
-      ) : data.length === 0 ? ( <h1>No items to show</h1> ) : (
-        <h1>No matches were found. Please change your filters.</h1>
+      ) : (
+        <h1>Nothing to Show</h1>
       )}
       {pageOptions.length > 1 && (
         <div className="is-clearfix">
@@ -334,7 +342,7 @@ const Table = ({
           <button
             style={{ marginRight: '0.5rem' }}
             className="is-light is-small"
-            onClick={() => previousPage()}            
+            onClick={() => previousPage()}
             disabled={!canPreviousPage}
           >
             {'<'}