diff --git a/app/client/src/actions/jsPaneActions.ts b/app/client/src/actions/jsPaneActions.ts index 13b09a2e43..9eee273646 100644 --- a/app/client/src/actions/jsPaneActions.ts +++ b/app/client/src/actions/jsPaneActions.ts @@ -54,7 +54,7 @@ export const refactorJSCollectionAction = (payload: { }; }; -export const executeJSFunction = (payload: { +export const executeJSFunctionInit = (payload: { collectionName: string; action: JSAction; collectionId: string; diff --git a/app/client/src/reducers/entityReducers/jsActionsReducer.tsx b/app/client/src/reducers/entityReducers/jsActionsReducer.tsx index f162f8fe83..a4b500af6f 100644 --- a/app/client/src/reducers/entityReducers/jsActionsReducer.tsx +++ b/app/client/src/reducers/entityReducers/jsActionsReducer.tsx @@ -1,5 +1,5 @@ import { createReducer } from "utils/AppsmithUtils"; -import { JSCollection } from "entities/JSCollection"; +import { JSAction, JSCollection } from "entities/JSCollection"; import { ReduxActionTypes, ReduxAction, @@ -247,9 +247,9 @@ const jsActionsReducer = createReducer(initialState, { [ReduxActionTypes.EXECUTE_JS_FUNCTION_INIT]: ( state: JSCollectionDataState, action: ReduxAction<{ - results: any; + collectionName: string; collectionId: string; - actionId: string; + action: JSAction; }>, ): JSCollectionDataState => state.map((a) => { @@ -258,7 +258,7 @@ const jsActionsReducer = createReducer(initialState, { ...a, isExecuting: { ...a.isExecuting, - [action.payload.actionId]: true, + [action.payload.action.id]: true, }, }; } diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts index 33bc55485e..714832939b 100644 --- a/app/client/src/sagas/JSPaneSagas.ts +++ b/app/client/src/sagas/JSPaneSagas.ts @@ -41,6 +41,7 @@ import { refactorJSCollectionAction, updateJSCollectionBodySuccess, updateJSFunction, + executeJSFunctionInit, } from "actions/jsPaneActions"; import { getCurrentOrgId } from "selectors/organizationSelectors"; import { getPluginIdOfPackageName } from "sagas/selectors"; @@ -303,6 +304,13 @@ export function* handleExecuteJSFunctionSaga(data: { }): any { const { action, collectionId, collectionName } = data; const actionId = action.id; + yield put( + executeJSFunctionInit({ + collectionName, + action, + collectionId, + }), + ); try { const result = yield call(executeFunction, collectionName, action); yield put({