Refactor checks suggestion to take a callback when starting checks

execution
trento-project · Jan 16, 2023 · 0b119f6 · 0b119f6
1 parent a242d21
commit 0b119f6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 16 deletions.
diff --git a/assets/js/components/ClusterDetails/ChecksSelection.jsx b/assets/js/components/ClusterDetails/ChecksSelection.jsx
@@ -2,6 +2,9 @@
 import React, { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
+import ReactMarkdown from 'react-markdown';
+import remarkGfm from 'remark-gfm';
+
 import { Disclosure, Switch, Transition } from '@headlessui/react';
 
 import {
@@ -12,14 +15,14 @@ import {
 import classNames from 'classnames';
 import { remove, uniq } from '@lib/lists';
 
-import ReactMarkdown from 'react-markdown';
-import remarkGfm from 'remark-gfm';
+import LoadingBox from '@components/LoadingBox';
+import NotificationBox from '@components/NotificationBox';
+import { executionRequested } from '@state/actions/lastExecutions';
+
 import {
   SavingFailedAlert,
   SuggestTriggeringChecksExecutionAfterSettingsUpdated,
 } from './ClusterSettings';
-import LoadingBox from '../LoadingBox';
-import NotificationBox from '../NotificationBox';
 
 const toggle = (list, element) =>
   list.includes(element)
@@ -293,9 +296,12 @@ export function ChecksSelection({ clusterId, cluster }) {
         )}
         {localSavingSuccess && selectedChecks.length > 0 && (
           <SuggestTriggeringChecksExecutionAfterSettingsUpdated
-            cluster={cluster}
             clusterId={clusterId}
+            selectedChecks={selectedChecks}
             onClose={() => setLocalSavingSuccess(null)}
+            onStartExecution={(clusterID, hosts, checks) =>
+              dispatch(executionRequested(clusterID, hosts, checks))
+            }
           />
         )}
       </div>

diff --git a/assets/js/components/ClusterDetails/ClusterDetails.jsx b/assets/js/components/ClusterDetails/ClusterDetails.jsx
@@ -78,8 +78,8 @@ function ClusterDetails() {
 
   const checkResults = useChecksResult(cluster);
   const dispatch = useDispatch();
-  const onStartExecution = (clusterId, hosts, selectedChecks) => {
-    dispatch(executionRequested(clusterId, hosts, selectedChecks));
+  const onStartExecution = (_, hosts, selectedChecks) => {
+    dispatch(executionRequested(clusterID, hosts, selectedChecks));
   };
   const hosts = useSelector(getClusterHostIDs(clusterID));
   const hostsData = useSelector((state) =>

diff --git a/assets/js/components/ClusterDetails/ClusterDetailsNew.jsx b/assets/js/components/ClusterDetails/ClusterDetailsNew.jsx
@@ -150,8 +150,8 @@ export function ClusterDetailsNew() {
             usingNewChecksEngine
             hosts={hosts}
             checks={cluster.selected_checks}
-            onStartExecution={(clusterId, hostList, selectedChecks) =>
-              dispatch(executionRequested(clusterId, hostList, selectedChecks))
+            onStartExecution={(_, hostList, selectedChecks) =>
+              dispatch(executionRequested(clusterID, hostList, selectedChecks))
             }
           >
             <EOS_PLAY_CIRCLE

diff --git a/assets/js/components/ClusterDetails/ClusterSettings.jsx b/assets/js/components/ClusterDetails/ClusterSettings.jsx
@@ -115,10 +115,11 @@ export function SavingFailedAlert({ onClose = () => {}, children }) {
 }
 
 export function SuggestTriggeringChecksExecutionAfterSettingsUpdated({
-  cluster,
   clusterId,
   usingNewChecksEngine = false,
+  selectedChecks,
   onClose = () => {},
+  onStartExecution = () => {},
 }) {
   return (
     <div>
@@ -134,7 +135,8 @@ export function SuggestTriggeringChecksExecutionAfterSettingsUpdated({
           clusterId={clusterId}
           usingNewChecksEngine={usingNewChecksEngine}
           hosts={useSelector(getClusterHostIDs(clusterId))}
-          checks={cluster.selected_checks}
+          checks={selectedChecks}
+          onStartExecution={onStartExecution}
         >
           <EOS_PLAY_CIRCLE color="green" />
         </TriggerChecksExecutionRequest>

diff --git a/assets/js/components/ClusterDetails/ConnectionSettings.jsx b/assets/js/components/ClusterDetails/ConnectionSettings.jsx
@@ -1,12 +1,14 @@
 import { EOS_ERROR, EOS_LOADING_ANIMATED } from 'eos-icons-react';
 import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import Table from '@components/Table';
+import classNames from 'classnames';
 import { Switch } from '@headlessui/react';
 
-import classNames from 'classnames';
-import NotificationBox from '../NotificationBox';
-import LoadingBox from '../LoadingBox';
+import Table from '@components/Table';
+import NotificationBox from '@components/NotificationBox';
+import LoadingBox from '@components/LoadingBox';
+import { executionRequested } from '@state/actions/lastExecutions';
+
 import {
   SavingFailedAlert,
   SuggestTriggeringChecksExecutionAfterSettingsUpdated,
@@ -182,9 +184,12 @@ export function ConnectionSettings({ clusterId, cluster }) {
         )}
         {localSavingSuccess && cluster.selected_checks.length > 0 && (
           <SuggestTriggeringChecksExecutionAfterSettingsUpdated
-            cluster={cluster}
             clusterId={clusterId}
+            selectedChecks={cluster.selected_checks}
             onClose={() => setLocalSavingSuccess(null)}
+            onStartExecution={(clusterID, hosts, checks) =>
+              dispatch(executionRequested(clusterID, hosts, checks))
+            }
           />
         )}
       </div>