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

fix: marking old async functions as async in the backed for settings (#10723)

Browse Source
This commit is contained in:
Apeksha Bhosale 2022-02-18 19:28:11 +05:30 committed by GitHub
parent 92a8df8f04
commit 44597c5e57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/client/src/actions/evaluationActions.ts
View File

@ -17,7 +17,7 @@ export const FIRST_EVAL_REDUX_ACTIONS = [
export const EVALUATE_REDUX_ACTIONS = [
...FIRST_EVAL_REDUX_ACTIONS,
// Actions
ReduxActionTypes.FETCH_ACTIONS_SUCCESS,
ReduxActionTypes.FETCH_PLUGIN_AND_JS_ACTIONS_SUCCESS,
ReduxActionTypes.FETCH_PLUGIN_FORM_CONFIGS_SUCCESS,
ReduxActionTypes.FETCH_ACTIONS_VIEW_MODE_SUCCESS,
ReduxActionErrorTypes.FETCH_ACTIONS_ERROR,
@ -35,7 +35,6 @@ export const EVALUATE_REDUX_ACTIONS = [
ReduxActionErrorTypes.EXECUTE_PLUGIN_ACTION_ERROR,
ReduxActionTypes.CLEAR_ACTION_RESPONSE,
// JS Actions
ReduxActionTypes.FETCH_JS_ACTIONS_SUCCESS,
ReduxActionTypes.CREATE_JS_ACTION_SUCCESS,
ReduxActionErrorTypes.FETCH_JS_ACTIONS_ERROR,
ReduxActionTypes.DELETE_JS_ACTION_SUCCESS,

1
app/client/src/constants/ReduxActionConstants.tsx
View File

@ -645,6 +645,7 @@ export const ReduxActionTypes = {
/* This action constants is for identifying the status of the updates of the entities */
ENTITY_UPDATE_STARTED: "ENTITY_UPDATE_STARTED",
ENTITY_UPDATE_SUCCESS: "ENTITY_UPDATE_SUCCESS",
FETCH_PLUGIN_AND_JS_ACTIONS_SUCCESS: "FETCH_PLUGIN_AND_JS_ACTIONS_SUCCESS",
};
export type ReduxActionType = typeof ReduxActionTypes[keyof typeof ReduxActionTypes];

42
app/client/src/sagas/InitSagas.ts
View File

@ -126,7 +126,6 @@ function* initializeEditorSaga(
}),
fetchPageList({ applicationId }, APP_MODE.EDIT),
];
const successEffects = [
ReduxActionTypes.FETCH_APPLICATION_SUCCESS,
ReduxActionTypes.FETCH_PAGE_LIST_SUCCESS,
@ -136,12 +135,6 @@ function* initializeEditorSaga(
ReduxActionErrorTypes.FETCH_APPLICATION_ERROR,
ReduxActionErrorTypes.FETCH_PAGE_LIST_ERROR,
];
const jsActionsCall = yield failFastApiCalls(
[fetchJSCollections({ applicationId })],
[ReduxActionTypes.FETCH_JS_ACTIONS_SUCCESS],
[ReduxActionErrorTypes.FETCH_JS_ACTIONS_ERROR],
);
if (!jsActionsCall) return;
if (pageId) {
initCalls.push(fetchPage(pageId, true) as any);
successEffects.push(ReduxActionTypes.FETCH_PAGE_SUCCESS);
@ -156,6 +149,34 @@ function* initializeEditorSaga(
if (!applicationAndLayoutCalls) return;
const initActionsCalls = [
fetchActions({ applicationId }, []),
fetchJSCollections({ applicationId }),
];
const successActionEffects = [
ReduxActionTypes.FETCH_JS_ACTIONS_SUCCESS,
ReduxActionTypes.FETCH_ACTIONS_SUCCESS,
];
const failureActionEffects = [
ReduxActionErrorTypes.FETCH_JS_ACTIONS_ERROR,
ReduxActionErrorTypes.FETCH_ACTIONS_ERROR,
];
const allActionCalls = yield failFastApiCalls(
initActionsCalls,
successActionEffects,
failureActionEffects,
);
if (!allActionCalls) {
return;
} else {
yield put({
type: ReduxActionTypes.FETCH_PLUGIN_AND_JS_ACTIONS_SUCCESS,
});
yield put(executePageLoadActions());
}
let fetchPageCallResult;
const defaultPageId = yield select(getDefaultPageId);
const toLoadPageId = pageId || defaultPageId;
@ -193,13 +214,6 @@ function* initializeEditorSaga(
);
if (!pluginFormCall) return;
const actionsCall = yield failFastApiCalls(
[fetchActions({ applicationId }, [executePageLoadActions()])],
[ReduxActionTypes.FETCH_ACTIONS_SUCCESS],
[ReduxActionErrorTypes.FETCH_ACTIONS_ERROR],
);
if (!actionsCall) return;
const currentApplication = yield select(getCurrentApplication);
const appName = currentApplication ? currentApplication.name : "";
const appId = currentApplication ? currentApplication.id : "";

5
app/client/src/utils/JSPaneUtils.tsx
View File

@ -37,7 +37,10 @@ export const getDifferenceInJSCollection = (
const action = parsedBody.actions[i];
const preExisted = jsAction.actions.find((js) => js.name === action.name);
if (preExisted) {
if (preExisted.actionConfiguration.body !== action.body) {
if (
preExisted.actionConfiguration.body !== action.body ||
preExisted.actionConfiguration.isAsync !== action.isAsync
) {
toBeUpdatedActions.push({
...preExisted,
actionConfiguration: {