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

Feature/4007 remove the seal #2458

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
2 changes: 0 additions & 2 deletions cms/data/nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
56 changes: 0 additions & 56 deletions cms/pages/apply/seal.md

This file was deleted.

4 changes: 1 addition & 3 deletions doajtest/example_files/incoming_application.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
},
"article": {
"license_display": ["Embed"],
"license_display_example_url": "http://licence.embedded",
Copy link
Contributor

Choose a reason for hiding this comment

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

These fields are not being removed from the data, only from the display, so they should still be allowed in the incoming application

"orcid": "True",
"i4oc_open_citations": "False"
"license_display_example_url": "http://licence.embedded"
},
"boai": "True",
"copyright": {
Expand Down
2 changes: 0 additions & 2 deletions doajtest/fixtures/article.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"}
}
Expand Down
4 changes: 1 addition & 3 deletions doajtest/fixtures/v2/applications.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions doajtest/fixtures/v2/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
"editor": "associate"
}

SEAL_FORM_EXPANDED = {
"doaj_seal": [],
}

JOURNAL_LIKE_BIBJSON = {
"alternative_title": "Alternative Title",
"apc": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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"],
Expand Down
17 changes: 2 additions & 15 deletions doajtest/fixtures/v2/journals.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -98,7 +96,6 @@ def question_answers():

JOURNAL_BULK_EDIT = {
"publisher": "Test Publisher",
"doaj_seal": True,
"country": "DZ",
"platform": "HighWire",
"contact_email": "[email protected]",
Expand All @@ -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",
Expand All @@ -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
Expand All @@ -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',
Expand All @@ -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",
Expand Down
8 changes: 2 additions & 6 deletions doajtest/mocks/preservation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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",
Expand Down Expand Up @@ -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": [
Expand All @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions doajtest/testbook/bulk_edit/journals_articles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ tests:
metadata ..."'
results:
- 'Form unfold below the pull down that includes fields: "Publisher", "Platform,
Host or Aggregator", "Country", "Owner", "Contact Name", "Contact''s email address",
"Qualifies for Seal"'
Host or Aggregator", "Country", "Owner", "Contact Name", "Contact''s email address"'
- step: Input value for one or many of the fields
- step: Click "Submit" button
results:
Expand Down
2 changes: 0 additions & 2 deletions doajtest/testbook/new_application_form/maned_form.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ tests:
- A "SAVE" button is available
- Status, Re-assign publisher account, Continuation Information and Subject Classification
sections are available
- Award the Seal is available
- The Journal Labels section is available, offering one option for "Subscribe to Open"
- The main application form questions are available
- The Notes section is available
Expand Down Expand Up @@ -57,7 +56,6 @@ tests:
- The form saves
- The changes you applied, both to the form, and in the functionality box, have
been saved
- The form saved without requiring answers to the ORCiD and I4OA questions.
- step: Click "Unlock and Close"
results:
- The page closes, and you are able to return to the search interface
Expand Down
6 changes: 0 additions & 6 deletions doajtest/testbook/public_site/public_search.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ tests:
role: anonymous
steps:
- step: Go to the DOAJ search page at /search/journals
- step: Under 'See journals' facet on the left, click 'With a DOAJ Seal'
results:
- All Journals have the DOAJ Seal displayed in the search results
- step: Clear the "Journal has DOAJ Seal" filter
results:
- All Journals are shown
- step: Open the facet "Journal License"
- step: Select any CC licence from this facet
results:
Expand Down
3 changes: 2 additions & 1 deletion doajtest/unit/api_tests/test_apiv3_crud_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ def test_01_incoming_application_do(self):
del data["bibjson"]["plagiarism"]["url"]
with self.assertRaises(SeamlessException):
ia = IncomingApplication(data)
self.assertTrue(ia.data["bibjson"]["plagiarism"]["detection"])
self.assertTrue("url" in ia.data["bibjson"]["plagiarism"])

# embedded licence but no url
data = ApplicationFixtureFactory.incoming_application()
Expand Down Expand Up @@ -402,7 +404,6 @@ def test_05_outgoing_application_do(self):
assert "notes" not in oa.data.get("admin", {})
assert "editor_group" not in oa.data.get("admin", {})
assert "editor" not in oa.data.get("admin", {})
assert "seal" not in oa.data.get("admin", {})
assert "related_journal" not in oa.data.get("admin", {})

# check that it does contain admin information that it should
Expand Down
1 change: 0 additions & 1 deletion doajtest/unit/api_tests/test_apiv3_dataobj.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def check_do(self, do):

assert do.data["admin"]["in_doaj"] is self.jm.is_in_doaj(), 'actual val {0} is of type {1}'.format(do.admin.in_doaj, type(do.admin.in_doaj))
assert do.data["admin"]["ticked"] is self.jm.is_ticked() # it's not set in the journal fixture so we expect a None back
assert do.data["admin"]["seal"] is self.jm.has_seal()

# assert isinstance(do.data["bibjson"], dataobj.DataObj), 'Declared as "object" but not a Data Object?'
assert do.data["bibjson"]["title"] == self.jm.bibjson().title
Expand Down
Loading