Merge pull request #64 from feedingaliencat/chores-filter-available-for-me

Chores filter: Add filter for "Assigned to me or not assigned"

src/utils/Chores.jsx

@@ -332,6 +332,9 @@ export const ChoreFilters = userId => ({
   assigned_to_me: chore => {
     return chore.assignedTo && chore.assignedTo === userId
   },
+  available_for_me: chore => {
+    return chore.assignedTo === null || chore.assignedTo === userId
+  },
   assigned_to_others: chore => {
     return chore.assignedTo && chore.assignedTo !== userId
   },

src/views/Chores/SortAndGrouping.jsx

@@ -85,7 +85,12 @@ const SortAndGrouping = ({
         { name: 'Labels', value: 'labels' },
       ]
 
-      const filterItems = ['anyone', 'assigned_to_me', 'assigned_to_others']
+      const filterItems = [
+        'anyone',
+        'assigned_to_me',
+        'available_for_me',
+        'assigned_to_others',
+      ]
 
       // Total selectable items: 4 (group by) + 3 (filters) + 1 (create custom filter) = 8
       const totalItems = groupByItems.length + filterItems.length + 1
@@ -169,6 +174,65 @@ const SortAndGrouping = ({
     }
   }, [])
 
+  const MenuItem_QuickFilter = props => {
+    return (
+      <MenuItem
+        key={props.key}
+        onClick={() => {
+          setFilter(props.filterKey)
+          handleMenuClose()
+        }}
+        onMouseEnter={() => setIsKeyboardNavigating(false)}
+        sx={{
+          borderRadius: 'var(--joy-radius-sm)',
+          backgroundColor:
+            selectedFilter === props.filterKey
+              ? 'var(--joy-palette-primary-softBg)'
+              : selectedIndex === props.index &&
+                  anchorEl &&
+                  isKeyboardNavigating
+                ? 'var(--joy-palette-neutral-softHoverBg)'
+                : 'transparent',
+          '&:hover': {
+            backgroundColor:
+              selectedFilter === props.filterKey
+                ? 'var(--joy-palette-primary-softBg)'
+                : 'var(--joy-palette-neutral-softHoverBg)',
+          },
+        }}
+      >
+        <ListItemDecorator>
+          <Radio
+            checked={selectedFilter === props.filterKey}
+            variant='outlined'
+          />
+        </ListItemDecorator>
+        <ListItemContent>
+          <Box
+            sx={{
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'space-between',
+            }}
+          >
+            <Typography
+              level='body-sm'
+              sx={{
+                fontWeight: selectedFilter === props.filterKey ? 600 : 400,
+                color:
+                  selectedFilter === props.filterKey
+                    ? 'var(--joy-palette-primary-600)'
+                    : 'var(--joy-palette-text-primary)',
+              }}
+            >
+              {props.label}
+            </Typography>
+          </Box>
+        </ListItemContent>
+      </MenuItem>
+    )
+  }
+
   return (
     <>
       {!label && (
@@ -359,162 +423,33 @@ const SortAndGrouping = ({
           </ListItemContent>
         </MenuItem>
 
-        <MenuItem
+        <MenuItem_QuickFilter
           key={`${k}-assignee-anyone`}
-          onClick={() => {
+          index={4}
-            setFilter('anyone')
+          filterKey='anyone'
-            handleMenuClose()
+          label='Anyone'
-          }}
+        />
-          onMouseEnter={() => setIsKeyboardNavigating(false)}
-          sx={{
-            borderRadius: 'var(--joy-radius-sm)',
-            backgroundColor:
-              selectedFilter === 'anyone'
-                ? 'var(--joy-palette-primary-softBg)'
-                : selectedIndex === 4 && anchorEl && isKeyboardNavigating
-                  ? 'var(--joy-palette-neutral-softHoverBg)'
-                  : 'transparent',
-            '&:hover': {
-              backgroundColor:
-                selectedFilter === 'anyone'
-                  ? 'var(--joy-palette-primary-softBg)'
-                  : 'var(--joy-palette-neutral-softHoverBg)',
-            },
-          }}
-        >
-          <ListItemDecorator>
-            <Radio checked={selectedFilter === 'anyone'} variant='outlined' />
-          </ListItemDecorator>
-          <ListItemContent>
-            <Box
-              sx={{
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'space-between',
-              }}
-            >
-              <Typography
-                level='body-sm'
-                sx={{
-                  fontWeight: selectedFilter === 'anyone' ? 600 : 400,
-                  color:
-                    selectedFilter === 'anyone'
-                      ? 'var(--joy-palette-primary-600)'
-                      : 'var(--joy-palette-text-primary)',
-                }}
-              >
-                Anyone
-              </Typography>
-            </Box>
-          </ListItemContent>
-        </MenuItem>
 
-        <MenuItem
+        <MenuItem_QuickFilter
           key={`${k}-assignee-assigned-to-me`}
-          onClick={() => {
+          index={5}
-            setFilter('assigned_to_me')
+          filterKey='assigned_to_me'
-            handleMenuClose()
+          label='Assigned to me'
-          }}
+        />
-          onMouseEnter={() => setIsKeyboardNavigating(false)}
-          sx={{
-            borderRadius: 'var(--joy-radius-sm)',
-            backgroundColor:
-              selectedFilter === 'assigned_to_me'
-                ? 'var(--joy-palette-primary-softBg)'
-                : selectedIndex === 5 && anchorEl && isKeyboardNavigating
-                  ? 'var(--joy-palette-neutral-softHoverBg)'
-                  : 'transparent',
-            '&:hover': {
-              backgroundColor:
-                selectedFilter === 'assigned_to_me'
-                  ? 'var(--joy-palette-primary-softBg)'
-                  : 'var(--joy-palette-neutral-softHoverBg)',
-            },
-          }}
-        >
-          <ListItemDecorator>
-            <Radio
-              checked={selectedFilter === 'assigned_to_me'}
-              variant='outlined'
-            />
-          </ListItemDecorator>
-          <ListItemContent>
-            <Box
-              sx={{
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'space-between',
-              }}
-            >
-              <Typography
-                level='body-sm'
-                sx={{
-                  fontWeight: selectedFilter === 'assigned_to_me' ? 600 : 400,
-                  color:
-                    selectedFilter === 'assigned_to_me'
-                      ? 'var(--joy-palette-primary-600)'
-                      : 'var(--joy-palette-text-primary)',
-                }}
-              >
-                Assigned to me
-              </Typography>
-            </Box>
-          </ListItemContent>
-        </MenuItem>
 
-        <MenuItem
+        <MenuItem_QuickFilter
+          key={`${k}-assignee-available-for-me`}
+          index={6}
+          filterKey='available_for_me'
+          label='Available for me'
+        />
+
+        <MenuItem_QuickFilter
           key={`${k}-assignee-assigned-to-others`}
-          onClick={() => {
+          index={7}
-            setFilter('assigned_to_others')
+          filterKey='assigned_to_others'
-            handleMenuClose()
+          label='Assigned to others'
-          }}
+        />
-          onMouseEnter={() => setIsKeyboardNavigating(false)}
-          sx={{
-            borderRadius: 'var(--joy-radius-sm)',
-            backgroundColor:
-              selectedFilter === 'assigned_to_others'
-                ? 'var(--joy-palette-primary-softBg)'
-                : selectedIndex === 6 && anchorEl && isKeyboardNavigating
-                  ? 'var(--joy-palette-neutral-softHoverBg)'
-                  : 'transparent',
-            '&:hover': {
-              backgroundColor:
-                selectedFilter === 'assigned_to_others'
-                  ? 'var(--joy-palette-primary-softBg)'
-                  : 'var(--joy-palette-neutral-softHoverBg)',
-            },
-          }}
-        >
-          <ListItemDecorator>
-            <Radio
-              checked={selectedFilter === 'assigned_to_others'}
-              variant='outlined'
-            />
-          </ListItemDecorator>
-          <ListItemContent>
-            <Box
-              sx={{
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'space-between',
-              }}
-            >
-              <Typography
-                level='body-sm'
-                sx={{
-                  fontWeight:
-                    selectedFilter === 'assigned_to_others' ? 600 : 400,
-                  color:
-                    selectedFilter === 'assigned_to_others'
-                      ? 'var(--joy-palette-primary-600)'
-                      : 'var(--joy-palette-text-primary)',
-                }}
-              >
-                Assigned to others
-              </Typography>
-            </Box>
-          </ListItemContent>
-        </MenuItem>
 
         <Divider sx={{ my: 1 }} />
 
@@ -528,7 +463,7 @@ const SortAndGrouping = ({
           sx={{
             borderRadius: 'var(--joy-radius-sm)',
             backgroundColor:
-              selectedIndex === 7 && anchorEl && isKeyboardNavigating
+              selectedIndex === 8 && anchorEl && isKeyboardNavigating
                 ? 'var(--joy-palette-success-softHoverBg)'
                 : 'transparent',
             '&:hover': {