DOAJ · philipkcl · Mar 4, 2024 · Mar 4, 2024 · Mar 4, 2024 · Mar 4, 2024
diff --git a/cms/data/nav.yml b/cms/data/nav.yml
@@ -79,8 +79,6 @@ entries:
         route: apply.public_application   # ~~->Apply:WebRoute~~
       - label: Guide to applying
         route: doaj.guide             # ~~->ApplicationGuide:WebRoute~~
-      - label: The DOAJ Seal
-        route: doaj.seal              # ~~->Seal:WebRoute~~
       - label: Transparency & best practice
         route: doaj.transparency      # ~~->Transparency:WebRoute~~
       - label: Publisher information

diff --git a/cms/pages/apply/seal.md b/cms/pages/apply/seal.md
diff --git a/doajtest/example_files/incoming_application.json b/doajtest/example_files/incoming_application.json
@@ -11,9 +11,7 @@
 		},
 		"article": {
 			"license_display": ["Embed"],
-			"license_display_example_url": "http://licence.embedded",
-			"orcid": "True",
-			"i4oc_open_citations": "False"
+			"license_display_example_url": "http://licence.embedded"
 		},
 		"boai": "True",
 		"copyright": {

diff --git a/doajtest/fixtures/article.py b/doajtest/fixtures/article.py
@@ -165,7 +165,6 @@ def make_article_apido_struct():
     "id": "abcdefghijk_article",
     "admin": {
         "in_doaj": True,
-        "seal": False,
         "publisher_record_id": "some_identifier",
         "upload_id": "zyxwvutsrqpo_upload_id"
     },
@@ -240,7 +239,6 @@ def make_article_apido_struct():
         "admin": {
             "fields": {
                 "in_doaj": {"coerce": "bool", "get__default": False},
-                "seal": {"coerce": "bool", "get__default": False},
                 "publisher_record_id": {"coerce": "unicode"},
                 "upload_id": {"coerce": "unicode"}
             }

diff --git a/doajtest/fixtures/v2/applications.py b/doajtest/fixtures/v2/applications.py
@@ -4,7 +4,7 @@
 import rstr
 
 from portality import constants, regex
-from doajtest.fixtures.v2.common import JOURNAL_LIKE_BIBJSON, EDITORIAL_FORM_EXPANDED, SUBJECT_FORM_EXPANDED, NOTES_FORM_EXPANDED, OWNER_FORM_EXPANDED, SEAL_FORM_EXPANDED
+from doajtest.fixtures.v2.common import JOURNAL_LIKE_BIBJSON, EDITORIAL_FORM_EXPANDED, SUBJECT_FORM_EXPANDED, NOTES_FORM_EXPANDED, OWNER_FORM_EXPANDED
 from doajtest.fixtures.v2.journals import JOURNAL_FORM_EXPANDED, JOURNAL_FORM
 from portality.lib import dates
 from portality.lib.dates import FMT_DATE_YM, FMT_YEAR
@@ -123,7 +123,6 @@ def make_application_spread(cls, desired_output, period):
         ],
         "owner" : "publisher",
         "related_journal" : "987654321123456789",
-        "seal": False,
         "date_applied" : "2003-01-01T00:00:00Z"
     },
     "bibjson" : JOURNAL_LIKE_BIBJSON
@@ -155,7 +154,6 @@ def make_application_spread(cls, desired_output, period):
 APPLICATION_FORM_EXPANDED.update(deepcopy(SUBJECT_FORM_EXPANDED))
 APPLICATION_FORM_EXPANDED.update(deepcopy(OWNER_FORM_EXPANDED))
 APPLICATION_FORM_EXPANDED.update(deepcopy(EDITORIAL_FORM_EXPANDED))
-APPLICATION_FORM_EXPANDED.update(deepcopy(SEAL_FORM_EXPANDED))
 APPLICATION_FORM_EXPANDED.update(deepcopy(WORKFLOW_FORM_EXPANDED))
 
 from portality.crosswalks.application_form import ApplicationFormXWalk

diff --git a/doajtest/fixtures/v2/common.py b/doajtest/fixtures/v2/common.py
@@ -24,10 +24,6 @@
     "editor": "associate"
 }
 
-SEAL_FORM_EXPANDED = {
-    "doaj_seal": [],
-}
-
 JOURNAL_LIKE_BIBJSON = {
     "alternative_title": "Alternative Title",
     "apc": {
@@ -39,9 +35,7 @@
     },
     "article": {
         "license_display": ["Embed"],
-        "license_display_example_url": "http://licence.embedded",
-        "orcid": True,
-        "i4oc_open_citations": False
+        "license_display_example_url": "http://licence.embedded"
     },
     "boai": True,
     "copyright": {
@@ -175,8 +169,6 @@
     "title": "The Title",
     "has_other_charges" : "y",
     "has_waiver" : "y",
-    "orcid_ids" : "y",
-    "open_citations" : "n",
     "deposit_policy_url" : "http://deposit.policy",
     "continues": ["1111-1111"],
     "continued_by": ["2222-2222"],

diff --git a/doajtest/fixtures/v2/journals.py b/doajtest/fixtures/v2/journals.py
@@ -5,7 +5,7 @@
 import rstr
 
 from doajtest.fixtures.v2.common import EDITORIAL_FORM_EXPANDED, SUBJECT_FORM_EXPANDED, NOTES_FORM_EXPANDED, \
-    OWNER_FORM_EXPANDED, SEAL_FORM_EXPANDED, JOURNAL_LIKE_BIBJSON, JOURNAL_LIKE_BIBJSON_FORM_EXPANDED
+    OWNER_FORM_EXPANDED, JOURNAL_LIKE_BIBJSON, JOURNAL_LIKE_BIBJSON_FORM_EXPANDED
 from portality.regex import ISSN_COMPILED
 
 
@@ -78,7 +78,6 @@ def question_answers():
             {"application_id": "asdfghjkl", "date_accepted": "2018-01-01T00:00:00Z"},
             {"application_id": "zxcvbnm"}
         ],
-        "seal": False,
         "ticked": True
     },
     "bibjson": JOURNAL_LIKE_BIBJSON
@@ -87,7 +86,6 @@ def question_answers():
 JOURNAL_FORM_EXPANDED = {}
 JOURNAL_FORM_EXPANDED.update(JOURNAL_LIKE_BIBJSON_FORM_EXPANDED)
 JOURNAL_FORM_EXPANDED.update(EDITORIAL_FORM_EXPANDED)
-JOURNAL_FORM_EXPANDED.update(SEAL_FORM_EXPANDED)
 JOURNAL_FORM_EXPANDED.update(SUBJECT_FORM_EXPANDED)
 JOURNAL_FORM_EXPANDED.update(NOTES_FORM_EXPANDED)
 JOURNAL_FORM_EXPANDED.update(OWNER_FORM_EXPANDED)
@@ -98,7 +96,6 @@ def question_answers():
 
 JOURNAL_BULK_EDIT = {
     "publisher": "Test Publisher",
-    "doaj_seal": True,
     "country": "DZ",
     "platform": "HighWire",
     "contact_email": "[email protected]",
@@ -124,13 +121,11 @@ def question_answers():
     "License attributes",
     "URL for license terms",
     "Machine-readable CC licensing information embedded or displayed in articles",
-    "URL to an example page with embedded licensing information",
     "Author holds copyright without restrictions",
     "Copyright information URL",
     "Review process",
     "Review process information URL",
     "Journal plagiarism screening policy",
-    "Plagiarism information URL",
     "URL for journal's aims & scope",
     "URL for the Editorial Board page",
     "URL for journal's instructions for authors",
@@ -148,15 +143,12 @@ def question_answers():
     "Deposit policy directory",
     "URL for deposit policy",
     "Persistent article identifiers",
-    "Article metadata includes ORCIDs",
-    "Journal complies with I4OC standards for open citations",
     "Does the journal comply to DOAJ's definition of open access?",
-    "URL for journal's Open Access statement",
     "Continues",
     "Continued By",
     "LCC Codes",
+    "Subscribe to Open",
     'Subjects',  # (added outside journal2questions)
-    'DOAJ Seal',  # (added outside journal2questions)
     'Added on Date',  # (added outside journal2questions)
     'Last updated Date',  # (added outside journal2questions)
     # 'Tick: Accepted after March 2014', Removed 2020-12-11
@@ -181,13 +173,11 @@ def question_answers():
     'Attribution, No Commercial Usage',
     'http://licence.url',
     'Yes',
-    'http://licence.embedded',
     'Yes',
     'http://copyright.com',
     'Open peer review, some bloke checks it out',
     'http://review.process',
     'Yes',
-    'http://plagiarism.screening',
     'http://aims.scope',
     'http://editorial.board',
     'http://author.instructions.com',
@@ -206,9 +196,6 @@ def question_answers():
     "http://deposit.policy",
     'DOI, ARK, PURL, PIDMachine',
     'Yes',
-    'No',
-    'Yes',
-    'http://oa.statement',
     "1111-1111",
     "2222-2222",
     "HB1-3840|H|SF600-1100",

diff --git a/doajtest/helpers.py b/doajtest/helpers.py
@@ -162,7 +162,8 @@ def create_app_patch(cls):
             "UR_CONCURRENCY_TIMEOUT": 0,
             'UPLOAD_ASYNC_DIR': paths.create_tmp_path(is_auto_mkdir=True).as_posix(),
             'HUEY_IMMEDIATE': True,
-            'HUEY_ASYNC_DELAY': 0
+            'HUEY_ASYNC_DELAY': 0,
+            'URLSHORT_ALLOWED_SUPERDOMAINS': ['doaj.org', 'localhost', '127.0.0.1']
         }
 
     @classmethod

diff --git a/doajtest/mocks/preservation.py b/doajtest/mocks/preservation.py
@@ -35,7 +35,6 @@ class PreservationMock:
             ],
             "unpunctitle": "Variation in TMEM106B in chronic traumatic encephalopathy",
             "asciiunpunctitle": "Variation in TMEM106B in chronic traumatic encephalopathy",
-            "has_seal": "Yes",
             "doi": "10.1186/s40478-018-0619-9",
             "fulltext": "//link.springer.com/article/10.1186/s40478-018-0619-9",
             "schema_codes_tree": [
@@ -47,8 +46,7 @@ class PreservationMock:
         },
         "last_updated": "2020-11-24T21:55:20Z",
         "admin": {
-            "in_doaj": "true",
-            "seal": "true"
+            "in_doaj": "true"
         },
         "created_date": "2018-11-04T12:37:46Z",
         "id": "00003741594643f4996e2555a01e03c7",
@@ -260,7 +258,6 @@ class PreservationMock:
             ],
             "unpunctitle": "Variation in TMEM106B in chronic traumatic encephalopathy",
             "asciiunpunctitle": "Variation in TMEM106B in chronic traumatic encephalopathy",
-            "has_seal": "Yes",
             "doi": "10.3389/fcosc.2022.1028295",
             "fulltext": "https://frontiersin.org/articles/10.3389/fcosc.2022.1028295",
             "schema_codes_tree": [
@@ -272,8 +269,7 @@ class PreservationMock:
         },
         "last_updated": "2020-11-24T21:55:20Z",
         "admin": {
-            "in_doaj": "true",
-            "seal": "true"
+            "in_doaj": "true"
         },
         "created_date": "2018-11-04T12:37:46Z",
         "id": "00005741594643f4996e2666a01e0310",

diff --git a/doajtest/selenium_helpers.py b/doajtest/selenium_helpers.py
@@ -1,7 +1,6 @@
 import datetime
 import logging
 import multiprocessing
-import time
 from multiprocessing import Process, freeze_support
 from typing import TYPE_CHECKING
 
@@ -15,6 +14,7 @@
 from portality.util import patch_config
 from portality import app, models, core
 from portality.dao import ESMappingMissingError
+from portality.lib.thread_utils import wait_until
 
 if TYPE_CHECKING:
     from selenium.webdriver.remote.webdriver import WebDriver
@@ -119,7 +119,7 @@ def setUp(self):
         self.selenium.set_window_size(1400, 1000)  # avoid something is not clickable
 
         # wait for server to start
-        wait_unit(self._is_doaj_server_running, 10, 1.5, timeout_msg='doaj server not started')
+        wait_until(self._is_doaj_server_running, 10, 1.5, timeout_msg='doaj server not started')
 
         fix_index_not_found_exception(self.app_test)
         self.fix_es_mapping()
@@ -144,7 +144,8 @@ def _is_doaj_server_running(self):
             self.selenium.find_element(By.CSS_SELECTOR, 'div.container')
             log.info('doaj server is running')
             return True
-        except selenium.common.exceptions.NoSuchElementException:
+        except (selenium.common.exceptions.NoSuchElementException,
+                selenium.common.exceptions.WebDriverException):
             log.info('doaj server is not running')
             return False
 
@@ -160,12 +161,12 @@ def tearDown(self):
         print(f'{datetime.datetime.now().isoformat()} --- doaj process terminating...')
         self.doaj_process.terminate()
         self.doaj_process.join()
-        wait_unit(lambda: not self._is_doaj_server_running(), 10, 1,
-                  timeout_msg='doaj server is still running')
+        wait_until(lambda: not self._is_doaj_server_running(), 10, 1,
+                   timeout_msg='doaj server is still running')
 
         self.selenium.quit()
 
-        wait_unit(self._is_selenium_quit, 10, 1, timeout_msg='selenium is still running')
+        wait_until(self._is_selenium_quit, 10, 1, timeout_msg='selenium is still running')
         print('selenium terminated')
 
         super().tearDown()
@@ -220,17 +221,7 @@ def login_by_acc(driver: 'WebDriver', acc: models.Account = None):
     assert "/login" not in driver.current_url
 
 
-def wait_unit(exit_cond_fn, timeout=10, check_interval=0.1,
-              timeout_msg="wait_unit but exit_cond timeout"):
-    start = time.time()
-    while (time.time() - start) < timeout:
-        if exit_cond_fn():
-            return
-        time.sleep(check_interval)
-    raise TimeoutError(timeout_msg)
-
-
-def wait_unit_elements(driver: 'WebDriver', css_selector: str, timeout=10, check_interval=0.1):
+def wait_until_elements(driver: 'WebDriver', css_selector: str, timeout=10, check_interval=0.1):
     elements = []
 
     def exit_cond_fn():
@@ -241,11 +232,11 @@ def exit_cond_fn():
         except:
             return False
 
-    wait_unit(exit_cond_fn, timeout, check_interval)
+    wait_until(exit_cond_fn, timeout=timeout, sleep_time=check_interval)
     return elements
 
 
-def wait_unit_click(driver: 'WebDriver', css_selector: str, timeout=10, check_interval=0.1):
+def wait_until_click(driver: 'WebDriver', css_selector: str, timeout=10, check_interval=0.1):
     def _click():
         try:
             ele = find_ele_by_css(driver, css_selector)
@@ -256,11 +247,11 @@ def _click():
         except (StaleElementReferenceException, ElementClickInterceptedException):
             return False
 
-    wait_unit(_click, timeout=10, check_interval=0.1)
+    wait_until(_click, timeout=timeout, sleep_time=check_interval)
 
 
 def click_edges_item(driver: 'WebDriver', ele_name, item_name):
-    wait_unit_click(driver, f'#edges-bs3-refiningand-term-selector-toggle-{ele_name}')
+    wait_until_click(driver, f'#edges-bs3-refiningand-term-selector-toggle-{ele_name}')
     for ele in find_eles_by_css(driver, f'.edges-bs3-refiningand-term-selector-result-{ele_name} a'):
         if item_name in ele.text.strip():
             ele.click()