Skip to content

Commit

Permalink
Remove integrations card from datasources (#1110)
Browse files Browse the repository at this point in the history 
* Remove integrations card

Signed-off-by: Derek Ho <dxho@amazon.com>

* Fix test

Signed-off-by: Derek Ho <dxho@amazon.com>

* Also include copy changes

Signed-off-by: Derek Ho <dxho@amazon.com>

---------

Signed-off-by: Derek Ho <dxho@amazon.com>
(cherry picked from commit 48b1bad)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@github-actions
github-actions[bot] committed Oct 11, 2023
1 parent 945bb20 commit 4ed72fb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 64 deletions.
45 changes: 0 additions & 45 deletions ...c/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,51 +656,6 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
</div>
</div>
</div>
<div
class="euiFlexItem"
>
<div
class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--isClickable euiCard euiCard--centerAligned euiCard--isClickable euiCard--hasIcon"
>
<div
class="euiCard__top"
>
<svg
aria-hidden="true"
class="euiIcon euiIcon--xxLarge euiIcon-isLoading euiCard__icon"
focusable="false"
height="16"
role="img"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
/>
</div>
<div
class="euiCard__content"
>
<span
class="euiTitle euiTitle--small euiCard__title"
id="random_html_idTitle"
>
<button
aria-describedby=" random_html_idDescription"
class="euiCard__titleButton"
>
Integrate data
</button>
</span>
<div
class="euiText euiText--small euiCard__description"
id="random_html_idDescription"
>
<p>
Explore data faster through integrations
</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
8 changes: 0 additions & 8 deletions public/components/datasources/components/manage/data_connection.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,6 @@ export const DataConnection = (props: any) => {
}
/>
</EuiFlexItem>
<EuiFlexItem>
<EuiCard
icon={<EuiIcon size="xxl" type="integrationGeneral" />}
title={'Integrate data'}
description="Explore data faster through integrations"
onClick={() => application!.navigateToApp(observabilityIntegrationsID)}
/>
</EuiFlexItem>
</EuiFlexGroup>
);
};
Expand Down
20 changes: 10 additions & 10 deletions public/components/datasources/components/new/configure_s3_datasource.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
</EuiTitle>
<EuiSpacer size="s" />
<EuiText size="s" color="subdued">
{`Connect to Amazon S3 via AWS Glue with Amazon EMR as an execution engine. `}
{`Connect to Amazon S3 via AWS Glue Data Catalog with Amazon EMR as an execution engine. `}
<EuiLink external={true} href={OPENSEARCH_S3_DOCUMENTATION_URL} target="blank">
Learn more
</EuiLink>
</EuiText>
<EuiSpacer size="s" />
<EuiCallOut title="Setup Amazon EMR as execution engine first" iconType="iInCircle">
<EuiText size="s" color="subdued">
{`Connect to Amazon S3 via AWS Glue with Amazon EMR as an execution engine. `}
{`Connect to Amazon S3 via AWS Glue Data Catalog with Amazon EMR as an execution engine. `}
<EuiLink external={true} href={OPENSEARCH_S3_DOCUMENTATION_URL} target="blank">
Learn more
</EuiLink>
Expand Down Expand Up @@ -129,7 +129,7 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
<EuiSpacer />

<EuiText>
<h3>AWS Glue authentication details</h3>
<h3>AWS Glue Data Catalog authentication details</h3>
</EuiText>
<EuiSpacer />

Expand All @@ -138,14 +138,14 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
<EuiText size="xs">
<p>
This parameter provides the authentication type information required for execution
engine to connect to AWS Glue.
engine to connect to AWS Glue Data Catalog.
</p>
</EuiText>
<EuiFieldText data-test-subj="authentication-method" value="IAM role" disabled />
</>
</EuiFormRow>

<EuiFormRow label="AWS Glue authentication ARN">
<EuiFormRow label="AWS Glue Data Catalog authentication ARN">
<>
<EuiText size="xs">
<p>This should be the IAM role ARN</p>
Expand All @@ -167,16 +167,16 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
<EuiSpacer />

<EuiText>
<h3>AWS Glue index store details</h3>
<h3>AWS Glue Data Catalog index store details</h3>
</EuiText>
<EuiSpacer />

<EuiFormRow label="AWS Glue index store URI">
<EuiFormRow label="AWS Glue Data Catalog index store URI">
<>
<EuiText size="xs">
<p>
This parameter provides the OpenSearch cluster host information for AWS Glue. This
OpenSearch instance is used for writing index data back.
This parameter provides the OpenSearch cluster host information for AWS Glue Data
Catalog. This OpenSearch instance is used for writing index data back.
</p>
</EuiText>
<EuiFieldText
Expand All @@ -193,7 +193,7 @@ export const ConfigureS3Datasource = (props: ConfigureS3DatasourceProps) => {
</>
</EuiFormRow>

<EuiFormRow label="AWS Glue index store authentication">
<EuiFormRow label="AWS Glue Data Catalog index store authentication">
<>
<EuiText size="xs">
<p>Authentication settings to access the index store.</p>
Expand Down
2 changes: 1 addition & 1 deletion public/components/datasources/components/new/new_datasource_card_view.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function NewDatasourceCardView() {
{
name: 'S3GLUE',
displayName: 'S3',
description: 'Connect to Amazon S3 via AWS Glue',
description: 'Connect to Amazon S3 via AWS Glue Data Catalog',
displayIcon: <EuiIcon type={s3Svg} size="xl" />,
onClick: () => (window.location.hash = `#/configure/S3GLUE`),
},
Expand Down

0 comments on commit 4ed72fb

Please sign in to comment.