Merge pull request #16 from oarepo/stojanovic/fe-259-dashboard-requests

using /requests api for requests page
oarepo · Oct 22, 2024 · 32d8c28 · 32d8c28
2 parents 798cbe3 + 315a392
commit 32d8c28
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/oarepo_dashboard/ui/dashboard_requests/__init__.py b/oarepo_dashboard/ui/dashboard_requests/__init__.py
@@ -27,7 +27,7 @@ class DashboardRequestsUIResourceConfig(RecordsUIResourceConfig):
     components = [DashboardRequestsSearchComponent]
 
     def search_endpoint_url(self, identity, api_config, overrides={}, **kwargs):
-        return "/api/user/requests"
+        return "/api/requests"
 
 
 class DashboardRequestsUIResource(RecordsUIResource):

diff --git a/oarepo_dashboard/ui/dashboard_requests/semantic-ui/js/dashboard_requests/search/index.js b/oarepo_dashboard/ui/dashboard_requests/semantic-ui/js/dashboard_requests/search/index.js
@@ -11,10 +11,7 @@ import {
   SearchAppResultViewWithSearchbar,
 } from "@js/oarepo_ui";
 import { withState } from "react-searchkit";
-import {
-  RequestsEmptyResultsWithState,
-  RequestStatusFilter,
-} from "@js/invenio_requests/search";
+import { RequestsEmptyResultsWithState } from "@js/invenio_requests/search";
 import { defaultContribComponents } from "@js/invenio_requests/contrib";
 import { PropTypes } from "prop-types";
 import { FacetsButtonGroupNameToggler } from "@js/dashboard_components";
@@ -48,7 +45,13 @@ RequestsResultsItemTemplateDashboard.propTypes = {
 export const FacetButtons = () => (
   <React.Fragment>
     <Grid.Column only="computer" textAlign="right">
-      <RequestStatusFilter keepFiltersOnUpdate />
+      <FacetsButtonGroupNameToggler
+        basic
+        toggledFilters={[
+          { text: i18next.t("Open"), filterName: "is_open" },
+          { text: i18next.t("Closed"), filterName: "is_closed" },
+        ]}
+      />
       <span className="rel-ml-2"></span>
       <FacetsButtonGroupNameToggler
         basic
@@ -59,7 +62,13 @@ export const FacetButtons = () => (
       />
     </Grid.Column>
     <Grid.Column only="mobile tablet" textAlign="left">
-      <RequestStatusFilter keepFiltersOnUpdate />
+      <FacetsButtonGroupNameToggler
+        basic
+        toggledFilters={[
+          { text: i18next.t("Open"), filterName: "is_open" },
+          { text: i18next.t("Closed"), filterName: "is_closed" },
+        ]}
+      />
     </Grid.Column>
     <Grid.Column only="mobile tablet" textAlign="right">
       <FacetsButtonGroupNameToggler
@@ -81,10 +90,10 @@ const SearchAppResultViewWithSearchbarWAppName = parametrize(
 );
 
 const ActiveFiltersElementWIgnoredFilters = parametrize(ActiveFiltersElement, {
-  ignoredFilters: ["mine", "assigned"],
+  ignoredFilters: ["mine", "assigned", "is_closed"],
 });
 const ClearFiltersButtonWIgnoredFilters = parametrize(ClearFiltersButton, {
-  ignoredFilters: ["mine", "assigned"],
+  ignoredFilters: ["mine", "assigned", "is_closed"],
 });
 export const DashboardUploadsSearchLayout = SearchAppLayoutWithSearchbarHOC({
   placeholder: i18next.t("Search in my requests..."),