Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor search && sorting reducers && actions using redux toolkit #3124

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+47 −60
Open

refactor search && sorting reducers && actions using redux toolkit #3124

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
331889e
refactor search && sorting reducers && actions using redux toolkit
PiyushChandra17 May 16, 2024
64a4bbb
fix few stuff
PiyushChandra17 Jun 15, 2024
8f4e8fd
refactor few things
PiyushChandra17 Jun 15, 2024
680c242
fix
PiyushChandra17 Jun 15, 2024
45968e3
added prepare feature to accept two args
PiyushChandra17 Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions client/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,7 @@ export const CLEAR_PERSISTED_STATE = 'CLEAR_PERSISTED_STATE';
export const HIDE_RUNTIME_ERROR_WARNING = 'HIDE_RUNTIME_ERROR_WARNING';
export const SHOW_RUNTIME_ERROR_WARNING = 'SHOW_RUNTIME_ERROR_WARNING';

export const TOGGLE_DIRECTION = 'TOGGLE_DIRECTION';
export const SET_SORTING = 'SET_SORTING';
export const SET_SORT_PARAMS = 'SET_SORT_PARAMS';
export const SET_SEARCH_TERM = 'SET_SEARCH_TERM';
export const CLOSE_SKETCHLIST_MODAL = 'CLOSE_SKETCHLIST_MODAL';

export const START_SAVING_PROJECT = 'START_SAVING_PROJECT';
Expand Down
31 changes: 5 additions & 26 deletions client/modules/IDE/actions/sorting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,18 @@
import * as ActionTypes from '../../../constants';
import { setSorting } from '../reducers/sorting';
import { setSearchTerm } from '../reducers/search';

export { setSearchTerm } from '../reducers/search';
export { toggleDirectionForField } from '../reducers/sorting';

export const DIRECTION = {
ASC: 'ASCENDING',
DESC: 'DESCENDING'
};

export function setSorting(field, direction) {
return {
type: ActionTypes.SET_SORTING,
payload: {
field,
direction
}
};
}

export function resetSorting() {
return setSorting('createdAt', DIRECTION.DESC);
}

export function toggleDirectionForField(field) {
return {
type: ActionTypes.TOGGLE_DIRECTION,
field
};
}

export function setSearchTerm(scope, searchTerm) {
return {
type: ActionTypes.SET_SEARCH_TERM,
query: searchTerm,
scope
};
}

export function resetSearchTerm(scope) {
return setSearchTerm(scope, '');
}
25 changes: 17 additions & 8 deletions client/modules/IDE/reducers/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
import * as ActionTypes from '../../../constants';
import { createSlice } from '@reduxjs/toolkit';

const initialState = {
collectionSearchTerm: '',
sketchSearchTerm: ''
};

export default (state = initialState, action) => {
switch (action.type) {
case ActionTypes.SET_SEARCH_TERM:
return { ...state, [`${action.scope}SearchTerm`]: action.query };
default:
return state;
const searchSlice = createSlice({
name: 'search',
initialState,
reducers: {
setSearchTerm: (state, action) => {
const { scope, query } = action.payload;
return {
...state,
[`${scope}SearchTerm`]: query
};
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to do ...state stuff when using Redux Toolkit. The reducer uses a proxy of the actual state so it is okay to mutate it. You can return a new state to replace the entire state, but typically you just modify the state and don't return anything. It can be written as:

setSearchTerm: (state, action) => {
  const { scope, query } = action.payload;
  state[`${scope}SearchTerm`] = query;
}

}
};
});

export const { setSearchTerm } = searchSlice.actions;

export default searchSlice.reducer;
46 changes: 23 additions & 23 deletions client/modules/IDE/reducers/sorting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
import * as ActionTypes from '../../../constants';
import { createSlice } from '@reduxjs/toolkit';
import { DIRECTION } from '../actions/sorting';

const initialState = {
field: 'createdAt',
direction: DIRECTION.DESC
};

const sorting = (state = initialState, action) => {
switch (action.type) {
case ActionTypes.TOGGLE_DIRECTION:
if (action.field && action.field !== state.field) {
if (action.field === 'name') {
return { ...state, field: action.field, direction: DIRECTION.ASC };
}
return { ...state, field: action.field, direction: DIRECTION.DESC };
const sortingSlice = createSlice({
name: 'sorting',
initialState,
reducers: {
toggleDirectionForField: (state, action) => {
const { field } = action.payload;
if (field && field !== state.field) {
const direction = field === 'name' ? DIRECTION.ASC : DIRECTION.DESC;
return { ...state, field, direction };
}
if (state.direction === DIRECTION.ASC) {
return { ...state, direction: DIRECTION.DESC };
}
return { ...state, direction: DIRECTION.ASC };
case ActionTypes.SET_SORTING:
return {
...state,
field: action.payload.field,
direction: action.payload.direction
};
default:
return state;
const direction =
state.direction === DIRECTION.ASC ? DIRECTION.DESC : DIRECTION.ASC;
return { ...state, direction };
},
setSorting: (state, action) => {
const { field, direction } = action.payload;
console.log(field);
return { ...state, field, direction };
}
}
};
});

export const { toggleDirectionForField, setSorting } = sortingSlice.actions;

export default sorting;
export default sortingSlice.reducer;
Loading