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/base.js

@@ -12,76 +12,40 @@ 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 { Count, ResultsList, SearchBar, Sort, buildUID } from "react-searchkit";
+import { ResultsList, SearchBar, Sort, buildUID } from "react-searchkit";
 import { GridResponsiveSidebarColumn } from "react-invenio-forms";
-import { Grid, Segment, Button } from "semantic-ui-react";
+import { Grid, Button } from "semantic-ui-react";
 import PropTypes from "prop-types";
 import Overridable from "react-overridable";
 
 export function DashboardResultView(props) {
   const { sortOptions, paginationOptions, currentResultsState, appName } = props;
   const { total } = currentResultsState.data;
+
+  const handleResultsRendered = () => {
+    window.invenio?.onSearchResultsRendered();
+  };
   return (
     total && (
       <Grid>
-        <Grid.Row>
-          <Grid.Column width={16}>
-            <Segment>
-              <Grid>
-                <Overridable
-                  id={buildUID("ResultView.resultHeader", "", appName)}
-                  sortOptions={sortOptions}
-                  paginationOptions={paginationOptions}
-                  currentResultsState={currentResultsState}
-                  appName={appName}
-                >
-                  <Grid.Row
-                    verticalAlign="middle"
-                    className="small pt-5 pb-5 highlight-background"
-                  >
-                    <Grid.Column width={4}>
-                      <Count
-                        label={() => (
-                          <>
-                            {total} {i18next.t("result(s) found")}
-                          </>
-                        )}
-                      />
-                    </Grid.Column>
-                    <Grid.Column width={12} textAlign="right" className="padding-r-5">
-                      {sortOptions && (
-                        <Sort
-                          values={sortOptions}
-                          label={(cmp) => (
-                            <>
-                              <label className="mr-10">{i18next.t("Sort by")}</label>
-                              {cmp}
-                            </>
-                          )}
-                        />
-                      )}
-                    </Grid.Column>
-                  </Grid.Row>
-                </Overridable>
-                <Overridable
-                  id={buildUID("ResultView.resultList", "", appName)}
-                  sortOptions={sortOptions}
-                  paginationOptions={paginationOptions}
-                  currentResultsState={currentResultsState}
-                  appName={appName}
-                >
-                  <Grid.Row>
-                    <Grid.Column>
-                      <ResultsList />
-                    </Grid.Column>
-                  </Grid.Row>
-                </Overridable>
-              </Grid>
-            </Segment>
-          </Grid.Column>
-        </Grid.Row>
+        <Overridable
+          id={buildUID("ResultView.resultList", "", appName)}
+          sortOptions={sortOptions}
+          paginationOptions={paginationOptions}
+          currentResultsState={currentResultsState}
+          appName={appName}
+        >
+          <Grid.Row>
+            <Grid.Column>
+              <ResultsList onResultsRendered={handleResultsRendered} />
+            </Grid.Column>
+          </Grid.Row>
+        </Overridable>
+
         <Overridable
           id={buildUID("ResultView.resultFooter", "", appName)}
           sortOptions={sortOptions}
@@ -89,7 +53,10 @@ export function DashboardResultView(props) {
           currentResultsState={currentResultsState}
           appName={appName}
         >
-          <InvenioSearchPagination paginationOptions={paginationOptions} />
+          <InvenioSearchPagination
+            total={total}
+            paginationOptions={paginationOptions}
+          />
         </Overridable>
       </Grid>
     )
@@ -109,8 +76,9 @@ DashboardResultView.defaultProps = {
 
 export const DashboardSearchLayoutHOC = ({
   searchBarPlaceholder = "",
-  newBtn = () => null,
   appName = undefined,
+  showSharedFilters = false,
+  mineLabel = "",
 }) => {
   const DashboardUploadsSearchLayout = (props) => {
     const [sidebarVisible, setSidebarVisible] = React.useState(false);
@@ -118,22 +86,102 @@ export const DashboardSearchLayoutHOC = ({
 
     return (
       <Grid>
-        <Grid.Column only="mobile tablet" mobile={2} tablet={1}>
-          <Button
-            basic
-            icon="sliders"
-            onClick={() => setSidebarVisible(true)}
-            aria-label={i18next.t("Filter results")}
-          />
-        </Grid.Column>
+        <Overridable
+          id={buildUID("SearchLayout.searchHeader", "", appName)}
+          sortOptions={config.sortOptions}
+          appName={appName}
+        >
+          <>
+            {/* Mobile/tablet search header */}
+            <Grid.Row className="mobile tablet only">
+              <Grid.Column mobile={2} tablet={1} verticalAlign="middle">
+                <Button
+                  basic
+                  icon="sliders"
+                  onClick={() => setSidebarVisible(true)}
+                  aria-label={i18next.t("Filter results")}
+                />
+              </Grid.Column>
+              <Grid.Column
+                mobile={14}
+                tablet={14}
+                verticalAlign="middle"
+                floated="right"
+              >
+                <SearchBar placeholder={searchBarPlaceholder} />
+              </Grid.Column>
+            </Grid.Row>
+
+            <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.Column mobile={14} tablet={10} computer={8} floated="right">
-          <SearchBar placeholder={searchBarPlaceholder} />
-        </Grid.Column>
+            <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}
+                    label={(cmp) => (
+                      <>
+                        <label className="mr-10">{i18next.t("Sort by")}</label>
+                        {cmp}
+                      </>
+                    )}
+                  />
+                )}
+              </Grid.Column>
+            </Grid.Row>
+            {/* End mobile/tablet search header */}
 
-        <Grid.Column mobile={16} tablet={5} computer={4} align="right">
-          {newBtn}
-        </Grid.Column>
+            {/* Desktop search header */}
+            <Grid.Row className="computer only">
+              <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={3} textAlign="right">
+                {config.sortOptions && (
+                  <Sort
+                    values={config.sortOptions}
+                    label={(cmp) => (
+                      <>
+                        <label className="mr-10">{i18next.t("Sort by")}</label>
+                        {cmp}
+                      </>
+                    )}
+                  />
+                )}
+              </Grid.Column>
+            </Grid.Row>
+            {/* End desktop search header */}
+          </>
+        </Overridable>
 
         <Grid.Row>
           <GridResponsiveSidebarColumn

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

@@ -9,8 +9,6 @@
 
 import { createSearchAppInit } from "@js/invenio_search_ui";
 import { i18next } from "@translations/invenio_app_rdm/i18next";
-import React from "react";
-import { Button } from "semantic-ui-react";
 import {
   CommunityItem,
   ResultsGridItemTemplate,
@@ -29,16 +27,8 @@ export const appName = "InvenioAppRdm.DashboardCommunities";
 
 export const DashboardCommunitiesSearchLayout = DashboardSearchLayoutHOC({
   searchBarPlaceholder: i18next.t("Search in my communities..."),
-  newBtn: (
-    <Button
-      positive
-      icon="upload"
-      href="/communities/new"
-      content={i18next.t("New community")}
-      floated="right"
-    />
-  ),
   appName: appName,
+  mineLabel: i18next.t("My communities"),
 });
 
 const DashboardResultViewWAppName = parametrize(DashboardResultView, {