more conflict fixes

elastic · Mar 24, 2022 · 4de6e08 · 4de6e08
1 parent f97eb92
commit 4de6e08
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/x-pack/plugins/session_view/public/components/session_view/index.tsx b/x-pack/plugins/session_view/public/components/session_view/index.tsx
@@ -186,26 +186,26 @@ export const SessionView = ({
                   </SectionLoading>
                 )}
 
-               {hasError && (
-                <EuiEmptyPrompt
-                  iconType="alert"
-                  color="danger"
-                  title={
-                    <h2>
-                      <FormattedMessage
-                        id="xpack.sessionView.errorHeading"
-                        defaultMessage="Error loading Session View"
-                      />
-                    </h2>
-                  }
-                  body={
-                    <p>
-                      <FormattedMessage
-                        id="xpack.sessionView.errorMessage"
-                        defaultMessage="There was an error loading the Session View."
-                      />
-                    </p>
-                  }
+                {hasError && (
+                  <EuiEmptyPrompt
+                    iconType="alert"
+                    color="danger"
+                    title={
+                      <h2>
+                        <FormattedMessage
+                          id="xpack.sessionView.errorHeading"
+                          defaultMessage="Error loading Session View"
+                        />
+                      </h2>
+                    }
+                    body={
+                      <p>
+                        <FormattedMessage
+                          id="xpack.sessionView.errorMessage"
+                          defaultMessage="There was an error loading the Session View."
+                        />
+                      </p>
+                    }
                   />
                 )}
 
@@ -214,6 +214,7 @@ export const SessionView = ({
                     <ProcessTree
                       sessionEntityId={sessionEntityId}
                       data={data.pages}
+                      alerts={alerts}
                       searchQuery={searchQuery}
                       selectedProcess={selectedProcess}
                       onProcessSelected={onProcessSelected}
@@ -224,6 +225,8 @@ export const SessionView = ({
                       fetchNextPage={fetchNextPage}
                       fetchPreviousPage={fetchPreviousPage}
                       setSearchResults={setSearchResults}
+                      updatedAlertsStatus={updatedAlertsStatus}
+                      onShowAlertDetails={onShowAlertDetails}
                       timeStampOn={displayOptions.timestamp}
                       verboseModeOn={displayOptions.verboseMode}
                     />
@@ -236,8 +239,8 @@ export const SessionView = ({
                   <EuiResizableButton css={styles.resizeHandle} />
                   <EuiResizablePanel
                     id="session-detail-panel"
-                    initialSize={30}
-                    minSize="200px"
+                    initialSize={25}
+                    minSize="320px"
                     paddingSize="none"
                     css={styles.detailPanel}
                   >

diff --git a/x-pack/plugins/session_view/public/components/session_view/styles.ts b/x-pack/plugins/session_view/public/components/session_view/styles.ts
@@ -30,8 +30,6 @@ export const useStyles = ({ height = 500 }: StylesDeps) => {
     const detailPanel: CSSObject = {
       height: `${height}px`,
       borderRightWidth: '0px',
-      borderLeft: thinBorder,
-      borderRight: thinBorder,
     };
 
     const resizeHandle: CSSObject = {

diff --git a/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.tsx b/x-pack/plugins/session_view/public/components/session_view_detail_panel/index.tsx
@@ -16,7 +16,6 @@ import { useStyles } from './styles';
 import { DetailPanelAlertTab } from '../detail_panel_alert_tab';
 import { ALERT_COUNT_THRESHOLD } from '../../../common/constants';
 
-
 interface SessionViewDetailPanelDeps {
   selectedProcess: Process;
   alerts?: ProcessEvent[];