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.

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

OCLOMRS-932: Hide retired concepts & add option to include retired concepts #685

Merged
merged 2 commits into from
Apr 27, 2021
Merged

OCLOMRS-932: Hide retired concepts & add option to include retired concepts #685

merged 2 commits into from
Apr 27, 2021

Conversation

jwnasambu
Copy link
Contributor

@jwnasambu jwnasambu commented Apr 12, 2021

JIRA TICKET NAME:

General Filter: Hide Retired Concepts & Add Filter option to Include Retired Concepts

Summary:

I changed includeRetired: includeRetired ? 1 : 0
Back to :

includeRetired

to enable filtering of retired concepts well.

@HerbertYiga
Copy link
Contributor

General Filter: Hide Retired Concepts & Add Filter option to Include Retired Concepts

not sure why this link keeps breaking at my side

@jwnasambu
Copy link
Contributor Author

@HerbertYiga its failing because of this ERROR: Service 'solr' failed to build: toomanyrequests: You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit.

@hadijahkyampeire
Copy link
Collaborator

@ibacher please review this, I think we need to maintain the 1 and 0, if anything we actually need to change the true and false since APIv2 is using 1 and 0, we need to spec this ticket well because it looks like it has been confusing over time.

@hadijahkyampeire
Copy link
Collaborator

@jwnasambu please rebase your branch with master to get the test fixes.

@ibacher
Copy link
Member

ibacher commented Apr 19, 2021

@hadijahkyampeire I'm going from the OCL interface v2 which seems to use true/false. Here are requests I see when toggling the includeRetired setting in the UI:

https://api.openconceptlab.org/concepts/?q=dxtest&page=1&limit=25&includeRetired=false&verbose=false&sortDesc=last_update

https://api.openconceptlab.org/concepts/?q=dxtest&page=1&limit=25&includeRetired=true&verbose=false&sortDesc=last_update

So I think we really do want true / false there rather than 1 or 0. See also the underlying API code that handles this. It's API v1 that uses 1 / 0 or rather (I'm guessing) something that evaluates to True in Python. Maybe True / False would work for both?

@ibacher
Copy link
Member

ibacher commented Apr 21, 2021

@jwnasambu Can you rebase this on the lastest master which should fix the test failures?

@jwnasambu
Copy link
Contributor Author

jwnasambu commented Apr 22, 2021

@ibacher on my terminal I run this commands,

  • git checkout OCLOMRS-932
  • git rebase master

and ended up with this output Current branch OCLOMRS-932 is up to date. but the Travis CI is still failing could there be something I'm missing out?

@ibacher
Copy link
Member

ibacher commented Apr 22, 2021

Is your local master up to date? Try doing:

git fetch --all
git rebase upstream master

You might have to do a git push --force afterwards to update the branch.

@jwnasambu
Copy link
Contributor Author

@ibacher Thanks so much am so glad the build is successful. This is an achievement!

@hadijahkyampeire
Copy link
Collaborator

@ibacher @jwnasambu I think this ticket has many files which are other people commits, we need to rebase it well to have only commits for this PR.

@ibacher
Copy link
Member

ibacher commented Apr 27, 2021

@hadijahkyampeire That's a good point. Done.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.003%) to 44.713% when pulling 997f5e4 on jwnasambu:OCLOMRS-932 into 9232b52 on openmrs:master.

@ibacher ibacher changed the title OCLOMRS-932:General Filter: Hide Retired Concepts & Add Filter option to Include Retired Concepts OCLOMRS-932: Hide retired concepts & add option to include retired concepts Apr 27, 2021
@ibacher ibacher merged commit e72a7a6 into openmrs:master Apr 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants