Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
brandongregoryscott committed Jun 17, 2022
2 parents c22d7bd + d032d75 commit aa0fed0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ yarn-error.log*
yalc.lock

# Generated OpenAPI types file - we don't use it after parsing it into individual interfaces/types/etc
src/generated/supabase-types.ts
src/generated/supabase-types.ts

.eslintcache
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"glamor": "2.20.40",
"humanize-plus": "1.8.2",
"immutable": "4.0.0",
"jotai": "1.7.1",
"jotai": "1.7.2",
"keymirror": "0.1.1",
"lodash": "4.17.21",
"luxon": "2.4.0",
Expand Down Expand Up @@ -91,7 +91,7 @@
},
"lint-staged": {
"*.{ts,tsx,json,md}": "prettier --ignore-unknown --write",
"*.{ts,tsx}": "eslint --fix"
"*.{ts,tsx}": "eslint --cache --fix"
},
"name": "beets",
"private": true,
Expand All @@ -104,7 +104,7 @@
"eject": "react-scripts eject",
"format:check": "prettier src --ignore-unknown --check",
"format:fix": "prettier src --ignore-unknown --write",
"lint": "eslint 'src/**/*.{ts,tsx}'",
"lint": "eslint 'src/**/*.{ts,tsx}' --cache",
"lint:fix": "npm run lint -- --fix",
"migrations:create": "node-pg-migrate --migrations-dir src/scripts/migrations --template-file-name src/scripts/migrations/utils/migration-template.ts create",
"migrations:down": "node-pg-migrate --migrations-dir src/scripts/migrations/dist down",
Expand Down
8 changes: 7 additions & 1 deletion src/components/files/file-select-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const FileSelectMenu: React.FC<PropsWithChildren<FileSelectMenuProps>> = (
assigned,
children,
hasFilter,
hasTitle,
hasTitle = true,
isMultiSelect = false,
onDeselect,
onSelect,
Expand All @@ -84,6 +84,12 @@ const FileSelectMenu: React.FC<PropsWithChildren<FileSelectMenuProps>> = (

const options: Array<SelectMenuItem<FileRecord>> = useMemo(() => {
let filteredFiles: List<FileRecord> = files ?? List();
// We can't show the filter popover without the title component being rendered, so don't
// apply the filters without the user understanding where they came from
if (!hasTitle) {
return toSelectMenuItems(filteredFiles);
}

if (showAssigned) {
filteredFiles = assigned ?? List();
}
Expand Down

0 comments on commit aa0fed0

Please sign in to comment.