feat: Main layout NEO header

lablup · Nov 20, 2024 · 2148a93 · 2148a93
1 parent 19f959b
commit 2148a93
Show file tree

Hide file tree

Showing 36 changed files with 356 additions and 248 deletions.
diff --git a/main.js b/main.js
@@ -328,7 +328,7 @@ function createWindow() {
     height: windowHeight,
     title: 'Backend.AI',
     frame: true,
-    titleBarStyle: 'hiddenInset',
+    titleBarStyle: 'customButtonsOnHover',
     webPreferences: {
       nativeWindowOpen: true,
       nodeIntegration: false,

diff --git a/react/package.json b/react/package.json
@@ -26,6 +26,7 @@
     "ansi_up": "^6.0.2",
     "antd": "^5.20.0",
     "antd-style": "^3.6.2",
+    "classnames": "^2.5.1",
     "dayjs": "^1.11.12",
     "graphql": "^16.9.0",
     "i18next": "^23.12.2",

diff --git a/react/pnpm-lock.yaml b/react/pnpm-lock.yaml
diff --git a/react/src/components/BAIMenu.tsx b/react/src/components/BAIMenu.tsx
@@ -1,56 +1,29 @@
-import { ConfigProvider, Menu, MenuProps, theme } from 'antd';
+import { ConfigProvider, Menu, MenuProps } from 'antd';
 import React from 'react';
 
-// interface BAIMenuProps extends MenuProps {
-
-// }
-
 const BAIMenu: React.FC<MenuProps> = ({ ...props }) => {
-  const { token } = theme.useToken();
   return (
-    <>
-      <style>
-        {`
-          .bai-menu li.ant-menu-item.ant-menu-item-selected {
-            overflow: visible;
-            font-weight: 600;
-          }
-          
-          .bai-menu li.ant-menu-item.ant-menu-item-selected::before {
-            left: 0px;
-            top: 0;
-            bottom: 0;
-            position: absolute;
-            right: auto;
-            border-right: 3px solid ${token.colorPrimary};
-            transform: scaleY(1);
-            opacity: 1;
-            content: "";
-          }
-          `}
-      </style>
-      <ConfigProvider
-        theme={{
-          components: {
-            Menu: {
-              itemBorderRadius: 2,
-              itemMarginInline: 0,
-            },
+    <ConfigProvider
+      theme={{
+        components: {
+          Menu: {
+            itemBorderRadius: 2,
+            itemMarginInline: 0,
           },
+        },
+      }}
+    >
+      <Menu
+        style={{
+          backgroundColor: 'transparent',
+          borderRight: 'none',
+          paddingRight: 4,
         }}
-      >
-        <Menu
-          style={{
-            backgroundColor: 'transparent',
-            borderRight: 'none',
-            paddingRight: 4,
-          }}
-          mode="inline"
-          {...props}
-          className="bai-menu"
-        />
-      </ConfigProvider>
-    </>
+        // mode=""
+        {...props}
+        className="bai-menu"
+      />
+    </ConfigProvider>
   );
 };
 

diff --git a/react/src/components/BAINotificationButton.tsx b/react/src/components/BAINotificationButton.tsx
@@ -10,10 +10,15 @@ import { atom, useAtom } from 'jotai';
 import _ from 'lodash';
 import React, { useEffect } from 'react';
 
-interface Props extends ButtonProps {}
+interface Props extends ButtonProps {
+  buttonRender?: (defaultButton: React.ReactNode) => React.ReactNode;
+}
 export const isOpenDrawerState = atom(false);
 
-const BAINotificationButton: React.FC<Props> = ({ ...props }) => {
+const BAINotificationButton: React.FC<Props> = ({
+  buttonRender = (btn) => btn,
+  ...props
+}) => {
   const [notifications, { upsertNotification }] = useBAINotificationState();
   useBAINotificationEffect();
 
@@ -33,17 +38,18 @@ const BAINotificationButton: React.FC<Props> = ({ ...props }) => {
   });
   return (
     <>
-      <Button
-        size="large"
-        icon={
-          <Badge dot={hasRunningBackgroundTask}>
-            <BellOutlined />
-          </Badge>
-        }
-        type="text"
-        onClick={() => setIsOpenDrawer((v) => !v)}
-        {...props}
-      />
+      {buttonRender(
+        <Button
+          icon={
+            <Badge dot={hasRunningBackgroundTask}>
+              <BellOutlined />
+            </Badge>
+          }
+          type="text"
+          onClick={() => setIsOpenDrawer((v) => !v)}
+          {...props}
+        />,
+      )}
       <WEBUINotificationDrawer
         open={isOpenDrawer}
         onClose={() => setIsOpenDrawer((v) => !v)}

diff --git a/react/src/components/BAISelect.tsx b/react/src/components/BAISelect.tsx
@@ -1,8 +1,45 @@
 import { Select, SelectProps } from 'antd';
+import { createStyles } from 'antd-style';
+import classNames from 'classnames';
 import _ from 'lodash';
 import React, { useLayoutEffect } from 'react';
 
-interface BAISelectProps extends SelectProps {
+const useStyles = createStyles(({ css, token }) => ({
+  ghostSelect: css`
+    &.ant-select {
+      .ant-select-selector {
+        background-color: transparent;
+        border-color: ${token.colorBgBase} !important;
+        /* box-shadow: none; */
+        color: ${token.colorBgBase};
+        /* transition: color 0.3s, border-color 0.3s; */
+      }
+
+      &:hover .ant-select-selector {
+        background-color: rgb(255 255 255 / 10%);
+      }
+
+      &:active .ant-select-selector {
+        background-color: rgb(255 255 255 / 10%);
+      }
+
+      .ant-select-arrow {
+        color: ${token.colorBgBase};
+      }
+
+      &:hover .ant-select-arrow {
+        color: ${token.colorBgBase};
+      }
+
+      &:active .ant-select-arrow {
+        color: ${token.colorBgBase};
+      }
+    }
+  `,
+}));
+
+export interface BAISelectProps extends SelectProps {
+  ghost?: boolean;
   autoSelectOption?: boolean | ((options: SelectProps['options']) => any);
 }
 /**
@@ -18,9 +55,12 @@ interface BAISelectProps extends SelectProps {
  */
 const BAISelect: React.FC<BAISelectProps> = ({
   autoSelectOption,
+  ghost,
   ...selectProps
 }) => {
   const { value, options, onChange } = selectProps;
+  const { styles } = useStyles();
+
   useLayoutEffect(() => {
     if (autoSelectOption && _.isEmpty(value) && options?.[0]) {
       if (_.isBoolean(autoSelectOption)) {
@@ -30,7 +70,17 @@ const BAISelect: React.FC<BAISelectProps> = ({
       }
     }
   }, [value, options, onChange, autoSelectOption]);
-  return <Select {...selectProps} />;
+
+  return (
+    <Select
+      {...selectProps}
+      className={
+        ghost
+          ? classNames(styles.ghostSelect, selectProps.className)
+          : selectProps.className
+      }
+    />
+  );
 };
 
 export default BAISelect;
diff --git a/react/src/components/LoginSessionExtendButton.tsx b/react/src/components/LoginSessionExtendButton.tsx
@@ -4,8 +4,9 @@ import { useSuspenseTanQuery } from '../hooks/reactQueryAlias';
 import BAIIntervalView from './BAIIntervalView';
 import Flex from './Flex';
 import { ClockCircleOutlined } from '@ant-design/icons';
-import { Button, Tooltip } from 'antd';
+import { Button, ConfigProvider, Grid, Tooltip } from 'antd';
 import { default as dayjs } from 'dayjs';
+import { Repeat2Icon } from 'lucide-react';
 import React, { useTransition } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -19,6 +20,8 @@ const LoginSessionExtendButton: React.FC<
   const [isPending, startTransition] = useTransition();
   const [fetchKey, updateFetchKey] = useUpdatableState('first');
 
+  const gridBreakpoint = Grid.useBreakpoint();
+
   const { data } = useSuspenseTanQuery<{
     expires: string;
   }>({
@@ -33,37 +36,56 @@ const LoginSessionExtendButton: React.FC<
   });
 
   return (
-    <Flex direction="row" gap="xxs">
-      <Tooltip title={t('general.RemainingLoginSessionTime')}>
-        <Flex gap={'xxs'}>
-          <ClockCircleOutlined />
-          <BAIIntervalView
-            callback={() => {
-              const diff = dayjs(data?.expires).diff(dayjs(), 'seconds');
-              const duration = dayjs.duration(Math.max(0, diff), 'seconds');
-              const days = duration.days();
-              if (duration.seconds() === 0) {
-                // @ts-ignore
-                if (globalThis.isElectron) {
-                  // @ts-ignore
-                  globalThis.location.href = globalThis.electronInitialHref;
-                } else {
-                  globalThis.location.reload();
-                }
-              }
-              return `${days ? days + 'd ' : ''}${duration.format('HH:mm:ss')}`;
-            }}
-            delay={100}
-          ></BAIIntervalView>
-        </Flex>
-      </Tooltip>
-      <Button
-        loading={isPending}
-        onClick={() => startTransition(() => updateFetchKey())}
-        size="small"
+    <Flex direction="row" gap="xs">
+      <BAIIntervalView
+        callback={() => {
+          const diff = dayjs(data?.expires).diff(dayjs(), 'seconds');
+          const duration = dayjs.duration(Math.max(0, diff), 'seconds');
+          const days = duration.days();
+          if (duration.seconds() === 0) {
+            // @ts-ignore
+            if (globalThis.isElectron) {
+              // @ts-ignore
+              globalThis.location.href = globalThis.electronInitialHref;
+            } else {
+              globalThis.location.reload();
+            }
+          }
+          return gridBreakpoint.lg
+            ? `${days ? days + 'd ' : ''}${duration.format('HH:mm:ss')}`
+            : days
+              ? days + 'd'
+              : duration.format('HH:mm:ss');
+        }}
+        delay={100}
+        render={(text) => {
+          return (
+            <Tooltip title={t('general.RemainingLoginSessionTime')}>
+              <Flex gap={'xxs'}>
+                <ClockCircleOutlined />
+                {text}
+              </Flex>
+            </Tooltip>
+          );
+        }}
+      />
+      <ConfigProvider
+        theme={{
+          token: {
+            // hack to change the primary hover color for header
+            colorPrimaryHover: 'rgb(255,255,255,0.15)',
+          },
+        }}
       >
-        {t('general.Extend')}
-      </Button>
+        <Tooltip title={t('general.ExtendLoginSession')}>
+          <Button
+            type="primary"
+            loading={isPending}
+            onClick={() => startTransition(() => updateFetchKey())}
+            icon={<Repeat2Icon />}
+          />
+        </Tooltip>
+      </ConfigProvider>
     </Flex>
   );
 };

diff --git a/react/src/components/MainLayout/WebUIHeader.css b/react/src/components/MainLayout/WebUIHeader.css