forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-04-20 05:26:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecesary type castings and improved type inference for actions in demainsListReducer

Browse Source
This commit is contained in:
Alejandro Celaya
2022-11-04 16:50:03 +01:00
parent 79645099ba
commit 4fa6ae493d
2 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/domains/reducers/domainsList.ts
View File

@@ -1,15 +1,16 @@
import { createSlice, PayloadAction, createAsyncThunk, SliceCaseReducers } from '@reduxjs/toolkit';
import { createSlice, createAsyncThunk, createAction, SliceCaseReducers } from '@reduxjs/toolkit';
import { ShlinkDomainRedirects } from '../../api/types';
import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
import { ShlinkState } from '../../container/types';
import { Domain, DomainStatus } from '../data';
import { hasServerData } from '../../servers/data';
import { replaceAuthorityFromUri } from '../../utils/helpers/uri';
import { EDIT_DOMAIN_REDIRECTS, EditDomainRedirectsAction } from './domainRedirects';
import { EDIT_DOMAIN_REDIRECTS } from './domainRedirects';
import { ProblemDetailsError } from '../../api/types/errors';
import { parseApiError } from '../../api/utils';
export const LIST_DOMAINS = 'shlink/domainsList/LIST_DOMAINS';
export const FILTER_DOMAINS = 'shlink/domainsList/FILTER_DOMAINS';
export const VALIDATE_DOMAIN = 'shlink/domainsList/VALIDATE_DOMAIN';
export interface DomainsList {
@@ -31,15 +32,6 @@ interface ValidateDomain {
status: DomainStatus;
}
type ListDomainsAction = PayloadAction<ListDomains>;
type FilterDomainsAction = PayloadAction<string>;
type ValidateDomainAction = PayloadAction<ValidateDomain>;
export type DomainsCombinedAction = ListDomainsAction
& FilterDomainsAction
& EditDomainRedirectsAction
& ValidateDomainAction;
const initialState: DomainsList = {
domains: [],
filteredDomains: [],
@@ -92,15 +84,12 @@ export const domainsListReducerCreator = (buildShlinkApiClient: ShlinkApiClientB
},
);
const { actions, reducer } = createSlice<DomainsList, SliceCaseReducers<DomainsList>>({
const filterDomains = createAction<string>(FILTER_DOMAINS);
const { reducer } = createSlice<DomainsList, SliceCaseReducers<DomainsList>>({
name: 'domainsList',
initialState,
reducers: {
filterDomains: (state, { payload }) => ({
...state,
filteredDomains: state.domains.filter(({ domain }) => domain.toLowerCase().match(payload.toLowerCase())),
}),
},
reducers: {},
extraReducers: (builder) => {
builder.addCase(listDomains.pending, () => ({ ...initialState, loading: true }));
builder.addCase(listDomains.rejected, (_, { error }) => (
@@ -116,6 +105,11 @@ export const domainsListReducerCreator = (buildShlinkApiClient: ShlinkApiClientB
filteredDomains: filteredDomains.map(replaceStatusOnDomain(payload.domain, payload.status)),
}));
builder.addCase(filterDomains, (state, { payload }) => ({
...state,
filteredDomains: state.domains.filter(({ domain }) => domain.toLowerCase().match(payload.toLowerCase())),
}));
builder.addCase(EDIT_DOMAIN_REDIRECTS, (state, { domain, redirects }: any) => ({ // TODO Fix this "any"
...state,
domains: state.domains.map(replaceRedirectsOnDomain(domain, redirects)),
@@ -128,6 +122,6 @@ export const domainsListReducerCreator = (buildShlinkApiClient: ShlinkApiClientB
reducer,
listDomains,
checkDomainHealth,
...actions,
filterDomains,
};
};