Merge pull request #1699 from blesildaramirez/i9890

pkp/pkp-lib#9890 [OMP] - Implement new sidebar navigation

classes/template/TemplateManager.php

@@ -135,6 +135,7 @@ public function setupBackendPage()
                 'name' => __('navigation.catalog'),
                 'url' => $router->url($request, null, 'manageCatalog'),
                 'isCurrent' => $request->getRequestedPage() === 'manageCatalog',
+                'icon' => 'Catalog'
             ];
 
             $index = array_search('submissions', array_keys($menu));

cypress/support/commands.js

@@ -83,7 +83,7 @@ Cypress.Commands.add('createSubmissionWithApi', (data, csrfToken) => {
 
 		})
 		.then(() => {
-			cy.get('.pkpSteps__step__label:contains("Details")').click();
+			cy.get('.pkpSteps__step__label:contains("Details")').click({force: true});
 		})
 		.addSubmissionAuthorsWithApi(api, data, csrfToken)
 		.addChapters(data.chapters);

cypress/tests/data/10-ApplicationSetup/20-CreateContext.cy.js

@@ -60,7 +60,7 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a').contains('admin').click();
 		cy.get('a').contains('Dashboard').click();
-		cy.get('.app__nav a').contains('Administration').click();
+		cy.get('nav').contains('Administration').click();
 		cy.get('a').contains('Hosted Presses').click();
 		cy.get('a[class=show_extras]').click();
 		cy.contains('Settings wizard').click();
@@ -93,7 +93,9 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a').contains('admin').click();
 		cy.get('a').contains('Dashboard').click();
-		cy.get('.app__nav a').contains('Press').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Press').click({ force: true });
 
 		cy.get('div[id=masthead]').find('button').contains('Save').click();
 		cy.get('#masthead [role="status"]').contains('Saved');
@@ -103,7 +105,9 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a').contains('admin').click();
 		cy.get('a').contains('Dashboard').click();
-		cy.get('.app__nav a').contains('Press').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Press').click({ force: true });
 		cy.get('button[id="contact-button"]').click();
 
 		// Submit the form with required fields missing.
@@ -126,7 +130,9 @@ describe('Data suite tests', function() {
 
 	it('Tests role settings', function() {
 		cy.login('admin', 'admin', 'publicknowledge');
-		cy.get('a:contains("Users & Roles")').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Users & Roles').click({ force: true });
 		cy.get('button').contains('Roles').click();
 
 		// "Edit" link below "Volume editor" role

cypress/tests/data/10-ApplicationSetup/40-CreateUsers.cy.js

@@ -12,7 +12,9 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a:contains("admin"):visible').click();
 		cy.get('a:contains("Dashboard")').click();
-		cy.get('a:contains("Users & Roles")').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Users & Roles').click({ force: true });
 
 		var users = [
 			{

cypress/tests/data/10-ApplicationSetup/50-CreateCategories.cy.js

@@ -12,7 +12,9 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a').contains('admin').click();
 		cy.get('a').contains('Dashboard').click();
-		cy.get('.app__nav a').contains('Press').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Press').click({ force: true });
 		cy.get('button[id="categories-button"]').click();
 
 		// Create an Applied Science category

cypress/tests/data/10-ApplicationSetup/50-CreateSeries.cy.js

@@ -12,7 +12,9 @@ describe('Data suite tests', function() {
 		cy.login('admin', 'admin');
 		cy.get('a').contains('admin').click();
 		cy.get('a').contains('Dashboard').click();
-		cy.get('.app__nav a').contains('Press').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Press').click({ force: true });
 		cy.get('button[id="sections-button"]').click();
 
 		// Create a new "Library & Information Studies" series

cypress/tests/data/60-content/AfinkelSubmission.cy.js

@@ -268,7 +268,7 @@ describe('Data suite tests', function() {
 		cy.get('a').contains(submission.title).click();
 
 		// Go back to Details step and add chapters
-		cy.get('.pkpSteps__step__label:contains("Details")').click();
+		cy.get('.pkpSteps__step__label:contains("Details")').click({force: true});
 		cy.addChapters(submission.chapters);
 
 		cy.get('.submissionWizard__footer button').contains('Continue').click();

cypress/tests/integration/CompetingInterests.cy.js

@@ -55,7 +55,9 @@ describe('Data suite tests', function() {
 	it('Tests with Competing Interests enabled', function() {
 		// Set the CI requirement setting
 		cy.login('dbarnes', null, 'publicknowledge');
-		cy.get('.app__nav a').contains('Workflow').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Workflow').click({ force: true });
 		cy.get('button[id="review-button"]').click();
 		cy.get('button[id="reviewerGuidance-button"]').click();
 		cy.setTinyMceContent('reviewerGuidance-competingInterests-control-en', 'Reviewer competing interests disclosure');
@@ -104,7 +106,9 @@ describe('Data suite tests', function() {
 
 		// Disable the CI requirement again
 		cy.login('dbarnes', null, 'publicknowledge');
-		cy.get('.app__nav a').contains('Workflow').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Workflow').click({ force: true });
 		cy.get('button[id="review-button"]').click();
 		cy.get('button[id="reviewerGuidance-button"]').click();
 		cy.setTinyMceContent('reviewerGuidance-competingInterests-control-en', '');

cypress/tests/integration/Doi.cy.js

@@ -22,7 +22,7 @@ describe('DOI tests', function() {
 	};
 
 	const goToDoiPage = () => {
-		cy.get('a:contains("DOIs")').click();
+		cy.get('nav').contains('DOIs').click();
 		cy.get('button#submission-doi-management-button').click();
 	};
 

cypress/tests/integration/Payments.cy.js

@@ -12,7 +12,9 @@
 describe('Payments', function() {
     it('Enable Payment', function() {
         cy.login('dbarnes', null, 'publicknowledge');
-        cy.get('.app__nav a:contains("Distribution")').click();
+        cy.get('nav').contains('Settings').click();
+        // Ensure submenu item click despite animation
+        cy.get('nav').contains('Distribution').click({ force: true });
         cy.get('button[id="payments-button"]').click();
         cy.get('input[type="checkbox"][name="paymentsEnabled"]:first').click();
         cy.get('select[id="paymentSettings-currency-control"]').select('US Dollar');
@@ -24,7 +26,7 @@ describe('Payments', function() {
 
     it('Add a direct sales on Submission chapter', function () {
         cy.login('dbarnes', null, 'publicknowledge');
-        cy.get('.app__nav a:contains("Submissions")').click();
+        cy.get('nav').contains('Submissions').click();
         cy.get('button[id="archive-button"]').click();
 
         var submissionElement = cy.get('#archive .listPanel__item').contains('Bomb Canada and Other Unkind Remarks in the American Media').parents('.listPanel__item');

cypress/tests/integration/Statistics.cy.js

@@ -18,7 +18,9 @@ describe('Statistics Tests', function() {
 
 	it('Check statistics', function() {
 		cy.login('dbarnes', null, 'publicknowledge');
-		cy.get('.app__nav a:contains("Monographs")').click();
+		cy.get('nav').contains('Statistics').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Monographs').click({ force: true });
 		cy.checkGraph(
 			'Total catalog views by date',
 			'Abstract Views',

cypress/tests/integration/Z_MonographViewDCMetadata.cy.js

@@ -372,7 +372,9 @@ describe('Monograph View Metadata - DC Plugin', function() {
 		cy.get('a').contains('Dashboard').click();
 
 		// Enable metadata settings
-		cy.get('.app__nav a').contains('Press').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Press').click({ force: true });
 		cy.get('button#sections-button').click();
 		cy.get('tr[id^="component-grid-settings-series-seriesgrid-row-"]:contains("Political Economy") > .first_column > .show_extras').click();
 		cy.get('tr[id^="component-grid-settings-series-seriesgrid-row-"]:contains("Political Economy") + tr a:contains("Edit")').click();
@@ -384,7 +386,9 @@ describe('Monograph View Metadata - DC Plugin', function() {
 		cy.get('div:contains("Your changes have been saved.")');
 
 		// Enable metadata settings
-		cy.get('.app__nav a').contains('Workflow').click();
+		cy.get('nav').contains('Settings').click();
+		// Ensure submenu item click despite animation
+		cy.get('nav').contains('Workflow').click({ force: true });
 		cy.get('button').contains('Metadata').click();
 		cy.get('span').contains('Enable coverage metadata').prev('input[type="checkbox"]').check();
 		cy.get('span').contains('Enable type metadata').prev('input[type="checkbox"]').check();
@@ -398,7 +402,7 @@ describe('Monograph View Metadata - DC Plugin', function() {
 		cy.checkDoiConfig(['publication', 'chapter', 'representation', 'file']);
 
 		// After configuration, go to submissions
-		cy.get('.app__nav a').contains('Submissions').click();
+		cy.get('nav').contains('Submissions').click();
 
 		// Create a new submission
 		cy.getCsrfToken();