forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-02-27 12:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrated editTag and tagEdited actions to use payload

Browse Source
This commit is contained in:
Alejandro Celaya
2022-11-07 21:45:33 +01:00
parent 5ecc791b38
commit f8fc1245ca
4 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/tags/reducers/tagEdit.ts
View File

@@ -1,5 +1,6 @@
import { pick } from 'ramda';
import { Action, Dispatch } from 'redux';
import { PayloadAction } from '@reduxjs/toolkit';
import { Dispatch } from 'redux';
import { buildReducer } from '../../utils/helpers/redux';
import { GetState } from '../../container/types';
import { ColorGenerator } from '../../utils/services/ColorGenerator';
@@ -22,12 +23,14 @@ export interface TagEdition {
errorData?: ProblemDetailsError;
}
export interface EditTagAction extends Action<string> {
interface EditTag {
oldName: string;
newName: string;
color: string;
}
export type EditTagAction = PayloadAction<EditTag>;
const initialState: TagEdition = {
editing: false,
edited: false,
@@ -37,8 +40,8 @@ const initialState: TagEdition = {
export default buildReducer<TagEdition, EditTagAction & ApiErrorAction>({
[EDIT_TAG_START]: () => ({ editing: true, edited: false, error: false }),
[EDIT_TAG_ERROR]: (_, { errorData }) => ({ editing: false, edited: false, error: true, errorData }),
[EDIT_TAG]: (_, action) => ({
...pick(['oldName', 'newName'], action),
[EDIT_TAG]: (_, { payload }) => ({
...pick(['oldName', 'newName'], payload),
editing: false,
edited: true,
error: false,
@@ -56,7 +59,10 @@ export const editTag = (buildShlinkApiClient: ShlinkApiClientBuilder, colorGener
try {
await shlinkEditTag(oldName, newName);
colorGenerator.setColorForKey(newName, color);
dispatch({ type: EDIT_TAG, oldName, newName, color });
dispatch<EditTagAction>({
type: EDIT_TAG,
payload: { oldName, newName, color },
});
} catch (e: any) {
dispatch<ApiErrorAction>({ type: EDIT_TAG_ERROR, errorData: parseApiError(e) });
@@ -66,7 +72,9 @@ export const editTag = (buildShlinkApiClient: ShlinkApiClientBuilder, colorGener
export const tagEdited = (oldName: string, newName: string, color: string): EditTagAction => ({
type: TAG_EDITED,
oldName,
newName,
color,
payload: {
oldName,
newName,
color,
},
});

6
src/tags/reducers/tagsList.ts
View File

@@ -90,10 +90,10 @@ export default buildReducer<TagsList, TagsCombinedAction>({
tags: rejectTag(state.tags, tag),
filteredTags: rejectTag(state.filteredTags, tag),
}),
[TAG_EDITED]: (state, { oldName, newName }) => ({
[TAG_EDITED]: (state, { payload }) => ({
...state,
tags: state.tags.map(renameTag(oldName, newName)).sort(),
filteredTags: state.filteredTags.map(renameTag(oldName, newName)).sort(),
tags: state.tags.map(renameTag(payload.oldName, payload.newName)).sort(),
filteredTags: state.filteredTags.map(renameTag(payload.oldName, payload.newName)).sort(),
}),
[FILTER_TAGS]: (state, { searchTerm }) => ({
...state,