Merge branch 'main' into password-strenght-ui

derek-ho · Apr 12, 2024 · 314ee80 · 314ee80
2 parents 72a63c0 + 8f0a52d
commit 314ee80
Show file tree

Hide file tree

Showing 16 changed files with 527 additions and 52 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @cliu123 @cwperks @DarshitChanpura @davidlago @derek-ho @peternied @RyanL1997 @scrawfor99
+* @cliu123 @cwperks @DarshitChanpura @derek-ho @peternied @RyanL1997 @scrawfor99
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -8,7 +8,6 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | ---------------- | ----------------------------------------------------- | ----------- |
 | Chang Liu        | [cliu123](https://github.com/cliu123)                 | Amazon      |
 | Darshit Chanpura | [DarshitChanpura](https://github.com/DarshitChanpura) | Amazon      |
-| Dave Lago        | [davidlago](https://github.com/davidlago)             | Amazon      |
 | Peter Nied       | [peternied](https://github.com/peternied)             | Amazon      |
 | Craig Perkins    | [cwperks](https://github.com/cwperks)                 | Amazon      |
 | Ryan Liang       | [RyanL1997](https://github.com/RyanL1997)             | Amazon      |
@@ -22,3 +21,4 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Yan Zeng      | [zengyan-amazon](https://github.com/zengyan-amazon) | Amazon      |
 | Bandini Bhopi | [bandinib-amzn](https://github.com/bandinib-amzn)   | Amazon      |
 | Tianle Huang  | [tianleh](https://github.com/tianleh)               | Amazon      |
+| Dave Lago     | [davidlago](https://github.com/davidlago)           | Contributor |
diff --git a/common/index.ts b/common/index.ts
@@ -34,6 +34,7 @@ export const OPENID_AUTH_LOGIN_WITH_FRAGMENT = '/auth/openid/captureUrlFragment'
 export const SAML_AUTH_LOGIN = '/auth/saml/login';
 export const SAML_AUTH_LOGIN_WITH_FRAGMENT = '/auth/saml/captureUrlFragment';
 export const ANONYMOUS_AUTH_LOGIN = '/auth/anonymous';
+export const AUTH_TYPE_PARAM = 'auth_type';
 
 export const OPENID_AUTH_LOGOUT = '/auth/openid/logout';
 export const SAML_AUTH_LOGOUT = '/auth/saml/logout';

diff --git a/public/apps/configuration/panels/tenant-list/configure_tab1.tsx b/public/apps/configuration/panels/tenant-list/configure_tab1.tsx
@@ -328,7 +328,7 @@ export function ConfigureTab1(props: AppDependencies) {
         <EuiPageContentHeader>
           <EuiPageContentHeaderSection>
             <EuiTitle size="l">
-              <h3>Multi-tenancy</h3>
+              <h3>Dashboards multi-tenancy</h3>
             </EuiTitle>
             <EuiHorizontalRule />
 
@@ -360,15 +360,15 @@ export function ConfigureTab1(props: AppDependencies) {
         <EuiPageContentHeader>
           <EuiPageContentHeaderSection>
             <EuiTitle size="l">
-              <h3>Tenants</h3>
+              <h3>Dashboards tenants</h3>
             </EuiTitle>
             <EuiHorizontalRule />
             <EuiDescribedFormGroup
               title={<h4>Global Tenant</h4>}
               description={
                 <p4>
                   {' '}
-                  Global tenant is shared amaong all Dashboards users and cannot be disabled.{' '}
+                  Global tenant is shared among all Dashboards users and cannot be disabled.{' '}
                 </p4>
               }
               className="described-form-group2"
@@ -407,7 +407,7 @@ export function ConfigureTab1(props: AppDependencies) {
         <EuiPageContentHeader>
           <EuiPageContentHeaderSection>
             <EuiTitle size="l">
-              <h3>Default tenant</h3>
+              <h3>Dashboards default tenant</h3>
             </EuiTitle>
             <EuiHorizontalRule />
             <EuiDescribedFormGroup

diff --git a/public/apps/configuration/panels/tenant-list/manage_tab.tsx b/public/apps/configuration/panels/tenant-list/manage_tab.tsx
@@ -487,7 +487,7 @@ export function ManageTab(props: AppDependencies) {
           <EuiPageContentHeaderSection>
             <EuiTitle size="s">
               <h3>
-                Tenants
+                Dashboards tenants
                 <span className="panel-header-count">
                   {' '}
                   ({Query.execute(query || '', tenantData).length})

diff --git a/public/apps/configuration/panels/tenant-list/tenant-list.tsx b/public/apps/configuration/panels/tenant-list/tenant-list.tsx
@@ -135,7 +135,7 @@ export function TenantList(props: TenantListProps) {
     <>
       <EuiPageHeader>
         <EuiTitle size="l">
-          <h1>Multi-tenancy</h1>
+          <h1>Dashboards multi-tenancy</h1>
         </EuiTitle>
       </EuiPageHeader>
       <EuiText size="s" color="subdued" grow={true} textAlign={'left'}>

diff --git a/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-list.test.tsx.snap b/public/apps/configuration/panels/tenant-list/test/__snapshots__/tenant-list.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`Tenant list Action menu click Duplicate click 1`] = `
           size="s"
         >
           <h3>
-            Tenants
+            Dashboards tenants
             <span
               className="panel-header-count"
             >
@@ -198,7 +198,7 @@ exports[`Tenant list Action menu click Edit click 1`] = `
           size="s"
         >
           <h3>
-            Tenants
+            Dashboards tenants
             <span
               className="panel-header-count"
             >

diff --git a/public/apps/login/login-page.tsx b/public/apps/login/login-page.tsx
@@ -231,14 +231,14 @@ export function LoginPage(props: LoginPageDeps) {
             </EuiFormRow>
           );
 
-          if (authOpts.length > 1) {
-            if (props.config.auth.anonymous_auth_enabled) {
-              const anonymousConfig = props.config.ui[AuthType.ANONYMOUS].login;
-              formBody.push(
-                renderLoginButton(AuthType.ANONYMOUS, ANONYMOUS_AUTH_LOGIN, anonymousConfig)
-              );
-            }
+          if (props.config.auth.anonymous_auth_enabled) {
+            const anonymousConfig = props.config.ui[AuthType.ANONYMOUS].login;
+            formBody.push(
+              renderLoginButton(AuthType.ANONYMOUS, ANONYMOUS_AUTH_LOGIN, anonymousConfig)
+            );
+          }
 
+          if (authOpts.length > 1) {
             formBody.push(<EuiSpacer size="xs" />);
             formBody.push(<EuiHorizontalRule size="full" margin="xl" />);
             formBody.push(<EuiSpacer size="xs" />);