Fixes #36324 - Add bookmarks button for subscriptions

stejskalleos · May 17, 2023 · 659655b · 659655b
1 parent f1c0cc8
commit 659655b
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 10 deletions.
diff --git a/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js b/webpack/scenes/Subscriptions/components/SubscriptionsToolbar/SubscriptionsToolbar.js
@@ -4,6 +4,7 @@ import { Row, Col, Form, FormGroup, Button } from 'patternfly-react';
 import { LinkContainer } from 'react-router-bootstrap';
 import { noop } from 'foremanReact/common/helpers';
 import SearchBar from 'foremanReact/components/SearchBar';
+import { getControllerSearchProps } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { SUBSCRIPTIONS_SERVICE_URL } from '../../SubscriptionConstants';
 
@@ -34,11 +35,8 @@ const SubscriptionsToolbar = ({
         <FormGroup className="toolbar-pf-filter">
           <SearchBar
             data={{
-              autocomplete: {
-                url: '/katello/api/v2/subscriptions/auto_complete_search',
-                apiParams: { ...autocompleteQueryParams },
-              },
-              bookmarks: {},
+              ...getControllerSearchProps('/katello/api/v2/subscriptions', 'searchBar-katello_subscriptions', true, autocompleteQueryParams),
+              controller: 'katello_subscriptions',
             }}
             onSearch={onSearch}
             onSearchChange={updateSearchQuery}

diff --git a/...criptions/components/SubscriptionsToolbar/__snapshots__/SubscriptionsToolbar.test.js.snap b/...criptions/components/SubscriptionsToolbar/__snapshots__/SubscriptionsToolbar.test.js.snap
@@ -27,9 +27,18 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar 1`] = `
             Object {
               "autocomplete": Object {
                 "apiParams": Object {},
+                "id": "searchBar-katello_subscriptions",
+                "searchQuery": "",
                 "url": "/katello/api/v2/subscriptions/auto_complete_search",
+                "useKeyShortcuts": true,
               },
-              "bookmarks": Object {},
+              "bookmarks": Object {
+                "canCreate": true,
+                "documentationUrl": "/links/manual/4.1.5Searching",
+                "id": "searchBar-katello_subscriptions",
+                "url": "/api/bookmarks",
+              },
+              "controller": "katello_subscriptions",
             }
           }
           initialQuery=""
@@ -112,9 +121,18 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled add but
             Object {
               "autocomplete": Object {
                 "apiParams": Object {},
+                "id": "searchBar-katello_subscriptions",
+                "searchQuery": "",
                 "url": "/katello/api/v2/subscriptions/auto_complete_search",
+                "useKeyShortcuts": true,
+              },
+              "bookmarks": Object {
+                "canCreate": true,
+                "documentationUrl": "/links/manual/4.1.5Searching",
+                "id": "searchBar-katello_subscriptions",
+                "url": "/api/bookmarks",
               },
-              "bookmarks": Object {},
+              "controller": "katello_subscriptions",
             }
           }
           initialQuery=""
@@ -197,9 +215,18 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled delete
             Object {
               "autocomplete": Object {
                 "apiParams": Object {},
+                "id": "searchBar-katello_subscriptions",
+                "searchQuery": "",
                 "url": "/katello/api/v2/subscriptions/auto_complete_search",
+                "useKeyShortcuts": true,
+              },
+              "bookmarks": Object {
+                "canCreate": true,
+                "documentationUrl": "/links/manual/4.1.5Searching",
+                "id": "searchBar-katello_subscriptions",
+                "url": "/api/bookmarks",
               },
-              "bookmarks": Object {},
+              "controller": "katello_subscriptions",
             }
           }
           initialQuery=""
@@ -282,9 +309,18 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with disabled manifes
             Object {
               "autocomplete": Object {
                 "apiParams": Object {},
+                "id": "searchBar-katello_subscriptions",
+                "searchQuery": "",
                 "url": "/katello/api/v2/subscriptions/auto_complete_search",
+                "useKeyShortcuts": true,
               },
-              "bookmarks": Object {},
+              "bookmarks": Object {
+                "canCreate": true,
+                "documentationUrl": "/links/manual/4.1.5Searching",
+                "id": "searchBar-katello_subscriptions",
+                "url": "/api/bookmarks",
+              },
+              "controller": "katello_subscriptions",
             }
           }
           initialQuery=""
@@ -367,9 +403,18 @@ exports[`SubscriptionsToolbar renders SubscriptionsToolbar with table columns 1`
             Object {
               "autocomplete": Object {
                 "apiParams": Object {},
+                "id": "searchBar-katello_subscriptions",
+                "searchQuery": "",
                 "url": "/katello/api/v2/subscriptions/auto_complete_search",
+                "useKeyShortcuts": true,
+              },
+              "bookmarks": Object {
+                "canCreate": true,
+                "documentationUrl": "/links/manual/4.1.5Searching",
+                "id": "searchBar-katello_subscriptions",
+                "url": "/api/bookmarks",
               },
-              "bookmarks": Object {},
+              "controller": "katello_subscriptions",
             }
           }
           initialQuery=""