Skip to content

chore: added upcoming section for gac enabled users#39563

Merged
AmanAgarwal041 merged 5 commits intoreleasefrom
chore/39511-upcoming-sections
Mar 7, 2025
Merged

chore: added upcoming section for gac enabled users#39563
AmanAgarwal041 merged 5 commits intoreleasefrom
chore/39511-upcoming-sections

Conversation

@AmanAgarwal041
Copy link
Contributor

@AmanAgarwal041 AmanAgarwal041 commented Mar 5, 2025

Description

  • Added a new section Upcoming SaaS inetgrations for gacEnabled users.
  • Removed Soon Tags from the upcoming sections cards.
  • The experience remains the same for non gacEnabled users.
  • Removing beta tag for the released integration

Fixes #39511
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.Datasource"

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/13719106986
Commit: 0df6900
Cypress dashboard.
Tags: @tag.Datasource
Spec:


Fri, 07 Mar 2025 11:35:59 UTC

Communication

Should the DevRel and Marketing teams inform users about this change?

  • Yes
  • No

Summary by CodeRabbit

  • New Features

    • Introduced a new message alerting users to upcoming SaaS integrations.
    • Added an optional feature toggle that controls the display of enhanced integration content.
  • Bug Fixes

    • Removed deprecated constants and functions that were no longer in use, improving overall code clarity.
  • Refactor

    • Streamlined the presentation of premium datasource components for a more consistent user interface.
    • Removed outdated logic related to conditional messaging, ensuring simpler and uniform display behavior.
    • Updated capitalization for consistency in displayed messages.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 5, 2025

Walkthrough

This pull request introduces a new constant for upcoming SaaS integrations and extends component interfaces with an optional isGACEnabled flag. The change updates API-related plugins to conditionally render components based on the flag and simplifies the PremiumDatasources component by removing legacy conditional logic and the now-obsolete getTagText function.

Changes

File(s) Change Summary
app/client/src/ce/.../messages.ts Added a new constant UPCOMING_SAAS_INTEGRATIONS that returns the string "Upcoming SaaS Integrations". Updated string capitalization for several existing constants.
app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx Updated CreateAPIOrSaasPluginsProps by adding an optional isGACEnabled property; modified rendering logic to conditionally include the PremiumDatasources component and an upcoming SaaS integrations section; updated mapStateToProps to propagate the flag.
app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Helpers.ts
app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/index.tsx
Removed the getTagText function and refactored the PremiumDatasources component to simplify conditional rendering. The component now accepts the isGACEnabled prop directly and uses a fixed style for the PremiumTag via the createMessage function rather than feature flag checks.
app/client/src/pages/Editor/IntegrationEditor/IntegrationStyledComponents.tsx Removed the BetaTag styled component and its import statement, simplifying the styling structure.
app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Constants.ts Removed the RELEASED_PREMIUM_PLUGINS constant, eliminating its declaration and related mapping function.

Sequence Diagram(s)

sequenceDiagram
    participant S as mapStateToProps
    participant API as APIOrSaasPlugins
    participant PD as PremiumDatasources
    participant PT as PremiumTag

    S->>API: Provide isGACEnabled flag
    API->>PD: Render with props including isGACEnabled and premiumPlugins
    alt isGACEnabled true & premiumPlugins exist
        PD->>PD: Display "Upcoming SaaS Integrations" section
    else
        PD->>PT: Render static PremiumTag via createMessage
    end
Loading

Possibly related PRs

Suggested labels

Bug, Widgets Product

Suggested reviewers

  • sneha122

Poem

In our code's vibrant sky, a new constant gleams bright,
UPCOMING_SAAS_INTEGRATIONS sparks future light.
Flags and features dance in harmonious tune,
Simplified logic under a streamlined moon.
Code sings its verse—day turns into night 🚀✨


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro (Legacy)

📥 Commits

Reviewing files that changed from the base of the PR and between 04ab647 and 0df6900.

📒 Files selected for processing (1)
  • app/client/src/ce/constants/messages.ts (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • app/client/src/ce/constants/messages.ts
⏰ Context from checks skipped due to timeout of 90000ms (8)
  • GitHub Check: perform-test / server-build / server-unit-tests
  • GitHub Check: perform-test / client-build / client-build
  • GitHub Check: perform-test / rts-build / build
  • GitHub Check: client-unit-tests / client-unit-tests
  • GitHub Check: client-check-cyclic-deps / check-cyclic-dependencies
  • GitHub Check: client-build / client-build
  • GitHub Check: client-lint / client-lint
  • GitHub Check: client-prettier / prettier-check

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@github-actions github-actions bot added Datasources Issues related to configuring datasource on appsmith Integrations Pod General Issues related to the Integrations Pod that don't fit into other tags. Integrations Product Issues related to a specific integration Query & JS Pod Issues related to the query & JS Pod Query Widgets & IDE Pod All issues related to Query, JS, Eval, Widgets & IDE Task A simple Todo skip-changelog Adding this label to a PR prevents it from being listed in the changelog labels Mar 5, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx (1)

357-361: Comment should be updated for clarity.

The comment refers to a Notion doc for context, which is appropriate, but the phrasing could be improved for better developer understanding.

- // We are using this feature flag to identify whether its the enterprise/business user - ref : https://www.notion.so/appsmith/Condition-for-showing-Premium-Soon-tag-datasources-184fe271b0e2802cb55bd63f468df60d
+ // Feature flag to determine if Google Analytics Connector (GAC) is enabled - ref: https://www.notion.so/appsmith/Condition-for-showing-Premium-Soon-tag-datasources-184fe271b0e2802cb55bd63f468df60d
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 4f4b4f3 and ed34d0b.

📒 Files selected for processing (4)
  • app/client/src/ce/constants/messages.ts (1 hunks)
  • app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx (6 hunks)
  • app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Helpers.ts (0 hunks)
  • app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/index.tsx (3 hunks)
💤 Files with no reviewable changes (1)
  • app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/Helpers.ts
⏰ Context from checks skipped due to timeout of 90000ms (5)
  • GitHub Check: client-lint / client-lint
  • GitHub Check: client-check-cyclic-deps / check-cyclic-dependencies
  • GitHub Check: client-build / client-build
  • GitHub Check: client-unit-tests / client-unit-tests
  • GitHub Check: client-prettier / prettier-check
🔇 Additional comments (9)
app/client/src/ce/constants/messages.ts (1)

2639-2640: LGTM - New constant for upcoming SaaS integrations messaging.

The addition of this constant follows the established pattern of the codebase for message externalization.

app/client/src/pages/Editor/IntegrationEditor/APIOrSaasPlugins.tsx (4)

85-85: Appropriate interface extension for new conditional feature.

Adding the optional isGACEnabled property to the interface properly supports the GAC-dependent feature.


249-251: Correct conditional rendering based on GAC status.

This change ensures PremiumDatasources are only shown when GAC is not enabled, aligning with the PR objective.


296-305: Feature implementation for GAC users showing upcoming integrations.

The new section for upcoming SaaS integrations is correctly implemented with proper conditional rendering. This satisfies the PR objective to add this section specifically for GAC-enabled users.


395-395: LGTM - Properly exposed the GAC status to component props.

This ensures the component has access to the required feature flag state.

app/client/src/pages/Editor/IntegrationEditor/PremiumDatasources/index.tsx (4)

16-20: Simplified PremiumTag styling with fixed colors.

The tag styling is now consistent rather than conditionally styled. This simplification improves maintainability.


30-30: Added isGACEnabled prop to support new conditional rendering.

This prop enables the component to adapt its behavior based on GAC status.


34-35: Properly forwarding GAC status to handler function.

This ensures consistent behavior when interacting with premium datasources.


56-61: Implemented conditional tag rendering based on GAC status.

The premium tag is now only shown when GAC is not enabled, fulfilling the requirements stated in the PR objectives.

@AmanAgarwal041
Copy link
Contributor Author

/build-deploy-preview skip-tests=true

@github-actions
Copy link

github-actions bot commented Mar 5, 2025

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/13673049176.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 39563.
recreate: .

@AmanAgarwal041 AmanAgarwal041 added the ok-to-test Required label for CI label Mar 5, 2025
@AmanAgarwal041
Copy link
Contributor Author

/build-deploy-preview skip-tests=true

@github-actions
Copy link

github-actions bot commented Mar 6, 2025

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/13692480609.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 39563.
recreate: .

@github-actions
Copy link

github-actions bot commented Mar 6, 2025

Deploy-Preview-URL: https://ce-39563.dp.appsmith.com

@AmanAgarwal041 AmanAgarwal041 requested a review from sneha122 March 6, 2025 13:32
@sneha122
Copy link
Contributor

sneha122 commented Mar 7, 2025

/build-deploy-preview skip-tests=true

@github-actions
Copy link

github-actions bot commented Mar 7, 2025

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/13715993371.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 39563.
recreate: .

@AmanAgarwal041
Copy link
Contributor Author

/build-deploy-preview skip-tests=true

@github-actions
Copy link

github-actions bot commented Mar 7, 2025

Deploying Your Preview: https://github.com/appsmithorg/appsmith/actions/runs/13717910064.
Workflow: On demand build Docker image and deploy preview.
skip-tests: true.
env: ``.
PR: 39563.
recreate: .

@github-actions
Copy link

github-actions bot commented Mar 7, 2025

Deploy-Preview-URL: https://ce-39563.dp.appsmith.com

@sneha122 sneha122 self-requested a review March 7, 2025 12:48
@AmanAgarwal041 AmanAgarwal041 merged commit 03e4470 into release Mar 7, 2025
45 checks passed
@AmanAgarwal041 AmanAgarwal041 deleted the chore/39511-upcoming-sections branch March 7, 2025 12:49
github-actions bot pushed a commit to Zeral-Zhang/appsmith that referenced this pull request Apr 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Datasources Issues related to configuring datasource on appsmith Integrations Pod General Issues related to the Integrations Pod that don't fit into other tags. Integrations Product Issues related to a specific integration ok-to-test Required label for CI Query & JS Pod Issues related to the query & JS Pod Query Widgets & IDE Pod All issues related to Query, JS, Eval, Widgets & IDE skip-changelog Adding this label to a PR prevents it from being listed in the changelog Task A simple Todo

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Task]: Implement upcoming section for the soon launching integrations

2 participants