invenio-app-rdm 12.0.0.dev8__py2.py3-none-any.whl → 14.0.0b1.dev8__py2.py3-none-any.whl

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/requests.js

@@ -1,5 +1,5 @@
 // This file is part of InvenioRDM
-// Copyright (C) 2020-2022 CERN.
+// Copyright (C) 2020-2023 CERN.
 // Copyright (C) 2020-2021 Northwestern University.
 // Copyright (C) 2021 Graz University of Technology.
 // Copyright (C) 2021 New York University.
@@ -7,176 +7,41 @@
 // Invenio App RDM is free software; you can redistribute it and/or modify it
 // under the terms of the MIT License; see LICENSE file for more details.
 
-import {
-  RequestAcceptButton,
-  RequestCancelButton,
-  RequestDeclineButton,
-} from "@js/invenio_requests/components/Buttons";
-import {
-  RequestAcceptModalTrigger,
-  RequestCancelModalTrigger,
-  RequestDeclineModalTrigger,
-} from "@js/invenio_requests/components/ModalTriggers";
-import {
-  LabelStatusAccept,
-  LabelStatusCancel,
-  LabelStatusDecline,
-  LabelStatusDelete,
-  LabelStatusExpire,
-  LabelStatusSubmit,
-  LabelTypeCommunityInclusion,
-  LabelTypeCommunityInvitation,
-  LabelTypeCommunitySubmission,
-} from "@js/invenio_requests/request";
 import { createSearchAppInit } from "@js/invenio_search_ui";
 import {
   ContribBucketAggregationElement,
   ContribBucketAggregationValuesElement,
   ContribSearchAppFacets,
-  InvenioSearchPagination,
-  SearchAppFacets,
-  SearchAppResultsPane,
 } from "@js/invenio_search_ui/components";
-import { i18next } from "@translations/invenio_app_rdm/i18next";
-import _get from "lodash/get";
-import _truncate from "lodash/truncate";
 import PropTypes from "prop-types";
-import React, { Component } from "react";
-import { GridResponsiveSidebarColumn } from "react-invenio-forms";
+import React from "react";
 import { overrideStore, parametrize } from "react-overridable";
-import { Count, ResultsList, SearchBar, Sort, withState } from "react-searchkit";
-import {
-  Button,
-  Card,
-  Container,
-  Grid,
-  Header,
-  Icon,
-  Segment,
-} from "semantic-ui-react";
+import { withState } from "react-searchkit";
+import { defaultContribComponents } from "@js/invenio_requests/contrib";
 import { RDMRecordSearchBarElement } from "../search/components";
-import { timestampToRelativeTime } from "../utils";
-import { ComputerTabletRequestsItem } from "./requests_items/ComputerTabletRequestsItem";
-import { MobileRequestsItem } from "./requests_items/MobileRequestsItem";
+import {
+  MobileRequestItem,
+  ComputerTabletRequestItem,
+  RequestsSearchLayout,
+  RequestsEmptyResultsWithState,
+  RequestsResults,
+} from "@js/invenio_requests/search";
 
 const appName = "InvenioAppRdm.DashboardRequests";
 
-export const RequestsResults = ({
-  sortOptions,
-  paginationOptions,
-  currentResultsState,
-}) => {
-  const { total } = currentResultsState.data;
-  return (
-    total && (
-      <Grid>
-        <Grid.Row>
-          <Grid.Column width={16}>
-            <Segment>
-              <Grid>
-                <Grid.Row
-                  verticalAlign="middle"
-                  className="small pt-5 pb-5 highlight-background"
-                >
-                  <Grid.Column
-                    mobile={16}
-                    tablet={4}
-                    computer={4}
-                    className="mt-5 mb-5"
-                  >
-                    <Count
-                      label={() => (
-                        <>
-                          {total} {i18next.t("result(s) found")}
-                        </>
-                      )}
-                    />
-                  </Grid.Column>
-                  <Grid.Column
-                    mobile={16}
-                    tablet={12}
-                    computer={12}
-                    className="text-align-right-tablet text-align-right-computer"
-                  >
-                    {sortOptions && (
-                      <Sort
-                        values={sortOptions}
-                        label={(cmp) => (
-                          <>
-                            <label className="mr-10">{i18next.t("Sort by")}</label>
-                            {cmp}
-                          </>
-                        )}
-                      />
-                    )}
-                  </Grid.Column>
-                </Grid.Row>
-
-                <Grid.Row>
-                  <Grid.Column>
-                    <ResultsList />
-                  </Grid.Column>
-                </Grid.Row>
-              </Grid>
-            </Segment>
-          </Grid.Column>
-        </Grid.Row>
-        <InvenioSearchPagination paginationOptions={paginationOptions} />
-      </Grid>
-    )
-  );
-};
-
-RequestsResults.propTypes = {
-  sortOptions: PropTypes.array.isRequired,
-  paginationOptions: PropTypes.object.isRequired,
-  currentResultsState: PropTypes.object.isRequired,
-};
-
-export function RequestsResultsGridItemTemplate({ result, index }) {
-  return (
-    <Card fluid key={index} href={`/me/requests/${result.metadata.id}`}>
-      <Card.Content>
-        <Card.Header>{result.metadata.title}</Card.Header>
-        <Card.Description>
-          <div dangerouslySetInnerHTML={{ __html: result.metadata.description }} />
-        </Card.Description>
-      </Card.Content>
-    </Card>
-  );
-}
-
-RequestsResultsGridItemTemplate.propTypes = {
-  result: PropTypes.object.isRequired,
-  index: PropTypes.string.isRequired,
-};
-
 export function RequestsResultsItemTemplateDashboard({ result }) {
-  const ComputerTabletRequestsItemWithState = withState(ComputerTabletRequestsItem);
-  const MobileRequestsItemWithState = withState(MobileRequestsItem);
-  const createdDate = new Date(result.created);
-  const createdBy = result.created_by;
-  let creatorName = "";
-  const isCreatorUser = "user" in createdBy;
-  const isCreatorCommunity = "community" in createdBy;
-  if (isCreatorUser) {
-    creatorName =
-      result.expanded?.created_by.profile?.full_name ||
-      result.expanded?.created_by.username ||
-      createdBy.user;
-  } else if (isCreatorCommunity) {
-    creatorName = result.expanded?.created_by.metadata?.title || createdBy.community;
+  const ComputerTabletRequestsItemWithState = withState(ComputerTabletRequestItem);
+  const MobileRequestsItemWithState = withState(MobileRequestItem);
+  let detailsURL;
+  if (result.type === "user-access-request") {
+    detailsURL = `/access/requests/${result.id}`;
+  } else {
+    detailsURL = `/me/requests/${result.id}`;
   }
-  const extraData = {
-    differenceInDays: timestampToRelativeTime(createdDate.toISOString()),
-    isCreatorCommunity: isCreatorCommunity,
-    creatorName: creatorName,
-  };
-
   return (
     <>
-      <ComputerTabletRequestsItemWithState result={result} extraData={extraData} />
-      <MobileRequestsItemWithState result={result} extraData={extraData} />
+      <ComputerTabletRequestsItemWithState result={result} detailsURL={detailsURL} />
+      <MobileRequestsItemWithState result={result} detailsURL={detailsURL} />
     </>
   );
 }
@@ -185,272 +50,22 @@ RequestsResultsItemTemplateDashboard.propTypes = {
   result: PropTypes.object.isRequired,
 };
 
-// FIXME: Keeping ResultsGrid.item and SearchBar.element because otherwise
-// these components in RDM result broken.
-
-export const RDMRecordResultsGridItem = ({ result, index }) => {
-  const descriptionStripped = _get(result, "ui.description_stripped", "No description");
-  return (
-    <Card fluid key={index} href={`/me/requests/${result.id}`}>
-      <Card.Content>
-        <Card.Header>{result.metadata.title}</Card.Header>
-        <Card.Description>
-          {_truncate(descriptionStripped, { length: 200 })}
-        </Card.Description>
-      </Card.Content>
-    </Card>
-  );
-};
-
-RDMRecordResultsGridItem.propTypes = {
-  result: PropTypes.object.isRequired,
-  index: PropTypes.string.isRequired,
-};
-
-export class RequestStatusFilterComponent extends Component {
-  constructor(props) {
-    super(props);
-    const { currentQueryState } = this.props;
-    const userSelectionFilters = currentQueryState.filters;
-    const openFilter = userSelectionFilters.find((obj) => obj.includes("is_open"));
-    this.state = {
-      open: openFilter ? openFilter.includes("true") : undefined,
-    };
-  }
-
-  /**
-   * Updates queryFilters based on selection and removing previous filters
-   * @param {string} OpenStatus true if open requests and false if closed requests
-   */
-  retrieveRequests = (OpenStatus) => {
-    const { currentQueryState, updateQueryState } = this.props;
-    const { open } = this.state;
-
-    if (open === OpenStatus) {
-      return;
-    }
-    this.setState({
-      open: OpenStatus,
-    });
-    currentQueryState.filters = [];
-    currentQueryState.filters.push(["is_open", OpenStatus]);
-    updateQueryState(currentQueryState);
-  };
-
-  retrieveOpenRequests = () => {
-    this.retrieveRequests(true);
-  };
-
-  retrieveClosedRequests = () => {
-    this.retrieveRequests(false);
-  };
-
-  render() {
-    const { open } = this.state;
-    return (
-      <Button.Group basic>
-        <Button
-          className="request-search-filter"
-          onClick={this.retrieveOpenRequests}
-          active={open === true}
-        >
-          {i18next.t("Open")}
-        </Button>
-        <Button
-          className="request-search-filter"
-          onClick={this.retrieveClosedRequests}
-          active={open === false}
-        >
-          {i18next.t("Closed")}
-        </Button>
-      </Button.Group>
-    );
-  }
-}
-
-RequestStatusFilterComponent.propTypes = {
-  updateQueryState: PropTypes.func.isRequired,
-  currentQueryState: PropTypes.object.isRequired,
-};
-
-export const RequestStatusFilter = withState(RequestStatusFilterComponent);
-
-export const RDMRequestsSearchLayout = (props) => {
-  const [sidebarVisible, setSidebarVisible] = React.useState(false);
-  const { config } = props;
-  return (
-    <Container>
-      <Grid>
-        <Grid.Row>
-          <Grid.Column only="mobile tablet" mobile={3} tablet={1}>
-            <Button
-              basic
-              size="medium"
-              icon="sliders"
-              onClick={() => setSidebarVisible(true)}
-              aria-label={i18next.t("Filter results")}
-              className="rel-mb-1"
-            />
-          </Grid.Column>
-
-          <Grid.Column
-            mobile={13}
-            tablet={4}
-            computer={3}
-            floated="right"
-            className="text-align-right-mobile"
-          >
-            <RequestStatusFilter className="rel-mb-1" />
-          </Grid.Column>
-
-          <Grid.Column mobile={16} tablet={11} computer={9}>
-            <SearchBar placeholder={i18next.t("Search in my requests...")} />
-          </Grid.Column>
-        </Grid.Row>
-
-        <Grid.Row>
-          <GridResponsiveSidebarColumn
-            width={4}
-            open={sidebarVisible}
-            onHideClick={() => setSidebarVisible(false)}
-          >
-            <SearchAppFacets aggs={config.aggs} appName={appName} />
-          </GridResponsiveSidebarColumn>
-          <Grid.Column mobile={16} tablet={16} computer={12}>
-            <SearchAppResultsPane
-              layoutOptions={config.layoutOptions}
-              appName={appName}
-            />
-          </Grid.Column>
-        </Grid.Row>
-      </Grid>
-    </Container>
-  );
-};
-
-RDMRequestsSearchLayout.propTypes = {
-  config: PropTypes.object.isRequired,
-};
-
-export const RDMRequestsEmptyResults = (props) => {
-  const { queryString, userSelectionFilters, updateQueryState } = props;
-  const isOpen = userSelectionFilters.some(
-    (obj) => obj.includes("is_open") && obj.includes("true")
-  );
-  const filtersToNotReset = userSelectionFilters.find((obj) => obj.includes("is_open"));
-  const elementsToReset = {
-    queryString: "",
-    page: 1,
-    filters: [filtersToNotReset],
-  };
-
-  const AllDone = () => {
-    return (
-      <Header as="h1" icon>
-        {i18next.t("All done!")}
-        <Header.Subheader>
-          {i18next.t("You've caught up with all open requests.")}
-        </Header.Subheader>
-      </Header>
-    );
-  };
-
-  const NoResults = () => {
-    return (
-      <>
-        <Header icon>
-          <Icon name="search" />
-          {i18next.t("No requests found!")}
-        </Header>
-        {queryString && (
-          <Button primary onClick={() => updateQueryState(elementsToReset)}>
-            {i18next.t("Reset search")}
-          </Button>
-        )}
-      </>
-    );
-  };
-
-  const allRequestsDone = isOpen && !queryString;
-  return (
-    <Segment placeholder textAlign="center">
-      {allRequestsDone ? <AllDone /> : <NoResults />}
-    </Segment>
-  );
-};
-
-RDMRequestsEmptyResults.propTypes = {
-  queryString: PropTypes.string.isRequired,
-  updateQueryState: PropTypes.func.isRequired,
-  userSelectionFilters: PropTypes.array.isRequired,
-};
-
-export const RDMRequestsEmptyResultsWithState = withState(RDMRequestsEmptyResults);
-
-const RequestAcceptModalTriggerWithConfig = parametrize(RequestAcceptModalTrigger, {
-  size: "mini",
-  className: "ml-5",
-});
-
-const RequestDeclineModalTriggerWithConfig = parametrize(RequestDeclineModalTrigger, {
-  size: "mini",
-  className: "ml-5",
+const RequestsSearchLayoutWithApp = parametrize(RequestsSearchLayout, {
+  appName: appName,
+  showSharedFilters: true,
 });
 
-const RequestCancelModalTriggerWithConfig = parametrize(RequestCancelModalTrigger, {
-  size: "mini",
-  className: "ml-5",
-});
-
-const CommunitySubmission = () => (
-  <LabelTypeCommunitySubmission className="primary" size="small" />
-);
-
-const CommunityInclusion = () => (
-  <LabelTypeCommunityInclusion className="primary" size="small" />
-);
-
-const CommunityInvitation = () => (
-  <LabelTypeCommunityInvitation className="primary" size="small" />
-);
-
-const Submitted = () => <LabelStatusSubmit className="primary" size="small" />;
-
-const Deleted = () => <LabelStatusDelete className="negative" size="small" />;
-
-const Accepted = () => <LabelStatusAccept className="positive" size="small" />;
-
-const Declined = () => <LabelStatusDecline className="negative" size="small" />;
-
-const Cancelled = () => <LabelStatusCancel className="neutral" size="small" />;
-
-const Expired = () => <LabelStatusExpire className="expired" size="small" />;
-
 export const defaultComponents = {
   [`${appName}.BucketAggregation.element`]: ContribBucketAggregationElement,
   [`${appName}.BucketAggregationValues.element`]: ContribBucketAggregationValuesElement,
   [`${appName}.SearchApp.facets`]: ContribSearchAppFacets,
   [`${appName}.ResultsList.item`]: RequestsResultsItemTemplateDashboard,
-  [`${appName}.ResultsGrid.item`]: RequestsResultsGridItemTemplate,
-  [`${appName}.SearchApp.layout`]: RDMRequestsSearchLayout,
+  [`${appName}.ResultsGrid.item`]: () => null,
+  [`${appName}.SearchApp.layout`]: RequestsSearchLayoutWithApp,
   [`${appName}.SearchApp.results`]: RequestsResults,
   [`${appName}.SearchBar.element`]: RDMRecordSearchBarElement,
-  [`${appName}.EmptyResults.element`]: RDMRequestsEmptyResultsWithState,
-  [`RequestTypeLabel.layout.community-submission`]: CommunitySubmission,
-  [`RequestTypeLabel.layout.community-inclusion`]: CommunityInclusion,
-  [`RequestTypeLabel.layout.community-invitation`]: CommunityInvitation,
-  [`RequestStatusLabel.layout.submitted`]: Submitted,
-  [`RequestStatusLabel.layout.deleted`]: Deleted,
-  [`RequestStatusLabel.layout.accepted`]: Accepted,
-  [`RequestStatusLabel.layout.declined`]: Declined,
-  [`RequestStatusLabel.layout.cancelled`]: Cancelled,
-  [`RequestStatusLabel.layout.expired`]: Expired,
-  [`RequestActionModalTrigger.accept`]: RequestAcceptModalTriggerWithConfig,
-  [`RequestActionModalTrigger.decline`]: RequestDeclineModalTriggerWithConfig,
-  [`RequestActionModalTrigger.cancel`]: RequestCancelModalTriggerWithConfig,
-  [`RequestActionButton.cancel`]: RequestCancelButton,
-  [`RequestActionButton.decline`]: RequestDeclineButton,
-  [`RequestActionButton.accept`]: RequestAcceptButton,
+  [`${appName}.EmptyResults.element`]: RequestsEmptyResultsWithState,
+  ...defaultContribComponents,
 };
 
 const overriddenComponents = overrideStore.getAll();

invenio_app_rdm/theme/assets/semantic-ui/js/invenio_app_rdm/user_dashboard/uploads.js

@@ -3,6 +3,7 @@
 // Copyright (C) 2020-2021 Northwestern University.
 // Copyright (C) 2021 Graz University of Technology.
 // Copyright (C) 2021 New York University.
+// Copyright (C) 2024 KTH Royal Institute of Technology.
 //
 // Invenio App RDM is free software; you can redistribute it and/or modify it
 // under the terms of the MIT License; see LICENSE file for more details.
@@ -19,7 +20,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,15 +41,10 @@ const statuses = {
 };
 
 export const RDMRecordResultsListItem = ({ result }) => {
-  const editRecord = () => {
-    http
-      .post(`/api/records/${result.id}/draft`)
-      .then(() => {
-        window.location = `/uploads/${result.id}`;
-      })
-      .catch((error) => {
-        console.log(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;
@@ -88,14 +83,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}
@@ -112,7 +107,11 @@ RDMRecordResultsListItem.propTypes = {
 // these components in RDM result broken.
 
 export const RDMRecordResultsGridItem = ({ result, index }) => {
-  const descriptionStripped = _get(result, "ui.description_stripped", "No description");
+  const descriptionStripped = _get(
+    result,
+    "ui.description_stripped",
+    i18next.t("No description")
+  );
   return (
     <Card fluid key={index} href={`/records/${result.id}`}>
       <Card.Content>
@@ -176,10 +175,12 @@ export const DashboardUploadsSearchLayout = DashboardSearchLayoutHOC({
     />
   ),
   appName: appName,
+  mineLabel: i18next.t("My uploads"),
+  showSharedFilters: true,
 });
 
 const ContribSearchAppFacetsWithConfig = parametrize(ContribSearchAppFacets, {
-  toogle: true,
+  toggle: true,
 });
 
 const DashboardResultViewWAppName = parametrize(DashboardResultView, {