Merge branch 'opensearch-project:main' into main

wazuh · Jan 25, 2023 · 34d1c72 · 34d1c72
2 parents 916c801 + 52769f2
commit 34d1c72
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -102,6 +102,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Add automatic selection of the appropriate version of chrome driver to run functional tests ([#2990](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2990))
 - Add recording of functional test artifacts if they fail ([#3190](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3190))
 - Improve yarn's performance in workflows by caching yarn's cache folder ([#3194](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3194))
+- Fix detection of Chrome's version on Darwin during CI ([#3296](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3296))
 
 ### 📝 Documentation
 

diff --git a/scripts/upgrade_chromedriver.js b/scripts/upgrade_chromedriver.js
@@ -31,7 +31,7 @@ switch (process.platform) {
 
   case 'darwin':
     versionCheckCommands.push(
-      '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome --version'
+      '/Applications/Google\\ Chrome.app/Contents/MacOS/Google\\ Chrome --version'
     );
     break;
 

diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
@@ -338,6 +338,8 @@ export class DocLinksService {
               close: `${OPENSEARCH_VERSIONED_DOCS}rest-api/index-apis/close-index/`,
             },
           },
+          // https://opensearch.org/docs/latest/opensearch/supported-field-types/date/#date-math
+          dateMath: `${OPENSEARCH_VERSIONED_DOCS}supported-field-types/date/#date-math`,
         },
         opensearchDashboards: {
           // https://opensearch.org/docs/latest/dashboards/index/
@@ -386,6 +388,7 @@ export class DocLinksService {
             // https://opensearch.org/docs/latest/dashboards/dql/#nested-field-query
             nested_query: `${OPENSEARCH_DASHBOARDS_VERSIONED_DOCS}dql/#nested-field-query`,
           },
+          // https://opensearch.org/docs/latest/dashboards/browser-compatibility
           browser: `${OPENSEARCH_DASHBOARDS_VERSIONED_DOCS}browser-compatibility`,
         },
         noDocumentation: {
@@ -425,7 +428,6 @@ export class DocLinksService {
           },
           addData: `${OPENSEARCH_WEBSITE_DOCS}`,
           vega: `${OPENSEARCH_DASHBOARDS_VERSIONED_DOCS}`,
-          dateMath: `${OPENSEARCH_WEBSITE_DOCS}`,
           savedObject: {
             manageSavedObject: `https://opensearch.org/docs/latest/guide/en/kibana/current/managing-saved-objects.html#_export`,
           },
@@ -718,6 +720,7 @@ export interface DocLinksStart {
           readonly close: string;
         };
       };
+      readonly dateMath: string;
     };
     readonly opensearchDashboards: {
       readonly introduction: string;
@@ -777,7 +780,6 @@ export interface DocLinksStart {
       readonly visualize: Record<string, string>;
       readonly addData: string;
       readonly vega: string;
-      readonly dateMath: string;
       readonly savedObject: {
         readonly manageSavedObject: string;
       };

diff --git a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
@@ -139,7 +139,7 @@ function DateRangesParamEditor({
     <EuiFormRow display={'rowCompressed'} fullWidth>
       <>
         <EuiText size="xs">
-          <EuiLink href={services.docLinks.links.noDocumentation.dateMath} target="_blank">
+          <EuiLink href={services.docLinks.links.opensearch.dateMath} target="_blank">
             <FormattedMessage
               id="visDefaultEditor.controls.dateRanges.acceptedDateFormatsLinkText"
               defaultMessage="Acceptable date formats"