Merge branch 'main' into 3967-Add-new-or-remove-extra-tags-and-styles

Signed-off-by: Josh Romero <rmerqg@amazon.com>
opensearch-project · Jul 5, 2023 · dd5f710 · dd5f710
2 parents bbc7af0 + e07c5e6
commit dd5f710
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Add configurable defaults and overrides to uiSettings ([#4344](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4344))
 - Introduce new fonts for the Next theme ([#4381](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4381))
 - Bump OUI to `1.1.2` to make `anomalyDetection` icon available ([#4408](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4408))
+- Add `color-scheme` to the root styling ([#4477](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4477))
 - [Multiple DataSource] Frontend support for adding sample data ([#4412](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4412))
 
 ### 🐛 Bug Fixes
@@ -72,13 +73,15 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Replace the use of `bluebird` in `saved_objects` plugin ([#4026](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4026))
 - Relocate tutorials imagery into `src/plugins/home/public/assets/tutorials/logos` ([#4382](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4382))
 - [VisBuilder] Use OUI icon ([#4446](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4446))
+- [Vis Colors] [Region Maps] Replace hardcode color to OUI color in `region_map` plugin ([#4299](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4299))
 - [Vis Colors] Replace color maps with OUI color palettes ([#4293](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4293))
 - [Vis Colors] [Maps] Replace hardcoded color to OUI color in `maps_legacy` plugin ([#4294](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4294))
 - [Vis Colors] [TSVB] Update default color in `vis_type_timeseries` to use `ouiPaletteColorBlind()[0]`([#4363](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4363))
 - [Vis Colors] [Timeline] Replace `vis_type_timeline` colors with `ouiPaletteColorBlind()` ([#4366](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4366))
 - [Vis Colors] Update legacy seed colors to use `ouiPaletteColorBlind()` ([#4348](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4348))
 - [Vis colors] Update legacy mapped colors in charts plugin to use `ouiPaletteColorBlind()`, Update default color in legacy visualizations to use `ouiPaletteColorBlind()[0]` ([#4398](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4398))
 - [Saved Objects Management] Add new or remove extra tags and styles ([#4069](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4069))
+- [Console] Migrate `/lib/mappings/` module to TypeScript ([#4008](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4008))
 
 ### 🔩 Tests
 

diff --git a/src/core/server/rendering/views/styles.tsx b/src/core/server/rendering/views/styles.tsx
@@ -43,6 +43,9 @@ export const Styles: FunctionComponent<Props> = ({ darkMode }) => {
     <style
       dangerouslySetInnerHTML={{
         __html: `
+          :root {
+            color-scheme: ${darkMode ? 'dark' : 'light'};
+          }
 
           *, *:before, *:after {
             box-sizing: border-box;

diff --git a/...ic/lib/mappings/__tests__/mapping.test.js → ...ic/lib/mappings/__tests__/mapping.test.ts b/...ic/lib/mappings/__tests__/mapping.test.js → ...ic/lib/mappings/__tests__/mapping.test.ts
@@ -28,6 +28,7 @@
  * under the License.
  */
 
+import { Field } from '../mappings';
 import '../../../application/models/sense_editor/sense_editor.test.mocks';
 import * as mappings from '../mappings';
 
@@ -39,7 +40,7 @@ describe('Mappings', () => {
     mappings.clear();
   });
 
-  function fc(f1, f2) {
+  function fc(f1: Field, f2: Field) {
     if (f1.name < f2.name) {
       return -1;
     }
@@ -49,8 +50,8 @@ describe('Mappings', () => {
     return 0;
   }
 
-  function f(name, type) {
-    return { name: name, type: type || 'string' };
+  function f(name: string, type?: string) {
+    return { name, type: type || 'string' };
   }
 
   test('Multi fields 1.0 style', function () {
@@ -256,10 +257,37 @@ describe('Mappings', () => {
       'test_index2',
     ]);
     expect(mappings.getIndices(false).sort()).toEqual(['test_index1', 'test_index2']);
-    expect(mappings.expandAliases(['alias1', 'test_index2']).sort()).toEqual([
+    expect((mappings.expandAliases(['alias1', 'test_index2']) as string[]).sort()).toEqual([
       'test_index1',
       'test_index2',
     ]);
     expect(mappings.expandAliases('alias2')).toEqual('test_index2');
   });
+
+  test('Multi types', function () {
+    mappings.loadMappings({
+      index: {
+        properties: {
+          name1: {
+            type: 'object',
+            path: 'just_name',
+            properties: {
+              first1: { type: 'string' },
+              last1: { type: 'string', index_name: 'i_last_1' },
+            },
+          },
+          name2: {
+            type: 'object',
+            path: 'full',
+            properties: {
+              first2: { type: 'string' },
+              last2: { type: 'string', index_name: 'i_last_2' },
+            },
+          },
+        },
+      },
+    });
+
+    expect(mappings.getTypes()).toEqual(['properties']);
+  });
 });