Skip to content

CCN beckn referral #16676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
amjithtitus09 wants to merge 47 commits into
base: develop
Choose a base branch
from
Draft

CCN beckn referral #16676

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
79ad661
feat: add Patient Medications and Diagnostic Reports pages with navig…
abhimanyurajeesh Jul 30, 2026
605f469
A lot of changes
bodhish Jul 30, 2026
8352e5c
style(design): FINDING-001 — normalise patient portal typography onto…
bodhish Jul 30, 2026
461d81e
style(design): FINDING-002 — meet the 44px minimum touch target
bodhish Jul 30, 2026
70afec5
style(design): FINDING-002b — raise appointment card actions to 44px
bodhish Jul 30, 2026
9a562b1
More clean up
bodhish Jul 30, 2026
756c054
More design fixes
bodhish Jul 30, 2026
da12f46
Fix routes
bodhish Jul 30, 2026
a5d9117
just a small desktop view, (revert if no like)
abhimanyurajeesh Jul 30, 2026
5b375f8
more desktop fix and few other things
abhimanyurajeesh Jul 31, 2026
6db94da
more layout fix
abhimanyurajeesh Jul 31, 2026
d459856
Merge remote-tracking branch 'upstream/develop' into ENG-831
abhimanyurajeesh Jul 31, 2026
b6d4af4
clean ups
abhimanyurajeesh Jul 31, 2026
1d120d8
Merge branch 'develop' into ENG-831
abhimanyurajeesh Jul 31, 2026
49d6cb6
just clean ups
abhimanyurajeesh Jul 31, 2026
c2617c6
Merge branch 'develop' into ENG-831
abhimanyurajeesh Aug 3, 2026
14a48c0
more clean up
abhimanyurajeesh Aug 3, 2026
d3aec31
more clean up
abhimanyurajeesh Aug 3, 2026
a3bcd11
some more clean up
abhimanyurajeesh Aug 4, 2026
725cf45
Merge branch 'develop' into ENG-831
abhimanyurajeesh Aug 4, 2026
e276f62
little bit more clean up and new ui
abhimanyurajeesh Aug 4, 2026
e241601
fix lint
abhimanyurajeesh Aug 4, 2026
e8138b3
fix tel globally
abhimanyurajeesh Aug 4, 2026
2ca3b42
small thing
abhimanyurajeesh Aug 4, 2026
90fd169
hopefully last commit
abhimanyurajeesh Aug 4, 2026
d46c1c7
one last try to fix the number fill
abhimanyurajeesh Aug 5, 2026
67cc426
Merge remote-tracking branch 'upstream/develop' into ENG-831
abhimanyurajeesh Aug 5, 2026
9325d81
Merge branch 'develop' into ENG-831
abhimanyurajeesh Aug 5, 2026
8643c31
feat: add no appointment history message and handle query error in Ap…
abhimanyurajeesh Aug 6, 2026
d8c2751
feat: clear cached data on sign-out to prevent stale session data
abhimanyurajeesh Aug 6, 2026
b2d5897
feat: reduce patient token freshness duration from 45 to 15 minutes
abhimanyurajeesh Aug 6, 2026
b515fef
Merge branch 'develop' into ENG-831
abhimanyurajeesh Aug 11, 2026
2bee677
feat: add date range filter to patient records and prescriptions
abhimanyurajeesh Aug 11, 2026
31afc7e
Add CCN Beckn referral and appointment booking
Aug 12, 2026
1defbe1
Change to developApi BE
Aug 12, 2026
d890e5e
feat: comment out date range filter and related logic in PatientRecords
abhimanyurajeesh Aug 12, 2026
707a921
remove the date filter file
abhimanyurajeesh Aug 12, 2026
1a1f5b9
Move Beckn confirm to the origin facility
Aug 12, 2026
55b8d44
Show what is actually being confirmed in the Beckn popup
Aug 12, 2026
dfd4283
Merge branch 'ENG-831' into amjithtitus09-ccn-beckn-referral
Aug 12, 2026
228c53a
Add Availability Schedule to select API
Aug 12, 2026
7c07e06
Send the appointment window as performance[] on select
Aug 12, 2026
077ca16
Send a real timestamp for the select availability window
Aug 13, 2026
ddafc71
Add Refer Patient Encounter Action
gigincg Aug 13, 2026
8ddd2de
Merge branch 'amjithtitus09-ccn-beckn-referral' of github.com:ohcnetw…
Aug 13, 2026
9fedb06
Changes in CC Console
Aug 13, 2026
9051ab6
Update the ui
bodhish Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ HEADERS="Strict-Transport-Security: max-age=31536000; includeSubDomains; preload
REACT_RECAPTCHA_SITE_KEY=6LcedK8qAAAAAM2PpuqlqhZUxQpmIqHqluL74dDs

# Care API URL without the /api prefix
REACT_CARE_API_URL=https://careapi.ohc.network
REACT_CARE_API_URL=https://develop-api.ohc.network

@coderabbitai coderabbitai Bot Aug 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

📐 Maintainability & Code Quality | 🟠 Major | ⚡ Quick win

Do not merge the committed API base URL change.

REACT_CARE_API_URL is the committed default for every developer environment and for the test setup. care.config.ts line 50 returns it as the API base URL for all frontend requests, and tests/globalSetup.ts, tests/helper/utils.ts, and tests/setup/questionnaire.setup.ts all read it.

Changing it to https://develop-api.ohc.network repoints every local run and every CI run at the develop backend.

The PR objectives state that the CCN flow requires a backend with the Beckn BAP module enabled, so the change is understandable for the branch preview. Keep it out of the merged diff. Set the value through the deployment environment or a local .env.local override instead.

As per coding guidelines: "Check corresponding backend endpoint in the care backend repo and update both repos if API changes are needed."

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In @.env at line 12, Revert the REACT_CARE_API_URL change in .env to the
repository’s committed default so care.config.ts and test setup continue using
the standard backend. Configure the develop backend URL only through deployment
environment settings or a local .env.local override, keeping the committed .env
unchanged.

Source: Learnings

@github-actions github-actions Bot Aug 12, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Committing the develop API URL into the shared .env? So every dev who pulls this branch silently starts talking to develop-api. This is a preview-only hack in a file that ships to everyone — put it in .env.local/preview config, not here.

@github-actions github-actions Bot Aug 12, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pointing the committed default API URL at develop-api.ohc.network in .env? Congratulations, every fresh clone now silently talks to a dev backend. Even for a preview branch this belongs in a local/preview-only override, not the checked-in default.

@github-actions github-actions Bot Aug 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Committing REACT_CARE_API_URL=(developapi.ohc.network/redacted) to the checked-in .env points every default build at the develop API. Even for a preview branch, this is exactly the kind of change that survives a careless merge and quietly repoints production tooling. Use a preview-specific env override instead.

@github-actions github-actions Bot Aug 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Committing develop-api.ohc.network as the default API URL in .env? That is a shared default for everyone, not your preview branch scratchpad. Use a .env.local or a preview-specific env var before this ever gets near develop.

REACT_SBOM_BASE_URL=https://sbom.ohc.network
Comment on lines 11 to 13

# Default payment terms for invoices
Expand Down
43 changes: 42 additions & 1 deletion public/locale/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,32 @@
"batch_no": "Batch #",
"batch_number_required_at_row": "Batch number is required at row {{row}}",
"batch_select": "Batch",
"beckn_appointment_booked": "Appointment booked.",
"beckn_booking_appointment": "Booking appointment...",
"beckn_choose_slot": "Choose a slot",
"beckn_confirm_appointment": "Confirm appointment",
"beckn_confirm_booking": "Confirm booking",
"beckn_confirming_referral": "Confirming referral...",
"beckn_find_providers": "Find providers",
"beckn_loading_slots": "Loading available slots...",
"beckn_network_not_configured": "The coordination network is not configured.",
"beckn_no_abha_on_file": "This patient has no ABHA on file. The booking will be confirmed using their name only.",
"beckn_no_providers_returned": "No providers were returned.",
"beckn_no_slots_returned": "No slots were returned.",
"beckn_option_fallback_label": "Option {{index}}",
"beckn_provider_offer": "Provider offer",
"beckn_referral_booking": "Referral booking",
"beckn_referral_created": "Referral request created.",
"beckn_request_failed": "The request could not be completed. Please try again.",
"beckn_resource_request_id": "Resource request ID: {{id}}",
"beckn_searching_providers": "Searching for providers...",
"beckn_select_provider": "Select provider",
"beckn_select_provider_offer": "Select a provider offer",
"beckn_slot": "Slot",
"beckn_slot_fallback_label": "Slot {{index}}",
"beckn_start_over": "Start over",
"beckn_submitting_referral": "Submitting referral request...",
"beckn_working": "Working...",
"bed_active_removed_due_to_error": "Active bed assignment has been marked as an error and removed successfully.",
"bed_assigned_successfully": "Bed Assigned Successfully",
"bed_association": "Bed Association",
Expand Down Expand Up @@ -1138,6 +1164,21 @@
"category_required_for_item": "Category is required for {{item}}",
"category_updated_successfully": "Category updated successfully",
"caution": "Caution",
"cc_console": "CC Console",
"ccn_back_to_form": "Back to form",
"ccn_booking_available_once_approved": "Appointment booking is available once the request is approved.",
"ccn_confirm_and_approve": "Confirm & approve",
"ccn_confirm_referral": "Confirm referral",
"ccn_confirming_referral": "Confirming referral...",
"ccn_no_incoming_requests": "No incoming resource requests found.",
"ccn_no_linked_referral": "This request has no linked referral to confirm.",
"ccn_referral_confirmed": "Referral confirmed. The request is now approved.",
"ccn_select_request_to_begin": "Select a resource request to begin.",
"ccn_select_service_type": "Select a service type",
"ccn_service_type": "Service type",
"ccn_service_type__lab_test": "Lab test",
"ccn_service_type__physical_consultation": "Physical consultation",
"ccn_untitled_request": "Untitled request",
"center": "Center",
"central": "Central",
"central_nursing_station": "Central Nursing Station",
Expand Down Expand Up @@ -5030,7 +5071,7 @@
"resource_request_category__comfort_devices": "Comfort Devices",
"resource_request_category__financial": "Financial",
"resource_request_category__medicines": "Medicines",
"resource_request_category__other": "Other",
"resource_request_category__other": "Diagnostic",

@coderabbitai coderabbitai Bot Aug 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Description: Find every render site of the resource request category label.
rg -nP -C4 'resource_request_category__' --type=ts --type=tsx

Repository: ohcnetwork/care_fe

Length of output: 188

🏁 Script executed:

#!/bin/bash
set -e
printf '%s\n' '--- key references ---'
rg -n -P -C 5 'resource_request_category__' -g '*.ts' -g '*.tsx' .
printf '%s\n' '--- translation entries ---'
rg -n -C 2 '"resource_request_category__other"|"ccn_resource_request_category__other"' public/locale/en.json .
printf '%s\n' '--- beckn model context ---'
rg -n -C 8 'Other.*Diagnostic|resource_request_category__other|translation override' src/types/beckn/becknModels.ts

Repository: ohcnetwork/care_fe

Length of output: 8212

🏁 Script executed:

#!/bin/bash
set -e
printf '%s\n' '--- affected component definitions and usages ---'
rg -n -P -C 3 'ResourceForm|ResourceList|ResourceDetails|PrintResourceLetter|ResourceRequests|CcnConsole' -g '*.ts' -g '*.tsx' src
printf '%s\n' '--- category definitions and helper ---'
rg -n -P -C 8 'enum ResourceRequestCategory|ResourceRequestCategory|getResourceRequestCategoryEnum' -g '*.ts' -g '*.tsx' src
printf '%s\n' '--- CCN translation keys and diagnostic labels ---'
rg -n -i -P -C 3 'ccn.*(category|diagnostic)|diagnostic.*(category|resource)|resource.*diagnostic' public/locale/en.json src -g '*.ts' -g '*.tsx' -g '*.json'

Repository: ohcnetwork/care_fe

Length of output: 46716

Scope the “Diagnostic” label to CCN

resource_request_category__other is used by the shared resource request list, detail, form, print, and patient views. This change displays “Diagnostic” for every other request. Add a CCN-specific key for CcnConsole, and restore the shared key to “Other”.

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@public/locale/en.json` at line 5074, In the locale entries used by
CcnConsole, add a CCN-specific translation key with the “Diagnostic” label, and
change the shared resource_request_category__other value back to “Other”. Update
CcnConsole to use the new CCN-specific key while leaving the shared list,
detail, form, print, and patient views on the generic key.

"resource_request_category__patient_care": "Clinical Care and Social Support",
Comment on lines 5207 to 5210
"resource_request_details_description": "Provide detailed information about what resource is needed and why.",
"resource_request_status__approved": "Approved",
Expand Down
7 changes: 7 additions & 0 deletions src/Routers/routes/ResourceRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import CcnConsole from "@/components/Resource/CcnConsole";
import PrintResourceLetter from "@/components/Resource/PrintResourceLetter";
import ResourceDetails from "@/components/Resource/ResourceDetails";
import ResourceForm from "@/components/Resource/ResourceForm";
Expand All @@ -9,6 +10,12 @@ const ResourceRoutes: AppRoutes = {
"/facility/:facilityId/resource": ({ facilityId }) => (
<ResourceList facilityId={facilityId} />
),
"/facility/:facilityId/ccn": ({ facilityId }) => (
<CcnConsole facilityId={facilityId} />
),
"/facility/:facilityId/ccn/:resourceId": ({ facilityId, resourceId }) => (
<CcnConsole facilityId={facilityId} resourceId={resourceId} />
),
"/facility/:facilityId/resource/:id": ({ facilityId, id }) => (
<ResourceDetails facilityId={facilityId} id={id} />
),
Expand Down
Loading
Loading