Adjust Orbit Plugin name to ASR (#691)

Adjusted orbit integration name to ASR to better encompass the scope of the integration
hpcc-systems · Feb 2, 2024 · 46918da · 46918da
1 parent e730f71
commit 46918da
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/client-reactjs/src/components/admin/Integrations.js b/client-reactjs/src/components/admin/Integrations.js
@@ -159,6 +159,18 @@ const Integrations = () => {
         footer={saveBtn}
         title="Integration Settings">
         <Form layout="vertical" form={notificationForm} initialValues={{ monitoringActive: true }}>
+          <h3>General Settings</h3>
+          <Form.Item
+            label="Severity 3 Notification Emails"
+            style={{ width: '100%' }}
+            name="notificationEmailsSev3"
+            initialValue={selectedIntegration.metaData?.notificationEmailsSev3}
+            validateTrigger={['onChange', 'onBlur']}
+            rules={[{ max: 256, message: 'Maximum of 256 characters allowed' }]}>
+            <Input
+              onChange={(e) => setNotifications({ ...notifications, notificationEmailsSev3: e.target.value })}></Input>
+          </Form.Item>
+          <br />
           <h3>Megaphone Notification Settings</h3>
           <Form.Item name="megaphone" label="Active">
             <Switch
@@ -173,27 +185,20 @@ const Integrations = () => {
             style={{ width: '100%' }}
             name="notificationEmails"
             initialValue={selectedIntegration.metaData?.notificationEmails}
-            validateTrigger={['onChange', 'onBlur']}>
+            validateTrigger={['onChange', 'onBlur']}
+            rules={[{ max: 256, message: 'Maximum of 256 characters allowed' }]}>
             <Input onChange={(e) => setNotifications({ ...notifications, notificationEmails: e.target.value })}></Input>
           </Form.Item>
           <Form.Item
             label="Notification Webhooks"
             style={{ width: '100%' }}
             name="notificationWebhooks"
             initialValue={selectedIntegration.metaData?.notificationWebhooks}
-            validateTrigger={['onChange', 'onBlur']}>
+            validateTrigger={['onChange', 'onBlur']}
+            rules={[{ max: 256, message: 'Maximum of 256 characters allowed' }]}>
             <Input
               onChange={(e) => setNotifications({ ...notifications, notificationWebhooks: e.target.value })}></Input>
           </Form.Item>
-          <Form.Item
-            label="Severity 3 Notification Emails"
-            style={{ width: '100%' }}
-            name="notificationEmailsSev3"
-            initialValue={selectedIntegration.metaData?.notificationEmailsSev3}
-            validateTrigger={['onChange', 'onBlur']}>
-            <Input
-              onChange={(e) => setNotifications({ ...notifications, notificationEmailsSev3: e.target.value })}></Input>
-          </Form.Item>
         </Form>
       </Modal>
     </>

diff --git a/client-reactjs/src/components/layout/LeftNav.js b/client-reactjs/src/components/layout/LeftNav.js
@@ -63,7 +63,7 @@ class LeftNav extends Component {
     const applicationId = this.props?.applicationId || '';
     const integrations = this.props?.integrations || [];
 
-    const orbitActive = integrations.find((i) => i.name === 'Orbit')?.active;
+    const asrActive = integrations.find((i) => i.name === 'ASR')?.active;
 
     if (!this.props.loggedIn || !this.props.user || Object.getOwnPropertyNames(this.props.user).length == 0) {
       return null;
@@ -124,7 +124,7 @@ class LeftNav extends Component {
               <Link to={'/' + applicationId + '/superfileMonitoring'}>{<Text text="Superfiles" />}</Link>
             </Menu.Item>
 
-            {orbitActive ? (
+            {asrActive ? (
               <Menu.Item key="4e" icon={<CloudServerOutlined />}>
                 <Link to={'/' + applicationId + '/orbitMonitoring'}>{<Text text="Orbit" />}</Link>
               </Menu.Item>
@@ -139,7 +139,7 @@ class LeftNav extends Component {
               <Link to={'/' + applicationId + '/dashboard/clusterUsage'}>{<Text text="Cluster" />}</Link>
             </Menu.Item>
 
-            {orbitActive ? (
+            {asrActive ? (
               <Menu.Item key="5c" icon={<CloudServerOutlined />}>
                 <Link to={'/' + applicationId + '/dashboard/Orbit'}>{<Text text="Orbit" />}</Link>
               </Menu.Item>

diff --git a/server/job-scheduler.js b/server/job-scheduler.js
@@ -40,16 +40,17 @@ const {
   scheduleFileMonitoring,
 } = require("./jobSchedularMethods/hpccFiles.js");
 const { scheduleKeyCheck } = require("./jobSchedularMethods/apiKeys.js");
-const {scheduleEmailNotificationProcessing, scheduleTeamsNotificationProcessing} = require("./jobSchedularMethods/notificationJobs.js");
+const {
+  scheduleEmailNotificationProcessing,
+  scheduleTeamsNotificationProcessing,
+} = require("./jobSchedularMethods/notificationJobs.js");
 
 const {
   createOrbitMegaphoneJob,
   createOrbitMonitoringJob,
   scheduleOrbitMonitoringOnServerStart,
 } = require("./jobSchedularMethods/orbitJobs.js");
 
-const { scheduleKeyCheck } = require("./jobSchedularMethods/apiKeys.js");
-
 //import job directly to run it only once on server start
 const { createIntegrations } = require("./jobs/integrationCreation.js");
 
@@ -329,7 +330,7 @@ class JobScheduler {
   scheduleEmailNotificationProcessing() {
     return scheduleEmailNotificationProcessing.call(this);
   }
-  scheduleTeamsNotificationProcessing(){
+  scheduleTeamsNotificationProcessing() {
     return scheduleTeamsNotificationProcessing.call(this);
   }
   //orbit jobs

diff --git a/server/jobs/integrationCreation.js b/server/jobs/integrationCreation.js
@@ -19,14 +19,13 @@ async function createIntegrations() {
       if (process.env.ASR === "true") {
         integrationList.push({
           application_id: application.id,
-          name: "Orbit",
+          name: "ASR",
           description:
-            "Enabling this integration will allow Tombolo to collect data from HPCCs Orbit system and provide dashboard information for it",
+            "Enabling this integration will allow Tombolo to collect data from Orbit, FIDO, and other ASR sources in order to provide monitoring and alerting functionality. Additional fields will be made available in certain monitoring types as well.",
           active: "false",
           metaData: {
-            notificationEmails: "[email protected]",
-            notificationWebhooks:
-              "https://reedelsevier.webhook.office.com/webhookb2/81c072d6-6b47-4eca-9434-73944c464876@9274ee3f-9425-4109-a27f-9fb15c10675d/IncomingWebhook/60019c7653734064b4c225a02b1da597/af40e12f-e839-4801-91e9-e61a20045feb",
+            notificationEmails: "",
+            notificationWebhooks: "",
           },
         });
       }