-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge: Add Filters Update Interval setting; refactor
Close #641 * commit 'd0fc1dc54dfbc017f28c6c0afa4623c6259af557': + client: handle filters configuration * openapi: update /filtering filtering: refactor; change API; add "filters_update_interval" setting
- Loading branch information
Showing
40 changed files
with
1,111 additions
and
671 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| import { createAction } from 'redux-actions'; | ||
| import { showLoading, hideLoading } from 'react-redux-loading-bar'; | ||
|
|
||
| import { normalizeFilteringStatus, normalizeRulesTextarea } from '../helpers/helpers'; | ||
| import { addErrorToast, addSuccessToast } from './index'; | ||
| import apiClient from '../api/Api'; | ||
|
|
||
| export const toggleFilteringModal = createAction('FILTERING_MODAL_TOGGLE'); | ||
| export const handleRulesChange = createAction('HANDLE_RULES_CHANGE'); | ||
|
|
||
| export const getFilteringStatusRequest = createAction('GET_FILTERING_STATUS_REQUEST'); | ||
| export const getFilteringStatusFailure = createAction('GET_FILTERING_STATUS_FAILURE'); | ||
| export const getFilteringStatusSuccess = createAction('GET_FILTERING_STATUS_SUCCESS'); | ||
|
|
||
| export const getFilteringStatus = () => async (dispatch) => { | ||
| dispatch(getFilteringStatusRequest()); | ||
| try { | ||
| const status = await apiClient.getFilteringStatus(); | ||
| dispatch(getFilteringStatusSuccess({ ...normalizeFilteringStatus(status) })); | ||
| } catch (error) { | ||
| dispatch(addErrorToast({ error })); | ||
| dispatch(getFilteringStatusFailure()); | ||
| } | ||
| }; | ||
|
|
||
| export const setRulesRequest = createAction('SET_RULES_REQUEST'); | ||
| export const setRulesFailure = createAction('SET_RULES_FAILURE'); | ||
| export const setRulesSuccess = createAction('SET_RULES_SUCCESS'); | ||
|
|
||
| export const setRules = rules => async (dispatch) => { | ||
| dispatch(setRulesRequest()); | ||
| try { | ||
| const normalizedRules = normalizeRulesTextarea(rules); | ||
| await apiClient.setRules(normalizedRules); | ||
| dispatch(addSuccessToast('updated_custom_filtering_toast')); | ||
| dispatch(setRulesSuccess()); | ||
| } catch (error) { | ||
| dispatch(addErrorToast({ error })); | ||
| dispatch(setRulesFailure()); | ||
| } | ||
| }; | ||
|
|
||
| export const addFilterRequest = createAction('ADD_FILTER_REQUEST'); | ||
| export const addFilterFailure = createAction('ADD_FILTER_FAILURE'); | ||
| export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS'); | ||
|
|
||
| export const addFilter = (url, name) => async (dispatch) => { | ||
| dispatch(addFilterRequest()); | ||
| try { | ||
| await apiClient.addFilter(url, name); | ||
| dispatch(addFilterSuccess(url)); | ||
| dispatch(toggleFilteringModal()); | ||
| dispatch(addSuccessToast('filter_added_successfully')); | ||
| dispatch(getFilteringStatus()); | ||
| } catch (error) { | ||
| dispatch(addErrorToast({ error })); | ||
| dispatch(addFilterFailure()); | ||
| } | ||
| }; | ||
|
|
||
| export const removeFilterRequest = createAction('REMOVE_FILTER_REQUEST'); | ||
| export const removeFilterFailure = createAction('REMOVE_FILTER_FAILURE'); | ||
| export const removeFilterSuccess = createAction('REMOVE_FILTER_SUCCESS'); | ||
|
|
||
| export const removeFilter = url => async (dispatch) => { | ||
| dispatch(removeFilterRequest()); | ||
| try { | ||
| await apiClient.removeFilter(url); | ||
| dispatch(removeFilterSuccess(url)); | ||
| dispatch(getFilteringStatus()); | ||
| } catch (error) { | ||
| dispatch(addErrorToast({ error })); | ||
| dispatch(removeFilterFailure()); | ||
| } | ||
| }; | ||
|
|
||
| export const toggleFilterRequest = createAction('FILTER_TOGGLE_REQUEST'); | ||
| export const toggleFilterFailure = createAction('FILTER_TOGGLE_FAILURE'); | ||
| export const toggleFilterSuccess = createAction('FILTER_TOGGLE_SUCCESS'); | ||
|
|
||
| export const toggleFilterStatus = (url, enabled) => async (dispatch) => { | ||
| dispatch(toggleFilterRequest()); | ||
| try { | ||
| await apiClient.setFilterUrl({ url, enabled: !enabled }); | ||
| dispatch(toggleFilterSuccess(url)); | ||
| dispatch(getFilteringStatus()); | ||
| } catch (error) { | ||
| dispatch(addErrorToast({ error })); | ||
| dispatch(toggleFilterFailure()); | ||
| } | ||
| }; | ||
|
|
||
| export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST'); | ||
| export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE'); | ||
| export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS'); | ||
|
|
||
| export const refreshFilters = () => async (dispatch) => { | ||
| dispatch(refreshFiltersRequest()); | ||
| dispatch(showLoading()); | ||
| try { | ||
| const refreshText = await apiClient.refreshFilters(); | ||
| dispatch(refreshFiltersSuccess()); | ||
|
|
||
| if (refreshText.includes('OK')) { | ||
| if (refreshText.includes('OK 0')) { | ||
| dispatch(addSuccessToast('all_filters_up_to_date_toast')); | ||
| } else { | ||
| dispatch(addSuccessToast(refreshText.replace(/OK /g, ''))); | ||
| } | ||
| } else { | ||
| dispatch(addErrorToast({ error: refreshText })); | ||
| } | ||
|
|
||
| dispatch(getFilteringStatus()); | ||
| dispatch(hideLoading()); | ||
| } catch (error) { | ||
| dispatch(addErrorToast({ error })); | ||
| dispatch(refreshFiltersFailure()); | ||
| dispatch(hideLoading()); | ||
| } | ||
| }; | ||
|
|
||
| export const setFiltersConfigRequest = createAction('SET_FILTERS_CONFIG_REQUEST'); | ||
| export const setFiltersConfigFailure = createAction('SET_FILTERS_CONFIG_FAILURE'); | ||
| export const setFiltersConfigSuccess = createAction('SET_FILTERS_CONFIG_SUCCESS'); | ||
|
|
||
| export const setFiltersConfig = config => async (dispatch, getState) => { | ||
| dispatch(setFiltersConfigRequest()); | ||
| try { | ||
| const { enabled } = config; | ||
| const prevEnabled = getState().filtering.enabled; | ||
| let successToastMessage = 'config_successfully_saved'; | ||
|
|
||
| if (prevEnabled !== enabled) { | ||
| successToastMessage = enabled ? 'enabled_filtering_toast' : 'disabled_filtering_toast'; | ||
| } | ||
|
|
||
| await apiClient.setFiltersConfig(config); | ||
| dispatch(addSuccessToast(successToastMessage)); | ||
| dispatch(setFiltersConfigSuccess(config)); | ||
| } catch (error) { | ||
| dispatch(addErrorToast({ error })); | ||
| dispatch(setFiltersConfigFailure()); | ||
| } | ||
| }; |
Oops, something went wrong.