From 425afd4e2f0ea879e5ada744fcb915f53fb921f4 Mon Sep 17 00:00:00 2001 From: "Qingyang(Abby) Hu" Date: Wed, 24 Jul 2024 11:27:13 -0700 Subject: [PATCH] [Discover-next] remove plugin config toggle for data enhancements (#7291) (#7293) (#7408) * [Discover-next] remove plugin config toggle for data enhancements Remove the data config toggle for enhancements and rely on the UI settings for being enabled. (cherry picked from commit 5761207dd2b673563db2638bfc475ecb6b246c0d) Signed-off-by: Kawika Avilla Signed-off-by: github-actions[bot] Signed-off-by: Qingyang(Abby) Hu Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> --- .github/workflows/cypress_workflow.yml | 2 +- changelogs/fragments/7314.yml | 2 ++ package.json | 2 +- .../public/ui/query_editor/query_editor_top_row.tsx | 11 +---------- src/plugins/data/public/ui/settings/settings.ts | 2 +- src/plugins/data/public/ui/ui_service.ts | 1 - src/plugins/data/server/ui_settings.ts | 2 +- .../query_enhancements/opensearch_dashboards.json | 4 ++-- test/common/config.js | 1 + 9 files changed, 10 insertions(+), 17 deletions(-) create mode 100644 changelogs/fragments/7314.yml diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index 669f596df89..b404f9c4624 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -32,7 +32,7 @@ env: TEST_REPO: ${{ inputs.test_repo != '' && inputs.test_repo || 'opensearch-project/opensearch-dashboards-functional-test' }} TEST_BRANCH: "${{ inputs.test_branch != '' && inputs.test_branch || github.base_ref }}" FTR_PATH: 'ftr' - START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --csp.warnLegacyBrowsers=false' + START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --csp.warnLegacyBrowsers=false --uiSettings.overrides["query:enhancements:enabled"]=false' OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false' CYPRESS_BROWSER: 'chromium' CYPRESS_VISBUILDER_ENABLED: true diff --git a/changelogs/fragments/7314.yml b/changelogs/fragments/7314.yml new file mode 100644 index 00000000000..a3ff4b409d5 --- /dev/null +++ b/changelogs/fragments/7314.yml @@ -0,0 +1,2 @@ +fix: +- Unused config setting and remove data sources as a required plugin. ([#7314](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7314)) \ No newline at end of file diff --git a/package.json b/package.json index b90aa1f3b24..b24c09ea6a6 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "start": "scripts/use_node scripts/opensearch_dashboards --dev", "start:docker": "scripts/use_node scripts/opensearch_dashboards --dev --opensearch.hosts=$OPENSEARCH_HOSTS --opensearch.ignoreVersionMismatch=true --server.host=$SERVER_HOST", "start:security": "scripts/use_node scripts/opensearch_dashboards --dev --security", - "start:enhancements": "scripts/use_node scripts/opensearch_dashboards --dev --data_source.enabled=true --uiSettings.overrides['query:enhancements:enabled']=true", + "start:enhancements": "scripts/use_node scripts/opensearch_dashboards --dev --uiSettings.overrides['query:enhancements:enabled']=true", "debug": "scripts/use_node --nolazy --inspect scripts/opensearch_dashboards --dev", "debug-break": "scripts/use_node --nolazy --inspect-brk scripts/opensearch_dashboards --dev", "lint": "yarn run lint:es && yarn run lint:style", diff --git a/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx b/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx index bcd96b9b47d..e5b7529f414 100644 --- a/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx +++ b/src/plugins/data/public/ui/query_editor/query_editor_top_row.tsx @@ -191,16 +191,7 @@ export default function QueryEditorTopRow(props: QueryEditorTopRowProps) { } function isValidQuery(query: Query | undefined) { - if (!query || !query.query) return false; - return ( - !Array.isArray(props.indexPatterns!) || - compact(props.indexPatterns!).length === 0 || - fromUser(query!.query).includes( - typeof props.indexPatterns[0] === 'string' - ? props.indexPatterns[0] - : props.indexPatterns[0].title - ) - ); + if (query && query.query) return true; } function getQueryStringInitialValue(language: string) { diff --git a/src/plugins/data/public/ui/settings/settings.ts b/src/plugins/data/public/ui/settings/settings.ts index f90bee5cf47..df04d3dc6e7 100644 --- a/src/plugins/data/public/ui/settings/settings.ts +++ b/src/plugins/data/public/ui/settings/settings.ts @@ -35,7 +35,7 @@ export class Settings { private readonly queryEnhancements: Map, private readonly queryEditorExtensionMap: Record ) { - this.isEnabled = false; + this.isEnabled = true; this.setUserQueryEnhancementsEnabled(this.isEnabled); this.enhancedAppNames = this.isEnabled ? this.config.supportedAppNames : []; } diff --git a/src/plugins/data/public/ui/ui_service.ts b/src/plugins/data/public/ui/ui_service.ts index 243490dc820..1e0e6be8b78 100644 --- a/src/plugins/data/public/ui/ui_service.ts +++ b/src/plugins/data/public/ui/ui_service.ts @@ -42,7 +42,6 @@ export class UiService implements Plugin { return { __enhance: (enhancements?: UiEnhancements) => { if (!enhancements) return; - if (!this.enhancementsConfig.enabled) return; if (enhancements.query && enhancements.query.language) { this.queryEnhancements.set(enhancements.query.language, enhancements.query); } diff --git a/src/plugins/data/server/ui_settings.ts b/src/plugins/data/server/ui_settings.ts index dfe27d16c25..95439335e18 100644 --- a/src/plugins/data/server/ui_settings.ts +++ b/src/plugins/data/server/ui_settings.ts @@ -709,7 +709,7 @@ export function getUiSettings(): Record> { name: i18n.translate('data.advancedSettings.query.enhancements.enableTitle', { defaultMessage: 'Enable query enhancements', }), - value: false, + value: true, description: i18n.translate('data.advancedSettings.query.enhancements.enableText', { defaultMessage: ` Experimental: diff --git a/src/plugins/query_enhancements/opensearch_dashboards.json b/src/plugins/query_enhancements/opensearch_dashboards.json index e6ed7e2e0a1..b09494aab0c 100644 --- a/src/plugins/query_enhancements/opensearch_dashboards.json +++ b/src/plugins/query_enhancements/opensearch_dashboards.json @@ -3,7 +3,7 @@ "version": "opensearchDashboards", "server": true, "ui": true, - "requiredPlugins": ["data", "opensearchDashboardsReact", "opensearchDashboardsUtils", "dataSource", "dataSourceManagement", "savedObjects", "uiActions"], - "optionalPlugins": [] + "requiredPlugins": ["data", "opensearchDashboardsReact", "opensearchDashboardsUtils", "dataSourceManagement", "savedObjects", "uiActions"], + "optionalPlugins": ["dataSource"] } diff --git a/test/common/config.js b/test/common/config.js index 5a9d121ad63..5793e01d823 100644 --- a/test/common/config.js +++ b/test/common/config.js @@ -79,6 +79,7 @@ export default function () { `--opensearchDashboards.branding.mark.defaultUrl=https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_default.svg`, `--opensearchDashboards.branding.mark.darkModeUrl=https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_darkmode.svg`, `--opensearchDashboards.branding.applicationTitle=OpenSearch`, + `--uiSettings.overrides['query:enhancements:enabled']=false`, ], }, services,