address pr comments

Signed-off-by: Derek Ho <dxho@amazon.com>
opensearch-project · Sep 6, 2023 · 8c3190f · 8c3190f
1 parent 3d9314e
commit 8c3190f
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 276 deletions.
diff --git a/common/constants/custom_panels.ts b/common/constants/custom_panels.ts
@@ -8,7 +8,6 @@ import { v4 as uuidv4 } from 'uuid';
 export const CUSTOM_PANELS_API_PREFIX = '/api/observability/operational_panels';
 export const CUSTOM_PANELS_DOCUMENTATION_URL =
   'https://opensearch.org/docs/latest/observability-plugin/operational-panels/';
-export const OPENSEARCH_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest';
 export const CREATE_PANEL_MESSAGE =
   'Enter a name to describe the purpose of this Observability Dashboard.';
 

diff --git a/common/constants/explorer.ts b/common/constants/explorer.ts
@@ -38,16 +38,6 @@ export const CREATE_TAB_PARAM = {
 } as const;
 export const HAS_SAVED_TIMESTAMP = 'hasSavedTimestamp';
 export const FILTER_OPTIONS = ['Visualization', 'Query', 'Metric'];
-export const ASSET_FILTER_OPTIONS = ['index-pattern', 'search', 'visualization', 'dashboard'];
-export const INTEGRATION_TEMPLATE_OPTIONS = ['nginx', 'aws_elb'];
-export const INTEGRATION_CATEOGRY_OPTIONS = [
-  'communication',
-  'http',
-  'cloud',
-  'aws_elb',
-  'container',
-  'logs',
-];
 export const SAVED_QUERY = 'savedQuery';
 export const SAVED_VISUALIZATION = 'savedVisualization';
 export const SAVED_OBJECT_ID = 'savedObjectId';

diff --git a/common/constants/integrations.ts b/common/constants/integrations.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const OPENSEARCH_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest';
+export const ASSET_FILTER_OPTIONS = ['index-pattern', 'search', 'visualization', 'dashboard'];
+export const INTEGRATION_TEMPLATE_OPTIONS = ['nginx', 'aws_elb'];
+export const INTEGRATION_CATEOGRY_OPTIONS = [
+  'communication',
+  'http',
+  'cloud',
+  'aws_elb',
+  'container',
+  'logs',
+];
diff --git a/public/components/app.tsx b/public/components/app.tsx
@@ -12,7 +12,7 @@ import { observabilityID, observabilityTitle } from '../../common/constants/shar
 import { store } from '../framework/redux/store';
 import { AppPluginStartDependencies } from '../types';
 import { Home as ApplicationAnalyticsHome } from './application_analytics/home';
-import { Home as PlaceholderHome } from './integrations/home';
+import { Home as IntegrationsHome } from './integrations/home';
 import { MetricsListener } from './common/metrics_listener';
 import { Home as CustomPanelsHome } from './custom_panels/home';
 import { EventAnalytics } from './event_analytics';
@@ -43,7 +43,7 @@ const pages = {
   traces: TraceAnalyticsHome,
   notebooks: NotebooksHome,
   dashboards: CustomPanelsHome,
-  integrations: PlaceholderHome,
+  integrations: IntegrationsHome,
 };
 
 export const App = ({

diff --git a/public/components/common/side_nav.tsx b/public/components/common/side_nav.tsx
diff --git a/public/components/integrations/components/__tests__/mapping_validation.test.ts b/public/components/integrations/components/__tests__/mapping_validation.test.ts
@@ -1,3 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 import {
   doTypeValidation,
   doNestedPropertyValidation,

diff --git a/public/components/integrations/components/added_integration.tsx b/public/components/integrations/components/added_integration.tsx
@@ -29,7 +29,7 @@ import {
 import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
 import { PanelTitle } from '../../trace_analytics/components/common/helper_functions';
-import { ASSET_FILTER_OPTIONS, FILTER_OPTIONS } from '../../../../common/constants/explorer';
+import { ASSET_FILTER_OPTIONS } from '../../../../common/constants/integrations';
 import { INTEGRATIONS_BASE, OBSERVABILITY_BASE } from '../../../../common/constants/shared';
 import { DeleteModal } from '../../common/helpers/delete_modal';
 import { AddedIntegrationProps } from './integration_types';
@@ -282,83 +282,6 @@ export function AddedIntegration(props: AddedIntegrationProps) {
     );
   }
 
-  function AddedIntegrationFields(fieldProps: any) {
-    const data = fieldProps.data?.fields || [];
-
-    const search = {
-      box: {
-        incremental: true,
-      },
-      filters: [
-        {
-          type: 'field_value_selection',
-          field: 'type',
-          name: 'Type',
-          multiSelect: false,
-          options: FILTER_OPTIONS.map((i) => ({
-            value: i,
-            name: i,
-            view: i,
-          })),
-        },
-      ],
-    };
-
-    const tableColumns = [
-      {
-        field: 'name',
-        name: 'Name',
-        sortable: true,
-        truncateText: true,
-        render: (value, record) => (
-          <EuiText data-test-subj={`${record.name}IntegrationLink`}>
-            {_.truncate(record.description, { length: 100 })}
-          </EuiText>
-        ),
-      },
-      {
-        field: 'type',
-        name: 'Type',
-        sortable: true,
-        truncateText: true,
-        render: (value, record) => (
-          <EuiText data-test-subj={`${record.type}IntegrationDescription`}>
-            {_.truncate(record.type, { length: 100 })}
-          </EuiText>
-        ),
-      },
-      {
-        field: 'category',
-        name: 'Category',
-        sortable: true,
-        truncateText: true,
-        render: (value, record) => (
-          <EuiText data-test-subj={`${record.type}IntegrationDescription`}>
-            {_.truncate(record.category, { length: 100 })}
-          </EuiText>
-        ),
-      },
-    ] as Array<EuiTableFieldDataColumnType<any>>;
-
-    return (
-      <EuiPanel>
-        <PanelTitle title={'Integration Fields'} />
-        <EuiSpacer size="l" />
-        <EuiInMemoryTable
-          itemId="id"
-          loading={false}
-          items={data}
-          columns={tableColumns}
-          pagination={{
-            initialPageSize: 10,
-            pageSizeOptions: [5, 10, 15],
-          }}
-          search={search}
-        />
-      </EuiPanel>
-    );
-  }
-
   return (
     <EuiPage>
       <EuiPageBody>

diff --git a/public/components/integrations/components/added_integration_table.tsx b/public/components/integrations/components/added_integration_table.tsx
@@ -21,7 +21,7 @@ import { AddedIntegrationsTableProps } from './added_integration_overview_page';
 import {
   ASSET_FILTER_OPTIONS,
   INTEGRATION_TEMPLATE_OPTIONS,
-} from '../../../../common/constants/explorer';
+} from '../../../../common/constants/integrations';
 import { DeleteModal } from '../../../../public/components/common/helpers/delete_modal';
 import { INTEGRATIONS_BASE } from '../../../../common/constants/shared';
 import { useToast } from '../../../../public/components/common/toast';
@@ -154,17 +154,8 @@ export function AddedIntegrationsTable(props: AddedIntegrationsTableProps) {
             pageSizeOptions: [5, 10, 15],
           }}
           search={search}
-          // sorting={{
-          //   sort: {
-          //     field: 'dateModified',
-          //     direction: 'desc',
-          //   },
-          // }}
           allowNeutralSort={false}
           isSelectable={true}
-          // selection={{
-          //   onSelectionChange: (items) => setSelectedApplications(items),
-          // }}
         />
       ) : (
         <>

diff --git a/public/components/integrations/components/available_integration_card_view.tsx b/public/components/integrations/components/available_integration_card_view.tsx
@@ -99,14 +99,9 @@ export function AvailableIntegrationsCardView(props: AvailableIntegrationsCardVi
             isClearable={false}
             placeholder="Search..."
             data-test-subj="search-bar-input-box"
-            // value={query}
-            // onClick = {() => query.current.}
             onChange={(e) => {
               props.setQuery(e.target.value);
-              // query.current
-              // setGlobalQuery(e.target.value);
             }}
-            // onSearch={props.refresh}
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>{props.renderCateogryFilters()}</EuiFlexItem>

diff --git a/public/components/integrations/components/available_integration_table.tsx b/public/components/integrations/components/available_integration_table.tsx
@@ -23,7 +23,6 @@ import {
 } from '@elastic/eui';
 import _ from 'lodash';
 import React, { useState } from 'react';
-import { ASSET_FILTER_OPTIONS } from 'common/constants/explorer';
 import { AvailableIntegrationsTableProps } from './available_integration_overview_page';
 import { badges } from './integration_category_badge_group';
 
@@ -128,17 +127,8 @@ export function AvailableIntegrationsTable(props: AvailableIntegrationsTableProp
             pageSizeOptions: [5, 10, 15],
           }}
           search={search}
-          // sorting={{
-          //   sort: {
-          //     field: 'dateModified',
-          //     direction: 'desc',
-          //   },
-          // }}
           allowNeutralSort={false}
           isSelectable={true}
-          // selection={{
-          //   onSelectionChange: (items) => setSelectedApplications(items),
-          // }}
         />
       ) : (
         <>

diff --git a/public/components/integrations/components/integration_assets_panel.tsx b/public/components/integrations/components/integration_assets_panel.tsx
@@ -13,8 +13,7 @@ import {
 import React from 'react';
 import _ from 'lodash';
 import { PanelTitle } from '../../trace_analytics/components/common/helper_functions';
-
-const FILTER_OPTIONS = ['index-pattern', 'search', 'visualization', 'dashboard'];
+import { ASSET_FILTER_OPTIONS } from '../../../../common/constants/integrations';
 
 export function IntegrationAssets(props: any) {
   const [config, assets] = [props.integration, props.integrationAssets];
@@ -29,7 +28,7 @@ export function IntegrationAssets(props: any) {
         field: 'type',
         name: 'Type',
         multiSelect: false,
-        options: FILTER_OPTIONS.map((i) => ({
+        options: ASSET_FILTER_OPTIONS.map((i) => ({
           value: i,
           name: i,
           view: i,