-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: sniping mode for module to bind to existing and new widgets (#35072
) ## Description Fixes sniping for module instances. For binding to widgets, the module instance id and moduleInstance name was to be passed to the `BindDataButton` component. Fixes #31957 ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10056587287> > Commit: 74ec4dc > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10056587287&attempt=1" target="_blank">Cypress dashboard</a>. > Tags: `@tag.All` > Spec: > <hr>Tue, 23 Jul 2024 10:37:32 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [x] Yes - [ ] No <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Introduced new `apiName` prop in the `ApiResponseView` component for enhanced flexibility in API response rendering. - Added `moduleInstanceId` to `BindDataButtonProps` for improved data binding context. - Enhanced `QueryResponseTab` components by adding `actionName` prop, improving functionality and display. - **Bug Fixes** - Updated logic in `QueryResponseTab` to allow for fallback to `actionName` when rendering, enhancing adaptability. - **Tests** - Added a comprehensive test suite for `bindDataToWidgetSaga` to ensure expected behavior and integration with Redux state management. - **Refactor** - Improved the logic in `bindDataToWidgetSaga` to utilize `actionName`, streamlining the data binding process. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
- Loading branch information
1 parent
cbe1f58
commit d39eb58
Showing
7 changed files
with
130 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
import type { ModuleInstance } from "@appsmith/constants/ModuleInstanceConstants"; | ||
import { keyBy } from "lodash"; | ||
import { testStore } from "store"; | ||
import { PostgresFactory } from "test/factories/Actions/Postgres"; | ||
import type { Saga } from "redux-saga"; | ||
import { runSaga } from "redux-saga"; | ||
import { bindDataToWidgetSaga } from "./SnipingModeSagas"; | ||
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; | ||
import { getModuleInstanceById } from "@appsmith/selectors/moduleInstanceSelectors"; | ||
import WidgetFactory from "WidgetProvider/factory"; | ||
import TableWidget from "widgets/TableWidget/widget"; | ||
import { InputFactory } from "test/factories/Widgets/InputFactory"; | ||
|
||
jest.mock("@appsmith/selectors/moduleInstanceSelectors", () => ({ | ||
...jest.requireActual("@appsmith/selectors/moduleInstanceSelectors"), | ||
getModuleInstanceById: jest.fn(), | ||
})); | ||
|
||
describe("SnipingModeSaga", () => { | ||
beforeEach(() => { | ||
jest.restoreAllMocks(); | ||
}); | ||
|
||
it("should check for moduleInstance and use when action is missing", async () => { | ||
const widget = InputFactory.build(); | ||
const action = PostgresFactory.build(); | ||
const moduleInstance = { | ||
id: "module-instance-id", | ||
name: "ModuleInstance1", | ||
} as ModuleInstance; | ||
|
||
(getModuleInstanceById as jest.Mock).mockReturnValue(moduleInstance); | ||
const spy = jest | ||
.spyOn(WidgetFactory, "getWidgetMethods") | ||
.mockImplementation(TableWidget.getMethods); | ||
|
||
const store = testStore({ | ||
entities: { | ||
...({} as any), | ||
actions: [ | ||
{ | ||
config: action, | ||
}, | ||
], | ||
canvasWidgets: keyBy([widget], "widgetId"), | ||
}, | ||
ui: { | ||
...({} as any), | ||
editor: { | ||
snipModeBindTo: "module-instance-id", | ||
}, | ||
}, | ||
}); | ||
const dispatched: any[] = []; | ||
|
||
await runSaga( | ||
{ | ||
dispatch: (action) => dispatched.push(action), | ||
getState: () => store.getState(), | ||
}, | ||
bindDataToWidgetSaga as Saga, | ||
{ payload: { widgetId: widget.widgetId, bindingQuery: "data" } }, | ||
).toPromise(); | ||
|
||
expect(dispatched).toEqual([ | ||
{ | ||
payload: { | ||
updates: [ | ||
{ | ||
isDynamic: true, | ||
propertyPath: "tableData", | ||
skipValidation: true, | ||
}, | ||
], | ||
widgetId: widget.widgetId, | ||
}, | ||
type: ReduxActionTypes.BATCH_SET_WIDGET_DYNAMIC_PROPERTY, | ||
}, | ||
{ | ||
payload: { | ||
shouldReplay: true, | ||
updates: { modify: { tableData: `{{${moduleInstance.name}.data}}` } }, | ||
widgetId: widget.widgetId, | ||
}, | ||
type: ReduxActionTypes.BATCH_UPDATE_WIDGET_PROPERTY, | ||
}, | ||
{ | ||
payload: { bindTo: undefined, isActive: false }, | ||
type: ReduxActionTypes.SET_SNIPING_MODE, | ||
}, | ||
{ | ||
payload: { | ||
invokedBy: undefined, | ||
pageId: undefined, | ||
payload: [widget.widgetId], | ||
selectionRequestType: "One", | ||
}, | ||
type: ReduxActionTypes.SELECT_WIDGET_INIT, | ||
}, | ||
]); | ||
|
||
spy.mockRestore(); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters