Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
1682ff2
removing feature flag for using new Entity Item component from ADS te…
ankitakinger Feb 6, 2025
75b36b7
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Feb 6, 2025
304b6d7
fixing failing unit tests
ankitakinger Feb 6, 2025
e068b56
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Feb 6, 2025
edbba40
fixing another unit test
ankitakinger Feb 6, 2025
5c13d0e
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Feb 7, 2025
345fd93
updating locators
ankitakinger Feb 7, 2025
a5b55a1
fixing unit tests
ankitakinger Feb 7, 2025
a4551fa
updating selected entity item selector
ankitakinger Feb 7, 2025
e320299
fixing some more tests
ankitakinger Feb 7, 2025
672e056
fixing some more tests
ankitakinger Feb 7, 2025
bdc0de9
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Feb 11, 2025
0182006
fixing a couple of integration tests
ankitakinger Feb 11, 2025
e864601
minor change
ankitakinger Feb 11, 2025
500002f
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Feb 11, 2025
675a44e
fixing more tests
ankitakinger Feb 11, 2025
dc62804
fix for failing tests
ankitakinger Feb 12, 2025
29ad43c
fix for failing tests
ankitakinger Feb 12, 2025
f1452fb
reverting double click changes on entity item
ankitakinger Feb 12, 2025
7e84052
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Feb 12, 2025
521dc3e
updating a test
ankitakinger Feb 12, 2025
73bfc57
fixing remaining tests
ankitakinger Feb 12, 2025
76f393a
fixing another set of failing tests
ankitakinger Feb 12, 2025
8acb96f
fixing client build
ankitakinger Feb 12, 2025
78fbcc4
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Feb 19, 2025
9bacf69
feat: Add useActiveDoubleClick hook for improved double-click handling
hetunandu Feb 27, 2025
33461e2
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Feb 27, 2025
69c15bc
chore: Improvements to useActiveDoubleClick
hetunandu Feb 27, 2025
7aa10e2
Merge branch 'chore/entity-item-double-click' of https://github.com/a…
ankitakinger Feb 27, 2025
2b591c2
Merge branch 'release' into chore/entity-item-double-click
hetunandu Feb 27, 2025
239a945
Merge branch 'chore/entity-item-double-click' of https://github.com/a…
ankitakinger Feb 27, 2025
4e1852e
fixing client build
ankitakinger Feb 27, 2025
6d6a15a
fixing unit test
ankitakinger Feb 27, 2025
a4eefd0
fixing a few tests
ankitakinger Feb 28, 2025
6c232ca
fixing a few tests
ankitakinger Feb 28, 2025
0c51244
fixing some tests
ankitakinger Feb 28, 2025
531a76d
fixing yet another test
ankitakinger Feb 28, 2025
9473f99
and another
ankitakinger Feb 28, 2025
bfa6253
Merge branch 'release' into chore/remove-ff-entity-item-usage
hetunandu Mar 3, 2025
3a8c91b
fix: build issue
hetunandu Mar 3, 2025
e299af4
Merge remote-tracking branch 'origin/release' into chore/remove-ff-en…
hetunandu Mar 3, 2025
d88dfd7
Merge branch 'chore/remove-ff-entity-item-usage' of github.com:/appsm…
hetunandu Mar 3, 2025
13814dc
fix: Null check
hetunandu Mar 3, 2025
ea1bd3e
chore: Fix widget name fisasco adjustment
hetunandu Mar 3, 2025
b02398b
fix: Build issue with type change
hetunandu Mar 3, 2025
5a90ebc
fix: DSL parent ids
hetunandu Mar 3, 2025
dc24d29
fix: Page Element hook usage
hetunandu Mar 4, 2025
2d726be
Merge branch 'release' into chore/remove-ff-entity-item-usage
hetunandu Mar 4, 2025
29711d5
Sync changes from EE excluding enterprise directory
hetunandu Mar 4, 2025
69a3ddc
Merge branch 'release' into chore/remove-ff-entity-item-usage
hetunandu Mar 7, 2025
dabfa7d
Discard changes to app/client/src/ce/pages/AppIDE/components/JSListIt…
hetunandu Mar 7, 2025
e35c689
Discard changes to app/client/src/ce/pages/AppIDE/components/QueryEnt…
hetunandu Mar 7, 2025
b74ccf9
Discard changes to app/client/src/ee/pages/AppIDE/components/JSListIt…
hetunandu Mar 7, 2025
0e996ab
Discard changes to app/client/src/ee/pages/AppIDE/components/QueryEnt…
hetunandu Mar 7, 2025
d9e3bad
Discard changes to app/client/src/pages/AppIDE/components/JSExplorer/…
hetunandu Mar 7, 2025
6344db4
Discard changes to app/client/src/pages/AppIDE/components/PageList/Ol…
hetunandu Mar 7, 2025
042daf7
Discard changes to app/client/src/pages/AppIDE/components/QueryEntity…
hetunandu Mar 7, 2025
77f4b13
Discard changes to app/client/src/pages/AppIDE/components/QueryExplor…
hetunandu Mar 7, 2025
627aafd
Discard changes to app/client/src/pages/AppIDE/components/UIEntityLis…
hetunandu Mar 7, 2025
6eefeb4
Discard changes to app/client/src/pages/AppIDE/components/UIList/UILi…
hetunandu Mar 7, 2025
b39b620
Discard changes to app/client/src/pages/AppIDE/components/UIList/UILi…
hetunandu Mar 7, 2025
f086dc2
Discard changes to app/client/src/pages/Editor/Explorer/Widgets/OldWi…
hetunandu Mar 7, 2025
88cb2f7
Discard changes to app/client/src/pages/Editor/Explorer/Widgets/Widge…
hetunandu Mar 7, 2025
3ea586c
Discard changes to app/client/src/pages/Editor/Explorer/Widgets/Widge…
hetunandu Mar 7, 2025
eb9a9d2
chore: Revert few changes
hetunandu Mar 7, 2025
8908314
Merge branch 'chore/remove-ff-entity-item-usage' of github.com:/appsm…
hetunandu Mar 7, 2025
2435fd1
Discard changes to app/client/src/ce/entities/FeatureFlag.ts
hetunandu Mar 7, 2025
c19af30
enable feature flag in tests
hetunandu Mar 7, 2025
c1a36af
Revert "Discard changes to app/client/src/pages/AppIDE/components/UIL…
hetunandu Mar 7, 2025
22d8d6b
Merge remote-tracking branch 'origin/release' into chore/remove-ff-en…
hetunandu Mar 10, 2025
43e0b73
fix: some locators post new merge
hetunandu Mar 10, 2025
94f0fc5
Merge remote-tracking branch 'origin/release' into chore/remove-ff-en…
hetunandu Mar 10, 2025
0183f03
fix: Delete all queries in DB
hetunandu Mar 10, 2025
68579f6
fix: PageActions_spec
hetunandu Mar 11, 2025
08bb0b9
fix: Unit tests
hetunandu Mar 12, 2025
8a4a200
Merge branch 'release' into chore/remove-ff-entity-item-usage
hetunandu Mar 12, 2025
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
10 changes: 8 additions & 2 deletions app/client/cypress/support/Objects/CommonLocators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class CommonLocators {
_entityNameEditing = (entityNameinLeftSidebar: string) =>
"//span[text()='" +
entityNameinLeftSidebar +
"']/parent::div[contains(@class, 't--entity-name editing')]/input";
"']/parent::span[contains(@class, 't--entity-name editing')]/input";
Comment thread
ankitakinger marked this conversation as resolved.
Outdated
_jsToggle = (controlToToggle: string) =>
`.t--property-control-${controlToToggle} .t--js-toggle, [data-guided-tour-iid='${controlToToggle}']`;
_buttonByText = (btnVisibleText: string) =>
Expand Down Expand Up @@ -334,9 +334,14 @@ export class CommonLocators {
_exitFullScreen = ".application-demo-new-dashboard-control-exit-fullscreen";
_menuItem = ".bp3-menu-item";
_slashCommandHintText = ".slash-command-hint-text";
_selectionItem = ".rc-select-selection-item";
errorPageTitle = ".t--error-page-title";
errorPageDescription = ".t--error-page-description";
_moduleInstanceEntity = (module: string) =>
`[data-testid=t--entity-item-${module}1]`;
_codeEditor = "[data-testid=code-editor-target]";
_selectionItem = ".rc-select-selection-item";
_moduleInputEntity = (inputName: string) =>
`[data-testid=t--module-instance-input-field-wrapper-${inputName}]`;
_selectClearButton_testId = "selectbutton.btn.cancel";
_selectClearButton_dataTestId = `[data-testid="${this._selectClearButton_testId}"]`;
_saveDatasource = `[data-testid='t--store-as-datasource']`;
Expand All @@ -347,6 +352,7 @@ export class CommonLocators {
_showBoundary = ".show-boundary";
_entityItem = "[data-testid='t--entity-item-Api1']";
_rowData = "[data-colindex='0'][data-rowindex='0']";
_visualNonIdeaState = ".bp3-non-ideal-state";
_editorTab = ".editor-tab";
_entityTestId = (entity: string) =>
`[data-testid="t--entity-item-${entity}"]`;
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/support/Pages/EditorNavigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export enum EditorViewMode {
}

const pagePaneListItemSelector = (name: string) =>
"//div[contains(@class, 't--entity-name')][text()='" + name + "']";
"//span[contains(@class, 't--entity-name')][text()='" + name + "']";
Comment thread
ankitakinger marked this conversation as resolved.
Outdated

export const PageLeftPane = new LeftPane(
pagePaneListItemSelector,
Expand Down
5 changes: 1 addition & 4 deletions app/client/cypress/support/Pages/EntityExplorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ export class EntityExplorer {
"//div[text()='" +
entityNameinLeftSidebar +
"']/ancestor::div[1]/following-sibling::div//button[contains(@class, 'entity-context-menu')]";
_entityNameInExplorer = (entityNameinLeftSidebar: string) =>
"//div[contains(@class, 't--entity-explorer')]//div[contains(@class, 't--entity-name')][text()='" +
entityNameinLeftSidebar +
"']";

private _visibleTextSpan = (spanText: string) =>
"//span[text()='" + spanText + "']";
Expand All @@ -72,6 +68,7 @@ export class EntityExplorer {
_widgetTagSuggestedWidgets = ".widget-tag-collapsible-suggested";
_widgetTagBuildingBlocks = ".widget-tag-collapsible-building-blocks";
_widgetSeeMoreButton = "[data-testid='t--explorer-ui-entity-tag-see-more']";
_entityAddButton = ".t--entity-add-btn";

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Use data-testid for entity add button selector.

The selector uses a class which is more brittle than data attributes.

Apply this diff:

-  _entityAddButton = ".t--entity-add-btn";
+  _entityAddButton = "[data-testid='t--entity-add-btn']";
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
_entityAddButton = ".t--entity-add-btn";
_entityAddButton = "[data-testid='t--entity-add-btn']";

_entityName = ".t--entity-name";

public ActionContextMenuByEntityName({
Expand Down
8 changes: 3 additions & 5 deletions app/client/cypress/support/Pages/IDE/LeftPane.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { ObjectsRegistry } from "../../Objects/Registry";
import { PagePaneSegment } from "../EditorNavigation";
import AddView from "./AddView";
import FileTabs from "./FileTabs";
import ListView from "./ListView";

export class LeftPane {
Expand All @@ -11,9 +9,7 @@ export class LeftPane {
locators = {
segment: (name: string) => "//span[text()='" + name + "']/ancestor::div",
expandCollapseArrow: (name: string) =>
"//div[text()='" +
name +
"']/ancestor::div/span[contains(@class, 't--entity-collapse-toggle')]",
`//span[contains(@class, 't--entity-name')][text()="${name}"]/ancestor::div//*[@data-testid="t--entity-collapse-toggle"]`,
Comment thread
ankitakinger marked this conversation as resolved.
activeItemSelector: "",
selector: "",
};
Expand Down Expand Up @@ -83,13 +79,15 @@ export class LeftPane {
.then((state) => {
const closed = state === "arrow-right-s-line";
const opened = state === "arrow-down-s-line";

if ((expand && closed) || (!expand && opened)) {
ObjectsRegistry.AggregateHelper.GetNClick(
this.locators.expandCollapseArrow(itemName),
);
}
});
}

public selectedItem(
exists?: "exist" | "not.exist" | "noVerify",
): Cypress.Chainable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const EditableEntityName = (props: EditableEntityNameProps) => {
>
<Styled.Text
aria-invalid={Boolean(validationError)}
className="t--entity-name editing"
data-isediting={inEditMode}
data-isfixedwidth={isFixedWidth}
inputProps={inputProps}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ export function EntityListTree(props: EntityListTreeProps) {
{item.children && item.children.length ? (
<CollapseWrapper
data-itemid={item.id}
data-testid="entity-item-expand-icon"
data-testid="t--entity-collapse-toggle"
id={
item.isExpanded ? "arrow-down-s-line" : "arrow-right-s-line"
}
onClick={handleOnExpandClick}
>
<Icon
Expand All @@ -65,7 +68,10 @@ export function EntityListTree(props: EntityListTreeProps) {
<CollapseSpacer />
)}
<PaddingOverrider>
<EntityItem {...item} />
<EntityItem
{...item}
dataTestId={`t--entity-item-${item.title}`}
/>
</PaddingOverrider>
</EntityItemWrapper>
{item.children && item.isExpanded ? (
Expand Down
2 changes: 0 additions & 2 deletions app/client/src/ce/entities/FeatureFlag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export const FEATURE_FLAG = {
"config_mask_session_recordings_enabled",
config_user_session_recordings_enabled:
"config_user_session_recordings_enabled",
release_ads_entity_item_enabled: "release_ads_entity_item_enabled",
release_external_saas_plugins_enabled:
"release_external_saas_plugins_enabled",
} as const;
Expand Down Expand Up @@ -97,7 +96,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = {
kill_session_recordings_enabled: false,
config_user_session_recordings_enabled: true,
config_mask_session_recordings_enabled: true,
release_ads_entity_item_enabled: false,
release_external_saas_plugins_enabled: false,
};

Expand Down
27 changes: 0 additions & 27 deletions app/client/src/ce/pages/Editor/IDE/EditorPane/JS/old/ListItem.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ export const getJSContextMenuByIdeType = (
ideType: IDEType,
jsAction: JSCollection,
) => {
if (Boolean(jsAction?.isMainJSCollection)) {
return null;
}

switch (ideType) {
case IDE_TYPE.App: {
return (
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

83 changes: 0 additions & 83 deletions app/client/src/pages/Editor/Explorer/Widgets/WidgetContextMenu.tsx

This file was deleted.

Loading