github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 13:10:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New: Calendar filtering by tags

Browse source 
Closes #3658
Closes #4211

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
Qstick 2024-02-11 20:51:28 -06:00
commit a4af75b60c
7 changed files with 160 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

59
frontend/src/Store/Actions/calendarActions.js
View file

@ -4,9 +4,10 @@ import { createAction } from 'redux-actions';
import { batchActions } from 'redux-batched-actions';
import * as calendarViews from 'Calendar/calendarViews';
import * as commandNames from 'Commands/commandNames';
import { filterTypes } from 'Helpers/Props';
import { filterBuilderTypes, filterBuilderValueTypes, filterTypes } from 'Helpers/Props';
import { createThunk, handleThunks } from 'Store/thunks';
import createAjaxRequest from 'Utilities/createAjaxRequest';
import findSelectedFilters from 'Utilities/Filter/findSelectedFilters';
import translate from 'Utilities/String/translate';
import { set, update } from './baseActions';
import { executeCommandHelper } from './commandActions';
@ -54,8 +55,8 @@ export const defaultState = {
label: () => translate('All'),
filters: [
{
key: 'monitored',
value: false,
key: 'unmonitored',
value: [true],
type: filterTypes.EQUAL
}
]
@ -65,19 +66,35 @@ export const defaultState = {
label: () => translate('MonitoredOnly'),
filters: [
{
key: 'monitored',
value: true,
key: 'unmonitored',
value: [false],
type: filterTypes.EQUAL
}
]
}
],
filterBuilderProps: [
{
name: 'unmonitored',
label: () => translate('IncludeUnmonitored'),
type: filterBuilderTypes.EQUAL,
valueType: filterBuilderValueTypes.BOOL
},
{
name: 'tags',
label: () => translate('Tags'),
type: filterBuilderTypes.CONTAINS,
valueType: filterBuilderValueTypes.TAG
}
]
};
export const persistState = [
'calendar.view',
'calendar.selectedFilterKey',
'calendar.options'
'calendar.options',
'calendar.customFilters'
];
//
@ -189,6 +206,10 @@ function isRangePopulated(start, end, state) {
return false;
}
function getCustomFilters(state, type) {
return state.customFilters.items.filter((customFilter) => customFilter.type === type);
}
//
// Action Creators
@ -210,7 +231,8 @@ export const actionHandlers = handleThunks({
[FETCH_CALENDAR]: function(getState, payload, dispatch) {
const state = getState();
const calendar = state.calendar;
const unmonitored = calendar.selectedFilterKey === 'all';
const customFilters = getCustomFilters(state, section);
const selectedFilters = findSelectedFilters(calendar.selectedFilterKey, calendar.filters, customFilters);
const {
time = calendar.time,
@ -237,13 +259,26 @@ export const actionHandlers = handleThunks({
dispatch(set(attrs));
const requestParams = {
start,
end
};
selectedFilters.forEach((selectedFilter) => {
if (selectedFilter.key === 'unmonitored') {
requestParams.unmonitored = selectedFilter.value.includes(true);
}
if (selectedFilter.key === 'tags') {
requestParams.tags = selectedFilter.value.join(',');
}
});
requestParams.unmonitored = requestParams.unmonitored ?? false;
const promise = createAjaxRequest({
url: '/calendar',
data: {
unmonitored,
start,
end
}
data: requestParams
}).request;
promise.done((data) => {