invenio-vocabularies 7.2.0__py2.py3-none-any.whl → 7.3.0__py2.py3-none-any.whl

invenio_vocabularies/__init__.py

@@ -11,6 +11,6 @@
 
 from .ext import InvenioVocabularies
 
-__version__ = "7.2.0"
+__version__ = "7.3.0"
 
 __all__ = ("__version__", "InvenioVocabularies")

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

@@ -1,5 +1,5 @@
 // This file is part of InvenioVocabularies
-// Copyright (C) 2021-2024 CERN.
+// Copyright (C) 2021-2025 CERN.
 // Copyright (C) 2021 Northwestern University.
 //
 // Invenio is free software; you can redistribute it and/or modify it
@@ -11,7 +11,7 @@ import { FieldArray, getIn } from "formik";
 import { HTML5Backend } from "react-dnd-html5-backend";
 import { DndProvider } from "react-dnd";
 import { Button, Form, Icon, List } from "semantic-ui-react";
-import { FieldLabel } from "react-invenio-forms";
+import { FieldLabel, FeedbackLabel } from "react-invenio-forms";
 
 import { FundingFieldItem } from "./FundingFieldItem";
 import FundingModal from "./FundingModal";
@@ -25,7 +25,7 @@ function FundingFieldForm(props) {
     label,
     labelIcon,
     fieldPath,
-    form: { values },
+    form: { values, errors, initialErrors, initialValues },
     move: formikArrayMove,
     push: formikArrayPush,
     remove: formikArrayRemove,
@@ -81,12 +81,25 @@ function FundingFieldForm(props) {
 
         return { headerContent, descriptionContent, awardOrFunder };
       };
+
+  const fundingList = getIn(values, fieldPath, []);
+  const formikInitialValues = getIn(initialValues, fieldPath, []);
+
+  const error = getIn(errors, fieldPath, null);
+  const initialError = getIn(initialErrors, fieldPath, null);
+  const fundingError = error || (fundingList === formikInitialValues && initialError);
+
+  let className = "";
+  if (fundingError) {
+    className = typeof fundingError !== "string" ? fundingError.severity : "error";
+  }
+
   return (
     <DndProvider backend={HTML5Backend}>
-      <Form.Field required={required}>
+      <Form.Field required={required} className={className}>
         <FieldLabel htmlFor={fieldPath} icon={labelIcon} label={label} />
         <List>
-          {getIn(values, fieldPath, []).map((value, index) => {
+          {fundingList.map((value, index) => {
             const key = `${fieldPath}.${index}`;
             // if award does not exist or has no id, it's a custom one
             const awardType = value?.award?.id ? "standard" : "custom";
@@ -120,7 +133,7 @@ function FundingFieldForm(props) {
                 key="custom"
                 icon
                 labelPosition="left"
-                className="mb-5"
+                className={`mb-5 ${className}`}
               >
                 <Icon name="add" />
                 {i18next.t("Add")}
@@ -141,7 +154,13 @@ function FundingFieldForm(props) {
           <FundingModal
             searchConfig={searchConfig}
             trigger={
-              <Button type="button" key="custom" icon labelPosition="left">
+              <Button
+                type="button"
+                key="custom"
+                icon
+                labelPosition="left"
+                className={className}
+              >
                 <Icon name="add" />
                 {i18next.t("Add custom")}
               </Button>
@@ -156,6 +175,8 @@ function FundingFieldForm(props) {
             computeFundingContents={computeFundingContents}
           />
         </Overridable>
+
+        {fundingError && <FeedbackLabel errorMessage={fundingError} />}
       </Form.Field>
     </DndProvider>
   );

invenio_vocabularies/contrib/subjects/config.py

@@ -50,6 +50,11 @@ class SubjectsSearchOptions(SearchOptions):
             localized_title,
             "synonyms^20",
         ],
+        clauses=[
+            {"type": "cross_fields", "boost": 3},
+            {"type": "bool_prefix", "boost": 2, "fuzziness": "AUTO"},
+            {"type": "most_fields", "boost": 1, "fuzziness": "AUTO"},
+        ],
     )
 
     sort_default = "bestmatch"

invenio_vocabularies/webpack.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2019-2024 CERN.
+# Copyright (C) 2019-2025 CERN.
 # Copyright (C) 2019-2022 Northwestern University.
 # Copyright (C)      2022 TU Wien.
 # Copyright (C)      2022 Graz University of Technology.
@@ -34,7 +34,7 @@ theme = WebpackThemeBundle(
                 "react-dnd-html5-backend": "^11.1.0",
                 "react-dropzone": "^11.0.0",
                 "react-i18next": "^11.11.0",
-                "react-invenio-forms": "^4.0.0",
+                "react-invenio-forms": "^4.6.0",
                 "react-searchkit": "^3.0.0",
                 "yup": "^0.32.0",
             },

{invenio_vocabularies-7.2.0.dist-info → invenio_vocabularies-7.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: invenio-vocabularies
-Version: 7.2.0
+Version: 7.3.0
 Summary: Invenio module for managing vocabularies.
 Home-page: https://github.com/inveniosoftware/invenio-vocabularies
 Author: CERN
@@ -91,6 +91,14 @@ https://invenio-vocabularies.readthedocs.io/
 Changes
 =======
 
+Version v7.3.0 (released 2025-03-18)
+
+- form: funding: use FeedbackLabel and add error styling
+
+Version v7.2.1 (released 2025-03-17)
+
+- subjects: Keep bool_prefix clause for suggest search
+
 Version v7.2.0 (released 2025-03-10)
 
 - search: fix too many clauses on affiliation search

{invenio_vocabularies-7.2.0.dist-info → invenio_vocabularies-7.3.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-invenio_vocabularies/__init__.py,sha256=pSBx69wwYxkJc2fKyISdcYUgSDw4RB8psS7oN0z1aFc,429
+invenio_vocabularies/__init__.py,sha256=IuQRd0A4SQseB03HVn0A3YbUI1JUeqRykVF3aqcYMew,429
 invenio_vocabularies/cli.py,sha256=CpXTTIn2GTpUqNfLEMlRAp3JWst8ZjHVxoGYdhuuv_4,5959
 invenio_vocabularies/config.py,sha256=HCX670_PXw-fA1aaTto93N4579dr4M3xRxnA4nHZn18,6967
 invenio_vocabularies/ext.py,sha256=GujJ4UARd4Fxf4z7zznRk9JAgHamZuYCOdrKU5czg00,5987
@@ -7,7 +7,7 @@ invenio_vocabularies/fixtures.py,sha256=iEPkWf_ZjdP2D9r2sLdIlPoR8Rq2m5cnoFwywUGH
 invenio_vocabularies/jobs.py,sha256=cbiZnJ3D6Q-j4NvijjqeCoD90TSTMyYul8l4BmBIxPw,5776
 invenio_vocabularies/proxies.py,sha256=k7cTUgWfnCoYIuNqAj_VFi1zBN33KNNclRSVnBkObEM,711
 invenio_vocabularies/views.py,sha256=PNJ5nvc3O7ASwNe56xmqy5YaU9n3UYF3W2JwvtE_kYs,1561
-invenio_vocabularies/webpack.py,sha256=hzTM0qx6iiRHkmjti53yuZ5ebfPMR5mpO9uNewBat74,1891
+invenio_vocabularies/webpack.py,sha256=FkM8TxXClmaJcD8YsQq5Mai56nYVJh_1IYTMEHb3c1M,1891
 invenio_vocabularies/administration/__init__.py,sha256=0bDp2Aw8aZth7C-q9Xn9rxeCUQQRoIUxoWWWwPvKbXA,308
 invenio_vocabularies/administration/views/__init__.py,sha256=31DP4jLG6q4HQlzSRiGLPxUjHPUCCl4N34y4XMuPP6g,313
 invenio_vocabularies/administration/views/vocabularies.py,sha256=JyKr1OYF9DO89zvWCNOtNfClO_QptdHdjvgY1kkImnw,1290
@@ -32,7 +32,7 @@ invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/form
 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=TfwrlA_GrINvN1LAdW7J6q_hkbsiEKxbCWc-7VVp8mY,4674
 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=wXJz4ZL7J0ZPppcP-qd6U5Mnupf2hkog4zxMrQ9xZtI,6906
+invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js,sha256=NfbBZOxqphYqWB3i0N5p3LDNo4WxM1ko50K_zuuFT28,7621
 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=X2l1hjwboHFZWEEODvQS8Q7YntD6npj_TmZLiXkuZQs,7474
@@ -137,7 +137,7 @@ invenio_vocabularies/contrib/names/mappings/v7/__init__.py,sha256=qLGB8C0kPI3xub
 invenio_vocabularies/contrib/names/mappings/v7/names/name-v1.0.0.json,sha256=5Ybcq3fUMYx3u1MNKmHh-CWBtATS9MYpdEcwAM8EQ80,1943
 invenio_vocabularies/contrib/subjects/__init__.py,sha256=GtXZKA6VWG1oA1fUX2Wh92nd-1i7RnnQF6RprGhxkD4,591
 invenio_vocabularies/contrib/subjects/api.py,sha256=QH8mxoLsa8qjJT1i1Tj6rRnpbH23plo2IMOJ56rnvbU,347
-invenio_vocabularies/contrib/subjects/config.py,sha256=sdgFNCyXslb5Sac2yZ3xC9SumrKV8fZRdiuxdtmIPEA,2159
+invenio_vocabularies/contrib/subjects/config.py,sha256=CLQT1_5gj4waCFBI6K2jobHHUQjW0RJ7Xk49caWDP14,2378
 invenio_vocabularies/contrib/subjects/datastreams.py,sha256=s6o5_A-0I3TMx77IbwmLHJpSuDWx8xClW9ocnP2JYfw,1885
 invenio_vocabularies/contrib/subjects/facets.py,sha256=qQ7_rppFBzsmrlZu4-MvOIdUcjeOmDA9gOHAcs0lWwI,695
 invenio_vocabularies/contrib/subjects/models.py,sha256=8XgbVRxDDvhWPjMWsoCriNlOKdmV_113a14yLRtlvM4,363
@@ -305,10 +305,10 @@ invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.mo,sha256=bpqywk-Hn
 invenio_vocabularies/translations/zh_CN/LC_MESSAGES/messages.po,sha256=vg8qC8ofpAdJ3mQz7mWM1ylKDpiNWXFs7rlMdSPkgKk,4629
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.mo,sha256=o3nwy64PXTcRaAbRrJpYMICW5aVQ0sCdGIn2Xy4UccU,600
 invenio_vocabularies/translations/zh_TW/LC_MESSAGES/messages.po,sha256=9ACePz_EpB-LfcIJajZ2kp8Q04tcdrQLOtug162ZUss,4115
-invenio_vocabularies-7.2.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
-invenio_vocabularies-7.2.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
-invenio_vocabularies-7.2.0.dist-info/METADATA,sha256=b74JZCv3Wt2ICL2A5jvsZ5FlCp7OyXaLrKyl1IDu2UE,13270
-invenio_vocabularies-7.2.0.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
-invenio_vocabularies-7.2.0.dist-info/entry_points.txt,sha256=lget4Ekno9VRTq36oowWReIJA99165gOp0BOiiET60Y,3179
-invenio_vocabularies-7.2.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
-invenio_vocabularies-7.2.0.dist-info/RECORD,,
+invenio_vocabularies-7.3.0.dist-info/AUTHORS.rst,sha256=8d0p_WWE1r9DavvzMDi2D4YIGBHiMYcN3LYxqQOj8sY,291
+invenio_vocabularies-7.3.0.dist-info/LICENSE,sha256=UvI8pR8jGWqe0sTkb_hRG6eIrozzWwWzyCGEpuXX4KE,1062
+invenio_vocabularies-7.3.0.dist-info/METADATA,sha256=VdGum0SJJwYTn6gfdGbGiNWSDkDw84w4veKV4j6Dr4g,13460
+invenio_vocabularies-7.3.0.dist-info/WHEEL,sha256=Kol19cahXavY536r5Aj6aAgK_6CmctrOu3bgNJMSNJA,109
+invenio_vocabularies-7.3.0.dist-info/entry_points.txt,sha256=lget4Ekno9VRTq36oowWReIJA99165gOp0BOiiET60Y,3179
+invenio_vocabularies-7.3.0.dist-info/top_level.txt,sha256=x1gRNbaODF_bCD0SBLM3nVOFPGi06cmGX5X94WKrFKk,21
+invenio_vocabularies-7.3.0.dist-info/RECORD,,

{invenio_vocabularies-7.2.0.dist-info → invenio_vocabularies-7.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any