Merge branch 'main' into feature/integ_saved_queries

opensearch-project · Apr 16, 2024 · efe7b42 · efe7b42
2 parents be58780 + e1e6da7
commit efe7b42
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/common/constants/integrations.ts b/common/constants/integrations.ts
@@ -4,7 +4,13 @@
  */
 
 export const OPENSEARCH_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest/integrations/index';
-export const ASSET_FILTER_OPTIONS = ['index-pattern', 'search', 'visualization', 'dashboard'];
+export const ASSET_FILTER_OPTIONS = [
+  'index-pattern',
+  'search',
+  'visualization',
+  'dashboard',
+  'observability-search',
+];
 export const VALID_INDEX_NAME = /^[a-z\d\.][a-z\d\._\-\*]*$/;
 
 // Upstream doesn't export this, so we need to redeclare it for our use.

diff --git a/...omponents/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap b/...omponents/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
@@ -453,6 +453,11 @@ exports[`Added Integration View Test Renders added integration view using dummy
                             "value": "dashboard",
                             "view": "dashboard",
                           },
+                          Object {
+                            "name": "observability-search",
+                            "value": "observability-search",
+                            "view": "observability-search",
+                          },
                         ],
                         "type": "field_value_selection",
                       },
@@ -495,6 +500,11 @@ exports[`Added Integration View Test Renders added integration view using dummy
                               "value": "dashboard",
                               "view": "dashboard",
                             },
+                            Object {
+                              "name": "observability-search",
+                              "value": "observability-search",
+                              "view": "observability-search",
+                            },
                           ],
                           "type": "field_value_selection",
                         },
@@ -652,6 +662,11 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                         "value": "dashboard",
                                         "view": "dashboard",
                                       },
+                                      Object {
+                                        "name": "observability-search",
+                                        "value": "observability-search",
+                                        "view": "observability-search",
+                                      },
                                     ],
                                     "type": "field_value_selection",
                                   },
@@ -709,6 +724,11 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                             "value": "dashboard",
                                             "view": "dashboard",
                                           },
+                                          Object {
+                                            "name": "observability-search",
+                                            "value": "observability-search",
+                                            "view": "observability-search",
+                                          },
                                         ],
                                         "type": "field_value_selection",
                                       }

diff --git a/public/components/integrations/components/added_integration.tsx b/public/components/integrations/components/added_integration.tsx
@@ -220,6 +220,18 @@ export function AddedIntegration(props: AddedIntegrationProps) {
               {_.truncate(record.description, { length: 100 })}
             </EuiLink>
           );
+        case 'observability-search':
+          return (
+            <EuiLink
+              data-test-subj={`SavedQueryLink`}
+              data-click-metric-element="integrations.saved_query_link"
+              onClick={() =>
+                window.location.assign(`observability-logs#/explorer/${record.assetId}`)
+              }
+            >
+              {_.truncate(record.description, { length: 100 })}
+            </EuiLink>
+          );
         default:
           return (
             <EuiText data-test-subj={`IntegrationAssetText`}>