[ML] Fix Data Visualizer time picker showing even if data view has be…

…en configured not to use a time filter (elastic#146080) fixes elastic#139480
kibanamachine · Nov 23, 2022 · 14437df · 14437df
1 parent 78a6764
commit 14437df
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/...sualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx b/...sualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
@@ -69,7 +69,10 @@ function updateLastRefresh(timeRange?: OnRefreshProps) {
 }
 
 // FIXME: Consolidate this component with ML and AIOps's component
-export const DatePickerWrapper: FC = () => {
+export const DatePickerWrapper: FC<{ isAutoRefreshOnly?: boolean; showRefresh?: boolean }> = ({
+  isAutoRefreshOnly,
+  showRefresh,
+}) => {
   const {
     services,
     notifications: { toasts },
@@ -246,7 +249,7 @@ export const DatePickerWrapper: FC = () => {
           start={time.from}
           end={time.to}
           isPaused={refreshInterval.pause}
-          isAutoRefreshOnly={!isTimeRangeSelectorEnabled}
+          isAutoRefreshOnly={!isTimeRangeSelectorEnabled || isAutoRefreshOnly}
           refreshInterval={refreshInterval.value || DEFAULT_REFRESH_INTERVAL_MS}
           onTimeChange={updateTimeFilter}
           onRefresh={updateLastRefresh}
@@ -257,7 +260,7 @@ export const DatePickerWrapper: FC = () => {
         />
       </EuiFlexItem>
 
-      {isTimeRangeSelectorEnabled ? null : (
+      {showRefresh === true || !isTimeRangeSelectorEnabled ? (
         <EuiFlexItem grow={false}>
           <EuiButton
             fill
@@ -272,7 +275,7 @@ export const DatePickerWrapper: FC = () => {
             />
           </EuiButton>
         </EuiFlexItem>
-      )}
+      ) : null}
     </EuiFlexGroup>
   ) : null;
 };
diff --git a/...ndex_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/...ndex_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
@@ -449,6 +449,11 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
       language: searchQueryLanguage,
     });
   }, [data, searchQueryLanguage, searchString]);
+
+  const hasValidTimeField = useMemo(
+    () => currentDataView.timeFieldName !== undefined && currentDataView.timeFieldName !== '',
+    [currentDataView.timeFieldName]
+  );
   const helpLink = docLinks.links.ml.guide;
 
   return (
@@ -475,7 +480,7 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
                 gutterSize="s"
                 data-test-subj="dataVisualizerTimeRangeSelectorSection"
               >
-                {currentDataView.timeFieldName !== undefined && (
+                {hasValidTimeField ? (
                   <EuiFlexItem grow={false}>
                     <FullTimeRangeSelector
                       dataView={currentDataView}
@@ -484,9 +489,12 @@ export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVi
                       timefilter={timefilter}
                     />
                   </EuiFlexItem>
-                )}
+                ) : null}
                 <EuiFlexItem grow={false}>
-                  <DatePickerWrapper />
+                  <DatePickerWrapper
+                    isAutoRefreshOnly={!hasValidTimeField}
+                    showRefresh={!hasValidTimeField}
+                  />
                 </EuiFlexItem>
               </EuiFlexGroup>
             </EuiPageContentHeader>

diff --git a/...r/public/application/index_data_visualizer/search_strategy/requests/get_document_stats.ts b/...r/public/application/index_data_visualizer/search_strategy/requests/get_document_stats.ts
@@ -124,7 +124,11 @@ export const getDocumentCountStats = async (
     },
   });
 
-  const hasTimeField = timeFieldName !== undefined && intervalMs !== undefined && intervalMs > 0;
+  const hasTimeField =
+    timeFieldName !== undefined &&
+    timeFieldName !== '' &&
+    intervalMs !== undefined &&
+    intervalMs > 0;
 
   const getSearchParams = (aggregations: unknown, trackTotalHits = false) => ({
     index,
@@ -159,7 +163,7 @@ export const getDocumentCountStats = async (
 
   // If time field is not defined, no need to show the document count chart
   // Just need to return the tracked total hits
-  if (timeFieldName === undefined) {
+  if (!hasTimeField) {
     const trackedTotalHits =
       typeof firstResp.rawResponse.hits.total === 'number'
         ? firstResp.rawResponse.hits.total