From 706b284cb8091ef00bc352bc5ee32f4fdca1162a Mon Sep 17 00:00:00 2001
From: "saul.gill" <saul.gill@est.tech>
Date: Mon, 9 Aug 2021 14:19:33 +0100
Subject: Add error handling and refactoring

Added error for when common or instance props can't be retrieved
Added error for monitoring when control loops can't be retrieved
Made node templates collapsed by default when editing properties
Added single service function to get common or instance properties

Issue-ID: POLICY-3439
Change-Id: I74560a06aae1a820862f977d5e7ac86597a093c0
Signed-off-by: saul.gill <saul.gill@est.tech>
---
 .../__snapshots__/CommissioningModal.test.js.snap    | 20 ++++++++++++++++++--
 .../__snapshots__/InstanceModal.test.js.snap         | 16 ++++++++++++++++
 .../__snapshots__/MonitorInstantiation.test.js.snap  | 11 ++++++++++-
 .../__snapshots__/ReadAndConvertYaml.test.js.snap    |  8 ++++++--
 4 files changed, 50 insertions(+), 5 deletions(-)

(limited to 'gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__')

diff --git a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/CommissioningModal.test.js.snap b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/CommissioningModal.test.js.snap
index 41c13de..8c26ff6 100644
--- a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/CommissioningModal.test.js.snap
+++ b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/CommissioningModal.test.js.snap
@@ -13,7 +13,7 @@ exports[`Verify ReadAndConvertYaml renders correctly 1`] = `
     closeLabel="Close"
   >
     <ModalTitle>
-      Edit Common Properties
+      Change Control Loop Common Properties
     </ModalTitle>
   </ModalHeader>
   <br />
@@ -28,6 +28,22 @@ exports[`Verify ReadAndConvertYaml renders correctly 1`] = `
       <div
         id="editor"
       />
+      <Styled(Alert)
+        show={false}
+        variant="danger"
+      >
+        Can't get service template:
+        <br />
+        {}
+      </Styled(Alert)>
+      <Styled(Alert)
+        show={false}
+        variant="danger"
+      >
+        Can't get common properties:
+        <br />
+        {}
+      </Styled(Alert)>
     </ModalBody>
   </div>
   <styled.div />
@@ -44,7 +60,7 @@ exports[`Verify ReadAndConvertYaml renders correctly 1`] = `
       active={false}
       disabled={false}
       onClick={[Function]}
-      variant="success"
+      variant="success mr-auto"
     >
       Commission
     </Button>
diff --git a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/InstanceModal.test.js.snap b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/InstanceModal.test.js.snap
index 07ae8f8..ba7caf9 100644
--- a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/InstanceModal.test.js.snap
+++ b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/InstanceModal.test.js.snap
@@ -27,6 +27,22 @@ exports[`Verify MonitoringInstantiation renders correctly 1`] = `
       <div
         id="editor"
       />
+      <Styled(Alert)
+        show={false}
+        variant="danger"
+      >
+        Can't get service template:
+        <br />
+        {}
+      </Styled(Alert)>
+      <Styled(Alert)
+        show={false}
+        variant="danger"
+      >
+        Can't get instance properties:
+        <br />
+        {}
+      </Styled(Alert)>
     </ModalBody>
     <styled.div />
   </div>
diff --git a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/MonitorInstantiation.test.js.snap b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/MonitorInstantiation.test.js.snap
index 6504b54..df5c243 100644
--- a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/MonitorInstantiation.test.js.snap
+++ b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/MonitorInstantiation.test.js.snap
@@ -16,7 +16,16 @@ exports[`Verify MonitoringInstantiation renders correctly 1`] = `
       Tosca Instantiation - Monitoring
     </ModalTitle>
   </ModalHeader>
-  <ModalBody />
+  <ModalBody>
+    <Styled(Alert)
+      show={false}
+      variant="danger"
+    >
+      Can't get control loop instantiation info:
+      <br />
+      {}
+    </Styled(Alert)>
+  </ModalBody>
   <ModalFooter>
     <Button
       active={false}
diff --git a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/ReadAndConvertYaml.test.js.snap b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/ReadAndConvertYaml.test.js.snap
index d515474..76739f3 100644
--- a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/ReadAndConvertYaml.test.js.snap
+++ b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/__snapshots__/ReadAndConvertYaml.test.js.snap
@@ -33,7 +33,9 @@ exports[`Verify ReadAndConvertYaml renders correctly 1`] = `
     <Styled(Alert)
       show={false}
       variant="danger"
-    />
+    >
+      null
+    </Styled(Alert)>
     <Styled(Alert)
       show={false}
       variant="success"
@@ -41,7 +43,9 @@ exports[`Verify ReadAndConvertYaml renders correctly 1`] = `
       <h2>
         Delete Successful
       </h2>
-      <styled.pre />
+      <styled.pre>
+        null
+      </styled.pre>
     </Styled(Alert)>
   </ModalBody>
   <ModalFooter>
-- 
cgit