resolved merge conflict
Signed-off-by: DominikKawka <dkawka@redhat.com>
This commit is contained in:
parent
954202adf9
commit
dcf488596d
|
|
@ -1,13 +1,9 @@
|
||||||
import React, { useCallback, useRef, useState } from 'react';
|
import React, { useCallback, useRef, useState } from 'react';
|
||||||
import {
|
import { Content, ContentVariants } from '@patternfly/react-core/dist/esm/components/Content';
|
||||||
Content,
|
import { PageSection } from '@patternfly/react-core/dist/esm/components/Page';
|
||||||
ContentVariants,
|
import { Stack, StackItem } from '@patternfly/react-core/dist/esm/layouts/Stack';
|
||||||
PageSection,
|
import { Breadcrumb } from '@patternfly/react-core/dist/esm/components/Breadcrumb';
|
||||||
Stack,
|
import { BreadcrumbItem } from '@patternfly/react-core/dist/esm/components/Breadcrumb/BreadcrumbItem';
|
||||||
StackItem,
|
|
||||||
Breadcrumb,
|
|
||||||
BreadcrumbItem,
|
|
||||||
} from '@patternfly/react-core';
|
|
||||||
import { useTypedLocation, useTypedParams } from '~/app/routerHelper';
|
import { useTypedLocation, useTypedParams } from '~/app/routerHelper';
|
||||||
import WorkspaceTable, {
|
import WorkspaceTable, {
|
||||||
WorkspaceTableFilteredColumn,
|
WorkspaceTableFilteredColumn,
|
||||||
|
|
|
||||||
|
|
@ -1,19 +1,16 @@
|
||||||
import React, { useMemo } from 'react';
|
import React, { useMemo } from 'react';
|
||||||
|
import { Button } from '@patternfly/react-core/dist/esm/components/Button';
|
||||||
import {
|
import {
|
||||||
Button,
|
|
||||||
Card,
|
Card,
|
||||||
CardBody,
|
CardBody,
|
||||||
CardExpandableContent,
|
|
||||||
CardHeader,
|
CardHeader,
|
||||||
CardTitle,
|
CardTitle,
|
||||||
Content,
|
CardExpandableContent,
|
||||||
ContentVariants,
|
} from '@patternfly/react-core/dist/esm/components/Card';
|
||||||
Divider,
|
import { Content, ContentVariants } from '@patternfly/react-core/dist/esm/components/Content';
|
||||||
Flex,
|
import { Divider } from '@patternfly/react-core/dist/esm/components/Divider';
|
||||||
FlexItem,
|
import { Flex, FlexItem } from '@patternfly/react-core/dist/esm/layouts/Flex';
|
||||||
Stack,
|
import { Stack, StackItem } from '@patternfly/react-core/dist/esm/layouts/Stack';
|
||||||
StackItem,
|
|
||||||
} from '@patternfly/react-core';
|
|
||||||
import { t_global_spacer_md as MediumPadding } from '@patternfly/react-tokens';
|
import { t_global_spacer_md as MediumPadding } from '@patternfly/react-tokens';
|
||||||
import { Workspace } from '~/shared/api/backendApiTypes';
|
import { Workspace } from '~/shared/api/backendApiTypes';
|
||||||
import {
|
import {
|
||||||
|
|
@ -52,7 +49,7 @@ const WorkspaceKindSummaryExpandableCard: React.FC<WorkspaceKindSummaryExpandabl
|
||||||
<Card isExpanded={isExpanded} variant="secondary">
|
<Card isExpanded={isExpanded} variant="secondary">
|
||||||
<CardHeader onExpand={onExpandToggle}>
|
<CardHeader onExpand={onExpandToggle}>
|
||||||
<CardTitle>
|
<CardTitle>
|
||||||
<Content component={ContentVariants.h2}>Workspaces Summary</Content>
|
<Content component={ContentVariants.h2}>Workspaces summary</Content>
|
||||||
</CardTitle>
|
</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardExpandableContent>
|
<CardExpandableContent>
|
||||||
|
|
@ -69,7 +66,7 @@ const WorkspaceKindSummaryExpandableCard: React.FC<WorkspaceKindSummaryExpandabl
|
||||||
</FlexItem>
|
</FlexItem>
|
||||||
</SectionFlex>
|
</SectionFlex>
|
||||||
<SectionDivider />
|
<SectionDivider />
|
||||||
<SectionFlex title="Idle GPU Workspaces">
|
<SectionFlex title="Idle GPU workspaces">
|
||||||
<FlexItem>
|
<FlexItem>
|
||||||
<Button
|
<Button
|
||||||
variant="link"
|
variant="link"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue