Skip to content
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

Jump to bottom

Staging Release - October Week 4 Release (v24.44.0) #8909

Merged
merged 26 commits into from
Oct 24, 2024
Merged

Staging Release - October Week 4 Release (v24.44.0) #8909

merged 26 commits into from
Oct 24, 2024

Conversation

khavinshankar
Copy link
Member

No description provided.

abhip161 and others added 25 commits October 21, 2024 09:45
@abhip161
Increase width of medical history text area in patient registration f…
30f160e 
…orm #8763 (#8797)
@tellmeY18
Added a page to list 3rd Party Licenses (#8748)
b9d7801
@rithviknishad
Uninstall react-redux and axios (#8731)
684b9ad
@Nithin9585
Improve validation check for phone number in patient list page #8189 (…
7ea31d3 
…#8394)
@nihal467
fixed the age format in shifting board (#8853)
06e853c
@syedfardeenjeelani
Add tooltip for Discussion Notes Icons #8618 (#8837)
146b5b1
@syedfardeenjeelani
Add validation for Insurance fields in Patient Registration Form (#8836)
494a4b9
@nithish1018
Fixed Misaligned text when there's no data (#8807)
2b8470c
@chakribontha
Fix comment overflow and ensure content fits within div (#8722)
c23b16c
@rithviknishad
Switch to using OHC domain for plausible (#8862)
7bf94f7
@nihal467
Removed the duplicate code in the patient details page (#8868)
e653318
@sainak
Allow users to set profile pictures (#8606)
5b3a86a
@Rishith25
Remove asset detail popup in asset configure's camera feed (#8855)
b1a1fad
@Mahendar0701
Fixed incorrect redirection after adding lab result and aligned view …
31e4ad5 
…and print buttons (#8879)
@Mahendar0701
First added diagnosis in create consultation removal (#8851)
30ae500
@Jacobjeevan
Bed management UI enhancement (#8839)
8c2ef01
@JavidSumra
Add Blur Method to Improve Component Focus Handling (#8890)
bd35fa8
@nihal467
Fixed the flaky test in patient registration test (#8893)
3f4069a
@gigincg @rithviknishad
Refactor Directory Names for Common, Components (#8888)
7e15e3c 
Co-authored-by: rithviknishad <[email protected]>
@Keerthilochankumar
fixes text overflow in resource details page (#8904)
9849ab0
@Jacobjeevan
Ventilator mode/Oxygen modality data as exclusive of each other (#8852)
5502433
@Jacobjeevan
Remove redundant API calls in Vitals tab (#8864)
160f745
@Jacobjeevan
Hide locations with no monitors in CNS page (#8812)
594c0d8
@JavidSumra
Add field validation to resolve the Update Profile Issue (#8809)
ed3c32a
@rithviknishad
Adds support for useMutation hook (#8891)
a0490fd
github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 24, 2024
View reviewed changes
src/components/Common/AvatarEditModal.tsx
<>
<div className="flex flex-1 items-center justify-center rounded-lg">
<img
src={preview || imageUrl}

Check warning

Code scanning / CodeQL

DOM text reinterpreted as HTML Medium

DOM text
Loading
is reinterpreted as HTML without escaping meta-characters.

Copilot Autofix AI 3 months ago

To fix the problem, we should ensure that the preview URL is safe to use in the img tag. One way to do this is to validate the file type and ensure it is an image before creating the object URL. Additionally, we can use a library like DOMPurify to sanitize any potentially unsafe URLs, although this might be overkill for object URLs.

  1. Validate the file type to ensure it is an image before setting the selectedFile.
  2. Use URL.createObjectURL to generate a safe URL for the image file.
  3. Ensure that the preview variable is only set with valid image URLs.
Suggested changeset 1
src/components/Common/AvatarEditModal.tsx

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/src/components/Common/AvatarEditModal.tsx b/src/components/Common/AvatarEditModal.tsx
--- a/src/components/Common/AvatarEditModal.tsx
+++ b/src/components/Common/AvatarEditModal.tsx
@@ -90,5 +90,7 @@
     if (selectedFile) {
-      const objectUrl = URL.createObjectURL(selectedFile);
-      setPreview(objectUrl);
-      return () => URL.revokeObjectURL(objectUrl);
+      if (selectedFile.type.split("/")[0] === "image") {
+        const objectUrl = URL.createObjectURL(selectedFile);
+        setPreview(objectUrl);
+        return () => URL.revokeObjectURL(objectUrl);
+      }
     }
@@ -101,3 +103,4 @@
     }
-    if (e.target.files[0]?.type.split("/")[0] !== "image") {
+    const file = e.target.files[0];
+    if (file?.type.split("/")[0] !== "image") {
       Warn({ msg: "Please upload an image file!" });
@@ -105,3 +108,3 @@
     }
-    setSelectedFile(e.target.files[0]);
+    setSelectedFile(file);
   };
EOF
@@ -90,5 +90,7 @@
if (selectedFile) {
const objectUrl = URL.createObjectURL(selectedFile);
setPreview(objectUrl);
return () => URL.revokeObjectURL(objectUrl);
if (selectedFile.type.split("/")[0] === "image") {
const objectUrl = URL.createObjectURL(selectedFile);
setPreview(objectUrl);
return () => URL.revokeObjectURL(objectUrl);
}
}
@@ -101,3 +103,4 @@
}
if (e.target.files[0]?.type.split("/")[0] !== "image") {
const file = e.target.files[0];
if (file?.type.split("/")[0] !== "image") {
Warn({ msg: "Please upload an image file!" });
@@ -105,3 +108,3 @@
}
setSelectedFile(e.target.files[0]);
setSelectedFile(file);
};
Copilot is powered by AI and may make mistakes. Always verify output.
Unable to commit as this autofix suggestion is now outdated
Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options
@netlify Netlify
Copy link

netlify bot commented Oct 24, 2024 •
edited
Loading

✅ Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit 7eee0ff
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/6719b394b1c25600081649a4
😎 Deploy Preview https://deploy-preview-8909--care-ohc.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

@cloudflare-workers-and-pages Cloudflare Workers and Pages
Copy link

cloudflare-workers-and-pages bot commented Oct 24, 2024 •
edited
Loading

Deploying care-fe with  Cloudflare Pages  Cloudflare Pages

Latest commit: 7eee0ff
Status: ✅  Deploy successful!
Preview URL: https://49d80edd.care-fe.pages.dev

View logs

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Oct 24, 2024
@github-actions GitHub Actions
Copy link

👋 Hi, @khavinshankar,
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.

@khavinshankar khavinshankar removed the merge conflict pull requests with merge conflict label Oct 24, 2024
@khavinshankar khavinshankar marked this pull request as ready for review October 24, 2024 07:09
@khavinshankar khavinshankar requested a review from a team as a code owner October 24, 2024 07:09
@khavinshankar khavinshankar changed the title Staging Release - October Week 3 Release Patch (v24.44.0) Staging Release - October Week 3 Release (v24.44.0) Oct 24, 2024
@khavinshankar khavinshankar changed the title Staging Release - October Week 3 Release (v24.44.0) Staging Release - October Week 4 Release (v24.44.0) Oct 24, 2024
@gigincg gigincg merged commit b6e5fa7 into staging Oct 24, 2024
78 of 91 checks passed
@github-actions GitHub Actions
Copy link

@khavinshankar Your efforts have helped advance digital healthcare and TeleICU systems. 🚀 Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! 🙌

@nihal467 nihal467 mentioned this pull request Oct 24, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nihal467 nihal467 nihal467 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.