[Serverless] Chrome UI fixes (#164030)

elastic · Aug 16, 2023 · 1b6430e · 1b6430e
1 parent 0d74544
commit 1b6430e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
@@ -16,6 +16,8 @@ import {
   EuiIcon,
   EuiLoadingSpinner,
   htmlIdGenerator,
+  useEuiTheme,
+  EuiThemeComputed,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
 import type { InternalApplicationStart } from '@kbn/core-application-browser-internal';
@@ -46,12 +48,12 @@ import { ScreenReaderRouteAnnouncements, SkipToMainContent } from '../header/scr
 import { AppMenuBar } from './app_menu';
 import { ProjectNavigation } from './navigation';
 
-const headerCss = {
+const getHeaderCss = ({ size }: EuiThemeComputed) => ({
   logo: {
     container: css`
       display: inline-block;
       min-width: 56px; /* 56 = 40 + 8 + 8 */
-      padding: 0 8px;
+      padding: 0 ${size.s};
       cursor: pointer;
     `,
     logo: css`
@@ -68,9 +70,12 @@ const headerCss = {
     toggleNavButton: css`
       border-right: 1px solid #d3dae6;
       margin-left: -1px;
+      padding-right: ${size.xs};
     `,
   },
-};
+});
+
+type HeaderCss = ReturnType<typeof getHeaderCss>;
 
 const headerStrings = {
   logo: {
@@ -114,16 +119,17 @@ export interface Props {
 const LOCAL_STORAGE_IS_OPEN_KEY = 'PROJECT_NAVIGATION_OPEN' as const;
 const LOADING_DEBOUNCE_TIME = 80;
 
-const Logo = (
-  props: Pick<Props, 'application' | 'homeHref$' | 'loadingCount$' | 'prependBasePath'>
-) => {
+type LogoProps = Pick<Props, 'application' | 'homeHref$' | 'loadingCount$' | 'prependBasePath'> & {
+  logoCss: HeaderCss['logo'];
+};
+
+const Logo = (props: LogoProps) => {
   const loadingCount = useObservable(
     props.loadingCount$.pipe(debounceTime(LOADING_DEBOUNCE_TIME)),
     0
   );
 
   const homeHref = useObservable(props.homeHref$, '/app/home');
-  const { logo } = headerCss;
 
   let fullHref: string | undefined;
   if (homeHref) {
@@ -141,18 +147,18 @@ const Logo = (
   );
 
   return (
-    <span css={logo.container} data-test-subj="nav-header-logo">
+    <span css={props.logoCss.container} data-test-subj="nav-header-logo">
       {loadingCount === 0 ? (
         <EuiHeaderLogo
           iconType="logoElastic"
           onClick={navigateHome}
           href={fullHref}
-          css={logo}
+          css={props.logoCss}
           data-test-subj="globalLoadingIndicator-hidden"
           aria-label={headerStrings.logo.ariaLabel}
         />
       ) : (
-        <a onClick={navigateHome} href={fullHref} css={logo.spinner}>
+        <a onClick={navigateHome} href={fullHref} css={props.logoCss.spinner}>
           <EuiLoadingSpinner
             size="l"
             aria-hidden={false}
@@ -178,6 +184,9 @@ export const ProjectHeader = ({
   const toggleCollapsibleNavRef = createRef<HTMLButtonElement & { euiAnimate: () => void }>();
   const headerActionMenuMounter = useHeaderActionMenuMounter(observables.actionMenu$);
   const projectsUrl = useObservable(observables.projectsUrl$);
+  const { euiTheme } = useEuiTheme();
+  const headerCss = getHeaderCss(euiTheme);
+  const { logo: logoCss } = headerCss;
 
   return (
     <>
@@ -228,6 +237,7 @@ export const ProjectHeader = ({
                   application={application}
                   homeHref$={observables.homeHref$}
                   loadingCount$={observables.loadingCount$}
+                  logoCss={logoCss}
                 />
               </EuiHeaderSectionItem>
 

diff --git a/src/plugins/dashboard/public/dashboard_app/listing_page/dashboard_listing_page.test.tsx b/src/plugins/dashboard/public/dashboard_app/listing_page/dashboard_listing_page.test.tsx
@@ -25,11 +25,13 @@ jest.mock('../../dashboard_listing/dashboard_listing', () => {
 });
 
 import { DashboardAppNoDataPage } from '../no_data/dashboard_app_no_data';
+const mockIsDashboardAppInNoDataState = jest.fn().mockResolvedValue(false);
 jest.mock('../no_data/dashboard_app_no_data', () => {
   const originalModule = jest.requireActual('../no_data/dashboard_app_no_data');
   return {
     __esModule: true,
     ...originalModule,
+    isDashboardAppInNoDataState: () => mockIsDashboardAppInNoDataState(),
     DashboardAppNoDataPage: jest.fn().mockReturnValue(null),
   };
 });
@@ -53,6 +55,7 @@ function mountWith({ props: incomingProps }: { props?: DashboardListingPageProps
 }
 
 test('renders analytics no data page when the user has no data view', async () => {
+  mockIsDashboardAppInNoDataState.mockResolvedValueOnce(true);
   pluginServices.getServices().data.dataViews.hasData.hasUserDataView = jest
     .fn()
     .mockResolvedValue(false);

diff --git a/src/plugins/dashboard/public/dashboard_app/listing_page/dashboard_listing_page.tsx b/src/plugins/dashboard/public/dashboard_app/listing_page/dashboard_listing_page.tsx
@@ -42,12 +42,12 @@ export const DashboardListingPage = ({
     dashboardContentManagement: { findDashboards },
   } = pluginServices.getServices();
 
-  const [showNoDataPage, setShowNoDataPage] = useState<boolean>(false);
+  const [showNoDataPage, setShowNoDataPage] = useState<boolean | undefined>();
   useEffect(() => {
     let isMounted = true;
     (async () => {
       const isInNoDataState = await isDashboardAppInNoDataState();
-      if (isInNoDataState && isMounted) setShowNoDataPage(true);
+      setShowNoDataPage(isInNoDataState && isMounted);
     })();
     return () => {
       isMounted = false;
@@ -92,6 +92,10 @@ export const DashboardListingPage = ({
 
   const titleFilter = title ? `${title}` : '';
 
+  if (showNoDataPage === undefined) {
+    return null;
+  }
+
   return (
     <>
       {showNoDataPage && (

diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
@@ -268,7 +268,7 @@ export const SearchBar: FC<SearchBarProps> = (opts) => {
 
   if (chromeStyle === 'project' && !isVisible) {
     return (
-      <EuiButtonIcon
+      <EuiHeaderSectionItemButton
         aria-label={i18nStrings.showSearchAriaText}
         buttonRef={visibilityButtonRef}
         color="text"