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

Bugfix #355 / Fix when dcs user has no organizations #356

Merged
merged 2 commits into from
Jan 9, 2023

Conversation

kintsoogi
Copy link
Contributor

Removed circular progress and show disabled org/language select when user has no orgs

Describe what your pull request addresses

  • [ ]

Test Instructions

  • [ ]

@kintsoogi kintsoogi marked this pull request as ready for review January 9, 2023 21:07
@kintsoogi kintsoogi changed the title WIP: Bugfix #355 / Fix when dcs user has no organizations Bugfix #355 / Fix when dcs user has no organizations Jan 9, 2023
Copy link
Contributor

@PhotoNomad0 PhotoNomad0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - code review

@PhotoNomad0
Copy link
Contributor

LGTM - testing - awesome job!

@PhotoNomad0 PhotoNomad0 merged commit 29414d4 into develop Jan 9, 2023
@delete-merged-branch delete-merged-branch bot deleted the bugfix-kintsoogi-355-noorgs branch January 9, 2023 21:18
PhotoNomad0 added a commit that referenced this pull request Apr 3, 2023
* Updated .gitignore testing files/paths

* Changed Jest coverage directory to jest-coverage

* Changed Cyprees coverage directory to cypress-coverage, added multiple scripts to combined Cypress and Jest test coverage reports

* Added step to github action to combine Cypress & Jest coverage reports

* Added another step to github action to upload combined coverage report to Coveralls

* README.md

* Test

* recovered

* jest.config.js

* Added badges to README.md

* README.md

* Migrated from coveralls to codecov for code coverage reporting

* set ubuntu-latest on gh action, updated badges

* t

* gh action twaeks

* Removed unnecesary codecov token

* Updated badges version numbers

* Fixes for running in Windows and README.md

* updated instructions.

* Created MinimizableWrapper.js

* Created MinimizedCards.js

* Created useMinimizedCardState.js custom hook

* Updated secondary theme main color

* Created MinimizedCards FAB component

* Fixing minimized card bug

* Created MinimizedCards component

* Code clean-up on MinimizedCards.js

* Added onMinimize method prop to ResourceCard.js

* Code clean-up & added data persistence to minimized cards in useMinimizedCardState hook

* removed src/components/MinimizableWrapper.js

* Added more code comments to useMinimizedCardState

* Added minimize/restore feature to resource cards

* yarn.lock

* Typo

* Improved varuable name in useMinimizedCardState

* Moved MinimizedCards component  and useMinimizedCardState.js from gateway edit app to resource-workspace-rcl to allow for other apps to gain the minimize card feature

* Removed unused framer-motion dependency

* Updated respective dependencies

* fix for unformatted paste

* adding UI Design documentation to README.md

* Further small edit in README.md

* Bugfix larsg 337 usfm new version (#339)

* WIP-updated to new version usfm-js #133

* bump version

* #328 - bumped version for translation-helps-rcl (#345)

* bumped version for translation-helps-rcl

* include latest mui (v5)

* included emotion (styled, react)

* bumped version
- boxes no longer displayed when not focused

* fixed yarn.lock

* bumped version for rcl component
- translation-helps-rcl

* Fix account settings behavior

* Bugfix #355 / Fix when dcs user has no organizations (#356)

* Removed circular progress and show disabled org/language select when user has no orgs

* Added lock file changes

* Bugfix #358... updated translation-helps to load GL Quotes (#359)

* updated translation-helps-rcl dependency

* updated translation-helps-rcl version

* Updated verion to 1.1 (#366)

* Feature #330/ampersand support (#371)

* merged Lars' ampersand fixes

* updating scripture resource rcl

* quote and occurrences cleanup

* rebuild

* rebuild

* add support for verse ranges in scripture pane highlighting

* add support for verse ranges in scripture pane highlighting

* update dependencies

* update dependencies

---------

Co-authored-by: Manny Colon <[email protected]>
Co-authored-by: Bruce McLean <[email protected]>
Co-authored-by: Cecil New <[email protected]>
Co-authored-by: larsgson <[email protected]>
Co-authored-by: Kintsoogi <[email protected]>
Co-authored-by: Abel Pérez <[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.

2 participants