Skip to content

Conversation

@OrangeAndGreen
Copy link
Contributor

@OrangeAndGreen OrangeAndGreen commented Apr 1, 2025

cross-request: dimagi/commcare-core#1455

Product Description

Fixes a bug where the app would attempt to navigate the user to the Connect menu if they select the first app in the dropdown list, instead of the selected app. This code should have been removed when we removed the "Go to Connect Menu" option as the first item in the dropdown list.

Technical Summary

Removed obsolete code that redirects to Connect menu when first item in app selector is selected.

Feature Flag

ConnectID

Safety Assurance

Safety story

Discovered via local testing, and fix verifide the same way.

Automated test coverage

No automated tests for ConnectID yet.

QA Plan

This was a pretty specific bug, but generally QA might be able to improve the testing by trying more single- and multi-app configurations from the login page.

Labels and Review

  • Do we need to enhance the manual QA test coverage ? If yes, the "QA Note" label is set correctly
  • Does the PR introduce any major changes worth communicating ? If yes, the "Release Note" label is set and a "Release Note" is specified in PR description.
  • Risk label is set correctly
  • The set of people pinged as reviewers is appropriate for the level of risk of the change

@coderabbitai
Copy link

coderabbitai bot commented Apr 1, 2025

📝 Walkthrough

Walkthrough

The changes modify the checkForSavedCredentials method in the LoginActivity class. The logic now directly checks whether the appIdDropdownList is non-empty before retrieving the selected application ID, rather than relying on the index value. Additionally, the nested condition that verifies if the app selector is visible and whether the selected app ID differs from the seated app ID has been simplified. The previous redundant else clause that set the app state to a connection management mode has been removed. These modifications streamline the conditions and enhance the clarity of the code responsible for determining and updating the state based on the selected application ID.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant LoginActivity
    participant DropdownList
    participant ConnectManager

    User->>LoginActivity: Initiate login process
    LoginActivity->>DropdownList: Check if list is not empty
    DropdownList-->>LoginActivity: Return selected app ID (if available)
    alt App selector is visible and selected app ID ≠ seated app ID
        LoginActivity->>ConnectManager: Update state to "Unmanaged"
    else No further state update
        LoginActivity->>ConnectManager: Continue with existing state flow
    end
Loading

Possibly related PRs

Suggested labels

cross requested, skip-integration-tests

Suggested reviewers

  • pm-dimagi

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between eee14c9 and 37ce9e8.

📒 Files selected for processing (1)
  • app/src/org/commcare/activities/LoginActivity.java (1 hunks)
🧰 Additional context used
🧬 Code Definitions (1)
app/src/org/commcare/activities/LoginActivity.java (1)
app/src/org/commcare/connect/ConnectManager.java (1)
  • ConnectManager (86-1064)
🔇 Additional comments (1)
app/src/org/commcare/activities/LoginActivity.java (1)

560-564: Good fix for app selection logic.

The changes correctly address a bug where selecting the first app in the dropdown list would incorrectly navigate to the Connect menu. By replacing the index-based check with a check for non-empty list, and simplifying the condition that determines app state to Unmanaged, the code now properly handles app selection regardless of position in the list.

The removal of redundant redirection logic ensures users are directed to their selected app rather than the Connect menu when choosing the first item in the dropdown.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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 generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai plan to trigger planning for file edits and PR creation.
  • @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.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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.

@OrangeAndGreen
Copy link
Contributor Author

@damagatchi retest this please

Copy link
Contributor

@shubham1g5 shubham1g5 left a comment

Choose a reason for hiding this comment

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

@pm-dimagi FYI that you will need to include this in phase 2 once merged.

int selectorIndex = uiController.getSelectedAppIndex();
if (selectorIndex > 0) {
String selectedAppId = appIdDropdownList.size() > 0 ? appIdDropdownList.get(selectorIndex) : "";
String selectedAppId = !appIdDropdownList.isEmpty() ? appIdDropdownList.get(selectorIndex) : "";
Copy link
Contributor

Choose a reason for hiding this comment

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

is it possible here for selectorIndex to be -1 i.e. no selection ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not that I'm aware of. The code for getSelectedAppIndex just calls to the Spinner to get the position, and it sounds like that never returns -1 unless the developer does something fancy like call setSelection(-1), and the only code we have that calls setSelection first contains some logic to ensure that the value is always between 0 and numItems-1.

@OrangeAndGreen OrangeAndGreen merged commit 412674a into connect_qa Apr 1, 2025
1 of 2 checks passed
@OrangeAndGreen OrangeAndGreen deleted the dv/login_selector_fix branch April 1, 2025 15:35
@coderabbitai coderabbitai bot mentioned this pull request Nov 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants