Skip to content

chore: Remove unused eventData #33730

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 28, 2024
Merged

chore: Remove unused eventData #33730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a80fe6
chore: Remove unused `eventData`
sharat87 May 26, 2024
bfe1170
chore: Remove unused AnalyticsInfo.java
sharat87 May 26, 2024
30e8f45
chore: Remove eventData from request payload in client
sharat87 May 26, 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
2 changes: 1 addition & 1 deletion app/client/src/api/ActionAPI.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class ActionAPI extends API {
static async createAction(
apiConfig: Partial<Action>,
): Promise<AxiosPromise<ActionCreateUpdateResponse>> {
return API.post(ActionAPI.url, apiConfig);
return API.post(ActionAPI.url, { ...apiConfig, eventData: undefined });
}

static async fetchActions(
Expand Down
20 changes: 0 additions & 20 deletions app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/AnalyticsInfo.java
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...erver/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.appsmith.external.exceptions.ErrorDTO;
import com.appsmith.external.helpers.Identifiable;
import com.appsmith.external.models.ActionConfiguration;
import com.appsmith.external.models.AnalyticsInfo;
import com.appsmith.external.models.CreatorContextType;
import com.appsmith.external.models.Datasource;
import com.appsmith.external.models.DefaultResources;
Expand Down Expand Up @@ -156,11 +155,6 @@ public class ActionCE_DTO implements Identifiable, Executable {
@JsonView(Views.Internal.class)
DefaultResources defaultResources;

// This field will be used to store analytics data related to this specific domain object. It's been introduced in
// order to track success metrics of modules. Learn more on GitHub issue#24734
@JsonView({Views.Public.class, FromRequest.class})
AnalyticsInfo eventData;

@JsonView(Views.Internal.class)
protected Instant createdAt;

Expand Down Expand Up @@ -211,7 +205,6 @@ public EntityReferenceType getEntityReferenceType() {

public void sanitiseToExportDBObject() {
this.resetTransientFields();
this.setEventData(null);
this.setDefaultResources(null);
this.setUpdatedAt(null);
this.setCacheResponse(null);
Expand Down
41 changes: 0 additions & 41 deletions ...r/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.appsmith.external.helpers.AppsmithEventContextType;
import com.appsmith.external.models.ActionConfiguration;
import com.appsmith.external.models.ActionDTO;
import com.appsmith.external.models.AnalyticsInfo;
import com.appsmith.external.models.Datasource;
import com.appsmith.external.models.DatasourceConfiguration;
import com.appsmith.external.models.DatasourceStorageDTO;
Expand Down Expand Up @@ -1567,44 +1566,4 @@ public void validateAndSaveActionToRepository_ActionDTOHasCreatedAtUpdatedAtFiel
assertThat(savedAction.getCreatedAt()).isNotNull();
assertThat(savedAction.getUpdatedAt()).isNotNull();
}

@Test
@WithUserDetails(value = "api_user")
public void createCopyActionWithAnalyticsData_validateAnalyticsDataPersistsInResponse() {
Mockito.when(pluginExecutorHelper.getPluginExecutor(Mockito.any()))
.thenReturn(Mono.just(new MockPluginExecutor()));

ActionDTO action = new ActionDTO();
action.setName("CopyOfQuery1");
action.setPageId(testPage.getId());
action.setDatasource(datasource);
ActionConfiguration actionConfiguration = new ActionConfiguration();
actionConfiguration.setPluginSpecifiedTemplates(List.of(new Property(null, true)));

AnalyticsInfo analyticsInfo = new AnalyticsInfo();
Map<String, Object> analyticsData = new HashMap<>();
String keyOriginalActionId = "originalActionId";
String valueOriginalActionId = "xyz";
analyticsData.put(keyOriginalActionId, valueOriginalActionId);
analyticsInfo.setAnalyticsData(analyticsData);
action.setEventData(analyticsInfo);

action.setActionConfiguration(actionConfiguration);

Mono<ActionDTO> actionMono =
Mono.just(action).flatMap(action1 -> layoutActionService.createSingleAction(action1, Boolean.FALSE));
StepVerifier.create(actionMono)
.assertNext(createdAction -> {
assertThat(createdAction.getId()).isNotEmpty();
assertThat(createdAction.getName()).isEqualTo(action.getName());
assertThat(createdAction.getIsValid()).isTrue();
assertThat(createdAction
.getEventData()
.getAnalyticsData()
.get(keyOriginalActionId)
.toString()
.equalsIgnoreCase(valueOriginalActionId));
})
.verifyComplete();
}
}