Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

feat(patients): escape string in appointments search #2031

Merged
merged 44 commits into from
May 2, 2020

Conversation

JDarke
Copy link
Contributor

@JDarke JDarke commented May 1, 2020

Fixes #2029 .

Changes proposed in this pull request:

  • Added escapeStringRegex method to search text when searching appointments from the patient info area: AppointmentRepository.ts

  • Added test suite to AppointmentRepository.ts.tsx to check the functionality of change.

JDarke and others added 30 commits April 21, 2020 10:38
Reason field on new appointment screen no longer a required field.  Line 21, Label element now takes
isRequired attr from interface Props.

fix HospitalRun#1997
Previously added a listing for yarn in the dependencies in package.json.  This commit undoes that.

re |
Added a test case to test if the Label receives the isRequired prop on required fields

re HospitalRun#2003
Changed const expectedValue to const expectedRequired, named for prop isRequired

re HospitalRun#2003
Added a step to take the search string and remove all non-letter/whitespace characters. Line 16 and
22

fix HospitalRun#1999
Added a step to remove all non-alphabetical and whitespace characters from search string regex

fix HospitalRun#1999
Removed special chars that interfered with RegExp in search strings

re HospitalRun#1999
Added a test to pass a search string including all prohibited chars, expects cleaned version of
string to be used for search.

re HospitalRun#1999
Added test on the search string cleaning regex;  runs search string containing all prohibited chars,
expects cleaned version to be searched and matched

re HospitalRun#1999
Removing mocha listed dependency added in error

re HospitalRun#1999
@vercel
Copy link

vercel bot commented May 1, 2020

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/hospitalrun/hospitalrun-frontend/3j5bwqc1w
✅ Preview: https://hospitalrun-frontend-git-fork-jdarke-fix-2029.hospitalrun.now.sh

@JDarke
Copy link
Contributor Author

JDarke commented May 1, 2020

I tried resetting my local repo and then making the changes again, as my master branch was out of sync with the master repo and things were getting untidy. Looks like I still managed to send multiple commits. :|

If anyone could give me an idea of how to submit a PR without having my previous 43 commits linked to it, I'd be very grateful!

@jackcmeyer
Copy link
Member

I tried resetting my local repo and then making the changes again, as my master branch was out of sync with the master repo and things were getting untidy. Looks like I still managed to send multiple commits. :|

If anyone could give me an idea of how to submit a PR without having my previous 43 commits linked to it, I'd be very grateful!

Without knowing the exact state of your local branch, it's hard to say. However, likely you'll need to ensure that your local master branch is up to date with the upstream master branch (see: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork).

Once your local master branch is up to date, then you can update your local branch so its up to date with your local master branch.

@jackcmeyer jackcmeyer added patients issue/pull request that interacts with patients module 🚀enhancement an issue/pull request that adds a feature to the application labels May 1, 2020
@jackcmeyer jackcmeyer added this to In progress in Version 2.0 via automation May 1, 2020
@jackcmeyer jackcmeyer added this to the v2.0 milestone May 1, 2020
@jackcmeyer jackcmeyer changed the title Fix #2029 feat(patients): escape string in appointments search May 2, 2020
@JDarke
Copy link
Contributor Author

JDarke commented May 2, 2020

@jackcmeyer - thanks, I'll give that another go, then. I must have made an error somewhere in the process the first time.

@gitpod-io
Copy link

gitpod-io bot commented May 2, 2020

@matteovivona matteovivona merged commit 254273f into HospitalRun:master May 2, 2020
Version 2.0 automation moved this from In progress to Done May 2, 2020
@JDarke JDarke deleted the fix-2029 branch May 2, 2020 13:31
@JDarke JDarke restored the fix-2029 branch May 2, 2020 13:32
@JDarke JDarke deleted the fix-2029 branch May 2, 2020 13:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🚀enhancement an issue/pull request that adds a feature to the application patients issue/pull request that interacts with patients module
Projects
Version 2.0
  
Done
Development

Successfully merging this pull request may close these issues.

Error while searching appointments
3 participants