Fix comments

Author: VladLasitsa

src/plugins/discover/kibana.json

@@ -16,7 +16,7 @@
     "indexPatternFieldEditor"
   ],
   "optionalPlugins": ["home", "share", "usageCollection", "spaces"],
-  "requiredBundles": ["kibanaUtils", "home", "kibanaReact", "fieldFormats"],
+  "requiredBundles": ["kibanaUtils", "home", "kibanaReact", "fieldFormats", "dataViews"],
   "extraPublicDirs": ["common"],
   "owner": {
     "name": "Data Discovery",

src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx

@@ -111,6 +111,7 @@ export async function onSaveSearch({
     const saveOptions: SaveSavedSearchOptions = {
       onTitleDuplicate,
       copyOnSave: newCopyOnSave,
+      isTitleDuplicateConfirmed,
     };
     const response = await saveDataSource({
       indexPattern,

src/plugins/discover/public/application/apps/main/discover_main_route.tsx

@@ -19,6 +19,7 @@ import { loadIndexPattern, resolveIndexPattern } from './utils/resolve_index_pat
 import { DiscoverMainApp } from './discover_main_app';
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../../helpers/breadcrumbs';
 import { redirectWhenMissing } from '../../../../../kibana_utils/public';
+import { DataViewSavedObjectConflictError } from '../../../../../data_views/common';
 import { getUrlTracker } from '../../../kibana_services';
 import { LoadingIndicator } from '../../components/common/loading_indicator';
 
@@ -119,22 +120,26 @@ export function DiscoverMainRoute({ services, history }: DiscoverMainProps) {
           );
         }
       } catch (e) {
-        redirectWhenMissing({
-          history,
-          navigateToApp: core.application.navigateToApp,
-          basePath,
-          mapping: {
-            search: '/',
-            'index-pattern': {
-              app: 'management',
-              path: `kibana/objects/savedSearches/${id}`,
+        if (e instanceof DataViewSavedObjectConflictError) {
+          setError(e);
+        } else {
+          redirectWhenMissing({
+            history,
+            navigateToApp: core.application.navigateToApp,
+            basePath,
+            mapping: {
+              search: '/',
+              'index-pattern': {
+                app: 'management',
+                path: `kibana/objects/savedSearches/${id}`,
+              },
             },
-          },
-          toastNotifications,
-          onBeforeRedirect() {
-            getUrlTracker().setTrackedUrl('/');
-          },
-        })(e);
+            toastNotifications,
+            onBeforeRedirect() {
+              getUrlTracker().setTrackedUrl('/');
+            },
+          })(e);
+        }
       }
     }
 

src/plugins/discover/public/saved_searches/save_saved_searches.ts

@@ -13,6 +13,7 @@ import { toSavedSearchAttributes } from './saved_searches_utils';
 
 export interface SaveSavedSearchOptions {
   onTitleDuplicate?: () => void;
+  isTitleDuplicateConfirmed?: boolean;
   copyOnSave?: boolean;
 }
 
@@ -48,6 +49,7 @@ export const saveSavedSearch = async (
   if (savedSearch.title) {
     if (
       isNew &&
+      !options.isTitleDuplicateConfirmed &&
       options.onTitleDuplicate &&
       (await hasDuplicatedTitle(savedSearch.title, savedObjectsClient))
     ) {

src/plugins/discover/public/saved_searches/saved_search_url_conflict_callout.ts

@@ -24,6 +24,7 @@ export const SavedSearchURLConflictCallout = ({
   spaces,
   history,
 }: SavedSearchURLConflictCalloutProps) => {
+  console.log('SavedSearchURLConflictCallout', savedSearch)
   if (spaces && savedSearch?.id && savedSearch?.sharingSavedObjectProps?.outcome === 'conflict') {
     const otherObjectId = savedSearch.sharingSavedObjectProps?.aliasTargetId;
 

src/plugins/discover/tsconfig.json

@@ -25,6 +25,7 @@
     { "path": "../kibana_legacy/tsconfig.json" },
     { "path": "../index_pattern_field_editor/tsconfig.json"},
     { "path": "../field_formats/tsconfig.json" },
+    { "path": "../data_views/tsconfig.json" },
     { "path": "../../../x-pack/plugins/spaces/tsconfig.json" }
   ]
 }

src/plugins/visualize/public/application/types.ts

@@ -46,7 +46,6 @@ import type { DashboardStart } from '../../../dashboard/public';
 import type { SavedObjectsTaggingApi } from '../../../saved_objects_tagging_oss/public';
 import type { UsageCollectionStart } from '../../../usage_collection/public';
 import type { SavedSearch } from '../../../discover/public';
-import type { SpacesPluginStart } from '../../../../../x-pack/plugins/spaces/public';
 
 import { PureVisState } from '../../common/types';