Skip to content

Commit

Permalink
Update according to UX feedback and tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Derek Ho <dxho@amazon.com>
  • Loading branch information
@derek-ho
derek-ho committed Oct 3, 2023
1 parent fdf26af commit f28a36e
Show file tree
Hide file tree
Showing 10 changed files with 255 additions and 312 deletions.
26 changes: 24 additions & 2 deletions .cypress/integration/10_datasources.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,38 @@
*/

/// <reference types="cypress" />


const moveToDatasourcesHome = () => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/dataconnections`);
cy.visit(`${Cypress.env('opensearchDashboards')}/app/datasources`);
};

const moveToNewDatasourcesPage = () => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/datasources#/new`);
};

const moveToCreatePrometheusDatasourcePage = () => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/datasources#/configure/PROMETHEUS`);
};

describe('Basic sanity test for datasources plugin', () => {
describe('Integration tests for datasources plugin', () => {
const testPrometheusSuffix = (Math.random() + 1).toString(36).substring(7);
const testPrometheusInstance = `Prometheus_${testPrometheusSuffix}`;
const testS3Suffix = (Math.random() + 1).toString(36).substring(7);
const testS3Instance = `S3_${testS3Suffix}`;
it('Navigates to datasources plugin and expects the correct header', () => {
moveToDatasourcesHome();
cy.get('[data-test-subj="dataconnections-header"]').should('exist');
});

it('Tests navigation between tabs and goes to Prometheus creation flow', () => {
moveToDatasourcesHome();
cy.get('[data-test-subj="new"]').click();
cy.url().should('include', '/new')
cy.get('[data-test-subj="datasource_card_prometheus"]').click();
cy.url().should('include', '/configure/PROMETHEUS');
});

});


Expand Down
181 changes: 5 additions & 176 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 @@ -53,31 +53,9 @@ exports[`Data Connection Page test Renders data connection page with data 1`] =
<div
class="euiText euiText--small overview-content"
>
my_spark3
prom
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiText euiText--medium overview-title"
>
Authentication method
</div>
<div
class="euiText euiText--small overview-content"
>
-
</div>
</div>
</div>
</div>
<div
class="euiFlexItem"
>
<div
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
Expand All @@ -92,20 +70,6 @@ exports[`Data Connection Page test Renders data connection page with data 1`] =
-
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiText euiText--medium overview-title"
>
Query permissions
</div>
<div
class="euiText euiText--small overview-content"
>
Everyone
</div>
</div>
</div>
</div>
<div
Expand All @@ -120,12 +84,12 @@ exports[`Data Connection Page test Renders data connection page with data 1`] =
<div
class="euiText euiText--medium overview-title"
>
Spark data location
Prometheus URI
</div>
<div
class="euiText euiText--small overview-content"
>
-
localhost:9201
</div>
</div>
</div>
Expand Down Expand Up @@ -225,142 +189,7 @@ exports[`Data Connection Page test Renders data connection page with data 1`] =
id="random_html_idDescription"
>
<p>
Query your data in Data Explorer or Observability Logs.
</p>
</div>
</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"
>
Accelerate performance
</button>
</span>
<div
class="euiText euiText--small euiCard__description"
id="random_html_idDescription"
>
<p>
Accelerate performance through OpenSearch indexing.
</p>
</div>
</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"
>
Tables
</button>
</span>
<div
class="euiText euiText--small euiCard__description"
id="random_html_idDescription"
>
<p>
Manually Define Tables
</p>
</div>
</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"
>
Integrations data
</button>
</span>
<div
class="euiText euiText--small euiCard__description"
id="random_html_idDescription"
>
<p>
Explore data faster through integrations
Query your data in Metrics Analytics.
</p>
</div>
</div>
Expand Down Expand Up @@ -492,7 +321,7 @@ exports[`Data Connection Page test Renders data connection page with data 1`] =
<div
class="euiText euiText--small overview-content"
>
-
Everyone
</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions ...atasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
<button
aria-selected="true"
class="euiTab euiTab-isSelected"
data-test-subj="manage"
role="tab"
type="button"
>
Expand All @@ -77,6 +78,7 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
<button
aria-selected="false"
class="euiTab"
data-test-subj="new"
role="tab"
type="button"
>
Expand Down
1 change: 1 addition & 0 deletions public/components/datasources/components/data_connections_header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const DataConnectionsHeader = () => {
isSelected={tab.id === selectedTabId}
disabled={tab.disabled}
key={index}
data-test-subj={tab.id}
>
{tab.name}
</EuiTab>
Expand Down
6 changes: 5 additions & 1 deletion public/components/datasources/components/manage/access_control_tab.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ export const AccessControlTab = (props: AccessControlTabProps) => {
<EuiFlexItem grow={false}>
<EuiText className="overview-title">Query access</EuiText>
<EuiText size="s" className="overview-content">
{selectedQueryPermissionRoles.length ? `Restricted` : '-'}
{selectedQueryPermissionRoles.length
? `Restricted to ${selectedQueryPermissionRoles
.map((role) => role.label)
.join(',')}`
: 'Everyone'}
</EuiText>
</EuiFlexItem>
</EuiFlexGroup>
Expand Down
Loading

0 comments on commit f28a36e

Please sign in to comment.