invenio-vocabularies 7.2.0__tar.gz → 7.3.0__tar.gz

{invenio_vocabularies-7.2.0 → invenio_vocabularies-7.3.0}/CHANGES.rst

@@ -9,6 +9,14 @@
 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 → invenio_vocabularies-7.3.0}/PKG-INFO

@@ -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 → invenio_vocabularies-7.3.0}/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-7.2.0 → invenio_vocabularies-7.3.0}/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-7.2.0 → invenio_vocabularies-7.3.0}/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-7.2.0 → invenio_vocabularies-7.3.0}/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 → invenio_vocabularies-7.3.0}/invenio_vocabularies.egg-info/PKG-INFO

@@ -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