invenio-vocabularies 3.1.0__py2.py3-none-any.whl → 3.3.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

@@ -10,6 +10,6 @@
 
 from .ext import InvenioVocabularies
 
-__version__ = "3.1.0"
+__version__ = "3.3.0"
 
 __all__ = ("__version__", "InvenioVocabularies")

invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/CustomAwardForm.js

@@ -12,17 +12,24 @@ import { TextField, RemoteSelectField } from "react-invenio-forms";
 import { i18next } from "@translations/invenio_rdm_records/i18next";
 import _isEmpty from "lodash/isEmpty";
 
+import Overridable from "react-overridable";
+
 function CustomAwardForm({ deserializeFunder, selectedFunding }) {
   function deserializeFunderToDropdown(funderItem) {
     let funderName = null;
     let funderPID = null;
+    let funderCountry = null;
 
     if (funderItem.name) {
       funderName = funderItem.name;
     }
 
-    if (funderItem.pid) {
-      funderPID = funderItem.pid;
+    if (funderItem.id) {
+      funderPID = funderItem.id;
+    }
+
+    if (funderItem.country) {
+      funderCountry = funderItem.country;
     }
 
     if (!funderName && !funderPID) {
@@ -30,7 +37,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
     }
 
     return {
-      text: funderName || funderPID,
+      text: [funderName, funderCountry, funderPID].filter((val) => val).join(", "),
       value: funderItem.id,
       key: funderItem.id,
       ...(funderName && { name: funderName }),
@@ -48,64 +55,85 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
 
   return (
     <Form>
-      <RemoteSelectField
+      <Overridable
+        id="InvenioVocabularies.CustomAwardForm.RemoteSelectField.Container"
         fieldPath="selectedFunding.funder.id"
-        suggestionAPIUrl="/api/funders"
-        suggestionAPIHeaders={{
-          Accept: "application/vnd.inveniordm.v1+json",
-        }}
-        placeholder={i18next.t("Search for a funder by name")}
-        serializeSuggestions={(funders) => {
-          return funders.map((funder) =>
-            deserializeFunderToDropdown(deserializeFunder(funder))
-          );
-        }}
-        searchInput={{
-          autoFocus: _isEmpty(selectedFunding),
-        }}
-        label={i18next.t("Funder")}
-        noQueryMessage={i18next.t("Search for funder...")}
-        clearable
-        allowAdditions={false}
-        multiple={false}
-        selectOnBlur={false}
-        selectOnNavigation={false}
-        required
-        search={(options) => options}
-        isFocused
-        onValueChange={({ formikProps }, selectedFundersArray) => {
-          if (selectedFundersArray.length === 1) {
-            const selectedFunder = selectedFundersArray[0];
-            if (selectedFunder) {
-              const deserializedFunder = serializeFunderFromDropdown(selectedFunder);
-              formikProps.form.setFieldValue(
-                "selectedFunding.funder",
-                deserializedFunder
-              );
+      >
+        <RemoteSelectField
+          fieldPath="selectedFunding.funder.id"
+          suggestionAPIUrl="/api/funders"
+          suggestionAPIHeaders={{
+            Accept: "application/vnd.inveniordm.v1+json",
+          }}
+          placeholder={i18next.t("Search for a funder by name")}
+          serializeSuggestions={(funders) => {
+            return funders.map((funder) =>
+              deserializeFunderToDropdown(deserializeFunder(funder))
+            );
+          }}
+          searchInput={{
+            autoFocus: _isEmpty(selectedFunding),
+          }}
+          label={i18next.t("Funder")}
+          noQueryMessage={i18next.t("Search for funder...")}
+          clearable
+          allowAdditions={false}
+          multiple={false}
+          selectOnBlur={false}
+          selectOnNavigation={false}
+          required
+          search={(options) => options}
+          isFocused
+          onValueChange={({ formikProps }, selectedFundersArray) => {
+            if (selectedFundersArray.length === 1) {
+              const selectedFunder = selectedFundersArray[0];
+              if (selectedFunder) {
+                const deserializedFunder = serializeFunderFromDropdown(selectedFunder);
+                formikProps.form.setFieldValue(
+                  "selectedFunding.funder",
+                  deserializedFunder
+                );
+              }
             }
-          }
-        }}
-      />
-
-      <Header as="h3" size="small">
-        {i18next.t("Award information")} ({i18next.t("optional")})
-      </Header>
+          }}
+        />
+      </Overridable>
+      <Overridable id="InvenioVocabularies.CustomAwardForm.AwardInformationHeader.Container">
+        <Header as="h3" size="small">
+          {i18next.t("Award information")} ({i18next.t("optional")})
+        </Header>
+      </Overridable>
       <Form.Group widths="equal">
-        <TextField
-          label={i18next.t("Number")}
-          placeholder={i18next.t("Award number")}
+        <Overridable
+          id="InvenioVocabularies.CustomAwardForm.AwardNumberTextField.Container"
           fieldPath="selectedFunding.award.number"
-        />
-        <TextField
-          label={i18next.t("Title")}
-          placeholder={i18next.t("Award Title")}
+        >
+          <TextField
+            label={i18next.t("Number")}
+            placeholder={i18next.t("Award number")}
+            fieldPath="selectedFunding.award.number"
+          />
+        </Overridable>
+        <Overridable
+          id="InvenioVocabularies.CustomAwardForm.AwardTitleTextField.Container"
           fieldPath="selectedFunding.award.title"
-        />
-        <TextField
-          label={i18next.t("URL")}
-          placeholder={i18next.t("Award URL")}
+        >
+          <TextField
+            label={i18next.t("Title")}
+            placeholder={i18next.t("Award Title")}
+            fieldPath="selectedFunding.award.title"
+          />
+        </Overridable>
+        <Overridable
+          id="InvenioVocabularies.CustomAwardForm.AwardUrlTextField.Container"
           fieldPath="selectedFunding.award.url"
-        />
+        >
+          <TextField
+            label={i18next.t("URL")}
+            placeholder={i18next.t("Award URL")}
+            fieldPath="selectedFunding.award.url"
+          />
+        </Overridable>
       </Form.Group>
     </Form>
   );

invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js

@@ -18,6 +18,8 @@ import FundingModal from "./FundingModal";
 
 import { i18next } from "@translations/invenio_rdm_records/i18next";
 
+import Overridable from "react-overridable";
+
 function FundingFieldForm(props) {
   const {
     label,
@@ -108,46 +110,52 @@ function FundingFieldForm(props) {
             );
           })}
         </List>
-        <FundingModal
-          searchConfig={searchConfig}
-          trigger={
-            <Button
-              type="button"
-              key="custom"
-              icon
-              labelPosition="left"
-              className="mb-5"
-            >
-              <Icon name="add" />
-              {i18next.t("Add award")}
-            </Button>
-          }
-          onAwardChange={(selectedFunding) => {
-            formikArrayPush(selectedFunding);
-          }}
-          mode="standard"
-          action="add"
-          deserializeAward={deserializeAward}
-          deserializeFunder={deserializeFunder}
-          computeFundingContents={computeFundingContents}
-        />
-        <FundingModal
-          searchConfig={searchConfig}
-          trigger={
-            <Button type="button" key="custom" icon labelPosition="left">
-              <Icon name="add" />
-              {i18next.t("Add custom")}
-            </Button>
-          }
-          onAwardChange={(selectedFunding) => {
-            formikArrayPush(selectedFunding);
-          }}
-          mode="custom"
-          action="add"
-          deserializeAward={deserializeAward}
-          deserializeFunder={deserializeFunder}
-          computeFundingContents={computeFundingContents}
-        />
+
+        <Overridable id="InvenioVocabularies.FundingField.AddAwardFundingModal.Container">
+          <FundingModal
+            searchConfig={searchConfig}
+            trigger={
+              <Button
+                type="button"
+                key="custom"
+                icon
+                labelPosition="left"
+                className="mb-5"
+              >
+                <Icon name="add" />
+                {i18next.t("Add award")}
+              </Button>
+            }
+            onAwardChange={(selectedFunding) => {
+              formikArrayPush(selectedFunding);
+            }}
+            mode="standard"
+            action="add"
+            deserializeAward={deserializeAward}
+            deserializeFunder={deserializeFunder}
+            computeFundingContents={computeFundingContents}
+          />
+        </Overridable>
+
+        <Overridable id="InvenioVocabularies.FundingField.AddCustomFundingModal.Container">
+          <FundingModal
+            searchConfig={searchConfig}
+            trigger={
+              <Button type="button" key="custom" icon labelPosition="left">
+                <Icon name="add" />
+                {i18next.t("Add custom")}
+              </Button>
+            }
+            onAwardChange={(selectedFunding) => {
+              formikArrayPush(selectedFunding);
+            }}
+            mode="custom"
+            action="add"
+            deserializeAward={deserializeAward}
+            deserializeFunder={deserializeFunder}
+            computeFundingContents={computeFundingContents}
+          />
+        </Overridable>
       </Form.Field>
     </DndProvider>
   );

invenio_vocabularies/ext.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020-2022 CERN.
+# Copyright (C) 2023 Graz University of Technology.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -123,3 +124,41 @@ class InvenioVocabularies(object):
             service=self.service,
             config=app.config["VOCABULARIES_RESOURCE_CONFIG"],
         )
+
+
+def finalize_app(app):
+    """Finalize app.
+
+    NOTE: replace former @record_once decorator
+    """
+    init(app)
+
+
+def api_finalize_app(app):
+    """Api Finalize app.
+
+    NOTE: replace former @record_once decorator
+    """
+    init(app)
+
+
+def init(app):
+    """Init app."""
+    # Register services - cannot be done in extension because
+    # Invenio-Records-Resources might not have been initialized.
+    sregistry = app.extensions["invenio-records-resources"].registry
+    ext = app.extensions["invenio-vocabularies"]
+    sregistry.register(ext.affiliations_service, service_id="affiliations")
+    sregistry.register(ext.awards_service, service_id="awards")
+    sregistry.register(ext.funders_service, service_id="funders")
+    sregistry.register(ext.names_service, service_id="names")
+    sregistry.register(ext.subjects_service, service_id="subjects")
+    sregistry.register(ext.service, service_id="vocabularies")
+    # Register indexers
+    iregistry = app.extensions["invenio-indexer"].registry
+    iregistry.register(ext.affiliations_service.indexer, indexer_id="affiliations")
+    iregistry.register(ext.awards_service.indexer, indexer_id="awards")
+    iregistry.register(ext.funders_service.indexer, indexer_id="funders")
+    iregistry.register(ext.names_service.indexer, indexer_id="names")
+    iregistry.register(ext.subjects_service.indexer, indexer_id="subjects")
+    iregistry.register(ext.service.indexer, indexer_id="vocabularies")

invenio_vocabularies/views.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020-2022 CERN.
+# Copyright (C) 2023 Graz University of Technology.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -13,30 +14,6 @@ from flask import Blueprint
 blueprint = Blueprint("invenio_vocabularies_ext", __name__)
 
 
-@blueprint.record_once
-def init(state):
-    """Init app."""
-    app = state.app
-    # Register services - cannot be done in extension because
-    # Invenio-Records-Resources might not have been initialized.
-    sregistry = app.extensions["invenio-records-resources"].registry
-    ext = app.extensions["invenio-vocabularies"]
-    sregistry.register(ext.affiliations_service, service_id="affiliations")
-    sregistry.register(ext.awards_service, service_id="awards")
-    sregistry.register(ext.funders_service, service_id="funders")
-    sregistry.register(ext.names_service, service_id="names")
-    sregistry.register(ext.subjects_service, service_id="subjects")
-    sregistry.register(ext.service, service_id="vocabularies")
-    # Register indexers
-    iregistry = app.extensions["invenio-indexer"].registry
-    iregistry.register(ext.affiliations_service.indexer, indexer_id="affiliations")
-    iregistry.register(ext.awards_service.indexer, indexer_id="awards")
-    iregistry.register(ext.funders_service.indexer, indexer_id="funders")
-    iregistry.register(ext.names_service.indexer, indexer_id="names")
-    iregistry.register(ext.subjects_service.indexer, indexer_id="subjects")
-    iregistry.register(ext.service.indexer, indexer_id="vocabularies")
-
-
 def create_blueprint_from_app(app):
     """Create app blueprint."""
     return app.extensions["invenio-vocabularies"].resource.as_blueprint()

{invenio_vocabularies-3.1.0.dist-info → invenio_vocabularies-3.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-vocabularies
-Version: 3.1.0
+Version: 3.3.0
 Summary: "Invenio module for managing vocabularies."
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -24,8 +24,8 @@ Requires-Dist: invenio-search[opensearch2] <3.0.0,>=2.1.0 ; extra == 'opensearch
 Provides-Extra: postgresql
 Provides-Extra: sqlite
 Provides-Extra: tests
-Requires-Dist: pytest-black >=0.3.0 ; extra == 'tests'
-Requires-Dist: invenio-app <2.0.0,>=1.3.3 ; extra == 'tests'
+Requires-Dist: pytest-black-ng >=0.4.0 ; extra == 'tests'
+Requires-Dist: invenio-app <2.0.0,>=1.4.0 ; extra == 'tests'
 Requires-Dist: invenio-db[mysql,postgresql] <2.0.0,>=1.0.14 ; extra == 'tests'
 Requires-Dist: pytest-invenio <3.0.0,>=2.1.0 ; extra == 'tests'
 Requires-Dist: Sphinx >=4.5 ; extra == 'tests'
@@ -74,6 +74,17 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
+Version 3.3.0 (released 2024-04-16)
+
+- assets: add overridable awards and funding
+
+Version 3.2.0 (released 2024-03-22)
+
+- funding: add country and ror to funder search results
+- init: move record_once to finalize_app (removes deprecation on `before_first_request`)
+- installation: upgrade invenio-app
+
+
 Version 3.1.0 (released 2024-03-05)
 
 - custom_fields: added subject field

{invenio_vocabularies-3.1.0.dist-info → invenio_vocabularies-3.3.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-invenio_vocabularies/__init__.py,sha256=zYD2SFatCz_VnsGt6BdXwowIM3I8ldPtGfW4BRPoCbs,377
+invenio_vocabularies/__init__.py,sha256=tQFCf91BM4aB3XPviHFG0TfPMsFrW4DQIJ4RMO2dIkA,377
 invenio_vocabularies/cli.py,sha256=Ymuy0l846eJXIA4UybunSqq7P9m2N0OdTtj6nEgd1-0,6355
 invenio_vocabularies/config.py,sha256=mLypkeVrPKZPtokvHSF-_Q7YcV4sCVONiyhGhu-34hI,3772
-invenio_vocabularies/ext.py,sha256=wMJfv3GG4ZOp-c4ePVrNhxi9KyWAb874b9_D23K1orU,3805
+invenio_vocabularies/ext.py,sha256=ukuvkhkLPBy2AITFLojLYTIUlP2qcbHNkt6ES8i1TwY,5310
 invenio_vocabularies/fixtures.py,sha256=nNWwH04HFASjfj1oy5kMdcQGKmVjzUuA5wSw-ER1QAg,1585
 invenio_vocabularies/proxies.py,sha256=H_bcJXPTwGbErx-pF89ChayOZcXJXJGZW7O0xkJkYQ4,693
-invenio_vocabularies/views.py,sha256=SKXfzdsHEfarpua6snB4D7nQLv9KczYexCHmEYMPKHM,2548
+invenio_vocabularies/views.py,sha256=fo71zH5c-YkkNq0mBXqVdXQ52xieku1gVQEyp3ww-dM,1344
 invenio_vocabularies/webpack.py,sha256=aLRm0ut3rXPb8D87pVA9mO_ODq7WOSZdsJQyU4iMLoI,1891
 invenio_vocabularies/alembic/17c703ce1eb7_create_names_table.py,sha256=2QGs0Ofi6yd93VzIBqghNi47hrZtuLf0DylKyvVzskI,1572
 invenio_vocabularies/alembic/4a9a4fd235f8_create_vocabulary_schemes.py,sha256=Ywtp8qOFcI3PxUXemHdvy_VwdcUVtMFV1sFgNAmYrms,1054
@@ -23,9 +23,9 @@ invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/index.js,sha
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/index.js,sha256=iSx-bdQkKj6XA9NAam31bdcQmFygljQnjLcFjjK3lwU,245
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/index.js,sha256=7sSg482yJODQHU4jkP-hWJjpBOw7ubFr5nPZl5D_1gQ,262
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/AwardResults.js,sha256=AgqJg9GEcJvKZR4plZsH0j7cm9C3yjT9YCPI6uvmOyc,3499
-invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/CustomAwardForm.js,sha256=PRlPCk6oh7Cxb4QlEmyekv5efWihCi5uqVeL_Cdl91Y,3644
+invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/CustomAwardForm.js,sha256=PDgCRtbOXkXOQCodbxoieHenhXrXhSTMQk4LcS-AjYg,4794
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FunderDropdown.js,sha256=pPMB9Hirc8z3efquecrO_CKlfXE1ws6OqDB7fB30l5k,2431
-invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js,sha256=r8t_6xIM49UdjV38ltuzM5KMJIJ_oOgHc1__KsyvjGE,6555
+invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js,sha256=aqQ92Z0WJ4rfXz0E8KIIN4-qjORdQYxXPa5eS5b_g8A,6912
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.test.js,sha256=z_4lWkf3h9Uin8OzSBSKY1wpUxtbnjE2kRUjW80jAhA,35
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingFieldItem.js,sha256=ZN4dEcHCVtSVFjzb1SAYPxmaY1Qk5ZdCt1yY7j6pvQs,4610
 invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingModal.js,sha256=To8qRm0RoMSiGZaNWfd2TM7NFZLML-8l9Wx7De8DKyI,8112
@@ -266,10 +266,10 @@ invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.mo,sha256=g1I5aNO8r
 invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.po,sha256=vg8qC8ofpAdJ3mQz7mWM1ylKDpiNWXFs7rlMdSPkgKk,4629
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.mo,sha256=cqSm8NtMAwrP9O6qbmtkDtRT1e9D93qpsJN5X9_PPVw,600
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.po,sha256=9ACePz_EpB-LfcIJajZ2kp8Q04tcdrQLOtug162ZUss,4115
-invenio_vocabularies-3.1.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-3.1.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-3.1.0.dist-info/METADATA,sha256=77H1YHotqln4kRFvQ0T_nCiSf97XGSrgCohzyf3o0aA,6148
-invenio_vocabularies-3.1.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-invenio_vocabularies-3.1.0.dist-info/entry_points.txt,sha256=cBazxlQQIn53RNdPI8edCL5v1k-6fE7UU4O0QssUoBE,2309
-invenio_vocabularies-3.1.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-3.1.0.dist-info/RECORD,,
+invenio_vocabularies-3.3.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-3.3.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-3.3.0.dist-info/METADATA,sha256=Pfbhxq_NJ2hyIoBF4N4sRWmRWXsxlukEUkhT4QD3H2M,6454
+invenio_vocabularies-3.3.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+invenio_vocabularies-3.3.0.dist-info/entry_points.txt,sha256=Cca3c5XGXkQItZ2-1oeN5xffwM8I1J3XjSvdq9-l_Bw,2497
+invenio_vocabularies-3.3.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-3.3.0.dist-info/RECORD,,

{invenio_vocabularies-3.1.0.dist-info → invenio_vocabularies-3.3.0.dist-info}/entry_points.txt

@@ -16,12 +16,18 @@ invenio_vocabularies_funders = invenio_vocabularies.views:create_funders_bluepri
 invenio_vocabularies_names = invenio_vocabularies.views:create_names_blueprint_from_app
 invenio_vocabularies_subjects = invenio_vocabularies.views:create_subjects_blueprint_from_app
 
+[invenio_base.api_finalize_app]
+invenio_vocabularies = invenio_vocabularies.ext:api_finalize_app
+
 [invenio_base.apps]
 invenio_vocabularies = invenio_vocabularies:InvenioVocabularies
 
 [invenio_base.blueprints]
 invenio_vocabularies_ext = invenio_vocabularies.views:blueprint
 
+[invenio_base.finalize_app]
+invenio_vocabularies = invenio_vocabularies.ext:finalize_app
+
 [invenio_db.alembic]
 invenio_vocabularies = invenio_vocabularies:alembic