Skip to content

chore: Remove unexpected fields in action update payload #33731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharat87 merged 3 commits into from
May 27, 2024
Merged

chore: Remove unexpected fields in action update payload #33731

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fa8026
chore: Remove unexpected fields in action update payload
sharat87 May 26, 2024
a68ba88
more cleanup of unused stuffs
sharat87 May 26, 2024
f0f1925
chore: Don't use `delete` statement
sharat87 May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 13 additions & 39 deletions app/client/src/api/ActionAPI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type React from "react";
import type { HttpMethod } from "api/Api";
import API from "api/Api";
import type { ApiResponse } from "./ApiResponses";
Expand All @@ -7,40 +8,15 @@ import axios from "axios";
import type { Action, ActionViewMode } from "entities/Action";
import type { APIRequest } from "constants/AppsmithActionConstants/ActionConstants";
import type { WidgetType } from "constants/WidgetConstants";
import { omit } from "lodash";
import type { OtlpSpan } from "UITelemetry/generateTraces";
import { wrapFnWithParentTraceContext } from "UITelemetry/generateTraces";
import type { ActionParentEntityTypeInterface } from "@appsmith/entities/Engine/actionHelpers";

export interface CreateActionRequest<T> extends APIRequest {
datasourceId: string;
pageId: string;
name: string;
actionConfiguration: T;
}

export interface UpdateActionRequest<T> extends CreateActionRequest<T> {
actionId: string;
}

export interface Property {
key: string;
value?: string;
}

export interface BodyFormData {
editable: boolean;
mandatory: boolean;
description: string;
key: string;
value?: string;
type: string;
}

export interface QueryConfig {
queryString: string;
}

export type ActionCreateUpdateResponse = ApiResponse & {
id: string;
jsonPathKeys: Record<string, string>;
Expand All @@ -66,10 +42,6 @@ export interface ExecuteActionRequest extends APIRequest {
analyticsProperties?: Record<string, boolean>;
}

export type ExecuteActionResponse = ApiResponse & {
actionId: string;
};

export interface ActionApiResponseReq {
headers: Record<string, string[]>;
body: Record<string, unknown> | null;
Expand Down Expand Up @@ -136,11 +108,6 @@ export interface MoveActionRequest {
destinationPageId: string;
}

export interface CopyActionRequest {
action: Action;
pageId: string;
}

export interface UpdateActionNameRequest {
pageId?: string;
actionId: string;
Expand Down Expand Up @@ -193,11 +160,18 @@ class ActionAPI extends API {
ActionAPI.apiUpdateCancelTokenSource.cancel();
}
ActionAPI.apiUpdateCancelTokenSource = axios.CancelToken.source();
let action = Object.assign({}, apiConfig);
// While this line is not required, name can not be changed from this endpoint
delete action.name;
// Removing datasource storages from the action object since embedded datasources don't have storages
action = omit(action, ["datasource.datasourceStorages"]);
const action: Partial<Action & { entityReferenceType: unknown }> = {
...apiConfig,
name: undefined,
entityReferenceType: undefined,
};
if (action.datasource != null) {
action.datasource = {
...(action as any).datasource,
datasourceStorages: undefined,
isValid: undefined,
};
}
return API.put(`${ActionAPI.url}/${action.id}`, action, undefined, {
cancelToken: ActionAPI.apiUpdateCancelTokenSource.token,
});
Expand Down