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

chore: filter out AI Datasource during import (#40286)

Browse Source 
Before:


https://github.com/user-attachments/assets/2954a270-b4e9-4871-b2f6-b9967f997d26

After:


https://github.com/user-attachments/assets/b83762e3-7e21-4fff-bdc6-708412d3d3b3

/ok-to-test tags="@tag.Templates"

<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/14509874809>
> Commit: a3d4aa2d68f39deb5767936521c09a2d579dfbeb
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=14509874809&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.Templates`
> Spec:
> <hr>Thu, 17 Apr 2025 07:16:52 UTC
<!-- end of auto-generated comment: Cypress test results  -->


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Bug Fixes**
- The "AI Datasource" will no longer appear in the reconnect datasource
modal during partial application or template imports, improving clarity
for users when reconnecting datasources.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Pawan Kumar 2025-04-17 13:36:42 +05:30 committed by GitHub
parent 33eaa51c8b
commit 882ad85e23
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/client/src/ce/sagas/ApplicationSagas.tsx
View File

@ -124,6 +124,8 @@ import { findDefaultPage } from "pages/utils";
export let windowReference: Window | null = null;
const AI_DATASOURCE_NAME = "AI Datasource";
export function* publishApplicationSaga(
requestAction: ReduxAction<PublishApplicationRequest>,
) {
@ -747,12 +749,22 @@ export function* forkApplicationSaga(
yield take(ReduxActionTypes.INITIALIZE_EDITOR_SUCCESS);
}
if (response.data.isPartialImport) {
// Temporary fix to remove AI Datasource from the unConfiguredDatasourceList
// so we can avoid showing the AI Datasource in reconnect datasource modal
const filteredUnConfiguredDatasourceList = (
response?.data?.unConfiguredDatasourceList || []
).filter(
(datasource) => datasource.name !== AI_DATASOURCE_NAME,
) as Datasource[];
if (
response.data.isPartialImport &&
filteredUnConfiguredDatasourceList.length > 0
) {
yield put(
showReconnectDatasourceModal({
application: response.data?.application,
unConfiguredDatasourceList:
response?.data.unConfiguredDatasourceList,
unConfiguredDatasourceList: filteredUnConfiguredDatasourceList,
workspaceId: action.payload.workspaceId,
}),
);
@ -796,7 +808,11 @@ export function* importApplicationSaga(
action: ReduxAction<ImportApplicationRequest>,
) {
try {
const response: ApiResponse = yield call(
const response: ApiResponse<{
unConfiguredDatasourceList: Datasource[];
application: ApplicationResponsePayload;
isPartialImport: boolean;
}> = yield call(
ApplicationApi.importApplicationToWorkspace,
action.payload,
);
@ -813,28 +829,29 @@ export function* importApplicationSaga(
if (currentWorkspaceId || currentWorkspace.length > 0) {
const {
// @ts-expect-error: response is of type unknown
application: { pages },
// @ts-expect-error: response is of type unknown
isPartialImport,
} = response.data;
// @ts-expect-error: response is of type unknown
yield put(importApplicationSuccess(response.data?.application));
if (isPartialImport) {
// Temporary fix to remove AI Datasource from the unConfiguredDatasourceList
// so we can avoid showing the AI Datasource in reconnect datasource modal
const filteredUnConfiguredDatasourceList = (
response?.data?.unConfiguredDatasourceList || []
).filter(
(datasource) => datasource.name !== AI_DATASOURCE_NAME,
) as Datasource[];
if (isPartialImport && filteredUnConfiguredDatasourceList.length > 0) {
yield put(
showReconnectDatasourceModal({
// @ts-expect-error: response is of type unknown
application: response.data?.application,
unConfiguredDatasourceList:
// @ts-expect-error: response is of type unknown
response?.data.unConfiguredDatasourceList,
unConfiguredDatasourceList: filteredUnConfiguredDatasourceList,
workspaceId: action.payload.workspaceId,
}),
);
} else {
// @ts-expect-error: pages is of type any
// TODO: Update route params here
const { application } = response.data;
const defaultPage = findDefaultPage(pages);
@ -844,6 +861,7 @@ export function* importApplicationSaga(
if (isApplicationUrl) {
const appId = application.id;
// @ts-expect-error: defaultPageId does not exist in the application response object
const pageId = application.defaultPageId;
yield put({

15
app/client/src/sagas/TemplatesSagas.ts
View File

@ -48,6 +48,7 @@ import { failFastApiCalls } from "./InitSagas";
import { getAllPageIdentities } from "./selectors";
const isAirgappedInstance = isAirgapped();
const AI_DATASOURCE_NAME = "AI Datasource";
function* getAllTemplatesSaga() {
try {
@ -96,12 +97,20 @@ function* importTemplateToWorkspaceSaga(
payload: response.data.application,
});
if (response.data.isPartialImport) {
// Temporary fix to remove AI Datasource from the unConfiguredDatasourceList
// so we can avoid showing the AI Datasource in reconnect datasource modal
const filteredUnConfiguredDatasourceList = (
response.data.unConfiguredDatasourceList || []
).filter((datasource) => datasource.name !== AI_DATASOURCE_NAME);
if (
response.data.isPartialImport &&
filteredUnConfiguredDatasourceList.length > 0
) {
yield put(
showReconnectDatasourceModal({
application: response.data.application,
unConfiguredDatasourceList:
response.data.unConfiguredDatasourceList,
unConfiguredDatasourceList: filteredUnConfiguredDatasourceList,
workspaceId: action.payload.workspaceId,
}),
);