Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: show loading state in JS Editor (#12820)

Browse Source
This commit is contained in:
Favour Ohanekwu 2022-04-12 23:17:56 -07:00 committed by GitHub
parent f973c2d86d
commit b102d32761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/actions/jsPaneActions.ts
View File

@ -54,7 +54,7 @@ export const refactorJSCollectionAction = (payload: {
};
};
export const executeJSFunction = (payload: {
export const executeJSFunctionInit = (payload: {
collectionName: string;
action: JSAction;
collectionId: string;

8
app/client/src/reducers/entityReducers/jsActionsReducer.tsx
View File

@ -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,
},
};
}

8
app/client/src/sagas/JSPaneSagas.ts
View File

@ -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({