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

Show a toast when action executeOnLoad status updates (#3042)

Browse Source
This commit is contained in:
Hetu Nandu 2021-02-15 21:43:44 +05:30 committed by GitHub
parent 56170b0cdf
commit ebd61efcca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/client/src/actions/actionActions.ts
View File

@ -229,7 +229,13 @@ export const updateActionProperty = (
}); });
}; };
export const setActionsToExecuteOnPageLoad = (actions: string[]) => { export const setActionsToExecuteOnPageLoad = (
actions: Array<{
executeOnLoad: boolean;
id: string;
name: string;
}>,
) => {
return { return {
type: ReduxActionTypes.SET_ACTION_TO_EXECUTE_ON_PAGELOAD, type: ReduxActionTypes.SET_ACTION_TO_EXECUTE_ON_PAGELOAD,
payload: actions, payload: actions,

6
app/client/src/api/PageApi.tsx
View File

@ -49,6 +49,12 @@ export interface SavePageResponse extends ApiResponse {
id: string; id: string;
layoutOnLoadActions: PageAction[][]; layoutOnLoadActions: PageAction[][];
dsl: Partial<ContainerWidgetProps<any>>; dsl: Partial<ContainerWidgetProps<any>>;
messages: string[];
actionUpdates: Array<{
executeOnLoad: boolean;
id: string;
name: string;
}>;
}; };
} }

14
app/client/src/reducers/entityReducers/actionsReducer.tsx
View File

@ -339,12 +339,20 @@ const actionsReducer = createReducer(initialState, {
}), }),
[ReduxActionTypes.SET_ACTION_TO_EXECUTE_ON_PAGELOAD]: ( [ReduxActionTypes.SET_ACTION_TO_EXECUTE_ON_PAGELOAD]: (
state: ActionDataState, state: ActionDataState,
actionIds: ReduxAction<string[]>, action: ReduxAction<
Array<{
executeOnLoad: boolean;
id: string;
name: string;
}>
>,
) => { ) => {
return produce(state, (draft) => { return produce(state, (draft) => {
const actionUpdateSearch = _.keyBy(action.payload, "id");
draft.forEach((action, index) => { draft.forEach((action, index) => {
if (actionIds.payload.indexOf(action.config.id) > -1) { if (action.config.id in actionUpdateSearch) {
draft[index].config.executeOnLoad = true; draft[index].config.executeOnLoad =
actionUpdateSearch[action.config.id].executeOnLoad;
} }
}); });
}); });

22
app/client/src/sagas/PageSagas.tsx
View File

@ -77,6 +77,8 @@ import PerformanceTracker, {
PerformanceTransactionName, PerformanceTransactionName,
} from "utils/PerformanceTracker"; } from "utils/PerformanceTracker";
import { WidgetTypes } from "constants/WidgetConstants"; import { WidgetTypes } from "constants/WidgetConstants";
import { Toaster } from "components/ads/Toast";
import { Variant } from "components/ads/common";
const getWidgetName = (state: AppState, widgetId: string) => const getWidgetName = (state: AppState, widgetId: string) =>
state.entities.canvasWidgets[widgetId]; state.entities.canvasWidgets[widgetId];
@ -323,13 +325,19 @@ function* savePageSaga() {
); );
const isValidResponse = yield validateResponse(savePageResponse); const isValidResponse = yield validateResponse(savePageResponse);
if (isValidResponse) { if (isValidResponse) {
if ( const { messages, actionUpdates } = savePageResponse.data;
savePageResponse.data.layoutOnLoadActions && // Show toast messages from the server
savePageResponse.data.layoutOnLoadActions.length > 0 if (messages && messages.length) {
) { savePageResponse.data.messages.forEach((message) => {
for (const actionSet of savePageResponse.data.layoutOnLoadActions) { Toaster.show({
yield put(setActionsToExecuteOnPageLoad(actionSet.map((a) => a.id))); text: message,
} type: Variant.info,
});
});
}
// Update actions
if (actionUpdates && actionUpdates.length > 0) {
yield put(setActionsToExecuteOnPageLoad(actionUpdates));
} }
yield put(savePageSuccess(savePageResponse)); yield put(savePageSuccess(savePageResponse));
PerformanceTracker.stopAsyncTracking( PerformanceTracker.stopAsyncTracking(