From fbfe8d010dc247eab39846126230297ccfce58f4 Mon Sep 17 00:00:00 2001 From: Ryan Liang <109499885+RyanL1997@users.noreply.github.com> Date: Thu, 3 Aug 2023 13:58:14 -0700 Subject: [PATCH 1/3] Change the version parsing command's regex to handle the case of double digits of minor versions (#1537) Signed-off-by: Ryan Liang Co-authored-by: Craig Perkins --- .github/actions/install-dashboards/action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/install-dashboards/action.yml b/.github/actions/install-dashboards/action.yml index d314c40f7..eea6eaf63 100644 --- 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 From 7d34953d834cd70f6c8be2285113d60e83263292 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 4 Aug 2023 18:50:54 -0400 Subject: [PATCH 2/3] Add release notes for 1.3.12.0 (#1543) Signed-off-by: Craig Perkins --- ...h-security-dashboards-plugin.release-notes-1.3.12.0.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 release-notes/opensearch-security-dashboards-plugin.release-notes-1.3.12.0.md 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 new file mode 100644 index 000000000..ac8c68b4f --- /dev/null +++ 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) From 20ba268e85b6d518a51d587a97b034f924c399f7 Mon Sep 17 00:00:00 2001 From: Miki Date: Thu, 10 Aug 2023 11:35:17 -0700 Subject: [PATCH 3/3] Make the steps diagram honor the theme (#1538) Signed-off-by: Miki Co-authored-by: Craig Perkins Co-authored-by: Ryan Liang <109499885+RyanL1997@users.noreply.github.com> --- public/apps/configuration/_index.scss | 42 ++++++++++ .../apps/configuration/panels/get-started.tsx | 13 +-- .../__snapshots__/get-started.test.tsx.snap | 17 +--- public/assets/get_started.svg | 79 +------------------ public/assets/get_started_layer_1.svg | 1 + public/assets/get_started_layer_2.svg | 1 + 6 files changed, 48 insertions(+), 105 deletions(-) create mode 100644 public/assets/get_started_layer_1.svg create mode 100644 public/assets/get_started_layer_2.svg diff --git a/public/apps/configuration/_index.scss b/public/apps/configuration/_index.scss index 57f25c45d..4914998cb 100644 --- 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 index fffa99570..b2c562e35 100644 --- 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) { - {props.config.ui.backend_configurable && ( -
- -
- )} + {props.config.ui.backend_configurable &&
} 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 index 355d3817e..d7fd749e2 100644 --- 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" />
- -
+ className="security-steps-diagram" + /> diff --git a/public/assets/get_started.svg b/public/assets/get_started.svg index 842164f5c..babb3db47 100644 --- a/public/assets/get_started.svg +++ b/public/assets/get_started.svg @@ -1,78 +1 @@ - - - get_started - - - - - - - - - - - - - - - - - - - - - - Map backend roles - - - - - - - - - - - - - - Map internal users - - - - - - - - - - - - Role - - - - - - - - - - - - (authc & authz) - - - Backends - - - - - - - - - - - - \ No newline at end of file +Map backend rolesMap internal usersRole(authc & authz)Backends diff --git a/public/assets/get_started_layer_1.svg b/public/assets/get_started_layer_1.svg new file mode 100644 index 000000000..e1413f4db --- /dev/null +++ b/public/assets/get_started_layer_1.svg @@ -0,0 +1 @@ +Map backend rolesMap internal usersRole(authc & authz)Backends diff --git a/public/assets/get_started_layer_2.svg b/public/assets/get_started_layer_2.svg new file mode 100644 index 000000000..d060b85dc --- /dev/null +++ b/public/assets/get_started_layer_2.svg @@ -0,0 +1 @@ +