Skip to content

refactor(site): improve settings option #11489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 8, 2024
Merged

refactor(site): improve settings option #11489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82b8ff1
refactor(site): improve settings option
BrunoQuaresma Jan 8, 2024
aa39124
Use nested style instead of context
BrunoQuaresma Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 36 additions & 43 deletions site/src/components/DeploySettingsLayout/Option.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import CheckCircleOutlined from "@mui/icons-material/CheckCircleOutlined";
import { css, useTheme } from "@emotion/react";
import type { HTMLAttributes, PropsWithChildren, FC } from "react";
import { type HTMLAttributes, type PropsWithChildren, type FC } from "react";
import { MONOSPACE_FONT_FAMILY } from "theme/constants";
import { DisabledBadge, EnabledBadge } from "../Badges/Badges";

Expand Down Expand Up @@ -104,68 +104,61 @@ export const OptionValue: FC<OptionValueProps> = (props) => {
return <span css={styles.option}>{JSON.stringify(value)}</span>;
};

interface OptionConfigProps extends HTMLAttributes<HTMLDivElement> {
source?: boolean;
}
type OptionConfigProps = HTMLAttributes<HTMLDivElement> & { isSource: boolean };

// OptionConfig takes a source bool to indicate if the Option is the source of the configured value.
export const OptionConfig: FC<OptionConfigProps> = ({
children,
source,
...attrs
}) => {
// OptionConfig takes a isSource bool to indicate if the Option is the source of the configured value.
export const OptionConfig = ({ isSource, ...attrs }: OptionConfigProps) => {
const theme = useTheme();
const borderColor = source ? undefined : theme.palette.divider;
const borderColor = isSource
? theme.experimental.roles.active.outline
: theme.palette.divider;

return (
<div
{...attrs}
css={{
fontSize: 13,
fontFamily: MONOSPACE_FONT_FAMILY,
fontWeight: 600,
backgroundColor: source
? theme.palette.primary.dark
: theme.palette.background.paper,
display: "inline-flex",
alignItems: "center",
borderRadius: 2,
padding: "0 8px",
border: `1px solid ${borderColor}`,
}}
>
{children}
</div>
css={[
{
fontSize: 13,
fontFamily: MONOSPACE_FONT_FAMILY,
fontWeight: 600,
backgroundColor: theme.palette.background.paper,
display: "inline-flex",
alignItems: "center",
borderRadius: 4,
padding: 6,
lineHeight: 1,
gap: 6,
border: `1px solid ${borderColor}`,
},
isSource
? {
"& .OptionConfigFlag": {
background: theme.experimental.roles.active.fill,
},
}
: undefined,
]}
/>
);
};

interface OptionConfigFlagProps extends HTMLAttributes<HTMLDivElement> {
source?: boolean;
}

export const OptionConfigFlag: FC<OptionConfigFlagProps> = ({
children,
source,
...attrs
}) => {
export const OptionConfigFlag = (props: HTMLAttributes<HTMLDivElement>) => {
const theme = useTheme();

return (
<div
{...attrs}
{...props}
className="OptionConfigFlag"
css={{
fontSize: 10,
fontWeight: 600,
margin: "0 6px 0 -4px",
display: "block",
backgroundColor: source ? "rgba(0, 0, 0, 0.7)" : theme.palette.divider,
backgroundColor: theme.palette.divider,
lineHeight: 1,
padding: "2px 4px",
borderRadius: 2,
borderRadius: 1,
}}
>
{children}
</div>
/>
);
};

Expand Down
8 changes: 4 additions & 4 deletions site/src/components/DeploySettingsLayout/OptionsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,25 @@ const OptionsTable: FC<OptionsTableProps> = ({ options, additionalValues }) => {
}}
>
{option.flag && (
<OptionConfig source={option.value_source === "flag"}>
<OptionConfig isSource={option.value_source === "flag"}>
<OptionConfigFlag>CLI</OptionConfigFlag>
--{option.flag}
</OptionConfig>
)}
{option.flag_shorthand && (
<OptionConfig source={option.value_source === "flag"}>
<OptionConfig isSource={option.value_source === "flag"}>
<OptionConfigFlag>CLI</OptionConfigFlag>-
{option.flag_shorthand}
</OptionConfig>
)}
{option.env && (
<OptionConfig source={option.value_source === "env"}>
<OptionConfig isSource={option.value_source === "env"}>
<OptionConfigFlag>ENV</OptionConfigFlag>
{option.env}
</OptionConfig>
)}
{option.yaml && (
<OptionConfig source={option.value_source === "yaml"}>
<OptionConfig isSource={option.value_source === "yaml"}>
<OptionConfigFlag>YAML</OptionConfigFlag>
{option.yaml}
</OptionConfig>
Expand Down