Use rest prop passing from HostSettingsPage to HostChecksSelection

trento-project · Jul 11, 2023 · 812e5ac · 812e5ac
1 parent 9d52fb9
commit 812e5ac
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 15 deletions.
diff --git a/assets/js/components/HostDetails/HostChecksSelection.jsx b/assets/js/components/HostDetails/HostChecksSelection.jsx
@@ -11,10 +11,7 @@ function HostChecksSelection({
   provider,
   agentVersion,
   selectedChecks,
-  catalog,
-  catalogError,
-  catalogLoading,
-  onUpdateCatalog,
+  ...rest
 }) {
   return (
     <div className="w-full px-2 sm:px-0">
@@ -25,20 +22,11 @@ function HostChecksSelection({
       <HostInfoBox provider={provider} agentVersion={agentVersion} />
       <ChecksSelection
         targetID={hostID}
-        catalog={catalog}
-        catalogError={catalogError}
-        loading={catalogLoading}
         selected={selectedChecks}
-        onSave={(_selectedChecks, _hostID) => {
-          // TODO: dispatch check selection for a host
-        }}
-        onUpdateCatalog={() => onUpdateCatalog()}
         onClear={() => {
           // TODO
         }}
-        saving={false}
-        error={null}
-        success={false}
+        {...rest}
       />
     </div>
   );

diff --git a/assets/js/components/HostDetails/HostSettingsPage.jsx b/assets/js/components/HostDetails/HostSettingsPage.jsx
@@ -4,9 +4,11 @@ import { useParams } from 'react-router-dom';
 
 import LoadingBox from '@components/LoadingBox';
 
+import { checksSelected } from '@state/checksSelection';
 import { updateCatalog } from '@state/actions/catalog';
 import { getCatalog } from '@state/selectors/catalog';
 import { getHost } from '@state/selectors';
+import { getCheckSelection } from '@state/selectors/checksSelection';
 import HostChecksSelection from './HostChecksSelection';
 
 function HostSettingsPage() {
@@ -21,9 +23,14 @@ function HostSettingsPage() {
     loading: catalogLoading,
   } = useSelector(getCatalog());
 
+  const { saving, savingError, savingSuccess } = useSelector(
+    getCheckSelection()
+  );
+
   if (!host) {
     return <LoadingBox text="Loading..." />;
   }
+
   const {
     hostname: hostName,
     provider,
@@ -40,7 +47,7 @@ function HostSettingsPage() {
       selectedChecks={selectedChecks}
       catalog={catalog}
       catalogError={catalogError}
-      catalogLoading={catalogLoading}
+      loading={catalogLoading}
       onUpdateCatalog={() =>
         dispatch(
           updateCatalog({
@@ -49,6 +56,19 @@ function HostSettingsPage() {
           })
         )
       }
+      saving={saving}
+      error={savingError}
+      success={savingSuccess}
+      onSave={(selection, targetID) =>
+        dispatch(
+          checksSelected({
+            targetID,
+            targetType: 'host',
+            targetName: host.hostname,
+            checks: selection,
+          })
+        )
+      }
     />
   );
 }