grabbing ASR Integration from redux

hpcc-systems · Feb 2, 2024 · e4b3b39 · e4b3b39
1 parent 5e4da54
commit e4b3b39
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/client-reactjs/src/components/application/jobMonitoring/AddEditJobMonitoringModal.jsx b/client-reactjs/src/components/application/jobMonitoring/AddEditJobMonitoringModal.jsx
@@ -30,7 +30,6 @@ const AddEditJobMonitoringModal = ({
   jobMonitorings,
   setEditingData,
   isEditing,
-  asrIntegration,
   erroneousTabs,
   setErroneousTabs,
   setErroneousScheduling,
@@ -79,16 +78,13 @@ const AddEditJobMonitoringModal = ({
           setCronMessage={setCronMessage}
           erroneousScheduling={erroneousScheduling}
           monitoringScope={monitoringScope}
-          asrIntegration={asrIntegration}
         />
       ),
     },
     {
       label: 'Notifications',
       id: 3,
-      component: () => (
-        <JobMonitoringNotificationTab form={form} teamsHooks={teamsHooks} asrIntegration={asrIntegration} />
-      ),
+      component: () => <JobMonitoringNotificationTab form={form} teamsHooks={teamsHooks} />,
     },
   ];
 

diff --git a/client-reactjs/src/components/application/jobMonitoring/JobMonitoringNotificationTab.jsx b/client-reactjs/src/components/application/jobMonitoring/JobMonitoringNotificationTab.jsx
@@ -1,5 +1,6 @@
 //Packages
 import React from 'react';
+import { useSelector } from 'react-redux';
 import { Form, Card, Select } from 'antd';
 import { isEmail } from 'validator';
 
@@ -16,7 +17,13 @@ const jobStatuses = [
   { label: 'Threshold Exceeded', value: 'ThresholdExceeded' }, //TODO - If threshold exceed option is selected make threshold time input value required
 ];
 
-function JobMonitoringNotificationTab({ form, teamsHooks, asrIntegration }) {
+function JobMonitoringNotificationTab({ form, teamsHooks }) {
+  //Redux
+  const {
+    applicationReducer: { integrations },
+  } = useSelector((state) => state);
+  const asrIntegration = integrations?.find((integration) => integration.name === 'ASR') !== undefined;
+
   // JSX
   return (
     <Card>

diff --git a/client-reactjs/src/components/application/jobMonitoring/JobMonitoringTab.jsx b/client-reactjs/src/components/application/jobMonitoring/JobMonitoringTab.jsx
@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
 import { Checkbox, Card, Form, Input } from 'antd';
 
 import './jobMonitoring.css';
@@ -17,10 +18,16 @@ function JobMonitoringTab({
   setCronMessage,
   erroneousScheduling,
   monitoringScope,
-  asrIntegration,
 }) {
   const [activateMonitoring, setActivateMonitoring] = useState(false);
 
+  //Redux
+  const {
+    applicationReducer: { integrations },
+  } = useSelector((state) => state);
+
+  const asrIntegration = integrations?.find((integration) => integration.name === 'ASR') !== undefined;
+
   return (
     <div>
       {/* Cluster wide monitoring does not require scheduling because all you are doing is monitoring the new work units in cluster that meet notification conditions */}
@@ -64,7 +71,7 @@ function JobMonitoringTab({
                   },
                 },
               ]}>
-              <Input type="number" min={1} max={1440} style={{ width: '100%' }} placeholder="Threshold (in minutes)" />
+              <Input type="number" min={1} max={1440} style={{ width: '50%' }} placeholder="Threshold (in minutes)" />
             </Form.Item>
           )}
 

diff --git a/client-reactjs/src/components/application/jobMonitoring/index.jsx b/client-reactjs/src/components/application/jobMonitoring/index.jsx
@@ -94,9 +94,6 @@ function JobMonitoring() {
     }
   }, [editingData]);
 
-  //TODO - Grab ASR integration flag from redux
-  const asrIntegration = true;
-
   // Create form instance
   const [form] = Form.useForm();
 
@@ -289,7 +286,6 @@ function JobMonitoring() {
         jobMonitorings={jobMonitorings}
         setEditingData={setEditingData}
         isEditing={editingData.isEditing}
-        asrIntegration={asrIntegration}
         erroneousTabs={erroneousTabs}
         setErroneousTabs={setErroneousTabs}
         setErroneousScheduling={setErroneousScheduling}