[backport 2.4] Backport/backport 662 to 2.4 (#667)

* fix test failures and update test snapshots Signed-off-by: Eric Wei <menwe@amazon.com> * Remove unused files (#662) * remove unused files Signed-off-by: Eric Wei <menwe@amazon.com> * missing snapshots Signed-off-by: Eric Wei <menwe@amazon.com> --------- Signed-off-by: Eric Wei <menwe@amazon.com> (cherry picked from commit 06ea75f) * update visualizations Signed-off-by: Eric Wei <menwe@amazon.com> * update snapshots Signed-off-by: Eric Wei <menwe@amazon.com> --------- Signed-off-by: Eric Wei <menwe@amazon.com>
opensearch-project · Jul 13, 2023 · 21df372 · 21df372
1 parent fed75fb
commit 21df372
Show file tree

Hide file tree

Showing 26 changed files with 153 additions and 317 deletions.
diff --git a/public/components/event_analytics/explorer/visualizations/_mixins.scss b/public/components/event_analytics/explorer/visualizations/_mixins.scss
@@ -6,7 +6,7 @@
 // sass-lint:disable-block indentation, no-color-keywords
 
 // SASSTODO: Create this in EUI
-@mixin lnsOverflowShadowHorizontal {
+@mixin vizOverflowShadowHorizontal {
   $hideHeight: $euiScrollBarCorner * 1.25;
   mask-image: linear-gradient(
     to right,
@@ -18,37 +18,37 @@
 }
 
 // Static styles for a draggable item
-@mixin lnsDraggable {
+@mixin vizDraggable {
   @include euiSlightShadow;
   background: lightOrDarkTheme($euiColorEmptyShade, $euiColorLightestShade);
   border: $euiBorderWidthThin dashed transparent;
   cursor: grab;
 }
 
 // Static styles for a drop area
-@mixin lnsDroppable {
+@mixin vizDroppable {
   border: $euiBorderWidthThin dashed $euiBorderColor;
 }
 
 // Hovering state for drag item and drop area
-@mixin lnsDragDropHover {
+@mixin vizDragDropHover {
   &:hover {
     border: $euiBorderWidthThin dashed $euiColorMediumShade;
   }
 }
 
 // Style for drop area when there's an item being dragged
-@mixin lnsDroppableActive {
+@mixin vizDroppableActive {
   background-color: transparentize($euiColorVis0, .9);
 }
 
 // Style for drop area while hovering with item
-@mixin lnsDroppableActiveHover {
+@mixin vizDroppableActiveHover {
   background-color: transparentize($euiColorVis0, .75);
   border: $euiBorderWidthThin dashed $euiColorVis0;
 }
 
 // Style for drop area that is not allowed for current item
-@mixin lnsDroppableNotAllowed {
+@mixin vizDroppableNotAllowed {
   opacity: .5;
 }
diff --git a/public/components/event_analytics/explorer/visualizations/_variables.scss b/public/components/event_analytics/explorer/visualizations/_variables.scss
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-$lnsPanelMinWidth: $euiSize * 18;
+$vizPanelMinWidth: $euiSize * 18;
 
 // These sizes also match canvas' page thumbnails for consistency
-$lnsSuggestionHeight: 100px;
-$lnsSuggestionWidth: 150px;
+$vizSuggestionHeight: 100px;
+$vizSuggestionWidth: 150px;
diff --git a/...s/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap b/...s/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap
@@ -11,6 +11,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
           "fromApp": false,
         },
         "defaultAxes": Object {},
+        "explorer": Object {
+          "explorerData": Object {
+            "jsonData": Array [],
+          },
+        },
         "indexFields": Object {
           "availableFields": Array [
             Object {
@@ -4511,6 +4516,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                       "fromApp": false,
                     },
                     "defaultAxes": Object {},
+                    "explorer": Object {
+                      "explorerData": Object {
+                        "jsonData": Array [],
+                      },
+                    },
                     "indexFields": Object {
                       "availableFields": Array [
                         Object {
@@ -5287,6 +5297,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                         "fromApp": false,
                       },
                       "defaultAxes": Object {},
+                      "explorer": Object {
+                        "explorerData": Object {
+                          "jsonData": Array [],
+                        },
+                      },
                       "indexFields": Object {
                         "availableFields": Array [
                           Object {
@@ -5825,6 +5840,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                         "fromApp": false,
                       },
                       "defaultAxes": Object {},
+                      "explorer": Object {
+                        "explorerData": Object {
+                          "jsonData": Array [],
+                        },
+                      },
                       "indexFields": Object {
                         "availableFields": Array [
                           Object {
@@ -6645,6 +6665,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                       "fromApp": false,
                     },
                     "defaultAxes": Object {},
+                    "explorer": Object {
+                      "explorerData": Object {
+                        "jsonData": Array [],
+                      },
+                    },
                     "indexFields": Object {
                       "availableFields": Array [
                         Object {
@@ -7197,6 +7222,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                     "fromApp": false,
                                   },
                                   "defaultAxes": Object {},
+                                  "explorer": Object {
+                                    "explorerData": Object {
+                                      "jsonData": Array [],
+                                    },
+                                  },
                                   "indexFields": Object {
                                     "availableFields": Array [
                                       Object {
@@ -8016,6 +8046,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                     "fromApp": false,
                                   },
                                   "defaultAxes": Object {},
+                                  "explorer": Object {
+                                    "explorerData": Object {
+                                      "jsonData": Array [],
+                                    },
+                                  },
                                   "indexFields": Object {
                                     "availableFields": Array [
                                       Object {
@@ -9334,6 +9369,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                     "fromApp": false,
                                   },
                                   "defaultAxes": Object {},
+                                  "explorer": Object {
+                                    "explorerData": Object {
+                                      "jsonData": Array [],
+                                    },
+                                  },
                                   "indexFields": Object {
                                     "availableFields": Array [
                                       Object {
@@ -10673,6 +10713,11 @@ exports[`Config panel component Renders config panel with visualization data 1`]
                                     "fromApp": false,
                                   },
                                   "defaultAxes": Object {},
+                                  "explorer": Object {
+                                    "explorerData": Object {
+                                      "jsonData": Array [],
+                                    },
+                                  },
                                   "indexFields": Object {
                                     "availableFields": Array [
                                       Object {

diff --git a/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.scss b/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.scss
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-.lnsConfigPanel__addLayerBtn {
+.vizConfigPanel__addLayerBtn {
   color: transparentize($euiColorMediumShade, 0.3);
   // Remove EuiButton's default shadow to make button more subtle
   // sass-lint:disable-block no-important

diff --git a/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx b/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx
@@ -185,7 +185,7 @@ export const ConfigPanel = ({ visualizations, setCurVisId, callback }: any) => {
 
     return (
       <div className="configPanel__vizSelector-item">
-        <EuiIcon className="lnsChartSwitch__chartIcon" type={icontype} size="m" />
+        <EuiIcon className="vizChartSwitch__chartIcon" type={icontype} size="m" />
         &nbsp;&nbsp;
         <span>{label}</span>
       </div>

diff --git a/.../visualizations/shared_components/__tests__/__snapshots__/shared_components.test.tsx.snap b/.../visualizations/shared_components/__tests__/__snapshots__/shared_components.test.tsx.snap
diff --git a/..._analytics/explorer/visualizations/shared_components/__tests__/shared_components.test.tsx b/..._analytics/explorer/visualizations/shared_components/__tests__/shared_components.test.tsx
diff --git a/...mponents/event_analytics/explorer/visualizations/shared_components/empty_placeholder.scss b/...mponents/event_analytics/explorer/visualizations/shared_components/empty_placeholder.scss
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
- .lnsChart__empty {
+ .vizChart__empty {
   display: flex;
   justify-content: center;
   align-items: center;

diff --git a/...omponents/event_analytics/explorer/visualizations/shared_components/empty_placeholder.tsx b/...omponents/event_analytics/explorer/visualizations/shared_components/empty_placeholder.tsx
@@ -11,7 +11,7 @@ import './empty_placeholder.scss';
 export const EmptyPlaceholder = (props: { icon: string }) => (
   <>
     <EuiText
-      className="lnsChart__empty"
+      className="vizChart__empty"
       textAlign="center"
       color="subdued"
       size="xs"

diff --git a/public/components/event_analytics/explorer/visualizations/shared_components/index.ts b/public/components/event_analytics/explorer/visualizations/shared_components/index.ts
@@ -4,5 +4,4 @@
  */
 
 export * from './empty_placeholder';
-export { ToolbarButtonProps, ToolbarButton } from './toolbar_button';
-export { VisCanvassPlaceholder } from './vis_canvass_placeholder'
+export { VisCanvassPlaceholder } from './vis_canvass_placeholder';