Bugfix: Keep Cancel Button Visible After Removing All Questionnaires #10769

[idanidan29]

Related to #10769

I moved the Cancel button outside the conditional rendering block so it is always visible, even after removing all questionnaires.

Summary by CodeRabbit

• New Features
  • The questionnaire interface now always shows the cancel button, ensuring it's consistently accessible.
  • The submit button appears only when applicable, resulting in a clearer and more streamlined experience.

[coderabbitai]

Walkthrough

The pull request modifies the rendering logic within the QuestionnaireForm component. The cancel button is now always displayed, while the submit button is rendered only when there are one or more questionnaire forms. In addition, inline comments have been updated to clearly explain the visibility conditions for both buttons.

Changes

File	Change Summary
src/components/Questionnaire/QuestionnaireForm.tsx	Updated the button rendering logic: cancel button is always visible, submit button is conditionally visible based on questionnaireForms. Comments adjusted for clarity.

Sequence Diagram(s)

sequenceDiagram
    participant QF as QuestionnaireForm
    participant Data as Questionnaire Forms Data
    QF->>Data: Check if questionnaireForms exist
    alt Forms Exist
        QF->>+Submit: Render Submit Button
        Submit -->>-QF: Rendered
    end
    QF->>+Cancel: Render Cancel Button (Always)
    Cancel -->>-QF: Rendered

Loading

Possibly related PRs

• Cancel button fix in Book Appointment screen #9757: Enhances cancel button functionality with navigation, intersecting with changes to cancel button behavior.
• Fix cancel button in update encounter form #9772: Involves updates to the QuestionnaireForm.tsx file including modifications to the cancel button's functionality and localization.

Suggested labels

needs review, changes required

Suggested reviewers

• rithviknishad
• Jacobjeevan

Poem

I'm a clever rabbit in a code-filled glen,
Hoping through components again and again.
The cancel button hops out with flair,
While submit tiptoes when forms are there.
With each clear comment and tidy line,
My code-hopping heart sings, purely divine!
🐰💻

---

📜 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 327a2b8 and 9f6d73e.

📒 Files selected for processing (1)

• src/components/Questionnaire/QuestionnaireForm.tsx (2 hunks)

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

• GitHub Check: Redirect rules - care-ohc
• GitHub Check: Header rules - care-ohc
• GitHub Check: Pages changed - care-ohc

🔇 Additional comments (1)

src/components/Questionnaire/QuestionnaireForm.tsx (1)

496-527:

❓ Verification inconclusive

LGTM! The Cancel button visibility issue has been fixed.

The changes correctly address the bug by:

1. Moving the Cancel button outside the conditional rendering block
2. Maintaining the Submit button's conditional visibility
3. Adding clear comments to explain the visibility conditions

Let's verify that the Cancel button remains visible when there are no questionnaires:

---

🏁 Script executed:

#!/bin/bash
# Description: Verify that the Cancel button is not conditionally rendered.
# Test: Search for conditional rendering of the Cancel button. Expect: No direct dependencies on questionnaireForms.length.

ast-grep --pattern $'Button[
  $$$
  onClick={onCancel}
  $$$
]'

Length of output: 65

---

LGTM! The changes correctly ensure that the Cancel button is always rendered while retaining conditional rendering for the Submit button.

The code now displays the Cancel button unconditionally and confines the Submit button to cases where questionnaireForms.length > 0—exactly as intended. One minor note: our automated search for the Cancel button's rendering did not yield output, so please verify manually that its placement is indeed outside any conditional logic tied to questionnaire forms.

✨ Finishing Touches

• 📝 Generate Docstrings (Beta)

---

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.

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.

[netlify]

✅ Deploy Preview for care-ohc ready!

Name	Link
🔨 Latest commit	9f6d73e
🔍 Latest deploy log	https://app.netlify.com/sites/care-ohc/deploys/67bba3ec7922a00008fa6c82
😎 Deploy Preview	https://deploy-preview-10785.preview.ohc.network
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

---

To edit notification comments on pull requests, go to your Netlify site configuration.