Merge remote-tracking branch 'upstream/main' into fixes-saml-login-flow

DarshitChanpura · Apr 9, 2024 · 7b68f1c · 7b68f1c
2 parents 43c0c9d + 64995fc
commit 7b68f1c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
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"
             >