Merge branch 'main' into visBuilder-table

opensearch-project · Nov 3, 2022 · 4d5a4fc · 4d5a4fc
2 parents 42c9f3b + 82eb0e8
commit 4d5a4fc
Show file tree

Hide file tree

Showing 18 changed files with 545 additions and 297 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -12,6 +12,17 @@ jobs:
  contents: write
  pull-requests: write
  name: Backport
+ # Only react to merged PRs for security reasons.
+ # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+ if: >
+ github.event.pull_request.merged
+ && (
+ github.event.action == 'closed'
+ || (
+ github.event.action == 'labeled'
+ && contains(github.event.label.name, 'backport')
+ )
+ )
  steps:
  - name: GitHub App token
  id: github_app_token

diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml
@@ -11,7 +11,8 @@ env:
  FTR_PATH: 'ftr'
  START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch'
  OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot'
- SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/*.js,'
+ SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js,'
+ CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true '
 
 jobs:
  cypress-tests:
@@ -75,7 +76,7 @@ jobs:
  working-directory: ${{ env.FTR_PATH }}
  start: ${{ env.OPENSEARCH_SNAPSHOT_CMD }}, ${{ env.START_CMD }}
  wait-on: 'http://localhost:9200, http://localhost:5601'
- command: yarn cypress:run-without-security --browser chromium --spec ${{ env.SPEC }}
+ command: ${{ env.CYPRESS_ENV }} yarn cypress:run-without-security --browser chromium --spec ${{ env.SPEC }}
 
  # Screenshots are only captured on failure, will change this once we do visual regression tests
  - uses: actions/upload-artifact@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Vis Builder] Rename wizard to visBuilder in i18n id and formatted message id ([#2635](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2635))
 - [Vis Builder] Rename wizard to visBuilder in class name, type name and function name ([#2639](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2639))
 - [Vis Builder] Rename wizard on save modal and visualization table ([#2645](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2645))
+- [Vis Builder] Adds functional tests to CI ([#2728](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2728))
 - [Vis Builder] Enable VisBuilder by default ([#2725](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2725))
 - Change save object type, wizard id and name to visBuilder #2673 ([#2673](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2673))
 - [Multi DataSource] Update MD data source documentation link ([#2693](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2693))
@@ -53,7 +54,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Multi DataSource] Address UX comments on index pattern management stack ([#2611](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2611))
 - [Multi DataSource] Apply get indices error handling in step index pattern ([#2652](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2652))
 - [Vis Builder] Last Updated Timestamp for visbuilder savedobject is getting Generated ([#2628](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2628))
-- Removed Leftover X Pack references ([#2638](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2638))
+- Removed Leftover X Pack references ([#2638](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2638)) 
+- Removes Add Integration button ([#2723](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2723))
 
 ### 🚞 Infrastructure
 
@@ -69,7 +71,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Adding @zhongnansu as maintainer. ([#2590](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2590))
 
 ### 🪛 Refactoring
-* [MD] Refactor data source error handling ([#2661](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2661))
+
+- [MD] Refactor data source error handling ([#2661](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2661))
+- Refactor and improve Discover field summaries ([#2391](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2391))
 
 ### 🔩 Tests
 

diff --git a/src/core/public/mocks.ts b/src/core/public/mocks.ts
@@ -83,6 +83,7 @@ function createCoreSetupMock({
  uiSettings: uiSettingsServiceMock.createSetupContract(),
  injectedMetadata: {
  getInjectedVar: injectedMetadataServiceMock.createSetupContract().getInjectedVar,
+ getBranding: injectedMetadataServiceMock.createSetupContract().getBranding,
  },
  };
 

diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
@@ -29,6 +29,7 @@
  */
 
 import React from 'react';
+// @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
 // @ts-ignore
 import stubbedLogstashFields from 'fixtures/logstash_fields';
@@ -99,8 +100,9 @@ function getComponent({
 
  const props = {
  indexPattern,
+ columns: [],
  field: finalField,
- getDetails: jest.fn(() => ({ buckets: [], error: '', exists: 1, total: true, columns: [] })),
+ getDetails: jest.fn(() => ({ buckets: [], error: '', exists: 1, total: 1 })),
  onAddFilter: jest.fn(),
  onAddField: jest.fn(),
  onRemoveField: jest.fn(),

diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
@@ -40,6 +40,10 @@ import { getFieldTypeName } from './lib/get_field_type_name';
 import './discover_field.scss';
 
 export interface DiscoverFieldProps {
+ /**
+ * the selected columns displayed in the doc table in discover
+ */
+ columns: string[];
  /**
  * The displayed field
  */
@@ -76,6 +80,7 @@ export interface DiscoverFieldProps {
 }
 
 export function DiscoverField({
+ columns,
  field,
  indexPattern,
  onAddField,
@@ -228,9 +233,10 @@ export function DiscoverField({
  </EuiPopoverTitle>
  {infoIsOpen && (
  <DiscoverFieldDetails
- indexPattern={indexPattern}
- field={field}
+ columns={columns}
  details={getDetails(field)}
+ field={field}
+ indexPattern={indexPattern}
  onAddFilter={onAddFilter}
  />
  )}

diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_bucket.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field_bucket.tsx
@@ -68,7 +68,7 @@ export function DiscoverFieldBucket({ field, bucket, onAddFilter }: Props) {
  title={
  bucket.display === ''
  ? emptyTxt
- : `${bucket.display}: ${bucket.count} (${bucket.percent}%)`
+ : `${bucket.display}: ${bucket.count} (${bucket.percent.toFixed(1)}%)`
  }
  size="xs"
  className="eui-textTruncate"
@@ -78,7 +78,7 @@ export function DiscoverFieldBucket({ field, bucket, onAddFilter }: Props) {
  </EuiFlexItem>
  <EuiFlexItem grow={false} className="eui-textTruncate">
  <EuiText color="secondary" size="xs" className="eui-textTruncate">
- {bucket.percent}%
+ {bucket.percent.toFixed(1)}%
  </EuiText>
  </EuiFlexItem>
  </EuiFlexGroup>