invenio-vocabularies 3.2.0__py2.py3-none-any.whl → 3.4.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

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

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

@@ -12,6 +12,8 @@ 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;
@@ -53,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/services/custom_fields/subject.py

@@ -65,6 +65,7 @@ SUBJECT_FIELDS_UI = [
                     clearable=True,
                     allowAdditions=False,
                 ),
+                template="invenio_vocabularies/subjects.html",
             )
         ],
     }

invenio_vocabularies/templates/semantic-ui/invenio_vocabularies/subjects.html

@@ -0,0 +1,23 @@
+{#
+  Copyright (C) 2024-2024 CERN.
+
+  Invenio RDM Records is free software; you can redistribute it and/or modify
+  it under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{%- set subjects = field_value -%}
+{% if subjects %}
+  <ul class="ui horizontal list no-bullets subjects">
+    {%- for subject in subjects %}
+    <li class="item">
+      {%- set q = 'metadata.subjects.subject:"' + subject.subject + '"' %}
+      <a href="{{ url_for('invenio_search_ui.search', q=q) }}"
+          class="subject"
+          title="{{ _('Search results for ') + subject.subject }}"
+      >
+        {{ subject.subject }}
+      </a>
+    </li>
+    {%- endfor %}
+  </ul>
+{% endif %}

invenio_vocabularies/views.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020-2022 CERN.
+# Copyright (C) 2020-2024 CERN.
 # Copyright (C) 2023 Graz University of Technology.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
@@ -11,7 +11,9 @@
 
 from flask import Blueprint
 
-blueprint = Blueprint("invenio_vocabularies_ext", __name__)
+blueprint = Blueprint(
+    "invenio_vocabularies_ext", __name__, template_folder="./templates"
+)
 
 
 def create_blueprint_from_app(app):

{invenio_vocabularies-3.2.0.dist-info → invenio_vocabularies-3.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: invenio-vocabularies
-Version: 3.2.0
+Version: 3.4.0
 Summary: "Invenio module for managing vocabularies."
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -74,6 +74,14 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
+Version 3.4.0 (released 2024-04-19)
+
+- templates: add subject fields UI template (#303)
+
+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

{invenio_vocabularies-3.2.0.dist-info → invenio_vocabularies-3.4.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-invenio_vocabularies/__init__.py,sha256=T7_NfvtdyJ5WKhZsXZ5oAtejPyW8TBTuWr1mzkm3CHw,377
+invenio_vocabularies/__init__.py,sha256=isFHRQKyWkN_xf9gydG-Vaewcf0X83UVIMjMZn1Qr-w,377
 invenio_vocabularies/cli.py,sha256=Ymuy0l846eJXIA4UybunSqq7P9m2N0OdTtj6nEgd1-0,6355
 invenio_vocabularies/config.py,sha256=mLypkeVrPKZPtokvHSF-_Q7YcV4sCVONiyhGhu-34hI,3772
 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=fo71zH5c-YkkNq0mBXqVdXQ52xieku1gVQEyp3ww-dM,1344
+invenio_vocabularies/views.py,sha256=JCUA6yzF_160U1oAFUIgGt4MigsLQ9MiHOInHBQw98M,1381
 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=Hht40rz6JgeKvjbEemLM4QBD2N3HWcmSRarZVywGiwc,3798
+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
@@ -169,8 +169,9 @@ invenio_vocabularies/services/schema.py,sha256=ShnnH_ILHZGxE546J6Jsdwdeix6jLubSR
 invenio_vocabularies/services/service.py,sha256=W3wtKOttQjOr8Nkaus6m3KRuCMBqBsWUCAVv7Dj8bvM,7392
 invenio_vocabularies/services/tasks.py,sha256=zTAWdnI5celWBKrF986wQzCmkOTGOwTghtN7U5FMZ5Q,783
 invenio_vocabularies/services/custom_fields/__init__.py,sha256=QgvSsn-S1xLzbZ57pjjGTt5oI3HqzXHVjwGTtuPgzN8,421
-invenio_vocabularies/services/custom_fields/subject.py,sha256=BQxvfZLqGpv3uSHCfzaCBjceZnynHeXNS4lDcYi8S-k,2171
+invenio_vocabularies/services/custom_fields/subject.py,sha256=k-qXbCjXPTk-Xo_W5sojFpQbkntv50odROiNyJHMzL8,2234
 invenio_vocabularies/services/custom_fields/vocabulary.py,sha256=eCvqrNloMMCCvqR49IQwzk2p4xapx5_bmQhd6ByJZFM,3019
+invenio_vocabularies/templates/semantic-ui/invenio_vocabularies/subjects.html,sha256=h9syHkwZ6ltgjWw_0M5UoR6h6Re2imJ7uQ6M6peOyhk,686
 invenio_vocabularies/translations/messages.pot,sha256=IzTTWdWknzmKKtl1UNUxPOwHjfBB_iidm_eeEY2kV-M,3907
 invenio_vocabularies/translations/af/LC_MESSAGES/messages.mo,sha256=HokSco2JpukLl_j07yQ2wjKmUf8_Zzru6KQtYdyLtEo,523
 invenio_vocabularies/translations/af/LC_MESSAGES/messages.po,sha256=XXoiqCtGELaxl6hxRj31D3DCdgBUrz0oD3MYJUpcklM,3976
@@ -266,10 +267,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.2.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-3.2.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-3.2.0.dist-info/METADATA,sha256=P_Hv7pjmodRu8F38__8YDHbgLwqHrHhGsW0a2a_qc0M,6371
-invenio_vocabularies-3.2.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-invenio_vocabularies-3.2.0.dist-info/entry_points.txt,sha256=Cca3c5XGXkQItZ2-1oeN5xffwM8I1J3XjSvdq9-l_Bw,2497
-invenio_vocabularies-3.2.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-3.2.0.dist-info/RECORD,,
+invenio_vocabularies-3.4.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-3.4.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-3.4.0.dist-info/METADATA,sha256=BW9iKZv2-Vn6vecbaCdP8ogzjk4YLqy9EhUtkYPC2hI,6543
+invenio_vocabularies-3.4.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+invenio_vocabularies-3.4.0.dist-info/entry_points.txt,sha256=Cca3c5XGXkQItZ2-1oeN5xffwM8I1J3XjSvdq9-l_Bw,2497
+invenio_vocabularies-3.4.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-3.4.0.dist-info/RECORD,,