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

pkp/pkp-lib#9658 send and accept invitation views and php integrations #10558

Merged
merged 7 commits into from
Oct 31, 2024

Conversation

ipula
Copy link
Contributor

@ipula ipula commented Oct 24, 2024

No description provided.

@ipula ipula changed the title [TEST ONLY] send and accept invitation views and php integrations send and accept invitation views and php integrations Oct 24, 2024
Copy link
Collaborator

@ewhanson ewhanson left a comment

Choose a reason for hiding this comment

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

Hey @ipula, thanks for putting this together! It's looking really good. Just a few general comments and questions along with a few more minor style/typo requests.

In general:

  • Invitation search for users should strip start/end whitespace out: dbarnes@mailinator.com and dbarnes@mailinator.com are different and a search for the former won't return the latter.
  • "Next" link in user & roles page for invitations is a clickable link even if there are no invitations.
  • Invitation workflow doesn't work for inviting a user to a role again that they had previously been removed from. This is a larger issue that I don't know is within the scope here, but I found it while going through this. Pinging @defstat for this. For example, if a user has a role that has been "removed" i.e. ended, and an editor wants to add them to that same role again with a new start date, it's currently impossible.
  • The phrase "OJS" and "journal" are used throughout the locale keys. I've indicated these ones with comments, but I think for this PR it would probably be best to get this merged, and address that separately afterwards. So you can keep the comments there, but I wouldn't worry about them right now.

Thanks again and let me know if you have any questions.

pages/invitation/InvitationHandler.php Outdated Show resolved Hide resolved
pages/invitation/InvitationHandler.php Outdated Show resolved Hide resolved
pages/invitation/InvitationHandler.php Outdated Show resolved Hide resolved
pages/invitation/InvitationHandler.php Outdated Show resolved Hide resolved
locale/en/user.po Outdated Show resolved Hide resolved
classes/components/forms/invitation/UserDetailsForm.php Outdated Show resolved Hide resolved
templates/invitation/userInvitation.tpl Outdated Show resolved Hide resolved
templates/invitation/acceptInvitation.tpl Show resolved Hide resolved
@@ -18,6 +18,7 @@

<tabs :track-history="true">
<tab id="users" label="{translate key="manager.users"}">
<user-invitation-manager></user-invitation-manager>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should use tabs instead of spcaes.

Copy link
Collaborator

Choose a reason for hiding this comment

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

This line should use tabs like the rest of the file.

templates/invitation/userInvitation.tpl Show resolved Hide resolved
@withanage
Copy link
Member

@ewhanson

  • The phrase "OJS" and "journal" are used throughout the locale keys. I've indicated these ones with comments, but I think for this PR it would probably be best to get this merged, and address that separately afterwards. So you can keep the comments there, but I wouldn't worry about them right now.

The OJS specific locale were moved to OJS locale, so that other PKP applications may customize them easily.
pkp/ojs#4497

@ipula
Copy link
Contributor Author

ipula commented Oct 30, 2024

@ewhanson I made some changes to white-spaces and hide next button in ui-library in this pr pkp/ui-library#439

@ipula ipula changed the title send and accept invitation views and php integrations pkp/pkp-lib#9658 send and accept invitation views and php integrations Oct 30, 2024
@ewhanson
Copy link
Collaborator

The OJS specific locale were moved to OJS locale, so that other PKP applications may customize them easily. pkp/ojs#4497

Thanks @withanage. Have PRs with equivalents been created for OPS and OMP been created? We'll need those too. Thanks!

Copy link
Collaborator

@ewhanson ewhanson left a comment

Choose a reason for hiding this comment

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

Thanks @ipula for the quick changes! Just a few other smaller style things along with a question about journal specific language for @withanage. Once that's taken care of it should be ready for merge!

classes/invitation/sections/Sections.php Outdated Show resolved Hide resolved

msgid "acceptInvitation.privacyStatement.label"
msgstr "Yes, I agree to have my data collected and stored according to the"
Copy link
Collaborator

Choose a reason for hiding this comment

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

I see, thanks @ipula. I think it would be better to include this as a variable in the locale string directly rather than appending it to the end so other languages can change both the text and placement within the sentence.

classes/invitation/stepTypes/SendInvitationStep.php Outdated Show resolved Hide resolved

msgid "invitation.role.masthead"
msgstr "Journal Masthead"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Anything journal-related should probably move to the applications as well. If you've already done this for the OJS language, could you do this for the word "journal" as well, @withanage?


msgid "userInvitation.roleTable.journalMasthead"
msgstr "Journal Masthead"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Usage of journal. Should be moved to app. cc: @withanage.


msgid "userInvitation.search.userNotFound"
msgstr "The user does not have a role in this journal"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Usage of journal. Should be moved to app. cc: @withanage.

msgstr "The user does not have a role in this journal"

msgid "userInvitation.search.userFound"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Usage of journal. Should be moved to app. cc: @withanage.

templates/invitation/acceptInvitation.tpl Show resolved Hide resolved
templates/invitation/userInvitation.tpl Show resolved Hide resolved
@@ -18,6 +18,7 @@

<tabs :track-history="true">
<tab id="users" label="{translate key="manager.users"}">
<user-invitation-manager></user-invitation-manager>
Copy link
Collaborator

Choose a reason for hiding this comment

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

This line should use tabs like the rest of the file.

@withanage
Copy link
Member

@ewhanson all the strings with "Jourals" were also moved to journal locale

Copy link
Collaborator

@ewhanson ewhanson left a comment

Choose a reason for hiding this comment

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

Thanks so much, @ipula! Looks good now!

@ewhanson ewhanson merged commit 499f720 into pkp:main Oct 31, 2024
1 check passed
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