Merge branch 'develop' into feature/3660_withdraw_journal_continuation

.circleci/config.yml

@@ -14,6 +14,7 @@ jobs:
           - xpack.security.enabled: false
           - transport.host: localhost
           - discovery.type: single-node
+    parallelism: 4
 
     steps:
       - checkout
@@ -26,7 +27,8 @@ jobs:
           echo "ELASTICSEARCH_HOSTS = [{'host': 'localhost', 'port': 9200}]" > test.cfg
           python portality/cms/build_fragments.py
           python portality/cms/build_sass.py
-          pytest -v --color=yes --code-highlight=yes --log-level=DEBUG doajtest/unit
+          TESTS=$(circleci tests glob "doajtest/unit/**/*.py" | circleci tests split)
+          pytest -v --color=yes --code-highlight=yes --log-level=DEBUG $TESTS
 
     working_directory: ~/doaj
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -55,6 +55,10 @@ Instructions for reviewers:
   - [ ] Developer
   - [ ] Reviewer
 
+- Urls are constructed with `url_for` not hard-coded
+  - [ ] N/A
+  - [ ] Developer
+  - [ ] Reviewer
 ### Testing
 
 - Unit tests have been added/modified

cms/data/notifications.yml

@@ -3,38 +3,38 @@ application:assed:assigned:notify:
   long: |
     An application, or update request for the journal **{journal_title}** has been assigned to you by the Editor of your group **{group_name}**. Please start work on this within 10 days.
   short:
-    New application assigned to you
+    New application ({issns}) assigned to you
 
 application:assed:inprogress:notify:
   long: |
     The application for **{application_title}** has not passed review by an Editor or Managing Editor and has been assigned back to you with questions or changes.
   short:
-    One of your applications has not passed review
+    One of your applications ({issns}) has not passed review
 
 application:editor:completed:notify:
   long: |
     **{associate_editor}** has finished a review of the application for **{application_title}**
      and marked it as **Completed**. Please review within 5 working days.
   short:
-    Application marked as completed
+    Application ({issns}) marked as completed
 
 application:editor_group:assigned:notify:
   long: |
     A new application or an update request for the journal **{journal_name}** has been assigned to your group by a Managing Editor. Please assign this to an Associate Editor within 5 working days.
   short:
-    New application assigned to your group
+    New application ({issns}) assigned to your group
 
 application:editor:inprogress:notify:
   long: |
     The application for **{application_title}** has not passed review by a Managing Editor and has been assigned back to your group with questions or changes.
   short:
-    Application reverted to 'In Progress' by Managing Editor
+    Application ({issns}) reverted to 'In Progress' by Managing Editor
 
 application:maned:ready:notify:
   long: |
     The application for **{application_title}** has been marked **Ready** by **{editor}**. Please review it as soon as possible.
   short:
-    Application marked as ready
+    Application ({issns}) marked as ready
 
 application:publisher:accepted:notify:
   long: |
@@ -52,13 +52,13 @@ application:publisher:accepted:notify:
 
     We are delighted to welcome this journal into DOAJ. Do not hesitate to contact us at [[email protected]](mailto:[email protected]) if you have any questions.
   short:
-    Your journal has been accepted
+    Your journal ({issns}) has been accepted
 
 application:publisher:assigned:notify:
   long: |
     Your application for **{application_title}** submitted on {application_date} has been assigned to an editor for review for inclusion in the DOAJ. Please look out for further communications about the application. These may come from someone who is not using a DOAJ email address: [{volunteers_url}]({volunteers_url})
   short:
-    Your application has been assigned an editor for review
+    Your application ({issns}) has been assigned to an editor for review
 
 application:publisher:created:notify:
   long: |
@@ -72,15 +72,15 @@ application:publisher:created:notify:
 
     If you write to us, check first that there is nothing in your Spam folder from us or one of our volunteers. Our volunteers may not be emailing from a DOAJ email address so you can check that their name is there on this page [{volunteers_url}]({volunteers_url})
   short:
-    Your application to DOAJ has been received
+    Your application ({issns}) to DOAJ has been received
 
 application:publisher:inprogress:notify:
   long: |
     Your submission for **{title}** submitted on {date_applied} is now being reviewed by an Associate Editor.
 
     The Associate Editor ([{volunteers}]({volunteers})) may contact you by email with questions. They may not be using a doaj.org email address. These emails can end up in your Spam folder so please check your Spam folder regularly.
   short:
-    Your submission is under review
+    Your submission ({issns}) is under review
 
 application:publisher:quickreject:notify:
   long: |
@@ -90,13 +90,13 @@ application:publisher:quickreject:notify:
     
     You may submit a new application 6 months after the date of this email unless advised otherwise by a member of the DOAJ Editorial Team. Before you apply again, make any necessary changes to ensure your journal adheres to our criteria: ([{doaj_guide_url}]({doaj_guide_url}))
   short:
-    Your application was rejected
+    Your application ({issns}) was rejected
 
 application:publisher:revision:notify:
   long: |
     The update which you submitted for **{application_title}** on {date_applied} requires some revisions before it can be accepted. The Managing Editor reviewing your update will contact you to explain the changes that are needed.
   short:
-    Your update request needs revisions
+    Your update request ({issns}) needs revisions
 
 bg:job_finished:notify:
   long: |
@@ -108,29 +108,29 @@ journal:assed:assigned:notify:
   long: |
     The journal **{journal_name}** has been assigned to you by the Editor of your group **{group_name}**. Please start work on this within 10 days.
   short:
-    New journal assigned to you
+    New journal ({issns}) assigned to you
 
 journal:editor_group:assigned:notify:
   long: |
     The journal **{journal_name}** has been assigned to your group by a Managing Editor. Please assign this to an Associate Editor within 5 working days.
   short:
-    New journal assigned to your group
+    New journal ({issns}) assigned to your group
 
 update_request:publisher:accepted:notify:
   long: |
     Congratulations! The changes which you sent us for **{application_title}** on {application_date} have been reviewed and the journal record updated. Please note that some of the changes you suggested may have been omitted and replaced with other values by the Managing Editor who carried out the review. Review the journal record here: [{publisher_dashboard_url}]({publisher_dashboard_url}).
 
     Thank you for updating this journal and helping to keep the DOAJ database up-to-date.
   short:
-    Update request accepted
+    Update request ({issns}) accepted
 
 update_request:publisher:assigned:notify:
   long: |
     The update you submitted for **{application_title}** on {application_date} has been assigned to a Managing Editor for review.
 
     Thank you for helping to keep the DOAJ database up-to-date.
   short:
-    Your update request has been assigned an editor for review
+    Your update request ({issns}) has been assigned to an editor for review
 
 update_request:publisher:rejected:notify:
   long: |
@@ -140,7 +140,7 @@ update_request:publisher:rejected:notify:
 
     - We already have one active update in the system. Additional updates are rejected without review.
   short:
-    Your update request was rejected
+    Your update request ({issns}) was rejected
 
 journal:assed:discontinuing_soon:notify:
   long: |

cms/data/sponsors.yml

@@ -94,6 +94,10 @@ bronze:
   url: https://www.iop.org/
   logo: iop.jpg
 
+- name: International Union for Conservation of Nature
+  url: https://iucn.org/
+  logo: IUCN.svg
+
 - name: JMIR Publications
   url: https://jmirpublications.com/
   logo: jmir.svg
@@ -106,6 +110,10 @@ bronze:
   url: https://www.keaipublishing.com/
   logo: keai.svg
 
+- name: NERAC Inc.
+  url: https://www.nerac.com/
+  logo: nerac.jpg
+
 - name: OASPA
   url: https://oaspa.org/
   logo: oaspa.png

cms/pages/about/at-20.md

@@ -12,9 +12,11 @@ featuremap: ~~At20:Fragment~~
 
 We are celebrating 20 years of being an important part of open infrastructure with a year-long campaign throughout 2023, and we want to invite you to be a part of our celebrations!
 
-We are holding three events for our community around the themes: ['Open', 'Global', and 'Trusted'](https://drive.google.com/file/d/1tw0d_Ztl09AQS_6L-VP1CqR3jtZ1iw5h/view?usp=sharing). Details about these events and how you can join them will be available on this page. We will also share interviews with key individuals who have shaped DOAJ into what it is today.
+We are holding three events for our community around the themes: ['Open', 'Global', and 'Trusted'](https://drive.google.com/file/d/1tw0d_Ztl09AQS_6L-VP1CqR3jtZ1iw5h/view?usp=sharing). Full details about these events and how you can join them are available on this page.
 
-Further down the page is a historical timeline to give you a full overview of DOAJ’s important milestones from 2003 to today.
+Below is a historical timeline providing an overview of DOAJ’s important milestones from 2003 to today.
+
+There is also an opportunity for you to [support DOAJ during its 20th year](/at-20/#support-our-anniversary-campaign) via Paypal.
 
 ---
 

cms/sass/components/_dropdown.scss

@@ -15,6 +15,10 @@
   }
 }
 
+.dropdown--notifications {
+  @extend .dropdown;
+}
+
 .dropdown__menu {
   display: none;
   padding: 0;

cms/sass/layout/_editorial-panel.scss

@@ -14,7 +14,7 @@
   @media (min-width: 992px) {
     position: -webkit-sticky;
     position: sticky;
-    top: 55px; // sticky header + 5px
+    top: 100px;
 
     &__content {
       max-height: 70vh;

cms/tours/dashboard_ed.yml

@@ -0,0 +1,12 @@
+steps:
+  - selector: '#group-tab'
+    title: Your group activity
+    content: This panel allows you to see how many applications your group has and their status, and which Associates need more applications.
+
+  - selector: '#group-tab ul.progress-bar'
+    title: Progress bar
+    content: Click any coloured block to open the list of applications.
+
+  - selector: "#feature_tour_nav"
+    title: Want to see the tour again?
+    content: Take the tour again by selecting it from the Feature Tours menu.

cms/tours/dashboard_ed_assed.yml

@@ -0,0 +1,48 @@
+steps:
+  - selector: header h1
+    title: Welcome to your dashboard!
+    content: Your dashboard is the starting point for your work and shows you a prioritised list of the applications that you have to work on.
+
+  - selector: "nav.vertical-nav a[href='/editor/']"
+    title: Navigation
+    content: Use the buttons here on the left to navigate around.
+
+  - selector: nav dl
+    title: Your groups
+    content: The groups that you are a member of and the email address of your Editor or Managing Editor are shown here.
+
+  - selector: "#notifications_nav"
+    title: Notifications
+    content: Notifications that you receive by email can also be found here. Click 'See all notifications' to find old notifications.
+
+  - selector: "header h1"
+    title: Your prioritised list
+    content: Each application is shown as a "card". The cards are arranged in date and priority order, from left to right. 
+      They are also categorised by colour. Click a card to open the application so you can start your work.
+
+  - selector: "header h1"
+    title: "Each card contains:"
+    content: |
+      <div>
+      <div><img src="/assets/img/tours/dashboard-ed-assed/card.png" alt="Dashboard card screenshot"></div>
+      <div><ol>
+        <li>The date the application was submitted.</li>
+        <li>The application's status.</li>
+        <li>What you need to do with the application.</li>
+        <li>The journal's title.</li>
+        <li>Which group the application is assigned to.</li>
+        <li>To who the application is assigned.</li>
+      </ol></div>
+      </div>
+
+  - selector: "#logout"
+    title: Log out
+    content: "You can now log out or update your account from the bottom of your dashboard."
+
+  - selector: "#doaj_home"
+    title: "DOAJ Home"
+    content: "To get back to the main DOAJ website, click 'DOAJ HOME' in the top right corner"
+
+  - selector: "#feature_tour_nav"
+    title: Want to see the tour again?
+    content: Take the tour again by selecting it from the Feature Tours menu.

doajtest/helpers.py

@@ -181,6 +181,10 @@ def tearDown(self):
                 pass  # could be removed by other thread / process
         shutil.rmtree(paths.rel2abs(__file__, "..", "tmp"), ignore_errors=True)
 
+        self.reset_db_record()
+
+    @staticmethod
+    def reset_db_record():
         global CREATED_INDICES
         if len(CREATED_INDICES) > 0:
             dao.DomainObject.destroy_index()

doajtest/matrices/bll_todo_assed/top_todo_assed.matrix.csv

@@ -0,0 +1,4 @@
+test_id,account,raises,todo_associate_follow_up_old,todo_associate_progress_stalled,todo_associate_start_pending,todo_associate_all_applications,todo_associate_follow_up_old_order,todo_associate_progress_stalled_order,todo_associate_start_pending_order,todo_associate_all_applications_order
+1,none,ArgumentException,0,0,0,0,,,,
+2,no_role,,0,0,0,0,,,,
+3,assed,,1,1,1,4,1,2,3,4

doajtest/matrices/bll_todo_assed/top_todo_assed.settings.csv

@@ -0,0 +1,26 @@
+field,test_id,account,raises,todo_associate_follow_up_old,todo_associate_progress_stalled,todo_associate_start_pending,todo_associate_all_applications,todo_associate_follow_up_old_order,todo_associate_progress_stalled_order,todo_associate_start_pending_order,todo_associate_all_applications_order
+type,index,generated,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional,conditional
+default,,,,,,,,,,,
+,,,,,,,,,,,
+values,,none,ArgumentException,,,,,,,,
+values,,no_role,,,,,,,,,
+values,,assed,,,,,,,,,
+,,,,,,,,,,,
+conditional raises,,none,ArgumentException,,,,,,,,
+,,,,,,,,,,,
+conditional todo_associate_follow_up_old,,assed,,1,,,,,,,
+conditional todo_associate_follow_up_old,,!assed,,0,,,,,,,
+,,,,,,,,,,,
+conditional todo_associate_progress_stalled,,assed,,,1,,,,,,
+conditional todo_associate_progress_stalled,,!assed,,,0,,,,,,
+,,,,,,,,,,,
+conditional todo_associate_start_pending,,assed,,,,1,,,,,
+conditional todo_associate_start_pending,,!assed,,,,0,,,,,
+,,,,,,,,,,,
+conditional todo_associate_all_applications,,assed,,,,,4,,,,
+conditional todo_associate_all_applications,,!assed,,,,,0,,,,
+,,,,,,,,,,,
+conditional todo_associate_follow_up_old_order,,assed,,,,,,1,,,
+conditional todo_associate_progress_stalled_order,,assed,,,,,,,2,,
+conditional todo_associate_start_pending_order,,assed,,,,,,,,3,
+conditional todo_associate_all_applications_order,,assed,,,,,,,,,4