added test files to circular dep check exception, updated some helper…

…s per pr feedback
elastic · Mar 17, 2020 · fe50183 · fe50183
1 parent 80c634d
commit fe50183
Show file tree

Hide file tree

Showing 7 changed files with 284 additions and 279 deletions.
diff --git a/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js b/x-pack/legacy/plugins/siem/dev_tools/circular_deps/run_check_circular_deps_cli.js
@@ -17,6 +17,16 @@ run(
       [resolve(__dirname, '../../public'), resolve(__dirname, '../../common')],
       {
         fileExtensions: ['ts', 'js', 'tsx'],
+        excludeRegExp: [
+          'test.ts$',
+          'test.tsx$',
+          'containers/detection_engine/rules/types.ts$',
+          'core/public/chrome/chrome_service.tsx$',
+          'src/core/server/types.ts$',
+          'src/core/server/saved_objects/types.ts$',
+          'src/core/public/overlays/banners/banners_service.tsx$',
+          'src/core/public/saved_objects/saved_objects_client.ts$',
+        ],
       }
     );
 

diff --git a/...ins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx b/...ins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx
@@ -382,7 +382,7 @@ describe('helpers', () => {
   });
 
   describe('buildNoteDescription', () => {
-    test('returns ListItem with passed in label and SeverityBadge component', () => {
+    test('returns ListItem with passed in label and note content', () => {
       const noteSample =
         'Cras mattism. [Pellentesque](https://elastic.co). ### Malesuada adipiscing tristique';
       const result: ListItems[] = buildNoteDescription('Test label', noteSample);
@@ -393,5 +393,11 @@ describe('helpers', () => {
       expect(noteElement.exists()).toBeTruthy();
       expect(noteElement.text()).toEqual(noteSample);
     });
+
+    test('returns empty array if passed in note is empty string', () => {
+      const result: ListItems[] = buildNoteDescription('Test label', '');
+
+      expect(result).toHaveLength(0);
+    });
   });
 });
diff --git a/.../plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx b/.../plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx
@@ -233,7 +233,7 @@ export const buildUrlsDescription = (label: string, values: string[]): ListItems
             <ul>
               {values
                 .filter(v => !isEmpty(v))
-                .map((val: string, index: number) => (
+                .map((val, index) => (
                   <li data-test-subj="urlsDescriptionReferenceLinkItem" key={`${index}-${val}`}>
                     <EuiLink href={val} external target="_blank">
                       {val}
@@ -250,7 +250,7 @@ export const buildUrlsDescription = (label: string, values: string[]): ListItems
 };
 
 export const buildNoteDescription = (label: string, note: string): ListItems[] => {
-  if (note) {
+  if (note.trim() !== '') {
     return [
       {
         title: label,

diff --git a/...ins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx b/...ins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx
@@ -34,7 +34,7 @@ const FlexGroupFullHeight = styled(EuiFlexGroup)`
 `;
 
 const VerticalOverflowContainer = styled.div((props: { maxHeight: number }) => ({
-  'max-height': `${props.maxHeight ?? '200'}px`,
+  'max-height': `${props.maxHeight}px`,
   'overflow-y': 'hidden',
 }));
 
@@ -69,7 +69,7 @@ const StepAboutRuleToggleDetailsComponent: React.FC<StepPanelProps> = ({
   loading,
 }) => {
   const [selectedToggleOption, setToggleOption] = useState('details');
-  const [aboutPanelHeight, setAboutPanelHeight] = useState();
+  const [aboutPanelHeight, setAboutPanelHeight] = useState(0);
 
   const onResize = (e: { height: number; width: number }) => {
     setAboutPanelHeight(e.height);
@@ -87,7 +87,7 @@ const StepAboutRuleToggleDetailsComponent: React.FC<StepPanelProps> = ({
         <FlexGroupFullHeight gutterSize="xs" direction="column">
           <EuiFlexItem grow={1}>
             <HeaderSection title={i18n.ABOUT_TEXT}>
-              {!isEmpty(stepDataDetails.note) && (
+              {!isEmpty(stepDataDetails.note) && stepDataDetails.note.trim() !== '' && (
                 <EuiButtonGroup
                   options={toggleOptions}
                   idSelected={selectedToggleOption}

diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/details/index.tsx
@@ -53,7 +53,7 @@ import * as detectionI18n from '../../translations';
 import { ReadOnlyCallOut } from '../components/read_only_callout';
 import { RuleSwitch } from '../components/rule_switch';
 import { StepPanel } from '../components/step_panel';
-import { getStepsDataDetails, redirectToDetections } from '../helpers';
+import { getStepsData, redirectToDetections } from '../helpers';
 import * as ruleI18n from '../translations';
 import * as i18n from './translations';
 import { GlobalTime } from '../../../../containers/global_time';
@@ -105,12 +105,12 @@ const RuleDetailsPageComponent: FC<PropsFromRedux> = ({
   // This is used to re-trigger api rule status when user de/activate rule
   const [ruleEnabled, setRuleEnabled] = useState<boolean | null>(null);
   const [ruleDetailTab, setRuleDetailTab] = useState(RuleDetailTabs.signals);
-  const { aboutRuleData, aboutRuleDataDetails, defineRuleData, scheduleRuleData } =
+  const { aboutRuleData, modifiedAboutRuleDetailsData, defineRuleData, scheduleRuleData } =
     rule != null
-      ? getStepsDataDetails(rule)
+      ? getStepsData({ rule, detailsView: true })
       : {
           aboutRuleData: null,
-          aboutRuleDataDetails: null,
+          modifiedAboutRuleDetailsData: null,
           defineRuleData: null,
           scheduleRuleData: null,
         };
@@ -299,7 +299,7 @@ const RuleDetailsPageComponent: FC<PropsFromRedux> = ({
                         <StepAboutRuleToggleDetails
                           loading={isLoading}
                           stepData={aboutRuleData}
-                          stepDataDetails={aboutRuleDataDetails}
+                          stepDataDetails={modifiedAboutRuleDetailsData}
                         />
                       </EuiFlexItem>