merge develop

.circleci/config.yml

@@ -4,6 +4,7 @@ orbs:
 
 jobs:
   build-and-test:
+
     docker:
       - image: cimg/python:3.8.10
         environment:
@@ -13,6 +14,8 @@ jobs:
           - xpack.security.enabled: false
           - transport.host: localhost
           - discovery.type: single-node
+    parallelism: 4
+
     steps:
       - checkout
       - run: git submodule update --init --recursive
@@ -24,7 +27,11 @@ 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
+
 
 workflows:
   unit_tests:
@@ -34,4 +41,4 @@ workflows:
             branches:
               ignore:
                 - /release\/.*/
-                - static_pages
+                - static_pages

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,12 +9,12 @@ assignees: ''
 
 Warning: don’t send us your passwords or API keys.
 
-**Contact details of bug reporter (or proxy of bug reporter)** 
+**Your contact details** 
 
 
-**User account you are logged in to when this occurred**
-The account’s e-mail address
-*please do not send password or API keys. this is a public ticketing system. if you do not want to put your email address here, please send the information below to us in an email instead.*
+**Your DOAJ user account ID that you are logged in with**
+The account’s e-mail address or account ID
+*please do not send password or API keys. this is a public ticketing system. if you do not want to put your email address here, please send the information below to us in [an email instead](mailto:[email protected]).*
 
 
 **Where this happened**
@@ -23,7 +23,8 @@ e.g. in the UI, API, OAI and which URL you were trying to access.
 
 
 **When this happened**
-What date and time; if it happened several times: a date range or all dates and times it happened. 
+What date and time? (Use UTC time.) If it happened several times: a date range or all dates and times it happened.
+Can you reproduce the error again if you try now?
 
 
 **What happened**
@@ -62,5 +63,11 @@ If applicable, add screenshots to help explain your problem.
  - Version [e.g. 22]
 
 
+**Do you have a Cloudflare Ray ID?
+Have you been blocked by Cloudflare?
+ - Path accessed (e.g. /api/v2/articles)
+ - supplied content if possible.
+
+
 **Additional context**
 Add any other context about the problem here, such as copies of the XML data you were trying to send.

.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
@@ -72,6 +76,11 @@ Instructions for reviewers:
   - [ ] Developer
   - [ ] Reviewer
 
+- Have CSS/style changes been implemented?  If they are of a global scope (e.g. on base HTML elements) have the downstream impacts of the change in other areas of the system been considered?
+  - [ ] N/A
+  - [ ] Developer
+  - [ ] Reviewer
+
 ### Documentation
 
 - FeatureMap annotations have been added

cms/data/advisory-board-council.yml

@@ -137,12 +137,6 @@ council:
   coi:
     2019: https://drive.google.com/file/d/1S2H8XZwWkZzB8oYjRFxuKX6A2AQKh-2O/view?usp=sharing
 
-- name: Shelley Allen
-  institution: Emerald Publishing
-  country: United Kingdom
-  coi:
-    2019: https://drive.google.com/file/d/1Mp4vRvmB3Layl9EiaKVXZZjjpxvXWskX/view?usp=sharing
-
 - name: Stephanie Savage
   institution: University of British Columbia
   country: Canada

cms/data/ambassadors.yml

@@ -3,7 +3,7 @@
 
 - name: Adrian Stanley
   region: North America
-  bio: "Adrian is past President of the <a href='https://www.sspnet.org/' target='_blank'>Society for Scholarly Publishing</a> (SSP). He has previously lived and worked in China and is well connected with the global publishing community, especially in places like Brazil (<a href='https://scielo.org/en/' target='_blank'>SciELO</a>) and Japan (<a href='https://www.jstage.jst.go.jp/' target='_blank'>J-STAGE</a>). He was also Managing Director, Publishers for <a href='https://www.digital-science.com/about-us/' target='_blank'>Digital Science</a>. Adrian serves on NISO’s <a href='https://www.niso.org/topic-committees/information-discovery-interchange' target='_blank'>Information Discovery and Interchange Topic Committee</a>, and he is currently the General Manager at <a href='https://www.jmirpublications.com/' target='_blank'>JMIR Publications</a>."
+  bio: "Adrian is past President of the <a href='https://www.sspnet.org/' target='_blank'>Society for Scholarly Publishing</a> (SSP). He has previously lived and worked in China and is well connected with the global publishing community, especially in places like Brazil (<a href='https://scielo.org/en/SciELO' target='_blank'>Scielo</a>) and Japan (<a href='https://www.jstage.jst.go.jp/' target='_blank'>J-STAGE</a>). He was also Managing Director, Publishers for <a href='https://www.digital-science.com/about-us/' target='_blank'>Digital Science</a>. Adrian serves on the <a href='https://www.oaswitchboard.org/about' target='_blank'>OA Switchboard</a> Client Advisor Group, and is the Chair of the <a href='https://fullyoapublishers.org/' target='_blank'>Fully OA Publishers Group</a> (a sub group formed out of OASPA working group), he is currently an Independent Contractor, and advisor for <a href='https://www.jmirpublications.com/' target='_blank'>JMIR Publications</a>, <a href='http://dataseer.ai/' target='_blank'>DataSeer.ai</a> and <a href='http://underline.io/' target='_blank'>Underline.io</a>."
   photo: "Adrian.png"
   coi:
     2022: https://drive.google.com/file/d/1CC6bqk_JF_kovY6Z-SVhv01epY7dcYWq/view?usp=sharing
@@ -42,6 +42,13 @@
   photo: "hyun-jung-yi.png"
   coi:
 
+- name: Ikhwan Arief
+  region: Indonesia
+  bio: "Ikhwan is a faculty member in the Industrial Engineering Department at Universitas Andalas, Indonesia. He is an enthusiastic photography hobbyist. He joined DOAJ in 2018 as an ambassador and gradually became a volunteer editor. He used to manage the university's library information system, including establishing the online public access catalogue (OPAC) and the repository servers. He is keenly interested in data science, primarily in industrial and manufacturing systems research. He has been assisting Indonesian journal managers in their application to DOAJ."
+  photo: "ikhwan.jpg"
+  coi:
+    2022: https://drive.google.com/file/d/1bmVVvMAPToLQCHGOfNz0D80xi4WyZhwn/view?usp=sharing
+
 - name: Ina Smith
   region: Southern Africa
   bio: "Ina holds a Master’s Degree from the University of Pretoria (South Africa) in Computer-Integrated Education, a Higher Education Teaching Diploma, and two degrees (BBibl and BBibl Honors) in Library and Information Science. She is Planning Manager at the Academy of Science of South Africa, and has vast experience of Open Access in general, scholarly research activities, repositories, and Open Access journal management and publishing."

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,5 +140,10 @@ 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: |
+    Journal "{title}" (id: {id}) will discontinue in {days} days.
+  short:
+     Journal discontinuing

cms/data/publisher-supporters.yml

@@ -25,3 +25,6 @@
 
 - name: Springer Nature
   url: https://www.springernature.com/gp
+
+- name: Tsinghua University Press
+  url: https://www.tsinghua.edu.cn/en/

cms/data/sponsors.yml

@@ -20,10 +20,6 @@ silver:
   url: https://www.cappelendammundervisning.no/
   logo: cda.jpg
 
-- name: Cambridge University Press
-  url: https://www.cambridge.org/
-  logo: cambridge.svg
-
 - name: Copernicus Publications
   url: https://publications.copernicus.org
   logo: copernicus.svg
@@ -35,10 +31,6 @@ silver:
 - name: Frontiers
   url: https://www.frontiersin.org/
   logo: frontiers.svg
-
-- name: JMIR Publications
-  url: https://jmirpublications.com/
-  logo: jmir.svg
 
 - name: Knowledge E
   url: https://knowledgee.com/
@@ -47,6 +39,10 @@ silver:
 - name: MDPI
   url: https://www.mdpi.com/
   logo: mdpi.svg  
+
+- name: OA.Works
+  url: https://oa.works/
+  logo: oaworks.png
 
 - name: SAGE Publishing
   url: https://www.sagepublications.com/
@@ -69,6 +65,10 @@ bronze:
 - name: American Psychological Association
   url: https://www.apa.org/pubs
   logo: apa.png
+
+- name: Cambridge University Press
+  url: https://www.cambridge.org/
+  logo: cambridge.svg
 
 - name: Digital Science
   url: https://www.digital-science.com/
@@ -93,6 +93,14 @@ bronze:
 - name: Institute of Physics
   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
 
 - name: Karger
   url: https://www.karger.com/
@@ -102,6 +110,14 @@ 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
+
 - name: OCLC
   url: https://www.oclc.org/
   logo: oclc.svg
@@ -113,6 +129,10 @@ bronze:
 - name: SciFree
   url: https://scifree.se/
   logo: scifree.svg
+
+- name: The IET
+  url: https://www.theiet.org/
+  logo: iet.svg
 
 - name: Ubiquity Press
   url: https://www.ubiquitypress.com/