show empty prompts in page and don't auto-open flyout in DataViews (#…

…134469) * show empty prompts in page and don't auto-open flyout in DataViews * changed flow based on comments * fix for namespace issues * fix for failed checks * fixes for failed checks and tests * fix failing tests Co-authored-by: Kibana Machine <[email protected]>
elastic · Jun 28, 2022 · c8520f9 · c8520f9
1 parent f89efc7
commit c8520f9
Show file tree

Hide file tree

Showing 34 changed files with 200 additions and 477 deletions.
diff --git a/packages/kbn-shared-ux-services/src/services/editors.ts b/packages/kbn-shared-ux-services/src/services/editors.ts
@@ -24,8 +24,6 @@ type DataView = unknown;
 interface DataViewEditorOptions {
   /** Handler to be invoked when the Data View Editor completes a save operation. */
   onSave: (dataView: DataView) => void;
-  /** If set to false, will skip empty prompt in data view editor. */
-  showEmptyPrompt?: boolean;
 }
 
 /**

diff --git a/packages/shared-ux/page/kibana_no_data/src/services.tsx b/packages/shared-ux/page/kibana_no_data/src/services.tsx
@@ -35,8 +35,6 @@ type DataView = unknown;
 interface DataViewEditorOptions {
   /** Handler to be invoked when the Data View Editor completes a save operation. */
   onSave: (dataView: DataView) => void;
-  /** If set to false, will skip empty prompt in data view editor. */
-  showEmptyPrompt?: boolean;
 }
 
 /**

diff --git a/packages/shared-ux/prompt/no_data_views/src/no_data_views.component.tsx b/packages/shared-ux/prompt/no_data_views/src/no_data_views.component.tsx
@@ -48,7 +48,7 @@ export const NoDataViewsPrompt = ({
       onClick={onClickCreate}
       iconType="plusInCircle"
       fill={true}
-      data-test-subj="createDataViewButtonFlyout"
+      data-test-subj="createDataViewButton"
     >
       {createDataViewText}
     </EuiButton>

diff --git a/packages/shared-ux/prompt/no_data_views/src/no_data_views.tsx b/packages/shared-ux/prompt/no_data_views/src/no_data_views.tsx
@@ -55,7 +55,6 @@ export const NoDataViewsPrompt = ({ onDataViewCreated }: Props) => {
       onSave: (dataView) => {
         onDataViewCreated(dataView);
       },
-      showEmptyPrompt: false,
     });
 
     if (setDataViewEditorRef) {

diff --git a/packages/shared-ux/prompt/no_data_views/src/services.tsx b/packages/shared-ux/prompt/no_data_views/src/services.tsx
@@ -26,8 +26,6 @@ type DataView = unknown;
 interface DataViewEditorOptions {
   /** Handler to be invoked when the Data View Editor completes a save operation. */
   onSave: (dataView: DataView) => void;
-  /** If set to false, will skip empty prompt in data view editor. */
-  showEmptyPrompt?: boolean;
 }
 
 /**

diff --git a/src/plugins/data_view_editor/public/components/data_view_editor.tsx b/src/plugins/data_view_editor/public/components/data_view_editor.tsx
@@ -24,7 +24,6 @@ export const DataViewEditor = ({
   defaultTypeIsRollup = false,
   requireTimestampField = false,
   editData,
-  showEmptyPrompt = true,
 }: DataViewEditorPropsWithServices) => {
   const { Provider: KibanaReactContextProvider } =
     createKibanaReactContext<DataViewEditorContext>(services);
@@ -38,7 +37,6 @@ export const DataViewEditor = ({
           defaultTypeIsRollup={defaultTypeIsRollup}
           requireTimestampField={requireTimestampField}
           editData={editData}
-          showEmptyPrompt={showEmptyPrompt}
         />
       </EuiFlyout>
     </KibanaReactContextProvider>

diff --git a/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx b/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
@@ -44,7 +44,6 @@ import {
   schema,
   Footer,
   AdvancedParamsContent,
-  EmptyPrompts,
   PreviewPanel,
   RollupBetaWarning,
 } from '.';
@@ -62,7 +61,6 @@ export interface Props {
   defaultTypeIsRollup?: boolean;
   requireTimestampField?: boolean;
   editData?: DataView;
-  showEmptyPrompt?: boolean;
 }
 
 const editorTitle = i18n.translate('indexPatternEditor.title', {
@@ -79,7 +77,6 @@ const IndexPatternEditorFlyoutContentComponent = ({
   defaultTypeIsRollup,
   requireTimestampField = false,
   editData,
-  showEmptyPrompt = true,
 }: Props) => {
   const {
     services: { http, dataViews, uiSettings, searchClient, overlays },
@@ -366,75 +363,68 @@ const IndexPatternEditorFlyoutContentComponent = ({
   );
 
   return (
-    <EmptyPrompts
-      onCancel={onCancel}
-      allSources={allSources}
-      loadSources={loadSources}
-      showEmptyPrompt={showEmptyPrompt}
-    >
-      <FlyoutPanels.Group flyoutClassName={'indexPatternEditorFlyout'} maxWidth={1180}>
-        <FlyoutPanels.Item className="fieldEditor__mainFlyoutPanel" border="right">
-          <EuiTitle data-test-subj="flyoutTitle">
-            <h2>{editData ? editorTitleEditMode : editorTitle}</h2>
-          </EuiTitle>
-          <Form form={form} className="indexPatternEditor__form">
-            {indexPatternTypeSelect}
-            <EuiSpacer size="l" />
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <NameField editData={editData} />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-            <EuiSpacer size="l" />
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <TitleField
-                  isRollup={form.getFields().type?.value === INDEX_PATTERN_TYPE.ROLLUP}
-                  existingIndexPatterns={existingIndexPatterns}
-                  refreshMatchedIndices={reloadMatchedIndices}
-                  matchedIndices={matchedIndices.exactMatchedIndices}
-                  rollupIndicesCapabilities={rollupIndicesCapabilities}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-            <EuiSpacer size="l" />
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <TimestampField
-                  options={timestampFieldOptions}
-                  isLoadingOptions={isLoadingTimestampFields}
-                  isExistingIndexPattern={existingIndexPatterns.includes(title)}
-                  isLoadingMatchedIndices={isLoadingMatchedIndices}
-                  hasMatchedIndices={!!matchedIndices.exactMatchedIndices.length}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-            <AdvancedParamsContent
-              disableAllowHidden={type === INDEX_PATTERN_TYPE.ROLLUP}
-              disableId={!!editData}
-            />
-          </Form>
-          <Footer
-            onCancel={onCancel}
-            onSubmit={() => form.submit()}
-            submitDisabled={form.isSubmitted && !form.isValid}
-            isEdit={!!editData}
+    <FlyoutPanels.Group flyoutClassName={'indexPatternEditorFlyout'} maxWidth={1180}>
+      <FlyoutPanels.Item className="fieldEditor__mainFlyoutPanel" border="right">
+        <EuiTitle data-test-subj="flyoutTitle">
+          <h2>{editData ? editorTitleEditMode : editorTitle}</h2>
+        </EuiTitle>
+        <Form form={form} className="indexPatternEditor__form">
+          {indexPatternTypeSelect}
+          <EuiSpacer size="l" />
+          <EuiFlexGroup>
+            <EuiFlexItem>
+              <NameField editData={editData} />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <EuiSpacer size="l" />
+          <EuiFlexGroup>
+            <EuiFlexItem>
+              <TitleField
+                isRollup={form.getFields().type?.value === INDEX_PATTERN_TYPE.ROLLUP}
+                existingIndexPatterns={existingIndexPatterns}
+                refreshMatchedIndices={reloadMatchedIndices}
+                matchedIndices={matchedIndices.exactMatchedIndices}
+                rollupIndicesCapabilities={rollupIndicesCapabilities}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <EuiSpacer size="l" />
+          <EuiFlexGroup>
+            <EuiFlexItem>
+              <TimestampField
+                options={timestampFieldOptions}
+                isLoadingOptions={isLoadingTimestampFields}
+                isExistingIndexPattern={existingIndexPatterns.includes(title)}
+                isLoadingMatchedIndices={isLoadingMatchedIndices}
+                hasMatchedIndices={!!matchedIndices.exactMatchedIndices.length}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <AdvancedParamsContent
+            disableAllowHidden={type === INDEX_PATTERN_TYPE.ROLLUP}
+            disableId={!!editData}
           />
-        </FlyoutPanels.Item>
-        <FlyoutPanels.Item>
-          {isLoadingSources ? (
-            <></>
-          ) : (
-            <PreviewPanel
-              type={type}
-              allowHidden={allowHidden}
-              title={title}
-              matched={matchedIndices}
-            />
-          )}
-        </FlyoutPanels.Item>
-      </FlyoutPanels.Group>
-    </EmptyPrompts>
+        </Form>
+        <Footer
+          onCancel={onCancel}
+          onSubmit={() => form.submit()}
+          submitDisabled={form.isSubmitted && !form.isValid}
+          isEdit={!!editData}
+        />
+      </FlyoutPanels.Item>
+      <FlyoutPanels.Item>
+        {isLoadingSources ? (
+          <></>
+        ) : (
+          <PreviewPanel
+            type={type}
+            allowHidden={allowHidden}
+            title={title}
+            matched={matchedIndices}
+          />
+        )}
+      </FlyoutPanels.Item>
+    </FlyoutPanels.Group>
   );
 };
 

diff --git a/src/plugins/data_view_editor/public/components/data_view_flyout_content_container.tsx b/src/plugins/data_view_editor/public/components/data_view_flyout_content_container.tsx
@@ -19,7 +19,6 @@ const IndexPatternFlyoutContentContainer = ({
   defaultTypeIsRollup,
   requireTimestampField = false,
   editData,
-  showEmptyPrompt = true,
 }: DataViewEditorProps) => {
   const {
     services: { dataViews, notifications },
@@ -62,7 +61,6 @@ const IndexPatternFlyoutContentContainer = ({
       defaultTypeIsRollup={defaultTypeIsRollup}
       requireTimestampField={requireTimestampField}
       editData={editData}
-      showEmptyPrompt={showEmptyPrompt}
     />
   );
 };

diff --git a/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.test.tsx b/src/plugins/data_view_editor/public/components/empty_prompts/empty_prompts.test.tsx