fix: Resolving merge conflict

[ankitakinger]

Description

Resolving merge conflict

Fixes #Issue Number
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.IDE"

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/12666175355
Commit: 639f92a
Cypress dashboard.
Tags: @tag.Sanity
Spec:

---

Wed, 08 Jan 2025 08:25:59 UTC

Communication

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

• Yes
• No

[coderabbitai]

Walkthrough

The pull request restores import statements for Text and Tooltip components in the List.tsx file within the design system package. These imports were previously removed and are now being reintroduced, which suggests the restoration of text rendering and tooltip display functionality for the List component without altering its core structure or logic.

Changes

File	Change Summary
app/client/packages/design-system/ads/src/List/List.tsx	Reintroduced import statements for TextProps, Text, and Tooltip components

Suggested labels

skip-changelog, ok-to-test

Suggested reviewers

• abhvsn
• albinAppsmith

Possibly related PRs

• fix: Broken UI on JS module instance in the side by side view mode #37909: Modifies JSFunctionRun component with similar Tooltip component usage

Poem

🧩 Imports restored with gentle care,
Components dancing without a scare,
Text and Tooltip, back in their place,
Bringing function with elegant grace!
Code's rhythm finds its sweet repair 🌟

---

📜 Recent review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between f7296ef and 639f92a.

📒 Files selected for processing (1)

• app/client/packages/design-system/ads/src/List/List.tsx (1 hunks)

⏰ Context from checks skipped due to timeout of 90000ms (7)

• GitHub Check: client-unit-tests / client-unit-tests
• GitHub Check: client-lint / client-lint
• GitHub Check: client-prettier / prettier-check
• GitHub Check: client-build / client-build
• GitHub Check: chromatic-deployment
• GitHub Check: chromatic-deployment
• GitHub Check: storybook-tests

🔇 Additional comments (1)

app/client/packages/design-system/ads/src/List/List.tsx (1)

22-24: LGTM - Essential imports restored correctly.

These imports are necessary as they're used by the TextWithTooltip component. The merge conflict resolution properly restores the required functionality.

Let's verify no other imports were accidentally removed during the merge conflict resolution:

✅ Verification successful

Imports are correctly restored and actively used

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check for any other potentially missing imports from Text or Tooltip modules
ast-grep --pattern 'import { $_ } from "../Text"' app/client/packages/design-system/ads/src/List/List.tsx
ast-grep --pattern 'import { $_ } from "../Tooltip"' app/client/packages/design-system/ads/src/List/List.tsx

Length of output: 406

---

Script:

#!/bin/bash
# Check usage of Text and Tooltip components
ast-grep --pattern 'TextWithTooltip' -A 10 app/client/packages/design-system/ads/src/List/List.tsx

Length of output: 5145

---

Script:

#!/bin/bash
# Check Tooltip usage within TextWithTooltip
ast-grep --pattern '<Tooltip' -A 5 app/client/packages/design-system/ads/src/List/List.tsx

Length of output: 92

---

Script:

#!/bin/bash
# Check Tooltip usage with broader context
ast-grep --pattern 'function TextWithTooltip($_) {
  $$$
  return $_
}' app/client/packages/design-system/ads/src/List/List.tsx

Length of output: 3884

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 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 generate docstrings to generate docstrings for this PR. (Beta)
• @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.