fix: User Preferences Issues (#1207)
* fix: study list translations * Don't render until translations are ready * Try to wait for translations to load * Use null to render "nothing" * Try toggling useSuspense off up a layer * logging * Remove useSuspense false flags * DO NOT OPEN A PR WITH IT. Experimental changes only. Try to solve issues with useTranslation hooks #Please enter the commit message for your changes. Lines starting * Remove unecessary changes * feat: 🎸 useMedia hook to not use one more prop for upd state vl * docs: Add license scan report and status (#1161) Signed-off-by: fossabot <badges@fossa.io> * fix: 🐛 Fix for JS breaking on header (#1164) * feat: 🎸 Code review and refact Revised code based on PRs(variable alias,...). Changed hook for useMedia. Now, it provides two hooks: one to get displayMediaSize and other to get Entity(component, objects...) based on displayMediaSize. Implemented a similar solution for state manager to store mediaQueryList(s) and displaySize for app. * feat: 🎸 Fine tunning on mediaQuery value, fixed issue about it * fix: 🐛 Fixed issue and refactoring Fixed js exception and also refactoring userPreferences components to functional component * fix: 🐛 Code review. Localstorage fix minor bugs * fix: 🐛 Ensure hotkey lower case always * fix: translation switcher * chore(release): publish [skip ci] - @ohif/extension-vtk@0.53.6 - @ohif/ui@0.62.1 - @ohif/viewer@2.8.2 * Add new modal service * Change serviceManager prop to servicesManager * CR Update: fix casing and add required proptypes to providers * CR Update: Improve ohifmodal proptypes * CR Update: Fix typo in extensionmanager * CR Update: add default props to service and check service in provider * Refactor modal provider to better use its own state * ci: don't build our master branch (#1177) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * Use modal instead of modal context * Ci/promotable builds (#1179) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Change modal children order * Ci/promotable builds (#1180) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * Ci/promotable builds (#1181) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * Ci/promotable builds (#1182) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * ci: use sudo for global command * Fix OHIFModal proptypes * Ci/promotable builds (#1183) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * ci: use sudo for global command * Inline personal access token w/ env var * Ci/promotable builds (#1184) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * ci: use sudo for global command * Inline personal access token w/ env var * ci: workaround for sudo limitations * ci: restore release workflow (#1185) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * ci: use sudo for global command * Inline personal access token w/ env var * ci: workaround for sudo limitations * ci: restore release workflow * Pass services to each module, improve tests * Add servicesManager test and registerServices method * Fix key warning of snackbar elements * Remove netlify-cli; we';ll install this on CI server * Update staging and prod netlify site IDs * Clean up NPM_PUBLISH step * Clean up DOCS_PUBLISH step * Clean up Deploy workflow * Custom executor to override cypress config * Spacing * Use an existing docker hub image * Switch to npx instead of digging into npm bin location * Remove e2e test before prod deploy * Add workflow images * docs: continous integrationn * Add default props to modal * chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.5.1 - @ohif/extension-vtk@0.53.7 - @ohif/core@1.9.1 - @ohif/ui@0.62.2 - @ohif/viewer@2.8.3 * chore(release): publish [skip ci] - @ohif/extension-vtk@0.53.8 - @ohif/core@1.10.0 - @ohif/ui@0.62.3 - @ohif/viewer@2.8.4 * ci: Redirect site traffic to index.html if file is not resolved * ci: fix typo * fix: 🐛 Code review. Remove 'global state' for displaySize * fix: 🐛 Code review. Ref back to useMedia and pass value down Code review. Ref back to useMedia and pass value down (components) instead of creating a specialized hook to tied any component on it * fix: translation switcher * fix * cleanup * add missed translation * fix: 🐛 Code review * fix: 🐛 Fix unit tests * fix: 🐛 Fix unit test * fix: 🐛 Code merge solve conflicts. Missing files changes * Merge from master. Missing files changes * feat: 🎸 Code review. Fix issues with DatePicker Fixed at least the minimum issue with datePicker and update some content on every translation changed * fix: 🐛 Code review. Style fix on modal * fixes in general preferences after merge * fix * export default i18n language * translation fixes * increase snackbar zindex * initialize language * WIP propagate props<>state fixes * fix state propagation * remove hotkey error when reset default * fix datePicker * i18n updates * fix i18n strings * fix reset default -- set right input value * fix default language * fix e2e for user preferences * small fix datePicker props * remove i18n from window -- debugging purposes only * lint fixes
This commit is contained in:
Rodrigo Antinarelli authored and Danny Brown committed
1 parent
fd1a9e2abe
commit
1df21a9e07
31 files changed
+1332
-737
No files matched your search
@@ -59,91 +59,89 @@ describe('OHIF User Preferences', () => {
|
||||
.should('have.text', 'SOLO USO PARA INVESTIGACIÓN');
|
||||
|
||||
// Options menu should be translated
|
||||
cy.get('[data-cy="options-menu"]').should('have.text', 'Opciones');
|
||||
cy.get('[data-cy="options-menu"]')
|
||||
.should('have.text', 'Opciones')
|
||||
.click();
|
||||
|
||||
//TODO: the following code is blocked by issue 1193: https://github.com/OHIF/Viewers/issues/1193
|
||||
//Once the issue is fixed, the following code should be uncommented
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .first()
|
||||
// .should('have.text', 'Acerca de');
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .last()
|
||||
// .should('have.text', 'Preferencias');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.first()
|
||||
.should('contain.text', 'Acerca de');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.last()
|
||||
.should('contain.text', 'Preferencias');
|
||||
|
||||
// Close Options menu
|
||||
cy.get('[data-cy="options-menu"]').click();
|
||||
});
|
||||
|
||||
it('checks if user can cancel the language selection and application will be in English', function() {
|
||||
cy.get('@userPreferencesGeneralTab')
|
||||
.click()
|
||||
.should('have.class', 'active');
|
||||
// Set language to English and save
|
||||
cy.setLanguage('English');
|
||||
|
||||
// Language dropdown should be displayed
|
||||
cy.get('#language-select').should('be.visible');
|
||||
// Set language to Spanish and cancel
|
||||
cy.setLanguage('Spanish', false);
|
||||
|
||||
// Select Spanish and Cancel
|
||||
cy.get('#language-select').select('Spanish');
|
||||
cy.get('@cancelBtn')
|
||||
// Header should be kept in English
|
||||
cy.get('.research-use')
|
||||
.scrollIntoView()
|
||||
.should('have.text', 'INVESTIGATIONAL USE ONLY');
|
||||
|
||||
// Options menu should be translated
|
||||
cy.get('[data-cy="options-menu"]')
|
||||
.should('have.text', 'Options')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.first()
|
||||
.should('contain.text', 'About');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.last()
|
||||
.should('contain.text', 'Preferences');
|
||||
|
||||
// Close Options menu
|
||||
cy.get('[data-cy="options-menu"]').click();
|
||||
});
|
||||
|
||||
it('checks if user can restore to default the language selection and application will be in English', function() {
|
||||
// Set language to Spanish
|
||||
cy.setLanguage('Spanish');
|
||||
|
||||
//Open Preferences again
|
||||
cy.openPreferences();
|
||||
|
||||
// Go to general tab
|
||||
cy.get('@userPreferencesGeneralTab').click();
|
||||
|
||||
cy.get('@restoreBtn')
|
||||
.scrollIntoView()
|
||||
.click();
|
||||
|
||||
// TODO: the following code is blocked by issue 1193: https://github.com/OHIF/Viewers/issues/1193
|
||||
// Once the issue is fixed, the following code should be uncommented
|
||||
// // Header should be kept in English
|
||||
// cy.get('.research-use')
|
||||
// .scrollIntoView()
|
||||
// .should('have.text', 'INVESTIGATIONAL USE ONLY');
|
||||
//
|
||||
// // Options menu should be translated
|
||||
// cy.get('[data-cy="options-menu"]').should('have.text', 'Options');
|
||||
//
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .first()
|
||||
// .should('have.text', 'About');
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .last()
|
||||
// .should('have.text', 'Preferences');
|
||||
// Save
|
||||
cy.get('@saveBtn')
|
||||
.scrollIntoView()
|
||||
.click();
|
||||
|
||||
// Header should be in English
|
||||
cy.get('.research-use')
|
||||
.scrollIntoView()
|
||||
.should('have.text', 'INVESTIGATIONAL USE ONLY');
|
||||
|
||||
// Options menu should be in English
|
||||
cy.get('[data-cy="options-menu"]')
|
||||
.should('have.text', 'Options')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.first()
|
||||
.should('contain.text', 'About');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.last()
|
||||
.should('contain.text', 'Preferences');
|
||||
|
||||
// Close options Menu
|
||||
cy.get('[data-cy="options-menu"]').click();
|
||||
});
|
||||
|
||||
// TODO: the following code is blocked by issue 1193: https://github.com/OHIF/Viewers/issues/1193
|
||||
// Once the issue is fixed, the following code should be uncommented
|
||||
// it('checks if user can restore to default the language selection and application will be in English', function() {
|
||||
// cy.get('@userPreferencesGeneralTab')
|
||||
// .click()
|
||||
// .should('have.class', 'active');
|
||||
|
||||
// // Language dropdown should be displayed
|
||||
// cy.get('#language-select').should('be.visible');
|
||||
|
||||
// // Select Spanish and Save
|
||||
// cy.get('#language-select').select('Spanish');
|
||||
// cy.get('@saveBtn')
|
||||
// .scrollIntoView()
|
||||
// .click();
|
||||
|
||||
// //Open Preferences again
|
||||
// cy.openPreferences();
|
||||
|
||||
// // Go to general tab
|
||||
// cy.get('@userPreferencesGeneralTab').click();
|
||||
|
||||
// cy.get('@restoreBtn')
|
||||
// .scrollIntoView()
|
||||
// .click();
|
||||
|
||||
// Header should be in English
|
||||
// cy.get('.research-use')
|
||||
// .scrollIntoView()
|
||||
// .should('have.text', 'INVESTIGATIONAL USE ONLY');
|
||||
//
|
||||
// Options menu should be in English
|
||||
// cy.get('[data-cy="options-menu"]').should('have.text', 'Options');
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .first()
|
||||
// .should('have.text', 'About');
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .last()
|
||||
// .should('have.text', 'Preferences');
|
||||
// });
|
||||
|
||||
it('checks if Preferences set in Study List Page will be consistent on Viewer Page', function() {
|
||||
// Go go hotkeys tab
|
||||
cy.get('@userPreferencesHotkeysTab')
|
||||
@@ -185,16 +183,12 @@ describe('OHIF User Preferences', () => {
|
||||
cy.get('[data-cy="options-menu"]')
|
||||
.should('have.text', 'Opciones')
|
||||
.click();
|
||||
cy.get('[data-cy="about-item-menu"]')
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.first()
|
||||
.should('contain.text', 'Acerca de');
|
||||
cy.get('[data-cy="options-menu"]').click(); //Close Options overlay
|
||||
|
||||
//TODO: the following code is blocked by issue 1193: https://github.com/OHIF/Viewers/issues/1193
|
||||
//Once the issue is fixed, the following code should be uncommented
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .last()
|
||||
// .should('have.text', 'Preferencias');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.last()
|
||||
.should('contain.text', 'Preferencias');
|
||||
|
||||
// Check if new hotkey is working on viewport
|
||||
cy.get('body').type('{shift}Q', { release: false });
|
||||
@@ -266,19 +260,49 @@ describe('OHIF User Preferences', () => {
|
||||
.should('have.text', 'SOLO USO PARA INVESTIGACIÓN');
|
||||
|
||||
// Options menu should be translated
|
||||
cy.get('[data-cy="options-menu"]').should('have.text', 'Opciones');
|
||||
cy.get('[data-cy="options-menu"]')
|
||||
.should('have.text', 'Opciones')
|
||||
.click();
|
||||
|
||||
//TODO: the following code is blocked by issue 1193: https://github.com/OHIF/Viewers/issues/1193
|
||||
//Once the issue is fixed, the following code should be uncommented
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .first()
|
||||
// .should('have.text', 'Acerca de');
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .last()
|
||||
// .should('have.text', 'Preferencias');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.first()
|
||||
.should('contain.text', 'Acerca de');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.last()
|
||||
.should('contain.text', 'Preferencias');
|
||||
|
||||
// Close Options menu
|
||||
cy.get('[data-cy="options-menu"]').click();
|
||||
});
|
||||
|
||||
it('checks if user can cancel the language selection and application will be in English', function() {
|
||||
// Set language to English and save
|
||||
cy.setLanguage('English');
|
||||
|
||||
// Set language to Spanish and cancel
|
||||
cy.setLanguage('Spanish', false);
|
||||
|
||||
// Header should be kept in English
|
||||
cy.get('.research-use')
|
||||
.scrollIntoView()
|
||||
.should('have.text', 'INVESTIGATIONAL USE ONLY');
|
||||
|
||||
// Options menu should be translated
|
||||
cy.get('[data-cy="options-menu"]')
|
||||
.should('have.text', 'Options')
|
||||
.click();
|
||||
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.first()
|
||||
.should('contain.text', 'About');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.last()
|
||||
.should('contain.text', 'Preferences');
|
||||
// Close Options menu
|
||||
cy.get('[data-cy="options-menu"]').click();
|
||||
});
|
||||
|
||||
it('checks if user can restore to default the language selection and application will be in English', function() {
|
||||
cy.get('@userPreferencesGeneralTab')
|
||||
.click()
|
||||
.should('have.class', 'active');
|
||||
@@ -286,76 +310,51 @@ describe('OHIF User Preferences', () => {
|
||||
// Language dropdown should be displayed
|
||||
cy.get('#language-select').should('be.visible');
|
||||
|
||||
// Select Spanish and Cancel
|
||||
// Select Spanish and Save
|
||||
cy.get('#language-select').select('Spanish');
|
||||
cy.get('@cancelBtn')
|
||||
cy.get('@saveBtn')
|
||||
.scrollIntoView()
|
||||
.click();
|
||||
|
||||
// TODO: the following code is blocked by issue 1193: https://github.com/OHIF/Viewers/issues/1193
|
||||
// Once the issue is fixed, the following code should be uncommented
|
||||
// // Header should be kept in English
|
||||
// cy.get('.research-use')
|
||||
// .scrollIntoView()
|
||||
// .should('have.text', 'INVESTIGATIONAL USE ONLY');
|
||||
//
|
||||
// // Options menu should be translated
|
||||
// cy.get('[data-cy="options-menu"]').should('have.text', 'Options');
|
||||
//
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .first()
|
||||
// .should('have.text', 'About');
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .last()
|
||||
// .should('have.text', 'Preferences');
|
||||
//Open Preferences again
|
||||
cy.get('[data-cy="options-menu"]')
|
||||
.scrollIntoView()
|
||||
.click();
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.last()
|
||||
.click();
|
||||
|
||||
// Go to general tab
|
||||
cy.get('@userPreferencesGeneralTab').click();
|
||||
|
||||
cy.get('@restoreBtn')
|
||||
.scrollIntoView()
|
||||
.click();
|
||||
|
||||
cy.get('@saveBtn')
|
||||
.scrollIntoView()
|
||||
.click();
|
||||
|
||||
// Header should be in English
|
||||
cy.get('.research-use')
|
||||
.scrollIntoView()
|
||||
.should('have.text', 'INVESTIGATIONAL USE ONLY');
|
||||
|
||||
// Options menu should be in English
|
||||
cy.get('[data-cy="options-menu"]')
|
||||
.should('have.text', 'Options')
|
||||
.click();
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.first()
|
||||
.should('contain.text', 'About');
|
||||
cy.get('[data-cy="dd-item-menu"]')
|
||||
.last()
|
||||
.should('contain.text', 'Preferences');
|
||||
|
||||
// Close Options menu
|
||||
cy.get('[data-cy="options-menu"]').click();
|
||||
});
|
||||
|
||||
// TODO: the following code is blocked by issue 1193: https://github.com/OHIF/Viewers/issues/1193
|
||||
// Once the issue is fixed, the following code should be uncommented
|
||||
// it('checks if user can restore to default the language selection and application will be in English', function() {
|
||||
// cy.get('@userPreferencesGeneralTab')
|
||||
// .click()
|
||||
// .should('have.class', 'active');
|
||||
|
||||
// // Language dropdown should be displayed
|
||||
// cy.get('#language-select').should('be.visible');
|
||||
|
||||
// // Select Spanish and Save
|
||||
// cy.get('#language-select').select('Spanish');
|
||||
// cy.get('@saveBtn')
|
||||
// .scrollIntoView()
|
||||
// .click();
|
||||
|
||||
// //Open Preferences again
|
||||
// cy.get('[data-cy="options-menu"]')
|
||||
// .scrollIntoView()
|
||||
// .click();
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .last()
|
||||
// .click();
|
||||
|
||||
// // Go to general tab
|
||||
// cy.get('@userPreferencesGeneralTab').click();
|
||||
|
||||
// cy.get('@restoreBtn')
|
||||
// .scrollIntoView()
|
||||
// .click();
|
||||
|
||||
// Header should be in English
|
||||
// cy.get('.research-use')
|
||||
// .scrollIntoView()
|
||||
// .should('have.text', 'INVESTIGATIONAL USE ONLY');
|
||||
//
|
||||
// Options menu should be in English
|
||||
// cy.get('[data-cy="options-menu"]').should('have.text', 'Options');
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .first()
|
||||
// .should('have.text', 'About');
|
||||
// cy.get('[data-cy="about-item-menu"]')
|
||||
// .last()
|
||||
// .should('have.text', 'Preferences');
|
||||
//});
|
||||
|
||||
it('checks new hotkeys for "Rotate Right" and "Rotate Left"', function() {
|
||||
// Go go hotkeys tab
|
||||
cy.get('@userPreferencesHotkeysTab')
|
||||
|
||||
Reference in new issue
Block a user