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

RA-1719: Program, Program Status and Relationship widgets not properl… #300

Merged
merged 1 commit into from
Mar 10, 2020

Conversation

mogoodrich
Copy link
Member

…y retrieving session use

@mogoodrich mogoodrich merged commit b304590 into master Mar 10, 2020
@mogoodrich mogoodrich deleted the RA-1719 branch March 10, 2020 14:41
@rrameshbtech
Copy link
Contributor

rrameshbtech commented Mar 12, 2020

@mogoodrich The new change in the session url (removing custom) has effects in the response returned by the server.

For example https://demo.openmrs.com/openmrs/ws/rest/v1/session returns below which does not have name for privileges (older one had). which is what checked in all the functions to validate whether the logged user has particular privilege or not.

 "privileges": [
            {
                "uuid": "d05118c6-2490-4d78-a41a-390e3596a237",
                "display": "Get Concept Datatypes",
                "links": [
                    {
                        "rel": "self",
                        "uri": "http://demo.openmrs.com/openmrs/ws/rest/v1/privilege/d05118c6-2490-4d78-a41a-390e3596a237"
                    }
                ]
            },
            {
                "uuid": "d05118c6-2490-4d78-a41a-390e3596a238",
                "display": "Get Concept Classes",
                "links": [
                    {
                        "rel": "self",
                        "uri": "http://demo.openmrs.com/openmrs/ws/rest/v1/privilege/d05118c6-2490-4d78-a41a-390e3596a238"
                    }
                ]
            },

@Ruhanga @mks-d
Could you help us to fix this?

@Ruhanga
Copy link
Member

Ruhanga commented Mar 12, 2020

Thanks for this observation @rrameshbtech. This in a way is fixed by depending on version 2.28.0 and above of webservices.rest module.

cc: @mogoodrich.

@mogoodrich
Copy link
Member Author

Yes, sorry @rrameshbtech and @Ruhanga ... this bug fix was across both REST web services and Core Apps and so Core Apps needs the late REST module... I did a release of REST, but neglected to update the dependency in Core Apps, my apologies... I just did that now...

@mogoodrich
Copy link
Member Author

Of course it looks like the build failed after my change... I'm in a meeting now but will check when I'm out.

@mogoodrich
Copy link
Member Author

For the record, I had issues updating the Core Apps module to use the latest REST, but I did release the REST module and the ref app now relies on that version.

mks-d pushed a commit that referenced this pull request Mar 19, 2020
* RA-1704 : improved programstatus state sort order - updating angular to 1.6.1 to get $httpBackend.flush() fix, changes to use a proper promise chain for test

* updating shrinkwrap to angular 1.6.1, updating GET mock

* changing use of result var to immediate returns per code style preferences

* reversing order of null check for endDate, provides short circuit and avoids ambiguous coercion/eval

* removing quiet flag from `mvn clean install` to debug travis build

* fixing comparison of two states with null end dates (from different workflows in the same program), adding logic for angular fallback orderby index, re-order expected order test states

* re-enabling mvn quiet mode to minimize build messages

* fixing typo in both enddates not null logic and reciprocal case for state1 endDate == null

* RA-1719: Program, Program Status and Relationship widgets not properly retrieving session use (#300)

* RA-1704 : improved programstatus state sort order - updating angular to 1.6.1 to get $httpBackend.flush() fix, changes to use a proper promise chain for test

* updating shrinkwrap to angular 1.6.1, updating GET mock

* changing use of result var to immediate returns per code style preferences

* reversing order of null check for endDate, provides short circuit and avoids ambiguous coercion/eval

* removing quiet flag from `mvn clean install` to debug travis build

* fixing comparison of two states with null end dates (from different workflows in the same program), adding logic for angular fallback orderby index, re-order expected order test states

* re-enabling mvn quiet mode to minimize build messages

* fixing typo in both enddates not null logic and reciprocal case for state1 endDate == null

* changing sort order back to repeated `else if` logic with new check for not both null and ordering when state1 endDate is null, new order of states in test

* RA-1704 : improved programstatus state sort order - updating angular to 1.6.1 to get $httpBackend.flush() fix, changes to use a proper promise chain for test

* updating shrinkwrap to angular 1.6.1, updating GET mock

* changing use of result var to immediate returns per code style preferences

* reversing order of null check for endDate, provides short circuit and avoids ambiguous coercion/eval

* removing quiet flag from `mvn clean install` to debug travis build

* fixing comparison of two states with null end dates (from different workflows in the same program), adding logic for angular fallback orderby index, re-order expected order test states

* re-enabling mvn quiet mode to minimize build messages

* fixing typo in both enddates not null logic and reciprocal case for state1 endDate == null

* changing sort order back to repeated `else if` logic with new check for not both null and ordering when state1 endDate is null, new order of states in test

* removing quiet flag from `mvn clean install` to debug travis build

* re-enabling mvn quiet mode to minimize build messages

* RA-1724: Fix NPE/undefined error in obsgraph dashboard widget.

* RA-1724 : Fix NPE/undefined error in obsgraph dashboard widget when some concept do not have associated obs

* RA-1724  : Adding null check

* RA-1725: ObsGraph - Added optional filter encounter type parameter for obsgraph.

* Added optional filter encounter type parameter for obsgraph

* Added support for multiple encounter types in obsGraph

* RA-1724: Follow-on commit to fix nul typo (#304)

* make dependent on latest version of REST web services

* try adding REST web services 1.12 dependency to fix build

* HTML-718, gray out retired concepts (#303)

* revert:upgrade to latest version of REST web services

* adding additional documentation of logic in sort

* commiting checkouts from master to clean up commit diff

* after syncing fork master HEAD, commiting checkouts from master to clean up commit diff

Co-authored-by: Mark Goodrich <[email protected]>
Co-authored-by: Ruhanga <[email protected]>
Co-authored-by: Ramesh Ramalingam <[email protected]>
Co-authored-by: Cosmin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants