invenio-app-rdm 13.0.0b2.dev4__tar.gz → 13.0.0b2.dev6__tar.gz

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/CHANGES.rst

@@ -10,6 +10,18 @@
 Changes
 =======
 
+Version v13.0.0b2.dev6 (released 2025-03-12)
+
+- dashboard: enable shared filters for requests
+
+Version v13.0.0b2.dev5 (released 2025-03-11)
+
+- dashboard: use always view button to redirect user to the upload
+    - If upload is published redirect user to published record
+    - If upload is draft redirect user to upload or preview depending on their permission
+- deposit: use permissions.can_manage for record community management
+- dashboard: split mine and shared with me uploads
+
 Version v13.0.0b2.dev4 (released 2025-03-10)
 
 - views: FAIR signposting level 1 support (config flag)

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: invenio-app-rdm
-Version: 13.0.0b2.dev4
+Version: 13.0.0b2.dev6
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -96,6 +96,18 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b2.dev6 (released 2025-03-12)
+
+- dashboard: enable shared filters for requests
+
+Version v13.0.0b2.dev5 (released 2025-03-11)
+
+- dashboard: use always view button to redirect user to the upload
+    - If upload is published redirect user to published record
+    - If upload is draft redirect user to upload or preview depending on their permission
+- deposit: use permissions.can_manage for record community management
+- dashboard: split mine and shared with me uploads
+
 Version v13.0.0b2.dev4 (released 2025-03-10)
 
 - views: FAIR signposting level 1 support (config flag)

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/__init__.py

@@ -17,6 +17,6 @@
 #
 # See PEP 0440 for details - https://www.python.org/dev/peps/pep-0440
 
-__version__ = "13.0.0b2.dev4"
+__version__ = "13.0.0b2.dev6"
 
 __all__ = ("__version__",)

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/detail.html

@@ -25,11 +25,11 @@
 {%- set title = record.metadata.title %}
 {%- set metadata = record.metadata %}
 
-{%- set can_manage_record = permissions is defined and (permissions.can_edit or permissions.can_review) %}
+{%- set can_curate_record = permissions is defined and (permissions.can_edit or permissions.can_review) %}
 
 <!-- preview_submission_request is set to true when coming from a community submission request -->
 {%- set is_preview_submission_request = preview_submission_request or false %}
-{%- set show_record_management_menu = can_manage_record and (not is_preview or is_preview_submission_request) %}
+{%- set show_record_management_menu = can_curate_record and (not is_preview or is_preview_submission_request) %}
 
 {%- if record.parent.access.settings %}
   {%- set allow_user_requests = not current_user.is_anonymous and record.parent.access.settings.allow_user_requests %}
@@ -175,7 +175,7 @@
 
               {%- block record_header_button -%}
 
-                {% if is_preview and not is_preview_submission_request and can_manage_record and is_draft %}
+                {% if is_preview and not is_preview_submission_request and can_curate_record and is_draft %}
                   <nav class="back-navigation rel-pb-2 pl-0"
                        aria-label="{{ _('Back-navigation') }}">
                     {%- set back_page = url_for('invenio_app_rdm_records.deposit_edit', pid_value=record.id) -%}

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/side_bar/communities.html

@@ -4,7 +4,6 @@
   data-record-community-endpoint="{{ record.links.communities }}"
   data-record-community-search-endpoint="{{ record.links['communities-suggestions'] }}"
   data-record-user-community-search-endpoint="{{ record.links['user-communities-suggestions'] }}"
-  data-can-manage-record='{{ can_manage_record |tojson }}'
   data-pending-communities-search-config='{{ search_app_rdm_record_requests_config(app_id="InvenioAppRdm.RecordRequests", endpoint=record.links.requests) | tojson }}'
   data-record-community-search-config='{{ search_app_rdm_record_communities_config(app_id="InvenioAppRdm.RecordCommunitiesSuggestions", endpoint=record.links["communities-suggestions"]) | tojson }}'
   data-record-user-community-search-config='{{ search_app_rdm_record_user_communities_config(app_id="InvenioAppRdm.RecordUserCommunitiesSuggestions", endpoint=record.links["communities-suggestions"]) | tojson }}'

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/records_ui/views/deposits.py

@@ -444,6 +444,7 @@ def deposit_create(community=None):
         .get("doi", {})
         .get("required")
     )
+
     return render_community_theme_template(
         current_app.config["APP_RDM_DEPOSIT_FORM_TEMPLATE"],
         theme=community_theme,
@@ -483,7 +484,12 @@ def deposit_edit(pid_value, draft=None, draft_files=None, files_locked=True):
     can_edit_draft = service.check_permission(
         g.identity, "update_draft", record=draft._record
     )
+    can_preview_draft = service.check_permission(
+        g.identity, "preview", record=draft._record
+    )
     if not can_edit_draft:
+        if can_preview_draft:
+            return redirect(draft["links"]["preview_html"])
         raise PermissionDeniedError()
 
     files_dict = None if draft_files is None else draft_files.to_dict()

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/CommunitiesManagement.js

@@ -88,7 +88,6 @@ export class CommunitiesManagement extends Component {
     const {
       recordCommunitySearchConfig,
       permissions,
-      canManageRecord,
       userCommunitiesMemberships,
       recordCommunityEndpoint,
       recordUserCommunitySearchConfig,
@@ -97,7 +96,7 @@ export class CommunitiesManagement extends Component {
     } = this.props;
     const { communities, loading, error, manageCommunitiesModalOpen } = this.state;
     return (
-      (!_isEmpty(communities) || canManageRecord) && (
+      (!_isEmpty(communities) || permissions.can_manage) && (
         <>
           <Header
             size="medium"
@@ -106,7 +105,7 @@ export class CommunitiesManagement extends Component {
             attached="top"
           >
             {i18next.t("Communities")}
-            {canManageRecord && (
+            {permissions.can_manage && (
               <CommunitiesManagementDropdown
                 actionSucceed={this.handleRefresh}
                 userCommunitiesMemberships={userCommunitiesMemberships}
@@ -166,7 +165,6 @@ CommunitiesManagement.propTypes = {
   recordCommunityEndpoint: PropTypes.string.isRequired,
   recordUserCommunitySearchConfig: PropTypes.object.isRequired,
   permissions: PropTypes.object.isRequired,
-  canManageRecord: PropTypes.bool.isRequired,
   userCommunitiesMemberships: PropTypes.object.isRequired,
   searchConfig: PropTypes.object.isRequired,
   record: PropTypes.object.isRequired,

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/ShareOptions/AccessLinks/LinksSearchItem.js

@@ -73,7 +73,7 @@ export const LinksSearchItem = ({
       selfLink = `${record.links.record_html || record.links.self_html}?`;
     } else if (result?.permission === "preview") {
       // point to `/records/<id>?preview=1` even for published records
-      selfLink = `${record.links.record_html || record.links.self_html}?preview=1&`;
+      selfLink = `${record.links.preview_html}&`;
     } else if (result?.permission === "edit") {
       selfLink = `${record.links.self_html}?`;
     }

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/ShareOptions/AccessLinks/LinksSearchResultContainer.js

@@ -33,7 +33,7 @@ export const dropdownOptions = [
     title: i18next.t("Can preview drafts"),
     value: "preview",
     description: i18next.t(
-      "Can view drafts and restricted files of all versions of this record."
+      "Can view drafts, restricted files, and comment on associated draft requests of all versions of this record."
     ),
   },
   {
@@ -43,7 +43,7 @@ export const dropdownOptions = [
     title: i18next.t("Can edit"),
     value: "edit",
     description: i18next.t(
-      "Can edit drafts and view restricted files of all versions of this record."
+      "Can edit drafts, view restricted files, and comment on associated draft requests of all versions of this record."
     ),
   },
 ];

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/ShareOptions/AccessUsersGroups/UserGroupAccessSearchResultItem.js

@@ -25,7 +25,7 @@ export const accessDropdownOptions = [
     title: i18next.t("Can manage"),
     value: "manage",
     description: i18next.t(
-      "Can manage access, edit drafts and view restricted files of all versions of this record."
+      "Can manage access, edit drafts, view restricted files, and comment on associated draft requests of all versions of this record."
     ),
   },
 ];

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/landing_page/index.js

@@ -100,9 +100,6 @@ if (sidebarCommunitiesManageDiv) {
         recordUserCommunitySearchConfig={JSON.parse(
           sidebarCommunitiesManageDiv.dataset.recordUserCommunitySearchConfig
         )}
-        canManageRecord={JSON.parse(
-          sidebarCommunitiesManageDiv.dataset.canManageRecord
-        )}
         recordCommunitySearchConfig={recordCommunitySearchConfig}
         permissions={JSON.parse(sidebarCommunitiesManageDiv.dataset.permissions)}
         searchConfig={JSON.parse(pendingCommunitiesSearchConfig)}
@@ -118,9 +115,6 @@ if (sidebarCommunitiesManageDiv) {
           recordUserCommunitySearchConfig={JSON.parse(
             sidebarCommunitiesManageDiv.dataset.recordUserCommunitySearchConfig
           )}
-          canManageRecord={JSON.parse(
-            sidebarCommunitiesManageDiv.dataset.canManageRecord
-          )}
           recordCommunitySearchConfig={recordCommunitySearchConfig}
           permissions={JSON.parse(sidebarCommunitiesManageDiv.dataset.permissions)}
           searchConfig={JSON.parse(pendingCommunitiesSearchConfig)}

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/base.js

@@ -12,6 +12,8 @@ import {
   SearchAppResultsPane,
   InvenioSearchPagination,
 } from "@js/invenio_search_ui/components";
+import { SharedOrMineFilter } from "@js/invenio_requests/components/SharedOrMineFilter";
+
 import { i18next } from "@translations/invenio_app_rdm/i18next";
 import React from "react";
 import { ResultsList, SearchBar, Sort, buildUID } from "react-searchkit";
@@ -75,6 +77,8 @@ DashboardResultView.defaultProps = {
 export const DashboardSearchLayoutHOC = ({
   searchBarPlaceholder = "",
   appName = undefined,
+  showSharedFilters = false,
+  mineLabel = "",
 }) => {
   const DashboardUploadsSearchLayout = (props) => {
     const [sidebarVisible, setSidebarVisible] = React.useState(false);
@@ -100,7 +104,7 @@ export const DashboardSearchLayoutHOC = ({
               </Grid.Column>
               <Grid.Column
                 mobile={14}
-                tablet={10}
+                tablet={14}
                 verticalAlign="middle"
                 floated="right"
               >
@@ -108,8 +112,32 @@ export const DashboardSearchLayoutHOC = ({
               </Grid.Column>
             </Grid.Row>
 
-            <Grid.Row className="mobile tablet only">
-              <Grid.Column width={16} textAlign="right">
+            <Grid.Row className="tablet only">
+              <Grid.Column tablet={6} floated="right">
+                {showSharedFilters && <SharedOrMineFilter mineLabel={mineLabel} />}
+              </Grid.Column>
+              <Grid.Column tablet={10} textAlign="right">
+                {config.sortOptions && (
+                  <Sort
+                    values={config.sortOptions}
+                    label={(cmp) => (
+                      <>
+                        <label className="mr-10">{i18next.t("Sort by")}</label>
+                        {cmp}
+                      </>
+                    )}
+                  />
+                )}
+              </Grid.Column>
+            </Grid.Row>
+
+            <Grid.Row className="mobile only">
+              <Grid.Column width={16}>
+                {showSharedFilters && <SharedOrMineFilter mineLabel={mineLabel} />}
+              </Grid.Column>
+            </Grid.Row>
+            <Grid.Row className="mobile only">
+              <Grid.Column textAlign="right">
                 {config.sortOptions && (
                   <Sort
                     values={config.sortOptions}
@@ -127,11 +155,17 @@ export const DashboardSearchLayoutHOC = ({
 
             {/* Desktop search header */}
             <Grid.Row className="computer only">
-              <Grid.Column width={8} floated="right">
+              <Grid.Column width={4} />
+              {showSharedFilters && (
+                <Grid.Column width={4}>
+                  <SharedOrMineFilter mineLabel={mineLabel} />
+                </Grid.Column>
+              )}
+              <Grid.Column width={showSharedFilters ? 5 : 9} floated="right">
                 <SearchBar placeholder={searchBarPlaceholder} />
               </Grid.Column>
 
-              <Grid.Column width={4} textAlign="right">
+              <Grid.Column width={3} textAlign="right">
                 {config.sortOptions && (
                   <Sort
                     values={config.sortOptions}

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/communities.js

@@ -28,6 +28,7 @@ export const appName = "InvenioAppRdm.DashboardCommunities";
 export const DashboardCommunitiesSearchLayout = DashboardSearchLayoutHOC({
   searchBarPlaceholder: i18next.t("Search in my communities..."),
   appName: appName,
+  mineLabel: i18next.t("My communities"),
 });
 
 const DashboardResultViewWAppName = parametrize(DashboardResultView, {

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/requests.js

@@ -52,6 +52,7 @@ RequestsResultsItemTemplateDashboard.propTypes = {
 
 const RequestsSearchLayoutWithApp = parametrize(RequestsSearchLayout, {
   appName: appName,
+  showSharedFilters: true,
 });
 
 export const defaultComponents = {

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/uploads.js

@@ -19,7 +19,6 @@ import {
   RDMRecordSearchBarElement,
   RDMToggleComponent,
 } from "../search/components";
-import { http } from "react-invenio-forms";
 import { DashboardResultView, DashboardSearchLayoutHOC } from "./base";
 import { createSearchAppInit } from "@js/invenio_search_ui";
 import { ComputerTabletUploadsItem } from "./uploads_items/ComputerTabletUploadsItem";
@@ -41,24 +40,10 @@ const statuses = {
 };
 
 export const RDMRecordResultsListItem = ({ result }) => {
-  const editRecord = () => {
-    http
-      .post(
-        `/api/records/${result.id}/draft`,
-        {},
-        {
-          headers: {
-            "Content-Type": "application/json",
-            "Accept": "application/vnd.inveniordm.v1+json",
-          },
-        }
-      )
-      .then(() => {
-        window.location = `/uploads/${result.id}`;
-      })
-      .catch((error) => {
-        console.error(error.response.data);
-      });
+  const viewDraft = () => {
+    // The upload view is responsible to redirect the user to the upload form or
+    // the preview page depending on the permissions they have.
+    window.location = `/uploads/${result.id}`;
   };
 
   const isPublished = result.is_published;
@@ -97,14 +82,14 @@ export const RDMRecordResultsListItem = ({ result }) => {
     <>
       <ComputerTabletUploadsItem
         result={result}
-        editRecord={editRecord}
+        viewDraft={viewDraft}
         statuses={statuses}
         access={access}
         uiMetadata={uiMetadata}
       />
       <MobileUploadsItem
         result={result}
-        editRecord={editRecord}
+        viewDraft={viewDraft}
         statuses={statuses}
         access={access}
         uiMetadata={uiMetadata}
@@ -185,6 +170,8 @@ export const DashboardUploadsSearchLayout = DashboardSearchLayoutHOC({
     />
   ),
   appName: appName,
+  mineLabel: i18next.t("My uploads"),
+  showSharedFilters: true,
 });
 
 const ContribSearchAppFacetsWithConfig = parametrize(ContribSearchAppFacets, {

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/uploads_items/ComputerTabletUploadsItem.js

@@ -15,7 +15,7 @@ import { DisplayPartOfCommunities } from "../../components/DisplayPartOfCommunit
 
 export const ComputerTabletUploadsItem = ({
   result,
-  editRecord,
+  viewDraft,
   statuses,
   access,
   uiMetadata,
@@ -69,16 +69,8 @@ export const ComputerTabletUploadsItem = ({
             <i className={`icon ${accessStatusIcon}`} />
             {accessStatus}
           </Label>
-          <Button
-            compact
-            size="small"
-            floated="right"
-            onClick={() => editRecord()}
-            labelPosition="left"
-            icon="edit"
-            content={i18next.t("Edit")}
-          />
-          {isPublished && (
+
+          {isPublished ? (
             <Button
               compact
               size="small"
@@ -88,6 +80,16 @@ export const ComputerTabletUploadsItem = ({
               icon="eye"
               content={i18next.t("View")}
             />
+          ) : (
+            <Button
+              compact
+              size="small"
+              floated="right"
+              onClick={() => viewDraft()}
+              labelPosition="left"
+              icon="eye"
+              content={i18next.t("View")}
+            />
           )}
         </Item.Extra>
         <Item.Header as="h2">
@@ -146,7 +148,7 @@ export const ComputerTabletUploadsItem = ({
 
 ComputerTabletUploadsItem.propTypes = {
   result: PropTypes.object.isRequired,
-  editRecord: PropTypes.func.isRequired,
+  viewDraft: PropTypes.func.isRequired,
   statuses: PropTypes.object.isRequired,
   access: PropTypes.object.isRequired,
   uiMetadata: PropTypes.object.isRequired,

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/uploads_items/MobileUploadsItem.js

@@ -15,7 +15,7 @@ import { DisplayPartOfCommunities } from "../../components/DisplayPartOfCommunit
 
 export const MobileUploadsItem = ({
   result,
-  editRecord,
+  viewDraft,
   statuses,
   access,
   uiMetadata,
@@ -122,20 +122,20 @@ export const MobileUploadsItem = ({
         <Item.Extra>
           <Dropdown button text={i18next.t("Actions")} labeled className="icon">
             <Dropdown.Menu>
-              <Dropdown.Item
-                onClick={() => editRecord()}
-                labelposition="left"
-                icon="edit"
-                content={i18next.t("Edit")}
-              />
-
-              {isPublished && (
+              {isPublished ? (
                 <Dropdown.Item
                   labelposition="left"
                   href={viewLink}
                   icon="eye"
                   content={i18next.t("View")}
                 />
+              ) : (
+                <Dropdown.Item
+                  onClick={() => viewDraft()}
+                  labelposition="left"
+                  icon="eye"
+                  content={i18next.t("View")}
+                />
               )}
             </Dropdown.Menu>
           </Dropdown>
@@ -147,7 +147,7 @@ export const MobileUploadsItem = ({
 
 MobileUploadsItem.propTypes = {
   result: PropTypes.object.isRequired,
-  editRecord: PropTypes.func.isRequired,
+  viewDraft: PropTypes.func.isRequired,
   statuses: PropTypes.object.isRequired,
   access: PropTypes.object.isRequired,
   uiMetadata: PropTypes.object.isRequired,

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm/users_ui/searchapp.py

@@ -24,6 +24,9 @@ def search_app_context():
             "/api/user/records",
             {"Accept": "application/vnd.inveniordm.v1+json"},
             pagination_options=(10, 20),
+            initial_filters=[
+                ["shared_with_me", "false"],
+            ],
         ),
         "search_app_rdm_user_communities_config": partial(
             search_app_config,
@@ -41,7 +44,10 @@ def search_app_context():
             current_app.config["RDM_SORT_OPTIONS"],
             "/api/user/requests",
             {"Accept": "application/json"},
-            initial_filters=[["is_open", "true"]],
+            initial_filters=[
+                ["is_open", "true"],
+                ["shared_with_me", "false"],
+            ],
             hidden_params=[["expand", "1"]],
         ),
     }

{invenio_app_rdm-13.0.0b2.dev4 → invenio_app_rdm-13.0.0b2.dev6}/invenio_app_rdm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: invenio-app-rdm
-Version: 13.0.0b2.dev4
+Version: 13.0.0b2.dev6
 Summary: Invenio Research Data Management.
 Home-page: https://github.com/inveniosoftware/invenio-app-rdm
 Author: CERN
@@ -96,6 +96,18 @@ https://inveniordm.docs.cern.ch
 Changes
 =======
 
+Version v13.0.0b2.dev6 (released 2025-03-12)
+
+- dashboard: enable shared filters for requests
+
+Version v13.0.0b2.dev5 (released 2025-03-11)
+
+- dashboard: use always view button to redirect user to the upload
+    - If upload is published redirect user to published record
+    - If upload is draft redirect user to upload or preview depending on their permission
+- deposit: use permissions.can_manage for record community management
+- dashboard: split mine and shared with me uploads
+
 Version v13.0.0b2.dev4 (released 2025-03-10)
 
 - views: FAIR signposting level 1 support (config flag)