Fix: Clear button functionality and center-align dropdown arrow (#8815) #8817

NitinPSingh · 2024-10-17T11:03:26Z

Proposed Changes

Fixes Clear Button of Spoke Facility Dropdown in facility details update page is not working #8815
The clear button should clear the already selected data in the input field
Align the dropdown arrow to be in the center rather than the top of the input field

@ohcnetwork/care-fe-code-reviewers

17.10.2024_16.19.02_REC.online-video-cutter.com.mp4

… fix#8815/fix-clear-button_aligned-arrow

netlify · 2024-10-17T11:03:42Z

✅ Deploy Preview for care-ohc ready!

Name	Link
🔨 Latest commit	`ce4831f`
🔍 Latest deploy log	https://app.netlify.com/sites/care-ohc/deploys/6718d1a347271f00080d29fb
😎 Deploy Preview	https://deploy-preview-8817--care-ohc.netlify.app
📱 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.

NitinPSingh · 2024-10-17T12:22:15Z

@rithviknishad @nihal467 the cross button is implemented such that it opens the dropdown on click , do you want to remove this?

current:

17.10.2024_16.19.02_REC.online-video-cutter.com.mp4

i have implemented the changes which will not open the dropdown on click of cross button, should i push?

17.10.2024_17.49.55_REC.mp4

nihal467 · 2024-10-18T10:28:29Z

@NitinPSingh the cross button is implemented such that it opens the dropdown on click , keep this behavior itself

NitinPSingh · 2024-10-18T10:40:38Z

@nihal467 ok , i havent push that part yet , so the current code will clear the selected and also open the drop-down

nihal467 · 2024-10-18T11:14:56Z

@NitinPSingh https://github.com/ohcnetwork/care_fe/actions/runs/11402328266/job/31727083859?pr=8817 , there is cypress failure, can you fix it

NitinPSingh · 2024-10-18T14:09:47Z

all green now

…k#8824)

nihal467 · 2024-10-18T15:40:48Z

LGTM

bodhish · 2024-10-21T04:09:28Z

@NitinPSingh Please do add a human firendly title for the PR

…orm ohcnetwork#8763 (ohcnetwork#8797)

…twork#8189 (ohcnetwork#8394)

Jacobjeevan · 2024-10-21T09:35:43Z

src/Components/Facility/SpokeFacilityEditor.tsx

@@ -99,7 +100,7 @@ export default function SpokeFacilityEditor(props: SpokeFacilityEditorProps) {
            showNOptions={8}
            selected={selectedFacility}
            setSelected={(v) =>
-              v && !Array.isArray(v) && setSelectedFacility(v)
+              (v === null || (!Array.isArray(v) && v)) && setSelectedFacility(v)


This isn't a big deal, but since you are specifying the type for state object to be FacilityModel or null, probably don't need the (&& v) check anymore.

@NitinPSingh Like @Jacobjeevan mentioned, the logic wouldnt be effected but its hard to read, please simplify it to something like

Suggested change

(v === null || (!Array.isArray(v) && v)) && setSelectedFacility(v)

(v === null || !Array.isArray(v)) && setSelectedFacility(v)

Jacobjeevan

LGTM

…network#8836)

khavinshankar · 2024-10-22T01:48:57Z

src/Components/Facility/SpokeFacilityEditor.tsx

@@ -99,7 +100,7 @@ export default function SpokeFacilityEditor(props: SpokeFacilityEditorProps) {
            showNOptions={8}
            selected={selectedFacility}
            setSelected={(v) =>
-              v && !Array.isArray(v) && setSelectedFacility(v)
+              (v === null || (!Array.isArray(v) && v)) && setSelectedFacility(v)


@NitinPSingh Like @Jacobjeevan mentioned, the logic wouldnt be effected but its hard to read, please simplify it to something like

Suggested change

(v === null || (!Array.isArray(v) && v)) && setSelectedFacility(v)

(v === null || !Array.isArray(v)) && setSelectedFacility(v)

)

…k#8855)

…and print buttons (ohcnetwork#8879)

Co-authored-by: rithviknishad <[email protected]>

github-actions · 2024-10-23T10:13:16Z

👋 Hi, @NitinPSingh,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

src/components/Common/AvatarEditModal.tsx

+                <>
+                  <div className="flex flex-1 items-center justify-center rounded-lg">
+                    <img
+                      src={preview || imageUrl}


rithviknishad · 2024-10-23T10:41:59Z

this wasn't intended right?

NitinPSingh · 2024-10-23T10:42:02Z

something went wrong here i guess let me fix , i create new pr

NitinPSingh added 2 commits October 17, 2024 16:10

fix ohcnetwork#8815 clear function fixed and aligned arrow button

8f4abb3

Merge branch 'develop' of https://github.com/NitinPSingh/care_fe into…

188f7da

… fix#8815/fix-clear-button_aligned-arrow

NitinPSingh requested a review from a team as a code owner October 17, 2024 11:03

rithviknishad added the needs testing label Oct 17, 2024

fix the drodpwon value persisting

2eff833

Merge branch 'develop' into fix#8815/fix-clear-button_aligned-arrow

c5a43f2

rithviknishad and others added 2 commits October 18, 2024 19:00

📷 Support for linking multiple cameras to a bed (ohcnetwork#8253)

b373a0d

test fail fix

291615e

fix: close profile dropdown on first click when navigating (ohcnetwor…

2778b49

…k#8824)

nihal467 added tested and removed needs testing labels Oct 18, 2024

Jacobjeevan and others added 2 commits October 19, 2024 03:39

Fix for csv generation in shifting (ohcnetwork#8790)

ab26fdc

Abdm V3 Plug (ohcnetwork#8340)

5c39b2c

bodhish added the needs review label Oct 21, 2024

NitinPSingh changed the title ~~Fix#8815/fix clear button aligned arrow~~ Fix: Clear button functionality and center-align dropdown arrow (#8815) Oct 21, 2024

abhip161 and others added 4 commits October 21, 2024 09:45

Increase width of medical history text area in patient registration f…

30f160e

…orm ohcnetwork#8763 (ohcnetwork#8797)

Added a page to list 3rd Party Licenses (ohcnetwork#8748)

b9d7801

Uninstall react-redux and axios (ohcnetwork#8731)

684b9ad

Improve validation check for phone number in patient list page ohcne…

7ea31d3

…twork#8189 (ohcnetwork#8394)

Jacobjeevan reviewed Oct 21, 2024

View reviewed changes

Jacobjeevan approved these changes Oct 21, 2024

View reviewed changes

fixed the age format in shifting board (ohcnetwork#8853)

06e853c

Add validation for Insurance fields in Patient Registration Form (ohc…

494a4b9

…network#8836)

khavinshankar requested changes Oct 22, 2024

View reviewed changes

khavinshankar added changes required and removed needs review labels Oct 22, 2024

nithish1018 and others added 12 commits October 22, 2024 07:23

Fixed Misaligned text when there's no data (ohcnetwork#8807)

2b8470c

Fix comment overflow and ensure content fits within div (ohcnetwork#8722

c23b16c

)

Switch to using OHC domain for plausible (ohcnetwork#8862)

7bf94f7

Removed the duplicate code in the patient details page (ohcnetwork#8868)

e653318

Allow users to set profile pictures (ohcnetwork#8606)

5b3a86a

Remove asset detail popup in asset configure's camera feed (ohcnetwor…

b1a1fad

…k#8855)

Fixed incorrect redirection after adding lab result and aligned view …

31e4ad5

…and print buttons (ohcnetwork#8879)

First added diagnosis in create consultation removal (ohcnetwork#8851)

30ae500

Bed management UI enhancement (ohcnetwork#8839)

8c2ef01

Add Blur Method to Improve Component Focus Handling (ohcnetwork#8890)

bd35fa8

Fixed the flaky test in patient registration test (ohcnetwork#8893)

3f4069a

Refactor Directory Names for Common, Components (ohcnetwork#8888)

7e15e3c

Co-authored-by: rithviknishad <[email protected]>

github-actions bot added the merge conflict pull requests with merge conflict label Oct 23, 2024

NitinPSingh added 5 commits October 23, 2024 15:56

fix ohcnetwork#8815 clear function fixed and aligned arrow button

2e1cb3f

fix the drodpwon value persisting

f7fdb9b

test fail fix

1c45a45

rebase with develop

7617702

simplified logic

ce4831f

github-advanced-security bot found potential problems Oct 23, 2024

View reviewed changes

rithviknishad added invalid This doesn't seem right and removed tested merge conflict pull requests with merge conflict labels Oct 23, 2024

NitinPSingh closed this Oct 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Clear button functionality and center-align dropdown arrow (#8815) #8817

Fix: Clear button functionality and center-align dropdown arrow (#8815) #8817

NitinPSingh commented Oct 17, 2024

netlify bot commented Oct 17, 2024 •

edited

Loading

NitinPSingh commented Oct 17, 2024

nihal467 commented Oct 18, 2024

NitinPSingh commented Oct 18, 2024

nihal467 commented Oct 18, 2024

NitinPSingh commented Oct 18, 2024

nihal467 commented Oct 18, 2024

bodhish commented Oct 21, 2024

Jacobjeevan Oct 21, 2024 •

edited

Loading

khavinshankar Oct 22, 2024

Jacobjeevan left a comment

khavinshankar Oct 22, 2024

github-actions bot commented Oct 23, 2024

rithviknishad commented Oct 23, 2024

NitinPSingh commented Oct 23, 2024

	(v === null \|\| (!Array.isArray(v) && v)) && setSelectedFacility(v)
	(v === null \|\| !Array.isArray(v)) && setSelectedFacility(v)

Fix: Clear button functionality and center-align dropdown arrow (#8815) #8817

Fix: Clear button functionality and center-align dropdown arrow (#8815) #8817

Conversation

NitinPSingh commented Oct 17, 2024

Proposed Changes

netlify bot commented Oct 17, 2024 • edited Loading

✅ Deploy Preview for care-ohc ready!

NitinPSingh commented Oct 17, 2024

nihal467 commented Oct 18, 2024

NitinPSingh commented Oct 18, 2024

nihal467 commented Oct 18, 2024

NitinPSingh commented Oct 18, 2024

nihal467 commented Oct 18, 2024

bodhish commented Oct 21, 2024

Jacobjeevan Oct 21, 2024 • edited Loading

Choose a reason for hiding this comment

khavinshankar Oct 22, 2024

Choose a reason for hiding this comment

Jacobjeevan left a comment

Choose a reason for hiding this comment

khavinshankar Oct 22, 2024

Choose a reason for hiding this comment

github-actions bot commented Oct 23, 2024

rithviknishad commented Oct 23, 2024

NitinPSingh commented Oct 23, 2024

netlify bot commented Oct 17, 2024 •

edited

Loading

Jacobjeevan Oct 21, 2024 •

edited

Loading