deposit form: add sharing of drafts #2668
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ntarocco
approved these changes
May 14, 2024
Comment on lines
44
to
50
| {%- if config %} | ||
| <input type="hidden" name="deposits-groups-enabled" | ||
| value='{{ config.USERS_RESOURCES_GROUPS_ENABLED | tojson }}'> | ||
| {%- endif %} | ||
|
|
There was a problem hiding this comment.
Config is always there, and I would also change the name:
Suggested change
| {%- if config %} | |
| <input type="hidden" name="deposits-groups-enabled" | |
| value='{{ config.USERS_RESOURCES_GROUPS_ENABLED | tojson }}'> | |
| {%- endif %} | |
| <input type="hidden" name="config-groups-enabled" | |
| value='{{ config.USERS_RESOURCES_GROUPS_ENABLED | tojson }}'> | |
| @@ -43,6 +43,7 @@ import { FundingField } from "@js/invenio_vocabularies"; | |||
| import { Card, Container, Grid, Ref, Sticky } from "semantic-ui-react"; | |||
| import PropTypes from "prop-types"; | |||
| import Overridable from "react-overridable"; | |||
| import { ShareDraftButton } from "../landing_page/ShareOptions/ShareDraftButton"; | |||
There was a problem hiding this comment.
We should maybe move the button away from landing_page/, to a more generic/global components module
| @@ -614,6 +621,16 @@ export class RDMDepositForm extends Component { | |||
| <Grid.Column width={16} className="pt-10"> | |||
| <PublishButton fluid /> | |||
| </Grid.Column> | |||
|
|
|||
| <Grid.Column width={16} className="pt-0"> | |||
| {(record.is_draft === null || permissions.can_manage) && ( | |||
There was a problem hiding this comment.
Can it be null? Shouldn't it be true/false?
There was a problem hiding this comment.
is_draft is null after just clicking on the "New upload" and rendering an empty deposit form
| @@ -22,6 +22,7 @@ ReactDOM.render( | |||
| config={getInputFromDOM("deposits-config")} | |||
| permissions={getInputFromDOM("deposits-record-permissions")} | |||
| filesLocked={getInputFromDOM("deposits-record-locked-files")} | |||
| groupsEnabled={getInputFromDOM("deposits-groups-enabled")} | |||
There was a problem hiding this comment.
Suggested change
| groupsEnabled={getInputFromDOM("deposits-groups-enabled")} | |
| groupsEnabled={getInputFromDOM("config-groups-enabled")} |
|
anikachurilova
force-pushed
the
add-share-draft
branch
2 times, most recently
from
feffe77
to
a9ec4d5
Compare
kpsherva
reviewed
May 24, 2024
| @@ -361,6 +361,8 @@ def new_record(): | |||
| defaults = current_app.config.get("APP_RDM_DEPOSIT_FORM_DEFAULTS") or {} | |||
| for key, value in defaults.items(): | |||
| set_default_value(record, value, key) | |||
|
|
|||
| record["parent"]["access"] = {"grants": [], "links": []} | |||
There was a problem hiding this comment.
shouldn't this part be handled by dump_empty in 354 line?
anikachurilova
force-pushed
the
add-share-draft
branch
3 times, most recently
from
e60102a
to
604dda2
Compare
anikachurilova
force-pushed
the
add-share-draft
branch
from
604dda2
to
558cc54
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updated dropdowns:
Share button on the deposit form:
enabled:
disabled: