From 8a67948f1bf96bcc0a91a5769b13d2b8639033e6 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Thu, 8 May 2025 12:26:06 +0530 Subject: [PATCH 1/3] chore: Update the carbon modal ux (#40599) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /ok-to-test tags="@tag.Settings" Corresponding CE PR for https://github.com/appsmithorg/appsmith-ee/pull/7416 ## Summary by CodeRabbit - **Refactor** - Updated internal logic related to AI Agent template imports to streamline behavior. No visible changes to user-facing features. > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: > Commit: f0d187eb480064a68fe17c1fdc83112d6695f4b9 > Cypress dashboard. > Tags: `@tag.Settings` > Spec: >
Thu, 08 May 2025 06:09:23 UTC --- app/client/src/sagas/TemplatesSagas.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/client/src/sagas/TemplatesSagas.ts b/app/client/src/sagas/TemplatesSagas.ts index dbca5a909c..b63a466a39 100644 --- a/app/client/src/sagas/TemplatesSagas.ts +++ b/app/client/src/sagas/TemplatesSagas.ts @@ -49,7 +49,6 @@ import { getAllPageIdentities } from "./selectors"; import { openCarbonModal, setCreateAgentModalOpen, - toggleFCIntegrations, } from "ee/actions/aiAgentActions"; import { getIsAiAgentFlowEnabled } from "ee/selectors/aiAgentSelectors"; import { getTemplatesByFlagSelector } from "selectors/templatesSelectors"; @@ -116,7 +115,6 @@ function* importTemplateToWorkspaceSaga( if (isScratchTemplate) { yield put(openCarbonModal({ shouldOpen: true })); - yield put(toggleFCIntegrations({ isEnabled: true })); } yield put(setCreateAgentModalOpen({ isOpen: false })); From 0e5252c30ceb061621ce921c84e81a3975442cbc Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Thu, 8 May 2025 13:37:58 +0530 Subject: [PATCH 2/3] chore: fix container query bug in ai chat widget (#40607) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /ok-to-test tags="@tag.Anvil" > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: > Commit: a3a3579aaac44d2cfdfa956d46024145c4bfdad9 > Cypress dashboard. > Tags: `@tag.Anvil` > Spec: >
Thu, 08 May 2025 07:22:28 UTC ## Summary by CodeRabbit - **Style** - Introduced a named container ("flex-container") to relevant CSS classes for improved container query support. - Updated container queries to explicitly reference the new container name, enabling more precise and scoped responsive styling. --- .../design-system/widgets/src/components/Flex/src/flexCss.ts | 2 +- .../widgets/src/components/Flex/src/styles.module.css | 1 + .../layoutSystems/anvil/layoutComponents/components/styles.css | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts b/app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts index d1f81e4d94..c17502d67f 100644 --- a/app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts +++ b/app/client/packages/design-system/widgets/src/components/Flex/src/flexCss.ts @@ -97,7 +97,7 @@ export const containerDimensionStyles = ( if (current !== "base") { return ( prev + - `@container (min-width: ${current}) {& { + `@container flex-container (min-width: ${current}) {& { ${cssProp}: ${ //@ts-expect-error: type mismatch callback ? callback(value[current], extraProps) : value[current] diff --git a/app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css index 140e79c428..82ff265193 100644 --- a/app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css +++ b/app/client/packages/design-system/widgets/src/components/Flex/src/styles.module.css @@ -1,5 +1,6 @@ .flexContainer { container-type: inline-size; + container-name: flex-container; display: flex; justify-content: center; width: 100%; diff --git a/app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css b/app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css index 89d39bbec9..b8b8c1ca74 100644 --- a/app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css +++ b/app/client/src/layoutSystems/anvil/layoutComponents/components/styles.css @@ -1,3 +1,4 @@ .make-container { container-type: inline-size; + container-name: flex-container; } From 1c531661c76594ac19f1baa17bef6fcd56869bc7 Mon Sep 17 00:00:00 2001 From: Rahul Barwal Date: Thu, 8 May 2025 16:06:26 +0530 Subject: [PATCH 3/3] fix: improve infinite scroll reset logic in TableWidgetV2 (#40609) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Problem Table would show inconsistent views or appear empty when infinite scroll setting changed or component height was modified. Root cause Page number was not reset properly during changes to infinite scroll or component height, causing the table to render an incorrect or empty state. Solution This PR handles improving the reset logic for the table when infinite scroll is enabled or component height changes. It refactors the reset conditions, introduces variables to track relevant state changes, and ensures the table resets correctly to maintain consistent behavior. Fixes #40411 _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.Table" ### :mag: Cypress test results > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: > Commit: efe1c54169d21708cb519e749047ff207fffeb0e > Cypress dashboard. > Tags: `@tag.Table` > Spec: >
Thu, 08 May 2025 10:36:21 UTC ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No ## Summary by CodeRabbit - **Refactor** - Improved the logic for resetting the table when infinite scroll is enabled or when the component height changes, resulting in clearer and more consistent behavior. No visible changes to features or exported entities. --- .../src/widgets/TableWidgetV2/widget/index.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/client/src/widgets/TableWidgetV2/widget/index.tsx b/app/client/src/widgets/TableWidgetV2/widget/index.tsx index 1f6b595061..c96d88ff24 100644 --- a/app/client/src/widgets/TableWidgetV2/widget/index.tsx +++ b/app/client/src/widgets/TableWidgetV2/widget/index.tsx @@ -1045,14 +1045,14 @@ class TableWidgetV2 extends BaseWidget { // Reset widget state when infinite scroll is initially enabled // This should come after all updateInfiniteScrollProperties are done - if (!prevProps.infiniteScrollEnabled && infiniteScrollEnabled) { - this.resetTableForInfiniteScroll(); - } + const didInfiniteScrollEnabledChange = + prevProps.infiniteScrollEnabled !== infiniteScrollEnabled; + const didComponentHeightChange = + prevProps.componentHeight !== componentHeight; - // Reset widget state when height changes while infinite scroll is enabled if ( - infiniteScrollEnabled && - prevProps.componentHeight !== componentHeight + didInfiniteScrollEnabledChange || + (infiniteScrollEnabled && didComponentHeightChange) ) { this.resetTableForInfiniteScroll(); }