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

Fix for timeout being sent in a different location (#2708)

Browse Source
This commit is contained in:
Hetu Nandu 2021-01-26 08:42:52 +05:30 committed by GitHub
parent 9e0f36a6f2
commit 40e42b296d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/client/src/api/ActionAPI.tsx
View File

@ -5,7 +5,7 @@ import {
DEFAULT_EXECUTE_ACTION_TIMEOUT_MS, DEFAULT_EXECUTE_ACTION_TIMEOUT_MS,
} from "constants/ApiConstants"; } from "constants/ApiConstants";
import axios, { AxiosPromise, CancelTokenSource } from "axios"; import axios, { AxiosPromise, CancelTokenSource } from "axios";
import { Action } from "entities/Action"; import { Action, ActionViewMode } from "entities/Action";
export interface CreateActionRequest<T> extends APIRequest { export interface CreateActionRequest<T> extends APIRequest {
datasourceId: string; datasourceId: string;
@ -127,7 +127,7 @@ class ActionAPI extends API {
static fetchActionsForViewMode( static fetchActionsForViewMode(
applicationId: string, applicationId: string,
): AxiosPromise<GenericApiResponse<Action[]>> { ): AxiosPromise<GenericApiResponse<ActionViewMode[]>> {
return API.get(`${ActionAPI.url}/view`, { applicationId }); return API.get(`${ActionAPI.url}/view`, { applicationId });
} }

9
app/client/src/entities/Action/index.ts
View File

@ -108,4 +108,13 @@ export interface QueryAction extends BaseAction {
datasource: StoredDatasource; datasource: StoredDatasource;
} }
export type ActionViewMode = {
id: string;
name: string;
pageId: string;
jsonPathKeys: string[];
confirmBeforeExecute?: boolean;
timeoutInMillisecond?: number;
};
export type Action = ApiAction | QueryAction; export type Action = ApiAction | QueryAction;

14
app/client/src/sagas/ActionSagas.ts
View File

@ -44,7 +44,7 @@ import {
} from "selectors/editorSelectors"; } from "selectors/editorSelectors";
import AnalyticsUtil from "utils/AnalyticsUtil"; import AnalyticsUtil from "utils/AnalyticsUtil";
import { QUERY_CONSTANT } from "constants/QueryEditorConstants"; import { QUERY_CONSTANT } from "constants/QueryEditorConstants";
import { Action } from "entities/Action"; import { Action, ActionViewMode } from "entities/Action";
import { ActionData } from "reducers/entityReducers/actionsReducer"; import { ActionData } from "reducers/entityReducers/actionsReducer";
import { import {
getAction, getAction,
@ -145,14 +145,22 @@ export function* fetchActionsForViewModeSaga(
{ mode: "VIEWER", appId: applicationId }, { mode: "VIEWER", appId: applicationId },
); );
try { try {
const response: GenericApiResponse<Action[]> = yield ActionAPI.fetchActionsForViewMode( const response: GenericApiResponse<ActionViewMode[]> = yield ActionAPI.fetchActionsForViewMode(
applicationId, applicationId,
); );
const correctFormatResponse = response.data.map((action) => {
return {
...action,
actionConfiguration: {
timeoutInMillisecond: action.timeoutInMillisecond,
},
};
});
const isValidResponse = yield validateResponse(response); const isValidResponse = yield validateResponse(response);
if (isValidResponse) { if (isValidResponse) {
yield put({ yield put({
type: ReduxActionTypes.FETCH_ACTIONS_VIEW_MODE_SUCCESS, type: ReduxActionTypes.FETCH_ACTIONS_VIEW_MODE_SUCCESS,
payload: response.data, payload: correctFormatResponse,
}); });
PerformanceTracker.stopAsyncTracking( PerformanceTracker.stopAsyncTracking(
PerformanceTransactionName.FETCH_ACTIONS_API, PerformanceTransactionName.FETCH_ACTIONS_API,