Skip to content

chore: Add code split for adding package pull status indicator#37944

Merged
subrata71 merged 1 commit intoreleasefrom
chore/code-split-for-pull-status-indicator
Dec 5, 2024
Merged

chore: Add code split for adding package pull status indicator#37944
subrata71 merged 1 commit intoreleasefrom
chore/code-split-for-pull-status-indicator

Conversation

@subrata71
Copy link
Collaborator

@subrata71 subrata71 commented Dec 4, 2024

Description

EE Counterpart PR: https://github.com/appsmithorg/appsmith-ee/pull/5667

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.All"

🔍 Cypress test results

Tip

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


Wed, 04 Dec 2024 14:29:40 UTC

Communication

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

  • Yes
  • No

Summary by CodeRabbit

  • New Features

    • Enhanced data fetching capabilities with new methods for better organization and clarity.
    • Improved handling of application modes with centralized logic.
  • Bug Fixes

    • Streamlined error handling and logging during data retrieval processes.
  • Refactor

    • Restructured existing methods for improved maintainability and extensibility.

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Dec 4, 2024

Walkthrough

The ConsolidatedAPIServiceCEImpl class has been modified to enhance method visibility and restructure data fetching logic. Key methods have been changed from private to protected, allowing subclass access. New methods have been introduced to streamline the retrieval of application and page data, improving code organization. The main method's inline logic has been replaced with calls to these new methods, promoting maintainability. Error handling and logging remain intact, ensuring consistent behavior during data fetching.

Changes

File Change Summary
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java - Changed visibility of getSuccessResponse, getErrorResponseMono, and toResponseDTO from private to protected.
- Added methods: getAllFetchableMonos, getBaseApplicationIdMono, isViewMode, getBranchedApplicationMono, getApplicationAndPageTupleMono.
- Refactored logic in getConsolidatedInfoForPageLoad to utilize new methods.

Possibly related PRs

Suggested labels

ok-to-test, Git Product

Suggested reviewers

  • sharat87
  • pratapaprasanna

🎉 In the code where logic flows,
Protected methods now brightly glow.
Fetching data with ease and grace,
New methods join the coding race!
With clarity and structure anew,
The service shines, a developer's view! 🌟


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
🪧 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.

@subrata71 subrata71 added the ok-to-test Required label for CI label Dec 4, 2024
@github-actions github-actions bot added the skip-changelog Adding this label to a PR prevents it from being listed in the changelog label Dec 4, 2024
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: 1

🧹 Outside diff range and nitpick comments (2)
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java (2)

Line range hint 157-464: Consider splitting getAllFetchableMonos into smaller methods

The method getAllFetchableMonos is quite long and could be broken down into smaller, focused methods to improve readability and maintainability.


500-627: Simplify complex conditional logic in getApplicationAndPageTupleMono

The method contains deeply nested conditionals and error handling that could be simplified or refactored for better readability.

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 1f07be3 and 7275865.

📒 Files selected for processing (1)
  • app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java (5 hunks)
🔇 Additional comments (2)
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java (2)

Line range hint 109-128: Visibility changes enhance extensibility

Changing methods getSuccessResponse, getErrorResponseMono, and toResponseDTO from private to protected allows subclasses to utilize these utility methods.


151-155: Refactored fetch logic improves readability

Extracting the fetch logic into getAllFetchableMonos simplifies getConsolidatedInfoForPageLoad, making the code cleaner and easier to maintain.

Comment on lines +466 to +482
protected Mono<String> getBaseApplicationIdMono(
String basePageId, String baseApplicationId, ApplicationMode mode, boolean isViewMode) {
Mono<String> baseApplicationIdMono = Mono.just("");
if (isViewMode) {
// Attempt to retrieve the application ID associated with the given base page ID from the cache.
baseApplicationIdMono = cacheableRepositoryHelper
.fetchBaseApplicationId(basePageId, baseApplicationId)
.switchIfEmpty(Mono.just(""))
.cast(String.class);
}

baseApplicationIdMono = baseApplicationIdMono
.name(getQualifiedSpanName(APPLICATION_ID_FETCH_REDIS_SPAN, mode))
.tap(Micrometer.observation(observationRegistry))
.cache();
return baseApplicationIdMono;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Ensure default values are appropriately handled

In getBaseApplicationIdMono, returning an empty string as a default might lead to unintended consequences. Consider using Mono.empty() or handling the absence of a value more explicitly.

Apply this diff to handle empty values properly:

-protected Mono<String> getBaseApplicationIdMono(
-        String basePageId, String baseApplicationId, ApplicationMode mode, boolean isViewMode) {
-    Mono<String> baseApplicationIdMono = Mono.just("");
+protected Mono<Optional<String>> getBaseApplicationIdMono(
+        String basePageId, String baseApplicationId, ApplicationMode mode, boolean isViewMode) {
+    Mono<Optional<String>> baseApplicationIdMono = Mono.empty();

Committable suggestion skipped: line range outside the PR's diff.

@subrata71 subrata71 merged commit d03ad6f into release Dec 5, 2024
@subrata71 subrata71 deleted the chore/code-split-for-pull-status-indicator branch December 5, 2024 12:04
github-actions bot pushed a commit to Zeral-Zhang/appsmith that referenced this pull request Dec 9, 2024
…ithorg#37944)

## Description
EE Counterpart PR: appsmithorg/appsmith-ee#5667


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.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/12160425603>
> Commit: 7275865
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=12160425603&attempt=2"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.All`
> Spec:
> <hr>Wed, 04 Dec 2024 14:29:40 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [x] No


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

## Summary by CodeRabbit

- **New Features**
- Enhanced data fetching capabilities with new methods for better
organization and clarity.
	- Improved handling of application modes with centralized logic.

- **Bug Fixes**
- Streamlined error handling and logging during data retrieval
processes.

- **Refactor**
- Restructured existing methods for improved maintainability and
extensibility.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ok-to-test Required label for CI skip-changelog Adding this label to a PR prevents it from being listed in the changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants