Merge branch 'feature/3573_autocheck_article_uploaded' into develop

doajtest/fixtures/accounts.py

@@ -85,9 +85,12 @@ def create_publisher_a():
     return publisher
 
 
-def create_maned_a():
+def create_maned_a(save=False):
     from portality import models
     maned = models.Account(**AccountFixtureFactory.make_managing_editor_source())
+    maned.set_password("password")
+    if save:
+        maned.save(blocking=True)
     return maned
 
 

doajtest/fixtures/v2/common.py

@@ -25,7 +25,7 @@
 }
 
 SEAL_FORM_EXPANDED = {
-    "doaj_seal": False,
+    "doaj_seal": [],
 }
 
 JOURNAL_LIKE_BIBJSON = {

doajtest/helpers.py

@@ -437,9 +437,9 @@ def assert_expected_dict(test_case: TestCase, target, expected: dict):
     test_case.assertDictEqual(actual, expected)
 
 
-def login(app_client, username, password, follow_redirects=True):
+def login(app_client, email, password, follow_redirects=True):
     return app_client.post(url_for('account.login'),
-                           data=dict(user=username, password=password),
+                           data=dict(user=email, password=password),
                            follow_redirects=follow_redirects)
 
 

doajtest/unit/api_tests/test_api_crud_returnvalues.py

@@ -1,3 +1,4 @@
+from doajtest import helpers
 from doajtest.helpers import DoajTestCase, with_es
 from portality import models
 from doajtest.fixtures import ApplicationFixtureFactory, ArticleFixtureFactory, JournalFixtureFactory
@@ -205,9 +206,7 @@ def test_04_article_structure_exceptions(self):
 
     @staticmethod
     def login(app, username, password):
-        return app.post('/account/login',
-                        data=dict(username=username, password=password),
-                        follow_redirects=True)
+        return helpers.login(app, username, password)
 
     @staticmethod
     def logout(app):

doajtest/unit/application_processors/test_maned_journal_review.py

@@ -148,7 +148,7 @@ def test_04_maned_review_doaj_seal(self):
         )
 
         # set the seal to False using the form
-        fc.form.doaj_seal.data = False
+        fc.form.doaj_seal.data = []
 
         # run the crosswalk, don't test it at all in this test
         fc.form2target()
@@ -162,7 +162,7 @@ def test_04_maned_review_doaj_seal(self):
         fc.source.set_seal(True)
         fc.source2form()
 
-        assert fc.form.doaj_seal.data is True
+        assert 'y' in fc.form.doaj_seal.data
 
     def test_05_maned_review_continuations(self):
         # construct it from form data (with a known source)

doajtest/unit/test_view_admin.py

@@ -0,0 +1,37 @@
+import json
+
+from doajtest import helpers
+from doajtest.fixtures import JournalFixtureFactory
+from doajtest.fixtures.accounts import create_maned_a
+from doajtest.helpers import DoajTestCase
+from portality import models
+from portality.util import url_for
+
+
+class TestViewAdmin(DoajTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.acc = create_maned_a(save=True)
+
+    def test_journal_article_info(self):
+        journal = models.Journal(
+            **JournalFixtureFactory.make_journal_source()
+        )
+        journal.save(blocking=True)
+        models.Journal.refresh()
+
+        with self.app_test.test_client() as client:
+            resp = helpers.login(client, self.acc.email, 'password')
+            assert resp.status_code == 200
+
+            resp = client.get(url_for("admin.journal_article_info", journal_id=journal.id))
+            assert resp.status_code == 200
+            assert json.loads(resp.data) == {'n_articles': 0}
+
+    def test_journal_article_info__not_found(self):
+        with self.app_test.test_client() as client:
+            helpers.login(client, self.acc.email, 'password')
+
+            resp = client.get(url_for("admin.journal_article_info", journal_id='aksjdlaksjdlkajsdlkajsdlk'))
+            assert resp.status_code == 404

docs/dictionary.md

@@ -1,11 +1,11 @@
-| Short   | Description                  |
-|---------|------------------------------|
-| bgjob   | background job               |
-| noti    | notification                 |
-| noqa    | NO-QA (NO Quality Assurance) |
-| inst    | instance                     |
-| fmt     | format                       |
-| exparam | extra parameter              |
-| maned   | Managing Editor              |
-| gsheet  | Google Sheet                 |
-| svc     | service                      |
+| Short    | Description                  |
+|----------|------------------------------|
+| bgjob    | background job               |
+| noti     | notification                 |
+| noqa     | NO-QA (NO Quality Assurance) |
+| inst     | instance                     |
+| fmt      | format                       |
+| exparam  | extra parameter              |
+| maned    | Managing Editor              |
+| gsheet   | Google Sheet                 |
+| svc,serv | service                      |

portality/crosswalks/journal_form.py

@@ -289,7 +289,7 @@ def form2admin(cls, form, obj):
                 obj.set_editor(editor)
 
         if getattr(form, "doaj_seal", None):
-            obj.set_seal(form.doaj_seal.data)
+            obj.set_seal('y' in form.doaj_seal.data)
 
     @classmethod
     def bibjson2form(cls, bibjson, forminfo):
@@ -457,7 +457,7 @@ def admin2form(cls, obj, forminfo):
         if obj.editor is not None:
             forminfo['editor'] = obj.editor
 
-        forminfo['doaj_seal'] = obj.has_seal()
+        forminfo['doaj_seal'] = ['y'] if obj.has_seal() else []
 
 
 class JournalFormXWalk(JournalGenericXWalk):

portality/forms/application_forms.py

@@ -1693,8 +1693,13 @@ class FieldDefinitions:
     # ~~->$ DOAJSeal:FormField~~
     DOAJ_SEAL = {
         "name": "doaj_seal",
-        "label": "The journal may have fulfilled all the criteria for the Seal. Award the Seal?",
+        "label": "The journal may have fulfilled all the criteria for the Seal.",
+        "multiple": True,
         "input": "checkbox",
+        "options": [
+            {"display": "Award the Seal?", "value": 'y'},
+        ],
+
         "validate": [
             {
                 "only_if": {
@@ -1716,7 +1721,10 @@ class FieldDefinitions:
                                "the journal must use a persistent identifier"
                 }
             }
-        ]
+        ],
+        "widgets": [
+            "article_info",
+        ],
     }
 
     # FIXME: this probably shouldn't be in the admin form fieldsets, rather its own separate form
@@ -1977,7 +1985,7 @@ class FieldDefinitions:
         "entry_template": templates.AF_ENTRY_GOUP,
         "widgets": [
             {"infinite_repeat": {"enable_on_repeat": ["textarea"]}},
-            "note_modal"
+            "note_modal",
         ],
         "merge_disabled": "merge_disabled_notes",
     }
@@ -3174,7 +3182,8 @@ def wtforms(field, settings):
     "trim_whitespace": "formulaic.widgets.newTrimWhitespace",  # ~~-> TrimWhitespace:FormWidget~~
     "note_modal": "formulaic.widgets.newNoteModal",  # ~~-> NoteModal:FormWidget~~,
     "autocheck": "formulaic.widgets.newAutocheck", # ~~-> Autocheck:FormWidget~~
-    "issn_link": "formulaic.widgets.newIssnLink"  # ~~-> IssnLink:FormWidget~~,
+    "issn_link" : "formulaic.widgets.newIssnLink", # ~~-> IssnLink:FormWidget~~,
+    "article_info": "formulaic.widgets.newArticleInfo", # ~~-> ArticleInfo:FormWidget~~
 }
 
 
@@ -3382,10 +3391,8 @@ def wtform(formulaic_context, field, wtfargs):
     HiddenFieldBuilder
 ]
 
-ApplicationFormFactory = Formulaic(APPLICATION_FORMS, WTFORMS_BUILDERS, function_map=PYTHON_FUNCTIONS,
-                                   javascript_functions=JAVASCRIPT_FUNCTIONS)
-JournalFormFactory = Formulaic(JOURNAL_FORMS, WTFORMS_BUILDERS, function_map=PYTHON_FUNCTIONS,
-                               javascript_functions=JAVASCRIPT_FUNCTIONS)
+ApplicationFormFactory = Formulaic(APPLICATION_FORMS, WTFORMS_BUILDERS, function_map=PYTHON_FUNCTIONS, javascript_functions=JAVASCRIPT_FUNCTIONS)
+JournalFormFactory = Formulaic(JOURNAL_FORMS, WTFORMS_BUILDERS, function_map=PYTHON_FUNCTIONS, javascript_functions=JAVASCRIPT_FUNCTIONS)
 
 if __name__ == "__main__":
     """

portality/models/article.py

@@ -85,8 +85,8 @@ def find_by_issns(cls, issns):
         return articles
 
     @classmethod
-    def count_by_issns(cls, issns):
-        q = ArticleQuery(issns=issns)
+    def count_by_issns(cls, issns, in_doaj=None):
+        q = ArticleQuery(issns=issns, in_doaj=in_doaj)
         return cls.hit_count(q.query())
 
     @classmethod
@@ -902,9 +902,10 @@ class ArticleQuery(object):
     _issn_terms = { "terms" : {"index.issn.exact" : ["<list of issns here>"]} }
     _volume_term = { "term" : {"bibjson.journal.volume.exact" : "<volume here>"} }
 
-    def __init__(self, issns=None, volume=None):
+    def __init__(self, issns=None, volume=None, in_doaj=None):
         self.issns = issns
         self.volume = volume
+        self.in_doaj = in_doaj
 
     def query(self):
         q = deepcopy(self.base_query)
@@ -919,6 +920,9 @@ def query(self):
             vq["term"]["bibjson.journal.volume.exact"] = self.volume
             q["query"]["bool"]["must"].append(vq)
 
+        if self.in_doaj is not None:
+            q["query"]["bool"]["must"].append({"term": {"admin.in_doaj": self.in_doaj}})
+
         return q
 
 class ArticleVolumesQuery(object):

portality/static/js/formulaic.js

@@ -1155,14 +1155,14 @@ var formulaic = {
 
             this._renderAutocheck = function(autocheck) {
                 let frag = "<li>";
-                
+
                 if (autocheck.checked_by && doaj.autocheckers &&
                     doaj.autocheckers.registry.hasOwnProperty(autocheck.checked_by)) {
                     frag += (new doaj.autocheckers.registry[autocheck.checked_by]()).draw(autocheck)
                 } else {
                     frag += this._defaultRender(autocheck);
                 }
-                
+
                 frag += `</li>`;
                 return frag;
             }
@@ -2252,5 +2252,36 @@ var formulaic = {
 
             this.init();
         },
+
+        newArticleInfo : (params) => edges.instantiate(formulaic.widgets.ArticleInfo, params),
+        ArticleInfo: function ({formulaic, fieldDef, args}) {
+            const $sealEle = $('label[for=doaj_seal-0]');
+
+            if (!$sealEle.length) {
+                console.log('skip ArticleInfo, seal section not found')
+                return;
+            }
+
+            const idResult = window.location.pathname.match('/journal/([a-f0-9]+)')
+            if (!idResult) {
+                console.log('skip ArticleInfo, journal id not found')
+                return
+            }
+            const journalId = idResult[1]
+            fetch(`/admin/journal/${journalId}/article-info`)
+                .then(response => response.json())
+                .then(data => {
+                    let articleText = `(This journal has ${data.n_articles} articles in DOAJ)`
+                    if (data.n_articles > 0) {
+                        const articlesUrl = `/admin/journal/${journalId}/article-info/admin-site-search`
+                        articleText = `<a href="${articlesUrl}" target="_blank">${articleText}</a>`
+                    }
+                    $sealEle.html($sealEle.text() + ` ${articleText}`)
+                })
+        },
+
+
+
+
     }
 };

portality/tasks/journal_bulk_edit.py

@@ -123,8 +123,8 @@ def run(self):
                     job.add_audit_message("Setting {f} to {x} for journal {y}".format(f=k, x=v, y=journal_id))
                     fc.form[k].data = v
                 else:
-                    if v:
-                        fc.form.doaj_seal.data = v
+                    if v or (isinstance(v, str) and v.lower() == 'y'):
+                        fc.form.doaj_seal.data = ['y']
                 updated = True
 
             if note:

portality/templates-v2/management/_application-form/includes/_editorial_form_fields.html

@@ -56,7 +56,6 @@ <h2 class="form__header">{{ fs.label }}</h2>
     {% set fs = formulaic_context.fieldset("seal") %}
     {% if fs %}
         <h2 class="form__header">{{ fs.label }}</h2>
-        <p>The journal may have fulfilled all the criteria for the Seal. </p>
         {% for f in fs.fields() %}
             {% set field_template = f.template %}
             {%  include field_template %}

portality/view/admin.py

@@ -7,13 +7,14 @@
 from flask_login import current_user, login_required
 from werkzeug.datastructures import MultiDict
 
-from portality import dao
 import portality.models as models
 from portality import constants
+from portality import dao
 from portality import lock
 from portality.background import BackgroundSummary
 from portality.bll import DOAJ, exceptions
 from portality.bll.exceptions import ArticleMergeConflict, DuplicateArticleException
+from portality.bll.services.query import Query
 from portality.core import app
 from portality.crosswalks.application_form import ApplicationFormXWalk
 from portality.decorators import ssl_required, restrict_to_role, write_required
@@ -29,8 +30,6 @@
 from portality.ui import templates
 from portality.util import flash_with_url, jsonp, make_json_resp, get_web_json_payload, validate_json
 from portality.view.forms import EditorGroupForm, MakeContinuation
-
-from portality.bll.services.query import Query
 from portality.view.view_helper import exparam_editing_user
 
 # ~~Admin:Blueprint~~
@@ -335,6 +334,31 @@ def journals_bulk_reinstate():
 #
 #####################################################################
 
+@blueprint.route("/journal/<journal_id>/article-info/", methods=["GET"])
+@login_required
+def journal_article_info(journal_id):
+    j = models.Journal.pull(journal_id)
+    if j is None:
+        abort(404)
+
+    return {'n_articles': models.Article.count_by_issns(j.bibjson().issns(), in_doaj=True)}
+
+
+@blueprint.route("/journal/<journal_id>/article-info/admin-site-search", methods=["GET"])
+@login_required
+def journal_article_info_admin_site_search(journal_id):
+    j = models.Journal.pull(journal_id)
+    if j is None:
+        abort(404)
+
+    issns = j.bibjson().issns()
+    if not issns:
+        abort(404)
+
+    target_url = '/admin/admin_site_search?source={"query":{"bool":{"must":[{"term":{"admin.in_doaj":true}},{"term":{"es_type.exact":"article"}},{"query_string":{"query":"%s","default_operator":"AND","default_field":"index.issn.exact"}}]}},"track_total_hits":true}'
+    return redirect(target_url % issns[0].replace('-', r'\\-'))
+
+
 @blueprint.route("/journal/<journal_id>/continue", methods=["GET", "POST"])
 @login_required
 @ssl_required
@@ -445,7 +469,8 @@ def application(application_id):
                 flash(str(e))
                 return redirect(url_for("admin.application", application_id=ap.id, _anchor='cannot_edit'))
         else:
-            return fc.render_template(obj=ap, lock=lockinfo, form_diff=form_diff, current_journal=current_journal, lcc_tree=lcc_jstree, autochecks=autochecks)
+            return fc.render_template(obj=ap, lock=lockinfo, form_diff=form_diff, current_journal=current_journal,
+                                      lcc_tree=lcc_jstree, autochecks=autochecks)
 
 
 @blueprint.route("/application_quick_reject/<application_id>", methods=["POST"])