Merge branch 'main' into fix-jwt-auth-test

opensearch-project · Aug 14, 2023 · 1d56a70 · 1d56a70
2 parents 3ed3faf + 20ba268
commit 1d56a70
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 108 deletions.
diff --git a/.github/actions/install-dashboards/action.yml b/.github/actions/install-dashboards/action.yml
@@ -40,15 +40,15 @@ runs:
 
     - id: osd-version
       run: |
-        echo "::set-output name=osd-version::$(cat package.json | jq '.opensearchDashboards.version' | cut -c 2-4)"
-        echo "::set-output name=osd-x-version::$(cat package.json | jq '.opensearchDashboards.version' | cut -c 2-3)"
+        echo "::set-output name=osd-version::$(jq -r '.opensearchDashboards.version | split(".") | .[:2] | join(".")' package.json)"
+        echo "::set-output name=osd-x-version::$(jq -r '.opensearchDashboards.version | split(".") | .[0]' package.json).x"
       working-directory: ${{ steps.determine-plugin-directory.outputs.plugin-directory }}
       shell: bash
 
     - id: branch-switch-if-possible
       continue-on-error: true # Defaults onto main if the branch switch doesn't work
       if: ${{ steps.osd-version.outputs.osd-version }}
-      run: git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}x
+      run: git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}
       working-directory: ./OpenSearch-Dashboards
       shell: bash
 

diff --git a/public/apps/configuration/_index.scss b/public/apps/configuration/_index.scss
@@ -41,3 +41,45 @@
 .limit-width-input {
   max-width: 400px;
 }
+
+.security-steps-diagram {
+  height: 114px;
+  position: relative;
+
+  &::before,
+  &::after {
+    content: "";
+    position: absolute;
+    width: 100%;
+    height: 100%;
+  }
+
+  &::before {
+    mask: url("../../assets/get_started_layer_1.svg") center / contain no-repeat;
+    background: $euiColorDarkestShade;
+  }
+
+  &::after {
+    mask: url("../../assets/get_started_layer_2.svg") center / contain no-repeat;
+    background: $euiColorPrimary;
+  }
+
+  @supports not (mask: center / contain no-repeat) {
+    /* stylelint-disable property-no-vendor-prefix */
+    &::before,
+    &::after {
+      -webkit-mask-repeat: no-repeat;
+      -webkit-mask-size: contain;
+      -webkit-mask-position: center;
+    }
+
+    &::before {
+      -webkit-mask-image: url("../../assets/get_started_layer_1.svg");
+    }
+
+    &::after {
+      -webkit-mask-image: url("../../assets/get_started_layer_2.svg");
+    }
+    /* stylelint-enable property-no-vendor-prefix */
+  }
+}
diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx
@@ -18,7 +18,6 @@ import {
   EuiCode,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiImage,
   EuiPageHeader,
   EuiPanel,
   EuiSpacer,
@@ -31,7 +30,6 @@ import { FormattedMessage } from '@osd/i18n/react';
 import { flow } from 'lodash';
 import { HashRouter as Router, Route } from 'react-router-dom';
 import { AppDependencies } from '../../types';
-import securityStepsDiagram from '../../../assets/get_started.svg';
 import { buildHashUrl, buildUrl } from '../utils/url-builder';
 import { Action, ResourceType, RouteItem } from '../types';
 import { API_ENDPOINT_CACHE, DocLinks } from '../constants';
@@ -189,16 +187,7 @@ export function GetStarted(props: AppDependencies) {
           </EuiText>
 
           <EuiSpacer size="l" />
-          {props.config.ui.backend_configurable && (
-            <div className="text-center">
-              <EuiImage
-                size="xl"
-                alt="Three steps to set up your security"
-                url={securityStepsDiagram}
-                style={{ maxWidth: '100%', height: 'auto', width: 'auto' }}
-              />
-            </div>
-          )}
+          {props.config.ui.backend_configurable && <div className={'security-steps-diagram'} />}
 
           <EuiSpacer size="l" />
 

diff --git a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
@@ -279,21 +279,8 @@ exports[`Get started (landing page) renders when backend configuration is enable
         size="l"
       />
       <div
-        className="text-center"
-      >
-        <EuiImage
-          alt="Three steps to set up your security"
-          size="xl"
-          style={
-            Object {
-              "height": "auto",
-              "maxWidth": "100%",
-              "width": "auto",
-            }
-          }
-          url="test-file-stub"
-        />
-      </div>
+        className="security-steps-diagram"
+      />
       <EuiSpacer
         size="l"
       />

diff --git a/public/assets/get_started.svg b/public/assets/get_started.svg
diff --git a/public/assets/get_started_layer_1.svg b/public/assets/get_started_layer_1.svg
diff --git a/public/assets/get_started_layer_2.svg b/public/assets/get_started_layer_2.svg
diff --git a/release-notes/opensearch-security-dashboards-plugin.release-notes-1.3.12.0.md b/release-notes/opensearch-security-dashboards-plugin.release-notes-1.3.12.0.md
@@ -0,0 +1,8 @@
+## 2023-08-10 Version 1.3.12.0
+
+Compatible with Opensearch-Dashboards 1.3.12
+
+### Bug Fixes
+
+* Switch to new tenant after loading a copied long URL ([#1450](https://github.com/opensearch-project/security-dashboards-plugin/pull/1450))
+* Add the tenant into the short URL once the short URL is resolved ([#1462](https://github.com/opensearch-project/security-dashboards-plugin/pull/1462)) [#1516](https://github.com/opensearch-project/security-dashboards-plugin/pull/1516)