Skip to content

Commit

Permalink
Merge branch 'master' into contribution-if-record-deleted-search
Browse files Browse the repository at this point in the history
  • Loading branch information
mesemus authored Mar 1, 2025
2 parents a01b341 + 4693102 commit 9b9b275
Show file tree
Hide file tree
Showing 77 changed files with 1,823 additions and 939 deletions.
24 changes: 5 additions & 19 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# Copyright (C) 2021 CERN.
#
# Copyright (C) 2024 Graz University of Technology.
# 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.

Expand All @@ -14,22 +15,7 @@ on:

jobs:
build-n-publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel babel
- name: Build package
run: |
python setup.py compile_catalog sdist bdist_wheel
- name: Publish
uses: pypa/[email protected]
with:
user: __token__
password: ${{ secrets.pypi_token }}
uses: inveniosoftware/workflows/.github/workflows/pypi-publish.yml@master
secrets: inherit
with:
babel-compile-catalog: true
82 changes: 0 additions & 82 deletions .github/workflows/tests-feature.yml

This file was deleted.

6 changes: 5 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# Copyright (C) 2020-2024 CERN.
# Copyright (C) 2020 Northwestern University.
# Copyright (C) 2024 Graz University of Technology.
#
# 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.
Expand All @@ -10,11 +11,14 @@ name: CI

on:
push:
branches: master
branches:
- master
- "feature/*"
pull_request:
branches:
- master
- "maint-**"
- "feature/*"
schedule:
# * is a special character in YAML so you have to quote this string
- cron: "0 3 * * 6"
Expand Down
44 changes: 43 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Copyright (C) 2019-2024 CERN.
Copyright (C) 2019-2024 Northwestern University.
Copyright (C) 2024 KTH Royal Institute of Technology.
Copyright (C) 2024 Graz University of Technology.
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
Expand All @@ -12,6 +12,48 @@
Changes
=======

Version v17.1.0 (released 2025-02-21)

- views: FAIR signposting level 1 support
- views: FAIR signposting remove linkset link to itself

Version v17.0.2 (released 2025-02-14)

- serializers/dcat: fix broken subject serialization for terms with apostrophes

Version v17.0.1 (released 2025-02-13)

- Bump pre-release dependencies to stable.

Version v17.0.0 (released 2025-02-13)

- Promote to stable release.
- serializers: DataCite to DCAT-AP: fix undefined variable $cheme for relation type has metadata
- services: proper escape the fields key in links generation
- UISerializer: add polygon locations to serializer in addition to points (#1924)

Version v17.0.0.dev2 (released 2025-01-23)

Version v17.0.0.dev1 (released 2024-12-16)

- fix: flask-sqlalchemy.pagination >= 3.0.0
- comp: make compatible to flask-sqlalchemy>=3.1
- setup: change to reusable workflows
- setup: bump major dependencies

Version v16.8.0 (released 2025-01-27)

- resources: expose record revisions

Version v16.7.1 (released 2025-01-21)

- optional-doi: fix new upload disabled states

Version v16.7.0 (released 2025-01-21)

- pids: improve deposit UI for optional DOI
- deposit-ui: fix affiliation selection input display

Version v16.6.1 (released 2025-01-16)

- Revert "bug: add custom comment notification for record/draft requests"
Expand Down
2 changes: 1 addition & 1 deletion invenio_rdm_records/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@

from .ext import InvenioRDMRecords

__version__ = "16.6.1"
__version__ = "17.1.0"

__all__ = ("__version__", "InvenioRDMRecords")
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class PublishButtonComponent extends Component {

handlePublish = (event, handleSubmit, publishWithoutCommunity) => {
const { setSubmitContext } = this.context;
const { formik, raiseDOINeededButNotReserved, isDOIRequired } = this.props;
const noINeedDOI = formik?.values?.noINeedDOI;
const { formik, raiseDOINeededButNotReserved, isDOIRequired, noINeedDOI } =
this.props;
// Check for explicit DOI reservation via the "GET DOI button" only when DOI is
// optional in the instance's settings. If it is required, backend will automatically
// mint one even if it was not explicitly reserved
Expand Down Expand Up @@ -92,6 +92,8 @@ class PublishButtonComponent extends Component {
formik,
publishModalExtraContent,
raiseDOINeededButNotReserved,
noINeedDOI,
isDOIRequired,
...ui
} = this.props;
const { isConfirmModalOpen } = this.state;
Expand Down Expand Up @@ -166,6 +168,7 @@ PublishButtonComponent.propTypes = {
filesState: PropTypes.object,
raiseDOINeededButNotReserved: PropTypes.func.isRequired,
isDOIRequired: PropTypes.bool,
noINeedDOI: PropTypes.bool,
};

PublishButtonComponent.defaultProps = {
Expand All @@ -175,13 +178,15 @@ PublishButtonComponent.defaultProps = {
publishModalExtraContent: undefined,
filesState: undefined,
isDOIRequired: undefined,
noINeedDOI: undefined,
};

const mapStateToProps = (state) => ({
actionState: state.deposit.actionState,
publishModalExtraContent: state.deposit.config.publish_modal_extra,
filesState: state.files,
isDOIRequired: state.deposit.config.is_doi_required,
noINeedDOI: state.deposit.noINeedDOI,
});

export const PublishButton = connect(mapStateToProps, (dispatch) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class AffiliationsField extends Component {
);
}}
value={getIn(values, fieldPath, []).map(
(val) => val.id || val.name || val.text
({ id, name, text }) => id ?? name ?? text
)}
ref={selectRef}
// Disable UI-side filtering of search results
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@ export class CreatibutorsModal extends Component {
});

// Update affiliations render
const affiliationsState = affiliations.map(({ name }) => ({
const affiliationsState = affiliations.map(({ id, name }) => ({
text: name,
value: name,
key: name,
value: id ?? name,
key: id ?? name,
name,
}));
affiliationsRef.current.setState({
Expand Down
Loading

0 comments on commit 9b9b275

Please sign in to comment.