Skip to content

Commit

Permalink
remove honorable Flex components (#1930)
Browse files Browse the repository at this point in the history
  • Loading branch information
jsladerman authored Feb 20, 2025
1 parent b8d1fbe commit 3411953
Show file tree
Hide file tree
Showing 48 changed files with 395 additions and 385 deletions.
4 changes: 2 additions & 2 deletions assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"start": "vite",
"start:dev": "BASE_URL=console.plrl-dev-aws.onplural.sh yarn start",
"start:cd": "BASE_URL=console.boot-aws.onplural.sh yarn start",
"start:prod": "yarn build && BASE_URL=console.plrl-dev-aws.onplural.sh vite preview",
"start:prod": "VITE_PROD_SECRET_KEY=1234567890 vite build && BASE_URL=console.boot-aws.onplural.sh vite preview",
"build": "tsc --build && vite build",
"test": "vitest --run",
"test:watch": "vitest",
Expand Down Expand Up @@ -49,7 +49,7 @@
"@nivo/radial-bar": "0.88.0",
"@nivo/tooltip": "0.88.0",
"@nivo/treemap": "0.88.0",
"@pluralsh/design-system": "5.7.0",
"@pluralsh/design-system": "5.7.1",
"@react-hooks-library/core": "0.6.0",
"@saas-ui/use-hotkeys": "1.1.3",
"@tanstack/react-table": "8.20.5",
Expand Down
4 changes: 2 additions & 2 deletions assets/src/components/cd/cluster/node/NodeEvents.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useOutletContext } from 'react-router-dom'
import { Flex } from 'honorable'
import { Flex } from '@pluralsh/design-system'
import LoadingIndicator from 'components/utils/LoadingIndicator'
import { useOutletContext } from 'react-router-dom'

import { Node } from 'generated/graphql'

Expand Down
10 changes: 5 additions & 5 deletions assets/src/components/cd/cluster/node/NodeMetadata.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useOutletContext } from 'react-router-dom'
import { Flex } from 'honorable'
import { Flex } from '@pluralsh/design-system'
import LoadingIndicator from 'components/utils/LoadingIndicator'
import { MetadataGrid, MetadataItem } from 'components/utils/Metadata'
import { Node } from 'generated/graphql'
import { useOutletContext } from 'react-router-dom'
import { nodeStatusToReadiness } from 'utils/status'
import { MetadataGrid, MetadataItem } from 'components/utils/Metadata'
import LoadingIndicator from 'components/utils/LoadingIndicator'

import { StatusChip } from '../../../cluster/TableElements'
import { LabelsAnnotations } from '../../../cluster/LabelsAnnotations'
import { StatusChip } from '../../../cluster/TableElements'

export default function NodeMetadata() {
const { node } = useOutletContext() as { node: Node }
Expand Down
4 changes: 2 additions & 2 deletions assets/src/components/cd/cluster/node/NodeRaw.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Flex } from '@pluralsh/design-system'
import LoadingIndicator from 'components/utils/LoadingIndicator'
import { useOutletContext } from 'react-router-dom'
import { stringify } from 'yaml'
import { Flex } from 'honorable'
import LoadingIndicator from 'components/utils/LoadingIndicator'

import { Node } from '../../../../generated/graphql'
import { RawPageCode } from '../../../utils/RawPageCode.tsx'
Expand Down
2 changes: 1 addition & 1 deletion assets/src/components/cd/cluster/pod/Pod.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export default function Pod() {
</ResponsiveLayoutSidenavContainer>
<ResponsiveLayoutSpacer />
<TabPanel
as={<ResponsiveLayoutContentContainer overflow="visible" />}
as={<ResponsiveLayoutContentContainer css={{ overflow: 'visible' }} />}
stateRef={tabStateRef}
>
<Outlet context={{ pod }} />
Expand Down
7 changes: 4 additions & 3 deletions assets/src/components/cd/cluster/pod/PodContainers.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
Chip,
CollapseIcon,
Flex,
IconFrame,
Prop,
Table,
Expand All @@ -11,18 +12,18 @@ import { createColumnHelper, Row } from '@tanstack/react-table'
import { UnstyledLink } from 'components/utils/Link'
import { filesize } from 'filesize'
import { Container, ContainerStatus, Maybe, Port } from 'generated/graphql'
import { Flex, Span } from 'honorable'
import { Span } from 'honorable'
import { ComponentProps, CSSProperties, useMemo } from 'react'
import { useNavigate } from 'react-router-dom'
import styled, { useTheme } from 'styled-components'
import { cpuParser, memoryParser } from 'utils/kubernetes'
import {
containerStatusToReadiness,
Readiness,
ReadinessT,
containerStatusToReadiness,
readinessToContainerLabel,
readinessToLabel,
readinessToSeverity,
readinessToContainerLabel,
} from 'utils/status'

import { Overline } from 'components/cd/utils/PermissionsModal.tsx'
Expand Down
17 changes: 9 additions & 8 deletions assets/src/components/cd/cluster/pod/PodInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import { Link, useOutletContext, useParams } from 'react-router-dom'
import { Flex } from 'honorable'
import { Button, Flex, LogsIcon } from '@pluralsh/design-system'
import { ScrollablePage } from 'components/utils/layout/ScrollablePage'
import { ContainerStatus, Maybe, Pod } from 'generated/graphql'
import { Button, LogsIcon } from '@pluralsh/design-system'
import { Link, useOutletContext, useParams } from 'react-router-dom'

import { SubTitle } from '../../../utils/SubTitle'

import { Readiness } from '../../../../utils/status'
import { getServicePodDetailsPath } from '../../../../routes/cdRoutesConsts'
import { Readiness } from '../../../../utils/status'
import { PodConditions } from './PodConditions.tsx'
import { PodMetadata } from './PodMetadata.tsx'
import {
ColCpuReservation,
ColExpander,
ColImage,
ColMemoryReservation,
ColName,
ColPorts,
ColStatus,
ShellLink,
columnHelper,
ColExpander,
PodContainers,
ShellLink,
} from './PodContainers.tsx'
import { PodMetadata } from './PodMetadata.tsx'
import { useTheme } from 'styled-components'

export const statusesToRecord = (statuses?: Maybe<Maybe<ContainerStatus>[]>) =>
(statuses || []).reduce(
Expand Down Expand Up @@ -94,6 +94,7 @@ const columns = [

// It's used by multiple routes.
export default function PodInfo() {
const { spacing } = useTheme()
const { clusterId, serviceId } = useParams()
const { pod } = useOutletContext() as { pod: Pod }
const containers = pod.spec.containers || []
Expand All @@ -112,7 +113,7 @@ export default function PodInfo() {
<Flex
direction="column"
gap="xlarge"
paddingBottom="large"
paddingBottom={spacing.large}
>
<section>
<SubTitle>Containers</SubTitle>
Expand Down
6 changes: 2 additions & 4 deletions assets/src/components/cd/cluster/pod/PodMetadata.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { Card } from '@pluralsh/design-system'
import { Card, Flex } from '@pluralsh/design-system'

import { Flex } from 'honorable'

import { Pod } from 'generated/graphql'
import { LabelPairsSection } from 'components/utils/LabelPairsSection'
import { Pod } from 'generated/graphql'

import { useTheme } from 'styled-components'

Expand Down
4 changes: 2 additions & 2 deletions assets/src/components/cd/logs/LogsInfoPanel.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CloseIcon, Modal } from '@pluralsh/design-system'
import { Div, Flex, Span } from 'honorable'
import { CloseIcon, Flex, Modal } from '@pluralsh/design-system'
import { Div, Span } from 'honorable'

export function LogsInfoPanel({
title,
Expand Down
2 changes: 1 addition & 1 deletion assets/src/components/cd/services/service/pod/Pod.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export default function Pod() {
</ResponsiveLayoutSidenavContainer>
<ResponsiveLayoutSpacer />
<TabPanel
as={<ResponsiveLayoutContentContainer overflow="visible" />}
as={<ResponsiveLayoutContentContainer css={{ overflow: 'visible' }} />}
stateRef={tabStateRef}
>
<Outlet context={{ pod }} />
Expand Down
6 changes: 3 additions & 3 deletions assets/src/components/cluster/ContainerStatuses.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Tooltip } from '@pluralsh/design-system'
import { Div, Flex, Span } from 'honorable'
import { Flex, Tooltip } from '@pluralsh/design-system'
import { Div, Span } from 'honorable'
import styled from 'styled-components'
import { Readiness, ReadinessT, readinessToContainerLabel } from 'utils/status'

import { ReactElement, type JSX } from 'react'
import { type JSX, ReactElement } from 'react'
import { ContainerStatusT } from '../cd/cluster/pod/PodsList.tsx'

const iconBaseProps = {
Expand Down
4 changes: 2 additions & 2 deletions assets/src/components/cluster/Gauges.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ReactNode, useMemo } from 'react'
import { filesize } from 'filesize'
import { ReactNode, useMemo } from 'react'
import styled from 'styled-components'

import { Flex, FlexProps } from 'honorable'
import { Flex, FlexProps } from '@pluralsh/design-system'

import RadialBarChart from 'components/utils/RadialBarChart'

Expand Down
8 changes: 4 additions & 4 deletions assets/src/components/cluster/LabelsAnnotations.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { CardProps, ChipList } from '@pluralsh/design-system'
import { Div, Flex } from 'honorable'
import { ReactNode } from 'react'
import type { LabelPair, Maybe, Metadata as MetadataT } from 'generated/graphql'
import { CardProps, ChipList, Flex } from '@pluralsh/design-system'
import { CARD_CONTENT_MAX_WIDTH, MetadataCard } from 'components/utils/Metadata'
import type { LabelPair, Maybe, Metadata as MetadataT } from 'generated/graphql'
import { Div } from 'honorable'
import { ReactNode } from 'react'
import { useTheme } from 'styled-components'

export const mapify = (tags) =>
Expand Down
10 changes: 4 additions & 6 deletions assets/src/components/cluster/TableElements.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import {
AppIcon,
CaretRightIcon,
Chip,
IconFrame,
ChipProps,
Flex,
IconFrame,
} from '@pluralsh/design-system'
import { SortingFn } from '@tanstack/table-core'
import { UnstyledLink } from 'components/utils/Link'
import { Maybe } from 'generated/graphql'
import { Flex } from 'honorable'
import { ComponentProps, ReactNode } from 'react'
import styled, { useTheme } from 'styled-components'
import styled from 'styled-components'
import {
PhaseT,
phaseToSeverity,
Expand Down Expand Up @@ -151,11 +151,9 @@ export function LabelWithIcon({
label?: Maybe<string>
icon?: Maybe<string>
}) {
const theme = useTheme()

return (
<Flex
gap={theme.spacing.xsmall}
gap="xsmall"
alignItems="center"
>
{icon && (
Expand Down
4 changes: 2 additions & 2 deletions assets/src/components/cluster/containers/ContainerShell.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Button, ToolIcon, Tooltip } from '@pluralsh/design-system'
import { Button, Flex, ToolIcon, Tooltip } from '@pluralsh/design-system'
import { Div } from 'honorable'
import { useContext, useState } from 'react'
import { Div, Flex } from 'honorable'

import TerminalThemeSelector from 'components/terminal/TerminalThemeSelector'

Expand Down
21 changes: 11 additions & 10 deletions assets/src/components/cluster/containers/ShellCommandEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
Input,
PencilIcon,
} from '@pluralsh/design-system'
import { Form } from 'honorable'
import { useEffect, useRef, useState } from 'react'
import { Flex, Form } from 'honorable'
import styled from 'styled-components'

export const CODELINE_HEIGHT = 42
Expand Down Expand Up @@ -102,7 +102,7 @@ export function ShellCommandEditor({
}) {
const [isEditing, setIsEditing] = useState(false)
const [inputVal, setInputVal] = useState(command)
const inputWrapRef = useRef<HTMLDivElement>(undefined)
const inputWrapRef = useRef<HTMLDivElement | null>(null)

useEffect(() => {
if (!isEditing) {
Expand Down Expand Up @@ -136,13 +136,7 @@ export function ShellCommandEditor({
flex="1 1"
overflow="hidden"
>
<Flex
ref={inputWrapRef as any}
minWidth={50}
// width="50px"
flex="1 1"
overflow="hidden"
>
<WrapperSC ref={inputWrapRef}>
<CodeWrap
$isEditing={isEditing}
className="codeWrap"
Expand All @@ -169,7 +163,7 @@ export function ShellCommandEditor({
}}
/>
)}
</Flex>
</WrapperSC>
{!isEditing && (
<Button
floating
Expand Down Expand Up @@ -208,3 +202,10 @@ export function ShellCommandEditor({
</Form>
)
}

const WrapperSC = styled.div(() => ({
display: 'flex',
minWidth: 50,
flex: '1 1',
overflow: 'hidden',
}))
Loading

0 comments on commit 3411953

Please sign in to comment.