From 45f9ac69ea5a1cd217ea17833b6626ddb7fe478f Mon Sep 17 00:00:00 2001 From: Piyush Date: Wed, 15 May 2024 12:13:31 +0530 Subject: [PATCH 1/2] refactor editorAccessibility reducers and actions using redux toolkit --- client/constants.js | 2 - .../IDE/actions/editorAccessibility.js | 27 +++--------- .../IDE/reducers/editorAccessibility.js | 42 ++++++++++--------- 3 files changed, 29 insertions(+), 42 deletions(-) diff --git a/client/constants.js b/client/constants.js index 608a31a0f9..ffffe1cfa8 100644 --- a/client/constants.js +++ b/client/constants.js @@ -58,8 +58,6 @@ export const CLEAR_CONSOLE = 'CLEAR_CONSOLE'; export const EXPAND_CONSOLE = 'EXPAND_CONSOLE'; export const COLLAPSE_CONSOLE = 'COLLAPSE_CONSOLE'; -export const UPDATE_LINT_MESSAGE = 'UPDATE_LINT_MESSAGE'; -export const CLEAR_LINT_MESSAGE = 'CLEAR_LINT_MESSAGE'; export const TOGGLE_FORCE_DESKTOP = 'TOGGLE_FORCE_DESKTOP'; export const UPDATE_FILE_NAME = 'UPDATE_FILE_NAME'; diff --git a/client/modules/IDE/actions/editorAccessibility.js b/client/modules/IDE/actions/editorAccessibility.js index 1014e6ad30..5363a7bebf 100644 --- a/client/modules/IDE/actions/editorAccessibility.js +++ b/client/modules/IDE/actions/editorAccessibility.js @@ -1,22 +1,7 @@ -import * as ActionTypes from '../../../constants'; +import { editorAccessibilityActions } from '../reducers/editorAccessibility'; -export function updateLintMessage(severity, line, message) { - return { - type: ActionTypes.UPDATE_LINT_MESSAGE, - severity, - line, - message - }; -} - -export function clearLintMessage() { - return { - type: ActionTypes.CLEAR_LINT_MESSAGE - }; -} - -export function toggleForceDesktop() { - return { - type: ActionTypes.TOGGLE_FORCE_DESKTOP - }; -} +export const { + updateLintMessage, + clearLintMessages, + toggleForceDesktop +} = editorAccessibilityActions; diff --git a/client/modules/IDE/reducers/editorAccessibility.js b/client/modules/IDE/reducers/editorAccessibility.js index 2f46ec2bae..2d03f845d3 100644 --- a/client/modules/IDE/reducers/editorAccessibility.js +++ b/client/modules/IDE/reducers/editorAccessibility.js @@ -1,30 +1,34 @@ -import * as ActionTypes from '../../../constants'; +import { createSlice } from '@reduxjs/toolkit'; const initialState = { lintMessages: [], forceDesktop: false }; + let messageId = 0; -const editorAccessibility = (state = initialState, action) => { - switch (action.type) { - case ActionTypes.UPDATE_LINT_MESSAGE: +const editorAccessibilitySlice = createSlice({ + name: 'editorAccessibility', + initialState, + reducers: { + updateLintMessage: (state, action) => { messageId += 1; - return Object.assign({}, state, { - lintMessages: state.lintMessages.concat({ - severity: action.severity, - line: action.line, - message: action.message, - id: messageId - }) + state.lintMessages.push({ + severity: action.payload.severity, + line: action.payload.line, + message: action.payload.message, + id: messageId }); - case ActionTypes.CLEAR_LINT_MESSAGE: - return Object.assign({}, state, { lintMessages: [] }); - case ActionTypes.TOGGLE_FORCE_DESKTOP: - return Object.assign({}, state, { forceDesktop: !state.forceDesktop }); - default: - return state; + }, + clearLintMessages: (state) => { + state.lintMessages = []; + }, + toggleForceDesktop: (state) => { + state.forceDesktop = !state.forceDesktop; + } } -}; +}); + +export const editorAccessibilityActions = editorAccessibilitySlice.actions; -export default editorAccessibility; +export default editorAccessibilitySlice.reducer; From fe8275594bffd08bb47c7c53fb2c18f2e6f5d290 Mon Sep 17 00:00:00 2001 From: Piyush Date: Fri, 14 Jun 2024 11:01:54 +0530 Subject: [PATCH 2/2] fix few errors and typo --- client/modules/IDE/actions/editorAccessibility.js | 8 +++----- client/modules/IDE/reducers/editorAccessibility.js | 8 ++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/client/modules/IDE/actions/editorAccessibility.js b/client/modules/IDE/actions/editorAccessibility.js index 5363a7bebf..b29b327929 100644 --- a/client/modules/IDE/actions/editorAccessibility.js +++ b/client/modules/IDE/actions/editorAccessibility.js @@ -1,7 +1,5 @@ -import { editorAccessibilityActions } from '../reducers/editorAccessibility'; - -export const { +export { updateLintMessage, - clearLintMessages, + clearLintMessage, toggleForceDesktop -} = editorAccessibilityActions; +} from '../reducers/editorAccessibility'; diff --git a/client/modules/IDE/reducers/editorAccessibility.js b/client/modules/IDE/reducers/editorAccessibility.js index 2d03f845d3..94cc9ac54f 100644 --- a/client/modules/IDE/reducers/editorAccessibility.js +++ b/client/modules/IDE/reducers/editorAccessibility.js @@ -20,7 +20,7 @@ const editorAccessibilitySlice = createSlice({ id: messageId }); }, - clearLintMessages: (state) => { + clearLintMessage: (state) => { state.lintMessages = []; }, toggleForceDesktop: (state) => { @@ -29,6 +29,10 @@ const editorAccessibilitySlice = createSlice({ } }); -export const editorAccessibilityActions = editorAccessibilitySlice.actions; +export const { + updateLintMessage, + clearLintMessage, + toggleForceDesktop +} = editorAccessibilitySlice.actions; export default editorAccessibilitySlice.reducer;