Merge branch 'inveniosoftware:master' into czech-vocabulary-translations

inveniosoftware · Oct 18, 2024 · ca63cfb · ca63cfb
2 parents a34dd6a + aa67a1a
commit ca63cfb
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 9 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -12,6 +12,11 @@
 Changes
 =======
 
+Version v15.4.0 (released 2024-10-17)
+
+- DOI: fix wrong parent DOI link
+- community: added props to make CommunitySelectionSearch reusable
+
 Version v15.3.0 (released 2024-10-16)
 
 - collections: display pages and REST API

diff --git a/invenio_rdm_records/__init__.py b/invenio_rdm_records/__init__.py
@@ -11,6 +11,6 @@
 
 from .ext import InvenioRDMRecords
 
-__version__ = "15.3.0"
+__version__ = "15.4.0"
 
 __all__ = ("__version__", "InvenioRDMRecords")
diff --git a/...io_rdm_records/src/deposit/components/CommunitySelectionModal/CommunitySelectionSearch.js b/...io_rdm_records/src/deposit/components/CommunitySelectionModal/CommunitySelectionSearch.js
@@ -1,5 +1,5 @@
 // This file is part of Invenio-RDM-Records
-// Copyright (C) 2020-2023 CERN.
+// Copyright (C) 2020-2024 CERN.
 // Copyright (C) 2020-2022 Northwestern University.
 //
 // Invenio-RDM-Records is free software; you can redistribute it and/or modify it
@@ -43,18 +43,23 @@ export class CommunitySelectionSearch extends Component {
         toggleText,
       },
     } = this.state;
+
     const {
       apiConfigs: { allCommunities, myCommunities },
       record,
       isInitialSubmission,
+      CommunityListItem,
+      pagination,
     } = this.props;
+
     const searchApi = new InvenioSearchApi(selectedSearchApi);
     const overriddenComponents = {
       [`${selectedAppId}.ResultsList.item`]: parametrize(CommunityListItem, {
         record: record,
         isInitialSubmission: isInitialSubmission,
       }),
     };
+
     return (
       <OverridableContext.Provider value={overriddenComponents}>
         <ReactSearchKit
@@ -75,7 +80,7 @@ export class CommunitySelectionSearch extends Component {
                 floated="left"
                 className="pt-0 pl-0"
               >
-                <Menu role="tablist" compact>
+                <Menu role="tablist" className="theme-primary-menu" compact>
                   <Menu.Item
                     as="button"
                     role="tab"
@@ -144,9 +149,11 @@ export class CommunitySelectionSearch extends Component {
               </ResultsLoader>
             </Modal.Content>
 
-            <Modal.Content className="text-align-center">
-              <Pagination />
-            </Modal.Content>
+            {pagination && (
+              <Modal.Content className="text-align-center">
+                <Pagination />
+              </Modal.Content>
+            )}
           </>
         </ReactSearchKit>
       </OverridableContext.Provider>
@@ -169,10 +176,14 @@ CommunitySelectionSearch.propTypes = {
   }),
   record: PropTypes.object.isRequired,
   isInitialSubmission: PropTypes.bool,
+  CommunityListItem: PropTypes.elementType,
+  pagination: PropTypes.bool,
 };
 
 CommunitySelectionSearch.defaultProps = {
   isInitialSubmission: true,
+  pagination: true,
+  CommunityListItem: CommunityListItem,
   apiConfigs: {
     allCommunities: {
       initialQueryState: { size: 5, page: 1, sortBy: "bestmatch" },

diff --git a/...emantic-ui/js/invenio_rdm_records/src/deposit/components/CommunitySelectionModal/index.js b/...emantic-ui/js/invenio_rdm_records/src/deposit/components/CommunitySelectionModal/index.js
@@ -1,5 +1,5 @@
 // This file is part of Invenio-RDM-Records
-// Copyright (C) 2020-2023 CERN.
+// Copyright (C) 2020-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.
@@ -9,4 +9,6 @@ export {
   CommunitySelectionModalComponent,
 } from "./CommunitySelectionModal";
 
+export { CommunitySelectionSearch } from "./CommunitySelectionSearch";
+
 export { CommunityContext } from "./CommunityContext";
diff --git a/...nio_rdm_records/assets/semantic-ui/js/invenio_rdm_records/src/deposit/components/index.js b/...nio_rdm_records/assets/semantic-ui/js/invenio_rdm_records/src/deposit/components/index.js
@@ -1,5 +1,5 @@
 // This file is part of Invenio-RDM-Records
-// Copyright (C) 2020-2023 CERN.
+// Copyright (C) 2020-2024 CERN.
 // Copyright (C) 2020-2022 Northwestern University.
 //
 // Invenio-RDM-Records is free software; you can redistribute it and/or modify it
@@ -8,6 +8,7 @@
 export {
   CommunitySelectionModal,
   CommunitySelectionModalComponent,
+  CommunitySelectionSearch,
 } from "./CommunitySelectionModal";
 export { DepositStatusBox } from "./DepositStatus";
 export { RDMUploadProgressNotifier } from "./UploadProgressNotifier";

diff --git a/invenio_rdm_records/services/config.py b/invenio_rdm_records/services/config.py
@@ -381,7 +381,7 @@ def expand(self, obj, context):
         when=is_record_or_draft_and_has_parent_doi,
     ),
     else_=RecordPIDLink(
-        "https://doi.org/{+pid_doi}", when=is_record_or_draft_and_has_parent_doi
+        "https://doi.org/{+parent_pid_doi}", when=is_record_or_draft_and_has_parent_doi
     ),
 )
 parent_doi_html_link = RecordPIDLink(