SaltIO
diff --git a/‎docs/tutorials/how-to-search-effective.md
-156 b/‎docs/tutorials/how-to-search-effective.md
-156
diff --git a/‎docs/tutorials/search-v2_1.md
+38 b/‎docs/tutorials/search-v2_1.md
+38
diff --git a/‎frontend/amundsen_application/static/.betterer.results
+13-7 b/‎frontend/amundsen_application/static/.betterer.results
+13-7
diff --git a/‎frontend/amundsen_application/static/js/components/Table/index.spec.tsx
+3-7 b/‎frontend/amundsen_application/static/js/components/Table/index.spec.tsx
+3-7
diff --git a/‎frontend/amundsen_application/static/js/components/Table/index.tsx
+4-4 b/‎frontend/amundsen_application/static/js/components/Table/index.tsx
+4-4
diff --git a/‎frontend/amundsen_application/static/js/components/Table/testDataBuilder.tsx
+3-18 b/‎frontend/amundsen_application/static/js/components/Table/testDataBuilder.tsx
+3-18
diff --git a/‎frontend/amundsen_application/static/js/ducks/tableMetadata/api/helpers.spec.ts
+1-3 b/‎frontend/amundsen_application/static/js/ducks/tableMetadata/api/helpers.spec.ts
+1-3
@@ -0,0 +1,38 @@
+# New Amundsen Search
+
+Amundsen Search now has a new API `v2` which supports searching all resources indexed in Amundsen and handles filtered and unfiltered search through the `/v2/search` endpoint as opposed to the old endpoints which were defined per resource. This new API also supports updating documents in Elasticsearch through `/v2/document`. The old endpoints relied on the `ElasticsearchProxy` proxy which doesn't support `v2`. The frontend service has been migrated to the `v2` API, so the old search proxy cannot be used with `amundsen-frontend >= 4.0.0`.
+There is `ElasticsearchProxyV2` which supports `v2` and has feature parity with the old API. However this proxy doesn't include any enhancements beyond multi-valued filters with AND/OR logic because further enhancements (like search fuzziness, stemmings, highlighting, etc.)require new mappings to be created by databuilder.
+Finally there is `ElasticsearchProxyV2_1`. This latets proxy supports all new search enhacements that rely on new Elasticsearch mappings and it's also accessible throught `/v2/search` and `/v2/document`. This proxy class is configured by default but it will fall back to `ElasticsearchProxyV2` if it cannot find the new mappings in Elasticsearch.
+
+The goal of this tutorial is to explain what the new search functionality offers, how to transition into using `/v2/search` search service endpoint out of the box as well as how to customize it ahead of deprecation of the old search endpoints. The updated search service offers [fuzziness](https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#fuzziness), word [stemming](https://www.elastic.co/guide/en/elasticsearch/reference/8.1/stemming.html), and [boosted search ranking](https://www.elastic.co/guide/en/elasticsearch/reference/8.1/query-dsl-rank-feature-query.html) based on usage.
+
+## Elasticsearch Context
+
+In order for search to function, metadata for all searchable resources configured is indexed into Elasticsearch with a databuilder task and then Elasticsearch is queried via the search service. In Elasticsearch there are two main concepts that are fundamental to understanding how search works, [mappings](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html) and [search queries](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-your-data.html). Mappings define how fields are indexed into Elasticsearch by specifying the types of fields and how text fields are analyzed. The queries should then be written with the mapping in mind since there certain field types are required to perform certain types of queries efficiently.
+
+## Transitioning to `/v2/search`
+
+In order to ensure a smooth transition from our previous search functionality to a version which supports these new features follow these steps:
+
+### Index Metadata to Elasticsearch Using New Mappings
+1. Bump to `amundsen-databuilder >= 6.8.0`
+2. Configure [SearchMetadatatoElasticsearchTask](https://github.com/amundsen-io/amundsen/blob/main/databuilder/databuilder/task/search/search_metadata_to_elasticsearch_task.py)
+    - Make sure to configure it using a different index alias. So for example if previously the configuration for writing new ES indices was **(A)** for this task **(B)** must be configured instead for each resource.
+        **(A)** `ELASTICSEARCH_ALIAS_CONFIG_KEY → table_search_index`
+        **(B)** `ELASTICSEARCH_ALIAS_CONFIG_KEY → table_search_index_v2_1`
+    - This way the previous index is preserved and the new index aliases have the [new mappings](https://github.com/amundsen-io/amundsen/blob/main/databuilder/databuilder/task/search/document_mappings.py) that enable all of the functionality mentioned above.
+    - Note this task will use the mappings already provided in this file and default queries to extract metadata from neo4j. Elasticsearch mappings can be customized by extending the mapping classes and configuring the task to use the custom mapping via `MAPPING_CLASS`
+Queries to extract metadata from neo4j can be customized and configured through `CYPHER_QUERY_CONFIG_KEY`.
+3. Run the task.
+4. Verify that your ES mappings match the [new mapping definitions](https://github.com/amundsen-io/amundsen/blob/main/databuilder/databuilder/task/search/document_mappings.py) by running this directly on Elasticsearch.
+    - `GET new_table_search_index`
+
+### Configuring the Search Service
+
+1. Bump to `amundsen-search >= 4.0.0`
+2. Configure the [Elasticsearch ES_PROXY_CLIENT to use ELASTICSEARCH_V2_1](https://github.com/amundsen-io/amundsen/blob/main/search/search_service/config.py#L18), which is enabled by default in the latest version of search unless configured differently.
+    - You can customize the search query by providing a custom client. You can create your own client by extending the class from `es_proxy_v2_1.py` (ex: `class MyESClient(ElasticsearchProxyV2_1):`) and overwritting any of the functions provided to change the query.
+3. (OPTIONAL) If the alias your new mappings are indexed under differs from `{resource}_search_index_v2_1` make sure to configure the correct string template by adding `ES_ALIAS_TEMPLATE = 'my_{resource}_search_index_alias'` to the config with your custom alias name.
+
+### Use the latest version of Frontend
+1. Make sure you are using `amundsen-frontend >= 4.0.0` which calls the search service `/v2/search` endpoint. 
@@ -341,7 +341,7 @@ exports[`eslint`] = {
       [60, 2, 51, "refToSelf should be placed after componentWillUnmount", "3412474606"],
       [105, 6, 13, "Do not use setState in componentDidUpdate", "57229240"]
     ],
-    "js/components/Table/index.tsx:1457853108": [
+    "js/components/Table/index.tsx:2629931458": [
       [314, 8, 65, "A control must be associated with a text label.", "1026764939"]
     ],
     "js/components/Table/table.story.tsx:3074937505": [
@@ -447,7 +447,7 @@ exports[`eslint`] = {
       [19, 2, 8, "Assignment to function parameter \'resource\'.", "2131237679"],
       [20, 2, 248, "Expected a default case.", "1034339850"]
     ],
-    "js/ducks/tableMetadata/api/v0.ts:4194065289": [
+    "js/ducks/tableMetadata/api/v0.ts:4044823741": [
       [80, 8, 23, "Use object destructuring.", "1142306891"],
       [139, 23, -4311, "Expected to return a value at the end of arrow function.", "5381"]
     ],
@@ -458,7 +458,7 @@ exports[`eslint`] = {
     "js/ducks/tableMetadata/owners/sagas.ts:3725515638": [
       [7, 0, 69, "\`../types\` import should occur before import of \`./reducer\`", "3326352266"]
     ],
-    "js/ducks/tableMetadata/reducer.ts:1012064960": [
+    "js/ducks/tableMetadata/reducer.ts:3872576896": [
       [416, 6, 93, "Unexpected lexical declaration in case block.", "4098864482"]
     ],
     "js/ducks/tags/api/v0.ts:2781466514": [
@@ -486,6 +486,9 @@ exports[`eslint`] = {
       [130, 6, 12, "Assignment to function parameter \'currentIndex\'.", "2078922066"],
       [171, 4, 10, "Assignment to function parameter \'columnType\'.", "460876587"]
     ],
+    "js/features/ColumnList/index.tsx:4269963749": [
+      [219, 2, 871, "Arrow function expected no return value.", "1083254797"]
+    ],
     "js/features/ExpandableUniqueValues/index.spec.tsx:2032191364": [
       [13, 0, 48, "\`./testDataBuilder\` import should occur before import of \`.\`", "3767205268"]
     ],
@@ -638,9 +641,12 @@ exports[`eslint`] = {
     "js/pages/TableDetailPage/FrequentUsers/index.tsx:14585253": [
       [62, 11, 26, "A form label must be associated with a control.", "2816972347"]
     ],
-    "js/pages/TableDetailPage/ListSortingDropdown/index.tsx:286421664": [
-      [64, 25, 1, "\'_\' is defined but never used.", "177658"],
-      [67, 14, 204, "A control must be associated with a text label.", "3622841199"]
+    "js/pages/TableDetailPage/ListSortingDropdown/index.spec.tsx:1478300175": [
+      [174, 14, 34, "Use array destructuring.", "2024515814"]
+    ],
+    "js/pages/TableDetailPage/ListSortingDropdown/index.tsx:3178023015": [
+      [62, 25, 1, "\'_\' is defined but never used.", "177658"],
+      [65, 14, 204, "A control must be associated with a text label.", "3622841199"]
     ],
     "js/pages/TableDetailPage/ReportTableIssue/index.tsx:2627382373": [
       [168, 15, 20, "Script URL is a form of eval.", "3959800777"],
@@ -684,7 +690,7 @@ exports[`eslint`] = {
     "js/pages/TableDetailPage/WatermarkLabel/index.tsx:2189911402": [
       [29, 22, 21, "Must use destructuring props assignment", "587844958"]
     ],
-    "js/pages/TableDetailPage/index.tsx:2270284782": [
+    "js/pages/TableDetailPage/index.tsx:324823146": [
       [159, 2, 20, "key should be placed after componentDidUpdate", "3916788587"],
       [205, 6, 13, "Do not use setState in componentDidUpdate", "57229240"]
     ],
 
@@ -730,12 +730,10 @@ describe('Table', () => {
         });
       });
 
-      describe('when currentSelectedKey is passed', () => {
+      describe('when currentSelectedIndex is passed', () => {
         it('adds the selected row styling to the selected row', () => {
           const { wrapper } = setup({
-            options: {
-              currentSelectedKey: 'database://cluster.schema/table/rowName',
-            },
+            options: { currentSelectedIndex: 0 },
           });
           const expected = 'ams-table-row is-selected-row';
           const actual = wrapper
@@ -748,9 +746,7 @@ describe('Table', () => {
 
         it('does not add the selected row styling to a non selected row', () => {
           const { wrapper } = setup({
-            options: {
-              currentSelectedKey: 'database://cluster.schema/table/rowName',
-            },
+            options: { currentSelectedIndex: 0 },
           });
           const expected = 'ams-table-row false';
           const actual = wrapper
 
@@ -42,7 +42,7 @@ export interface TableOptions {
   onExpand?: (rowValues: any, index: number) => void;
   onCollapse?: (rowValues: any, index: number) => void;
   emptyMessage?: string;
-  currentSelectedKey?: string;
+  currentSelectedIndex?: number;
 }
 
 export interface TableProps {
@@ -201,7 +201,7 @@ const Table: React.FC<TableProps> = ({
     onExpand,
     onCollapse,
     preExpandRow,
-    currentSelectedKey,
+    currentSelectedIndex,
   } = options;
   const fields = columns.map(({ field }) => field);
   const rowStyles = { height: `${rowHeight}px` };
@@ -231,7 +231,7 @@ const Table: React.FC<TableProps> = ({
       <React.Fragment key={`index:${index}`}>
         <tr
           className={`ams-table-row ${
-            currentSelectedKey === item.key && 'is-selected-row'
+            currentSelectedIndex === item.col_index && 'is-selected-row'
           } ${
             expandRow && expandedRows.includes(index)
               ? 'has-child-expanded'
@@ -251,7 +251,7 @@ const Table: React.FC<TableProps> = ({
                 onCollapse={onCollapse}
                 rowValues={item}
                 onClick={setExpandedRows}
-                isSelectedRow={currentSelectedKey === item.key}
+                isSelectedRow={currentSelectedIndex === item.col_index}
               />
             ) : (
               <td />
 
@@ -5,24 +5,9 @@ import * as React from 'react';
 import { Dropdown, MenuItem } from 'react-bootstrap';
 
 const defaultData = [
-  {
-    name: 'rowName',
-    type: 'rowType',
-    value: 1,
-    key: 'database://cluster.schema/table/rowName',
-  },
-  {
-    name: 'rowName2',
-    type: 'rowType2',
-    value: 2,
-    key: 'database://cluster.schema/table/rowName2',
-  },
-  {
-    name: 'rowName3',
-    type: 'rowType3',
-    value: 3,
-    key: 'database://cluster.schema/table/rowName3',
-  },
+  { name: 'rowName', type: 'rowType', value: 1, col_index: 0 },
+  { name: 'rowName2', type: 'rowType2', value: 2, col_index: 1 },
+  { name: 'rowName3', type: 'rowType3', value: 3, col_index: 2 },
 ];
 
 const defaultColumns = [
 
@@ -140,13 +140,11 @@ describe('helpers', () => {
 
   describe('parseNestedColumns', () => {
     it('Adds a children array to a column with nested columns', () => {
-      const tableKey = 'database://cluster.schema/table';
       const testColumn = [
         {
           badges: [],
           col_type: 'row(col1 varchar, col2 varchar)',
           description: '',
-          key: tableKey + '/amount',
           name: 'amount',
           sort_order: 0,
           nested_level: 0,
@@ -176,7 +174,7 @@ describe('helpers', () => {
           stats: [],
         },
       ];
-      const actual = Helpers.processColumns(testColumn, tableKey);
+      const actual = Helpers.processColumns(testColumn);
       expect(actual[0].children).toEqual(expectedChildren);
     });
   });