wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: allow grouping shows into collections (#6389)

Browse Source 
* Add form to enable grouping of shows

* Add strings for the group shows form
This commit is contained in:
Bill Thornton
2025-04-01 15:18:13 -04:00
committed by GitHub
parent d4995834df f84949bffa
commit 8e9fb47286
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+7 -7
View File
@@ -18,7 +18,7 @@
"@fontsource/noto-sans-sc": "5.2.5",
"@fontsource/noto-sans-tc": "5.2.5",
"@jellyfin/libass-wasm": "4.2.3",
"@jellyfin/sdk": "0.0.0-unstable.202503260501",
"@jellyfin/sdk": "0.0.0-unstable.202503290501",
"@mui/icons-material": "6.4.8",
"@mui/material": "6.4.8",
"@mui/x-date-pickers": "7.28.0",
@@ -4064,9 +4064,9 @@
"license": "LGPL-2.1-or-later AND (FTL OR GPL-2.0-or-later) AND MIT AND MIT-Modern-Variant AND ISC AND NTP AND Zlib AND BSL-1.0"
},
"node_modules/@jellyfin/sdk": {
"version": "0.0.0-unstable.202503260501",
"resolved": "https://registry.npmjs.org/@jellyfin/sdk/-/sdk-0.0.0-unstable.202503260501.tgz",
"integrity": "sha512-wsiDOwE+5eiy4FZ3UDfxgOL7PZMAh1W1VAScbb+OUeuJCfsSh8UKZM9B9mAvuotWxx8Orw9yLmvT57g/UthOqQ==",
"version": "0.0.0-unstable.202503290501",
"resolved": "https://registry.npmjs.org/@jellyfin/sdk/-/sdk-0.0.0-unstable.202503290501.tgz",
"integrity": "sha512-y4AbndAj4ke7dDffH7f9RXquo8yhcUImDUgNOlMAf3t5JMrOhMG0GJ0OnlASN8nBL7czUmHG9BivG+/g7oNG3A==",
"license": "MPL-2.0",
"peerDependencies": {
"axios": "^1.3.4"
@@ -28509,9 +28509,9 @@
"integrity": "sha512-C0OlBxIr9NdeFESMTA/OVDqNSWtog6Mi7wwzwH12xbZpxsMD0RgCupUcIP7zZgcpTNecW3fZq5d6xVo7Q8HEJw=="
},
"@jellyfin/sdk": {
"version": "0.0.0-unstable.202503260501",
"resolved": "https://registry.npmjs.org/@jellyfin/sdk/-/sdk-0.0.0-unstable.202503260501.tgz",
"integrity": "sha512-wsiDOwE+5eiy4FZ3UDfxgOL7PZMAh1W1VAScbb+OUeuJCfsSh8UKZM9B9mAvuotWxx8Orw9yLmvT57g/UthOqQ==",
"version": "0.0.0-unstable.202503290501",
"resolved": "https://registry.npmjs.org/@jellyfin/sdk/-/sdk-0.0.0-unstable.202503290501.tgz",
"integrity": "sha512-y4AbndAj4ke7dDffH7f9RXquo8yhcUImDUgNOlMAf3t5JMrOhMG0GJ0OnlASN8nBL7czUmHG9BivG+/g7oNG3A==",
"requires": {}
},
"@jridgewell/gen-mapping": {
package.json
+1 -1
View File
@@ -84,7 +84,7 @@
"@fontsource/noto-sans-sc": "5.2.5",
"@fontsource/noto-sans-tc": "5.2.5",
"@jellyfin/libass-wasm": "4.2.3",
"@jellyfin/sdk": "0.0.0-unstable.202503260501",
"@jellyfin/sdk": "0.0.0-unstable.202503290501",
"@mui/icons-material": "6.4.8",
"@mui/material": "6.4.8",
"@mui/x-date-pickers": "7.28.0",
src/apps/dashboard/routes/libraries/display.tsx
+16 -2
View File
@@ -38,7 +38,8 @@ export const action = async ({ request }: ActionFunctionArgs) => {
config.EnableFolderView = data.DisplayFolderView?.toString() === 'on';
config.DisplaySpecialsWithinSeasons = data.DisplaySpecialsWithinSeasons?.toString() === 'on';
config.EnableGroupingIntoCollections = data.GroupMoviesIntoCollections?.toString() === 'on';
config.EnableGroupingMoviesIntoCollections = data.GroupMoviesIntoCollections?.toString() === 'on';
config.EnableGroupingShowsIntoCollections = data.GroupShowsIntoCollections?.toString() === 'on';
config.EnableExternalContentInSuggestions = data.EnableExternalContentInSuggestions?.toString() === 'on';
await getConfigurationApi(api)
@@ -138,7 +139,7 @@ export const Component = () => {
control={
<Checkbox
name={'GroupMoviesIntoCollections'}
defaultChecked={config.EnableGroupingIntoCollections}
defaultChecked={config.EnableGroupingMoviesIntoCollections}
/>
}
label={globalize.translate('LabelGroupMoviesIntoCollections')}
@@ -146,6 +147,19 @@ export const Component = () => {
<FormHelperText>{globalize.translate('LabelGroupMoviesIntoCollectionsHelp')}</FormHelperText>
</FormControl>
<FormControl>
<FormControlLabel
control={
<Checkbox
name={'GroupShowsIntoCollections'}
defaultChecked={config.EnableGroupingShowsIntoCollections}
/>
}
label={globalize.translate('LabelGroupShowsIntoCollections')}
/>
<FormHelperText>{globalize.translate('LabelGroupShowsIntoCollectionsHelp')}</FormHelperText>
</FormControl>
<FormControl>
<FormControlLabel
control={
src/strings/en-us.json
+2
View File
@@ -724,6 +724,8 @@
"LabelFriendlyName": "Friendly name",
"LabelGroupMoviesIntoCollections": "Group movies into collections",
"LabelGroupMoviesIntoCollectionsHelp": "Movies in a collection will be displayed as one grouped item when displaying movie lists.",
"LabelGroupShowsIntoCollections": "Group shows into collections",
"LabelGroupShowsIntoCollectionsHelp": "Shows in a collection will be displayed as one grouped item when displaying show lists.",
"LabelH264Crf": "H.264 encoding CRF",
"LabelH265Crf": "H.265 encoding CRF",
"LabelHardwareAccelerationType": "Hardware acceleration",