feat(Diagnostics): update Healthcheck design (#509)

Author: krosy1337

src/components/DiagnosticCard/DiagnosticCard.scss

@@ -0,0 +1,5 @@
+.diagnostic-card {
+    min-width: 200px;
+    max-width: 350px;
+    padding: 16px;
+}

src/components/DiagnosticCard/DiagnosticCard.tsx

@@ -0,0 +1,17 @@
+import {ReactNode} from 'react';
+import cn from 'bem-cn-lite';
+
+import {Card} from '@gravity-ui/uikit';
+
+import './DiagnosticCard.scss';
+
+const b = cn('diagnostic-card');
+
+interface DiagnosticCardProps {
+    children?: ReactNode;
+    className?: string;
+}
+
+export function DiagnosticCard({children, className}: DiagnosticCardProps) {
+    return <Card className={b(null, className)}>{children}</Card>;
+}

src/components/EntityStatus/EntityStatus.js

@@ -107,13 +107,13 @@ class EntityStatus extends React.Component {
         );
     }
     render() {
-        const {name, label, iconPath, hasClipboardButton, className} = this.props;
+        const {name, label, iconPath, hasClipboardButton, className, size, status} = this.props;
 
         return (
             <div className={b(null, className)} title={name}>
                 {iconPath ? this.renderStatusLink() : this.renderIcon()}
                 {label && (
-                    <span title={label} className={b('label')}>
+                    <span title={label} className={b('label', {size, state: status.toLowerCase()})}>
                         {label}
                     </span>
                 )}

src/components/EntityStatus/EntityStatus.scss

@@ -47,6 +47,15 @@
         line-height: var(--yc-text-body-2-line-height);
 
         color: var(--yc-color-text-complementary);
+
+        &_size_m {
+            font-size: var(--yc-text-body-2-font-size);
+            line-height: var(--yc-text-body-2-line-height);
+        }
+
+        &_size_l {
+            font-size: var(--yc-text-header-2-font-size);
+        }
     }
 
     &__link {
@@ -89,6 +98,11 @@
             width: 18px;
             height: 18px;
         }
+
+        &_size_l {
+            width: 27px;
+            height: 27px;
+        }
     }
 
     &__status-color {
@@ -115,6 +129,7 @@
         }
     }
 
+    &__label,
     &__status-icon {
         &_state_blue {
             color: var(--yc-color-infographics-info-heavy);

src/containers/Tenant/Diagnostics/DetailedOverview/DetailedOverview.tsx

@@ -25,12 +25,9 @@ const b = cn('kv-detailed-overview');
 function DetailedOverview(props: DetailedOverviewProps) {
     const [isModalVisible, setIsModalVisible] = useState(false);
 
-    const [expandedIssueId, setExpandedIssueId] = useState<string>();
-
     const {currentSchemaPath} = useSelector((state: any) => state.schema);
 
-    const openModalHandler = (id: string) => {
-        setExpandedIssueId(id);
+    const openModalHandler = () => {
         setIsModalVisible(true);
     };
 
@@ -41,11 +38,7 @@ function DetailedOverview(props: DetailedOverviewProps) {
     const renderModal = () => {
         return (
             <Modal open={isModalVisible} onClose={closeModalHandler} className={b('modal')}>
-                <Healthcheck
-                    tenant={props.tenantName}
-                    fetchData={false}
-                    expandedIssueId={expandedIssueId}
-                />
+                <Healthcheck tenant={props.tenantName} fetchData={false} />
                 <Button
                     className={b('close-modal-button')}
                     onClick={closeModalHandler}

src/containers/Tenant/Diagnostics/Healthcheck/Details/Details.tsx

@@ -4,7 +4,9 @@ import {Button, Icon} from '@gravity-ui/uikit';
 
 import updateArrow from '../../../../../assets/icons/update-arrow.svg';
 
+import type {IResponseError} from '../../../../../types/api/error';
 import type {IIssuesTree} from '../../../../../types/store/healthcheck';
+import {ResponseError} from '../../../../../components/Errors/ResponseError';
 
 import IssueTree from '../IssuesViewer/IssueTree';
 
@@ -13,17 +15,14 @@ import i18n from '../i18n';
 const b = cn('healthcheck');
 
 interface DetailsProps {
-    issueTree?: IIssuesTree;
+    issueTrees?: IIssuesTree[];
     loading?: boolean;
     onUpdate: VoidFunction;
+    error?: IResponseError;
 }
 
 export const Details = (props: DetailsProps) => {
-    const {loading, onUpdate, issueTree} = props;
-
-    if (!issueTree) {
-        return null;
-    }
+    const {loading, onUpdate, issueTrees, error} = props;
 
     const renderHealthcheckHeader = () => {
         return (
@@ -38,18 +37,28 @@ export const Details = (props: DetailsProps) => {
         );
     };
 
-    const renderHealthcheckIssues = () => {
+    const renderContent = () => {
+        if (error) {
+            return <ResponseError error={error} defaultMessage={i18n('no-data')} />;
+        }
+
+        if (!issueTrees || !issueTrees.length) {
+            return i18n('status_message.ok');
+        }
+
         return (
-            <div className={b('issues-wrapper')}>
-                <IssueTree issueTree={issueTree} />
-            </div>
+            <>
+                {issueTrees.map((issueTree) => (
+                    <IssueTree key={issueTree.id} issueTree={issueTree} />
+                ))}
+            </>
         );
     };
 
     return (
         <div className={b('details')}>
             {renderHealthcheckHeader()}
-            {renderHealthcheckIssues()}
+            <div className={b('details-content-wrapper')}>{renderContent()}</div>
         </div>
     );
 };

src/containers/Tenant/Diagnostics/Healthcheck/Healthcheck.scss

@@ -3,6 +3,8 @@
 @import '@gravity-ui/uikit/styles/mixins.scss';
 
 .healthcheck {
+    display: flex;
+
     &_expanded {
         // Since most of the inner containers have fixed width, we can set fixed width here as well
         // Thus we will get rid of unneeded layout shift when scrollbar appear
@@ -17,7 +19,7 @@
         margin-bottom: 15px;
     }
 
-    &__issues-wrapper {
+    &__details-content-wrapper {
         overflow-x: hidden;
         overflow-y: auto;
 
@@ -67,6 +69,17 @@
         line-height: 24px;
     }
 
+    &__issues-statistics {
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+
+        margin: 10px 0;
+
+        column-gap: 26px;
+        row-gap: 16px;
+    }
+
     &__self-check-status-indicator {
         padding: 0 8px;
 

src/containers/Tenant/Diagnostics/Healthcheck/Healthcheck.tsx

@@ -8,40 +8,36 @@ import {SelfCheckResult} from '../../../../types/api/healthcheck';
 import {useTypedSelector, useAutofetcher} from '../../../../utils/hooks';
 import {
     getHealthcheckInfo,
-    selectIssuesTreeById,
-    selectIssuesTreesRoots,
+    selectIssuesStatistics,
+    selectIssuesTrees,
     setDataWasNotLoaded,
 } from '../../../../store/reducers/healthcheckInfo';
+import {DiagnosticCard} from '../../../../components/DiagnosticCard/DiagnosticCard';
 
 import {Details} from './Details';
 import {Preview} from './Preview';
 
-import i18n from './i18n';
 import './Healthcheck.scss';
 
 interface HealthcheckProps {
     tenant: string;
     preview?: boolean;
     fetchData?: boolean;
-    expandedIssueId?: string;
-    showMoreHandler?: (id: string) => void;
+    showMoreHandler?: VoidFunction;
 }
 
 const b = cn('healthcheck');
 
 export const Healthcheck = (props: HealthcheckProps) => {
-    const {tenant, preview, fetchData = true, showMoreHandler, expandedIssueId} = props;
+    const {tenant, preview, fetchData = true, showMoreHandler} = props;
 
     const dispatch = useDispatch();
 
     const {data, loading, wasLoaded, error} = useTypedSelector((state) => state.healthcheckInfo);
     const selfCheckResult = data?.self_check_result || SelfCheckResult.UNSPECIFIED;
 
-    const issuesTreesRoots = useTypedSelector(selectIssuesTreesRoots);
-    const expandedIssueTree = useTypedSelector((state) =>
-        selectIssuesTreeById(state, expandedIssueId),
-    );
-
+    const issuesStatistics = useTypedSelector(selectIssuesStatistics);
+    const issueTrees = useTypedSelector(selectIssuesTrees);
     const {autorefresh} = useTypedSelector((state) => state.schema);
 
     const fetchHealthcheck = useCallback(
@@ -66,37 +62,30 @@ export const Healthcheck = (props: HealthcheckProps) => {
     );
 
     const renderContent = () => {
-        if (error) {
-            return error.statusText;
-        }
-
         if (loading && !wasLoaded) {
             return (
-                <div className={b('loader')}>
+                <DiagnosticCard className={b('loader')}>
                     <Loader size="m" />
-                </div>
+                </DiagnosticCard>
             );
         }
-
-        if (data && data['self_check_result']) {
-            return preview ? (
-                <Preview
-                    issuesTrees={issuesTreesRoots}
-                    selfCheckResult={selfCheckResult}
-                    loading={loading}
-                    onShowMore={showMoreHandler}
-                    onUpdate={fetchHealthcheck}
-                />
-            ) : (
-                <Details
-                    issueTree={expandedIssueTree}
-                    loading={loading}
-                    onUpdate={fetchHealthcheck}
-                />
-            );
-        }
-
-        return <div className="error">{i18n('no-data')}</div>;
+        return preview ? (
+            <Preview
+                issuesStatistics={issuesStatistics}
+                selfCheckResult={selfCheckResult}
+                loading={loading}
+                onShowMore={showMoreHandler}
+                onUpdate={fetchHealthcheck}
+                error={error}
+            />
+        ) : (
+            <Details
+                loading={loading}
+                onUpdate={fetchHealthcheck}
+                issueTrees={issueTrees}
+                error={error}
+            />
+        );
     };
 
     return <div className={b({expanded: !preview})}>{renderContent()}</div>;