fixed types and reduced redundancy

Signed-off-by: Paul Sebastian <[email protected]>
mengweieric · Oct 23, 2023 · 464bb8d · 464bb8d
1 parent a1b9c59
commit 464bb8d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 43 deletions.
diff --git a/common/types/explorer.ts b/common/types/explorer.ts
@@ -421,9 +421,9 @@ export interface GridSortingColumn {
 }
 
 export enum DirectQueryLoadingStatus {
-  SUCCESS,
-  FAILED,
-  RUNNING,
-  SCHEDULED,
-  CANCELED,
+  SUCCESS = 'SUCCESS',
+  FAILED = 'FAILED',
+  RUNNING = 'RUNNING',
+  SCHEDULED = 'SCHEDULED',
+  CANCELED = 'CANCELED',
 }
diff --git a/public/components/event_analytics/explorer/explorer.tsx b/public/components/event_analytics/explorer/explorer.tsx
@@ -547,43 +547,7 @@ export const Explorer = ({
                         <EuiSpacer size="m" />
                       </>
                     )}
-                    {isDefaultDataSourceType || appLogEvents ? (
-                      <>
-                        {countDistribution.data && countDistribution.data['count()'] ? (
-                          <DataGrid
-                            http={http}
-                            pplService={pplService}
-                            rows={explorerData.jsonData}
-                            rowsAll={explorerData.jsonDataAll}
-                            explorerFields={explorerFields}
-                            timeStampField={queryRef.current![SELECTED_TIMESTAMP]}
-                            rawQuery={appBasedRef.current || queryRef.current![RAW_QUERY]}
-                            totalHits={_.sum(countDistribution.data?.['count()'])}
-                            requestParams={requestParams}
-                            startTime={appLogEvents ? startTime : dateRange[0]}
-                            endTime={appLogEvents ? endTime : dateRange[1]}
-                          />
-                        ) : (
-                          <EuiPanel paddingSize="s">
-                            <div style={{ padding: '20px' }}>
-                              <EuiFlexGroup
-                                direction="column"
-                                alignItems="center"
-                                gutterSize="none"
-                              >
-                                <EuiFlexItem>
-                                  <EuiLoadingSpinner size="xl" />
-                                </EuiFlexItem>
-                                <EuiSpacer size="s" />
-                                <EuiFlexItem>
-                                  <strong>Loading Documents</strong>
-                                </EuiFlexItem>
-                              </EuiFlexGroup>
-                            </div>
-                          </EuiPanel>
-                        )}
-                      </>
-                    ) : (
+                    {countDistribution.data && countDistribution.data['count()'] ? (
                       <DataGrid
                         http={http}
                         pplService={pplService}
@@ -592,11 +556,29 @@ export const Explorer = ({
                         explorerFields={explorerFields}
                         timeStampField={queryRef.current![SELECTED_TIMESTAMP]}
                         rawQuery={appBasedRef.current || queryRef.current![RAW_QUERY]}
-                        totalHits={explorerData?.datarows?.length || 0}
+                        totalHits={
+                          isDefaultDataSourceType || appLogEvents
+                            ? _.sum(countDistribution.data?.['count()'])
+                            : explorerData?.datarows?.length || 0
+                        }
                         requestParams={requestParams}
                         startTime={appLogEvents ? startTime : dateRange[0]}
                         endTime={appLogEvents ? endTime : dateRange[1]}
                       />
+                    ) : (
+                      <EuiPanel paddingSize="s">
+                        <div style={{ padding: '20px' }}>
+                          <EuiFlexGroup direction="column" alignItems="center" gutterSize="none">
+                            <EuiFlexItem>
+                              <EuiLoadingSpinner size="xl" />
+                            </EuiFlexItem>
+                            <EuiSpacer size="s" />
+                            <EuiFlexItem>
+                              <strong>Loading Documents</strong>
+                            </EuiFlexItem>
+                          </EuiFlexGroup>
+                        </div>
+                      </EuiPanel>
                     )}
                     <a tabIndex={0} id="discoverBottomMarker">
                       &#8203;