Skip to content

Commit

Permalink
address pr comments
Browse files Browse the repository at this point in the history
Signed-off-by: Derek Ho <dxho@amazon.com>
  • Loading branch information
derek-ho committed Sep 6, 2023
1 parent 8c3190f commit a1ea79d
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 231 deletions.
6 changes: 3 additions & 3 deletions common/constants/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ export const observabilityPanelsID = 'observability-dashboards';
export const observabilityPanelsTitle = 'Dashboards';
export const observabilityPanelsPluginOrder = 5095;

export const observabilityIntegrationsID = 'integrations';
export const observabilityIntegrationsTitle = 'Integrations';
export const observabilityIntegrationsPluginOrder = 9020;
export const integrationsID = 'integrations';
export const integrationsTitle = 'Integrations';
export const integrationsPluginOrder = 9020;

// Shared Constants
export const SQL_DOCUMENTATION_URL = 'https://opensearch.org/docs/latest/search-plugins/sql/index/';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import _ from 'lodash';
import {
EuiButton,
EuiCallOut,
EuiCheckbox,
EuiFieldText,
EuiFlexGroup,
EuiFlexItem,
Expand All @@ -17,16 +15,10 @@ import {
EuiFlyoutHeader,
EuiForm,
EuiFormRow,
EuiLink,
EuiRadioGroup,
EuiSpacer,
EuiSuperSelect,
EuiText,
EuiTitle,
} from '@elastic/eui';
import React, { Fragment, useState } from 'react';
import React, { useState } from 'react';
import { HttpStart } from '../../../../../../src/core/public';
import { INTEGRATIONS_BASE } from '../../../../common/constants/shared';
import { useToast } from '../../../../public/components/common/toast';

interface IntegrationFlyoutProps {
Expand Down
179 changes: 0 additions & 179 deletions public/components/integrations/components/add_integration_modal.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,17 @@ import {
EuiFilterButton,
EuiFilterGroup,
EuiFilterSelectItem,
EuiOverlayMask,
EuiPage,
EuiPageBody,
EuiPopover,
EuiPopoverTitle,
EuiSpacer,
EuiTab,
EuiTabs,
} from '@elastic/eui';
import _ from 'lodash';
import React, { Dispatch, SetStateAction, useEffect, useState } from 'react';
import { StringRegexOptions } from 'joi';
import React, { useEffect, useState } from 'react';
import { IntegrationHeader } from './integration_header';
import { AvailableIntegrationsTable } from './available_integration_table';
import { AvailableIntegrationsCardView } from './available_integration_card_view';
import { INTEGRATIONS_BASE } from '../../../../common/constants/shared';
import { getAddIntegrationModal } from './add_integration_modal';
import { AvailableIntegrationOverviewPageProps } from './integration_types';
import { useToast } from '../../../../public/components/common/toast';

Expand All @@ -44,7 +38,6 @@ export interface AvailableIntegrationType {
export interface AvailableIntegrationsTableProps {
loading: boolean;
data: AvailableIntegrationsList;
showModal: (input: string) => void;
isCardView: boolean;
setCardView: (input: boolean) => void;
renderCateogryFilters: () => React.JSX.Element;
Expand All @@ -56,7 +49,6 @@ export interface AvailableIntegrationsList {

export interface AvailableIntegrationsCardViewProps {
data: AvailableIntegrationsList;
showModal: (input: string) => void;
isCardView: boolean;
setCardView: (input: boolean) => void;
query: string;
Expand All @@ -72,9 +64,6 @@ export function AvailableIntegrationOverviewPage(props: AvailableIntegrationOver
const { setToast } = useToast();
const [data, setData] = useState<AvailableIntegrationsList>({ hits: [] });

const [isModalVisible, setIsModalVisible] = useState(false);
const [modalLayout, setModalLayout] = useState(<EuiOverlayMask />);

const [isPopoverOpen, setIsPopoverOpen] = useState(false);

const onButtonClick = () => {
Expand Down Expand Up @@ -128,30 +117,6 @@ export function AvailableIntegrationOverviewPage(props: AvailableIntegrationOver
</EuiFilterButton>
);

const getModal = (name: string) => {
setModalLayout(
getAddIntegrationModal(
() => {
addIntegrationRequest(name);
setIsModalVisible(false);
},
() => {
setIsModalVisible(false);
},
'Name',
'Namespace',
'Tags (optional)',
name,
'prod',
'Add Integration Options',
'Cancel',
'Add',
'test'
)
);
setIsModalVisible(true);
};

useEffect(() => {
chrome.setBreadcrumbs([
{
Expand Down Expand Up @@ -224,7 +189,6 @@ export function AvailableIntegrationOverviewPage(props: AvailableIntegrationOver
helper.every((compon) => hit.components.map((x) => x.name).includes(compon))
),
},
showModal: getModal,
isCardView,
setCardView,
query,
Expand All @@ -238,13 +202,11 @@ export function AvailableIntegrationOverviewPage(props: AvailableIntegrationOver
helper.every((compon) => hit.components.map((x) => x.name).includes(compon))
),
},
showModal: getModal,
isCardView,
setCardView,
renderCateogryFilters,
})}
</EuiPageBody>
{isModalVisible && modalLayout}
</EuiPage>
);
}
1 change: 0 additions & 1 deletion public/components/integrations/components/integration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { IntegrationOverview } from './integration_overview_panel';
import { IntegrationDetails } from './integration_details_panel';
import { IntegrationFields } from './integration_fields_panel';
import { IntegrationAssets } from './integration_assets_panel';
import { getAddIntegrationModal } from './add_integration_modal';
import { AvailableIntegrationProps } from './integration_types';
import { INTEGRATIONS_BASE } from '../../../../common/constants/shared';
import { IntegrationScreenshots } from './integration_screenshots_panel';
Expand Down

0 comments on commit a1ea79d

Please sign in to comment.