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.

Sign up for GitHub

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

I9992 #1608

Merged
merged 2 commits into from
Jul 2, 2024
Merged

I9992 #1608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dab138e
pkp/pkp-lib#9992 Remove legacy modal from workflow.tpl as its migrate…
jardakotesovec Jun 25, 2024
3f40d98
pkp/pkp-lib#9992 Cypress tests update for side modal
jardakotesovec Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions cypress/tests/data/60-content/AfinkelSubmission.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ describe('Data suite tests', function() {
'genre': Cypress.env('defaultGenre')
}]);
cy.get('.listPanel__item:contains("delete-this-file.pdf")').find('button').contains('Remove').click();
cy.get('.modal__panel:contains("Are you sure you want to remove this file?")').find('button').contains('Yes').click();
cy.get('div[role=dialog]:contains("Are you sure you want to remove this file?")').find('button').contains('Yes').click();
cy.get('.listPanel__item:contains("delete-this-file.pdf")').should('not.exist');

cy.get('.submissionWizard__footer button').contains('Continue').click();
Expand All @@ -206,7 +206,7 @@ describe('Data suite tests', function() {
cy.get('h2').contains('Contributors');
cy.get('.listPanel__item:contains("Alvin Finkel")');
cy.get('button').contains('Add Contributor').click();
cy.get('.modal__panel:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('div[role=dialog]:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('#contributor-givenName-error-en').contains('This field is required.');
cy.get('#contributor-email-error').contains('This field is required.');
cy.get('#contributor-country-error').contains('This field is required.');
Expand All @@ -215,48 +215,48 @@ describe('Data suite tests', function() {
cy.get('label').contains(submission.authors[0].role).parent().find('input').click();
cy.get('.pkpFormField:contains("Country")').find('select').select(submission.authors[0].country)
cy.get('.pkpFormField:contains("Email")').find('input').type('notanemail');
cy.get('.modal__panel:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('div[role=dialog]:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('#contributor-email-error').contains('This is not a valid email address.');
cy.get('.pkpFormField:contains("Email")').find('input').clear().type(submission.authors[0].email);
cy.get('.modal__panel:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('div[role=dialog]:contains("Add Contributor")').find('button').contains('Save').click();
cy.wait(3000);
cy.get('button').contains('Order').click();
cy.wait(3000);
cy.get('button:contains("Decrease position of Alvin Finkel")').click();
cy.get('button').contains('Save Order').click();
cy.get('button:contains("Preview")').click(); // Will only appear after order is saved
cy.get('.modal__panel:contains("List of Contributors")').find('tr:contains("Abbreviated")').contains('Carter et al.');
cy.get('.modal__panel:contains("List of Contributors")').find('tr:contains("Publication Lists")').contains('Sarah Carter (Volume editor); Alvin Finkel (Author)');
cy.get('.modal__panel:contains("List of Contributors")').find('tr:contains("Full")').contains('Sarah Carter (Volume editor); Alvin Finkel (Author)');
cy.get('.modal__panel:contains("List of Contributors")').find('.modal__closeButton').click();
cy.get('div[role=dialog]:contains("List of Contributors")').find('tr:contains("Abbreviated")').contains('Carter et al.');
cy.get('div[role=dialog]:contains("List of Contributors")').find('tr:contains("Publication Lists")').contains('Sarah Carter (Volume editor); Alvin Finkel (Author)');
cy.get('div[role=dialog]:contains("List of Contributors")').find('tr:contains("Full")').contains('Sarah Carter (Volume editor); Alvin Finkel (Author)');
cy.get('div[role=dialog]:contains("List of Contributors")').find('button:contains("Close")').click();
cy.get('.listPanel:contains("Contributors")').find('button').contains('Order').click();
cy.get('button:contains("Increase position of Alvin Finkel")').click();
cy.get('.listPanel:contains("Contributors")').find('button').contains('Save Order').click();
cy.get('.listPanel:contains("Contributors") button:contains("Preview")').click(); // Will only appear after order is saved
cy.get('.modal__panel:contains("List of Contributors")').find('tr:contains("Abbreviated")').contains('Finkel et al.');
cy.get('.modal__panel:contains("List of Contributors")').find('tr:contains("Publication Lists")').contains('Alvin Finkel (Author); Sarah Carter (Volume editor)');
cy.get('.modal__panel:contains("List of Contributors")').find('tr:contains("Full")').contains('Alvin Finkel (Author); Sarah Carter (Volume editor)');
cy.get('.modal__panel:contains("List of Contributors")').find('.modal__closeButton').click();
cy.get('div[role=dialog]:contains("List of Contributors")').find('tr:contains("Abbreviated")').contains('Finkel et al.');
cy.get('div[role=dialog]:contains("List of Contributors")').find('tr:contains("Publication Lists")').contains('Alvin Finkel (Author); Sarah Carter (Volume editor)');
cy.get('div[role=dialog]:contains("List of Contributors")').find('tr:contains("Full")').contains('Alvin Finkel (Author); Sarah Carter (Volume editor)');
cy.get('div[role=dialog]:contains("List of Contributors")').find('button:contains("Close")').click();

submission.authors.slice(1).forEach((author) => {
cy.get('button').contains('Add Contributor').click();
cy.get('.modal__panel:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('div[role=dialog]:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('.pkpFormField:contains("Given Name")').find('input[name*="givenName-en"]').type(author.givenName);
cy.get('.pkpFormField:contains("Family Name")').find('input[name*="familyName-en"]').type(author.familyName);
cy.get('label').contains(author.role).parent().find('input').click();
cy.get('.pkpFormField:contains("Country")').find('select').select(author.country)
cy.get('.pkpFormField:contains("Email")').find('input').type(author.email);
cy.get('.modal__panel:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('div[role=dialog]:contains("Add Contributor")').find('button').contains('Save').click();
});

// Delete a contributor
cy.get('.listPanel:contains("Contributors")').find('button').contains('Add Contributor').click();
cy.get('.pkpFormField:contains("Given Name")').find('input[name*="givenName-en"]').type('Fake Author Name');
cy.get('.pkpFormField:contains("Email")').find('input').type('delete@mailinator.com');
cy.get('.pkpFormField:contains("Country")').find('select').select('Barbados');
cy.get('.modal__panel:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('div[role=dialog]:contains("Add Contributor")').find('button').contains('Save').click();
cy.get('.listPanel__item:contains("Fake Author Name")').find('button').contains('Delete').click();
cy.get('.modal__panel:contains("Are you sure you want to remove Fake Author Name as a contributor?")').find('button').contains('Delete Contributor').click();
cy.get('div[role=dialog]:contains("Are you sure you want to remove Fake Author Name as a contributor?")').find('button').contains('Delete Contributor').click();
cy.get('.listPanel__item:contains("Fake Author Name")').should('not.exist');


Expand Down Expand Up @@ -325,7 +325,7 @@ describe('Data suite tests', function() {
cy.contains('Make a Submission: Review');
cy.get('button:contains("Submit")').click();
const message = 'The submission, ' + submission.title + ', will be submitted to ' + Cypress.env('contextTitles').en + ' for editorial review';
cy.get('.modal__panel:contains("' + message + '")').find('button').contains('Submit').click();
cy.get('div[role=dialog]:contains("' + message + '")').find('button').contains('Submit').click();
cy.contains('Submission complete');
cy.get('a').contains('Create a new submission');
cy.get('a').contains('Return to your dashboard');
Expand Down
2 changes: 1 addition & 1 deletion cypress/tests/data/60-content/CallanSubmission.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ describe('Data suite tests', function() {
cy.get('#publication-button').click();
cy.get('button').contains('Unpublish').click();
cy.contains('Are you sure you don\'t want this to be published?');
cy.get('.modal__panel button').contains('Unpublish').click();
cy.get('div[role=dialog] button').contains('Unpublish').click();
cy.wait(1000);
cy.visit('index.php/publicknowledge/catalog');
cy.contains('Bomb Canada and Other Unkind Remarks in the American Media').should('not.exist');
Expand Down
18 changes: 0 additions & 18 deletions templates/workflow/workflow.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,24 +116,6 @@
{capture assign=submissionProgressBarUrl}{url op="submissionProgressBar" submissionId=$submission->getId() stageId=$requestedStageId contextId="submission" escape=false}{/capture}
{load_url_in_div id="submissionProgressBarDiv" url=$submissionProgressBarUrl}
</div>

{* Modal to select one of the revision decisions *}
<modal
:close-label="t('common.close')"
name="selectRevisionDecision"
title="Revisions"
>
<pkp-form v-bind="components.{$smarty.const.FORM_SELECT_REVISION_DECISION}" @set="set" @success="goToRevisionDecision" />
</modal>

{* Modal to select one of the revision recommendations *}
<modal
:close-label="t('common.close')"
name="selectRevisionRecommendation"
title="Revisions"
>
<pkp-form v-bind="components.{$smarty.const.FORM_SELECT_REVISION_RECOMMENDATION}" @set="set" @success="goToRevisionDecision" />
</modal>
</tab>
<tab id="marketing" label="{translate key="settings.libraryFiles.category.marketing"}">
<tabs :is-side-tabs="true" :track-history="true" :label="publicationTabsLabel">
Expand Down
Loading