Edit detector - UX improvements and updates opensearch-project#482

Signed-off-by: Jovan Cvetkovic <[email protected]>
jovancacvetkovic · Mar 20, 2023 · 77604e3 · 77604e3
1 parent 6ea7fe9
commit 77604e3
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 4 deletions.
diff --git a/public/pages/Alerts/containers/Alerts/__snapshots__/Alerts.test.tsx.snap b/public/pages/Alerts/containers/Alerts/__snapshots__/Alerts.test.tsx.snap
@@ -943,6 +943,7 @@ exports[`<Alerts /> spec renders the component 1`] = `
               title="Alerts"
             >
               <EuiPanel
+                className=""
                 style={
                   Object {
                     "paddingLeft": "0px",

diff --git a/...ages/Detectors/components/DetectorRulesView/__snapshots__/DetectorRulesView.test.tsx.snap b/...ages/Detectors/components/DetectorRulesView/__snapshots__/DetectorRulesView.test.tsx.snap
@@ -202,6 +202,7 @@ exports[`<DetectorRulesView /> spec renders the component 1`] = `
     title="Active rules (2)"
   >
     <EuiPanel
+      className=""
       style={
         Object {
           "paddingLeft": "0px",

diff --git a/...tors/components/UpdateBasicDetails/__snapshots__/UpdateDetectorBasicDetails.test.tsx.snap b/...tors/components/UpdateBasicDetails/__snapshots__/UpdateDetectorBasicDetails.test.tsx.snap
@@ -609,6 +609,7 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
         titleSize="m"
       >
         <EuiPanel
+          className=""
           style={
             Object {
               "paddingLeft": "0px",
@@ -1105,6 +1106,7 @@ exports[`<UpdateDetectorBasicDetails /> spec renders the component 1`] = `
         title="Detector schedule"
       >
         <EuiPanel
+          className=""
           style={
             Object {
               "paddingLeft": "0px",

diff --git a/public/pages/Detectors/components/UpdateRules/UpdateRules.tsx b/public/pages/Detectors/components/UpdateRules/UpdateRules.tsx
@@ -45,6 +45,7 @@ export const UpdateDetectorRules: React.FC<UpdateDetectorRulesProps> = (props) =
   const detectorId = props.location.pathname.replace(`${ROUTES.EDIT_DETECTOR_RULES}/`, '');
   const [flyoutData, setFlyoutData] = useState<RuleTableItem | null>(null);
   const [fieldMappings, setFieldMappings] = useState<FieldMapping[]>();
+  const [showMappings, setShowMappings] = useState(false);
 
   const context = useContext(CoreServicesContext);
 
@@ -126,6 +127,7 @@ export const UpdateDetectorRules: React.FC<UpdateDetectorRulesProps> = (props) =
   }, [services, detectorId]);
 
   const onToggle = (changedItem: RuleItem, isActive: boolean) => {
+    setShowMappings(true);
     switch (changedItem.library) {
       case 'Custom':
         setCustomRuleItems(
@@ -147,6 +149,7 @@ export const UpdateDetectorRules: React.FC<UpdateDetectorRulesProps> = (props) =
   };
 
   const onAllRulesToggle = (isActive: boolean) => {
+    setShowMappings(true);
     setCustomRuleItems(customRuleItems.map((rule) => ({ ...rule, active: isActive })));
     setPrePackagedRuleItems(prePackagedRuleItems.map((rule) => ({ ...rule, active: isActive })));
   };
@@ -264,7 +267,7 @@ export const UpdateDetectorRules: React.FC<UpdateDetectorRulesProps> = (props) =
 
         <EuiSpacer size="xl" />
 
-        {detector?.inputs[0]?.detector_input.indices[0] ? (
+        {showMappings ? (
           <NewFieldMappings
             {...props}
             detector={detector}

diff --git a/...ic/pages/Detectors/components/UpdateRules/__snapshots__/UpdateDetectorRules.test.tsx.snap b/...ic/pages/Detectors/components/UpdateRules/__snapshots__/UpdateDetectorRules.test.tsx.snap
@@ -336,6 +336,9 @@ Object {
             <div
               class="euiSpacer euiSpacer--xl"
             />
+            <div
+              class="euiSpacer euiSpacer--xl"
+            />
             <div
               class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
             >
@@ -714,6 +717,9 @@ Object {
           <div
             class="euiSpacer euiSpacer--xl"
           />
+          <div
+            class="euiSpacer euiSpacer--xl"
+          />
           <div
             class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentFlexEnd euiFlexGroup--directionRow euiFlexGroup--responsive"
           >

diff --git a/...ages/Detectors/containers/AlertTriggersView/__snapshots__/AlertTriggersView.test.tsx.snap b/...ages/Detectors/containers/AlertTriggersView/__snapshots__/AlertTriggersView.test.tsx.snap
@@ -200,6 +200,7 @@ exports[`<AlertTriggersView /> spec renders the component 1`] = `
     title="Alert triggers (2)"
   >
     <EuiPanel
+      className=""
       style={
         Object {
           "paddingLeft": "0px",

diff --git a/public/pages/Detectors/containers/Detector/__snapshots__/DetectorDetails.test.tsx.snap b/public/pages/Detectors/containers/Detector/__snapshots__/DetectorDetails.test.tsx.snap
@@ -1373,6 +1373,7 @@ exports[`<DetectorDetails /> spec renders the component 1`] = `
         title="Detector details"
       >
         <EuiPanel
+          className=""
           style={
             Object {
               "paddingLeft": "0px",
@@ -2739,6 +2740,7 @@ exports[`<DetectorDetails /> spec renders the component 1`] = `
         title="Active rules (2)"
       >
         <EuiPanel
+          className=""
           style={
             Object {
               "paddingLeft": "0px",

diff --git a/.../Detectors/containers/DetectorDetailsView/__snapshots__/DetectorDetailsView.test.tsx.snap b/.../Detectors/containers/DetectorDetailsView/__snapshots__/DetectorDetailsView.test.tsx.snap
@@ -396,6 +396,7 @@ exports[`<DetectorDetailsView /> spec renders the component 1`] = `
       title="Detector details"
     >
       <EuiPanel
+        className=""
         style={
           Object {
             "paddingLeft": "0px",
@@ -1535,6 +1536,7 @@ exports[`<DetectorDetailsView /> spec renders the component 1`] = `
       title="Active rules (2)"
     >
       <EuiPanel
+        className=""
         style={
           Object {
             "paddingLeft": "0px",

diff --git a/...ic/pages/Detectors/containers/FieldMappings/__snapshots__/EditFieldMappings.test.tsx.snap b/...ic/pages/Detectors/containers/FieldMappings/__snapshots__/EditFieldMappings.test.tsx.snap
@@ -179,7 +179,7 @@ exports[`<EditFieldMappings /> spec renders the component 1`] = `
     }
   }
   fieldMappings={Array []}
-  fieldMappingService={
+  filedMappingService={
     FieldMappingService {
       "createMappings": [Function],
       "getMappings": [Function],
@@ -190,7 +190,9 @@ exports[`<EditFieldMappings /> spec renders the component 1`] = `
   loading={false}
   replaceFieldMappings={[MockFunction]}
 >
-  <div>
+  <div
+    className="editFieldMappings"
+  >
     <EuiPanel>
       <div
         className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
@@ -469,7 +471,7 @@ exports[`<EditFieldMappings /> spec renders the component 1`] = `
                         }
                       }
                       fieldMappings={Array []}
-                      fieldMappingService={
+                      filedMappingService={
                         FieldMappingService {
                           "createMappings": [Function],
                           "getMappings": [Function],
@@ -1103,6 +1105,45 @@ exports[`<EditFieldMappings /> spec renders the component 1`] = `
         className="euiSpacer euiSpacer--m"
       />
     </EuiSpacer>
+    <EuiCallOut
+      color="success"
+      title="We have automatically mapped 0 field(s)"
+    >
+      <div
+        className="euiCallOut euiCallOut--success"
+      >
+        <div
+          className="euiCallOutHeader"
+        >
+          <span
+            className="euiCallOutHeader__title"
+          >
+            We have automatically mapped 0 field(s)
+          </span>
+        </div>
+        <EuiText
+          color="default"
+          size="s"
+        >
+          <div
+            className="euiText euiText--small"
+          >
+            <EuiTextColor
+              color="default"
+              component="div"
+            >
+              <div
+                className="euiTextColor euiTextColor--default"
+              >
+                <p>
+                  Your data sources have been mapped with every rule field name. No action is needed.
+                </p>
+              </div>
+            </EuiTextColor>
+          </div>
+        </EuiText>
+      </div>
+    </EuiCallOut>
     <EuiSpacer
       size="m"
     >