Skip to content

Commit

Permalink
[ui] Update ui-components lint dep, re-run lint (#16661)
Browse files Browse the repository at this point in the history
## Summary & Motivation

Bump eslint-config version in `ui-components` to make the TS warning go
away. Re-run lint.

## How I Tested These Changes

BK
  • Loading branch information
hellendag authored Sep 20, 2023
1 parent 87f9b90 commit 0adef1b
Show file tree
Hide file tree
Showing 21 changed files with 95 additions and 386 deletions.
2 changes: 1 addition & 1 deletion js_modules/dagster-ui/packages/ui-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@babel/preset-env": "^7.16.7",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@dagster-io/eslint-config": "1.0.12",
"@dagster-io/eslint-config": "1.0.13",
"@mdx-js/react": "^1.6.22",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^21.0.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,15 @@ const borderSettingToCSS = (border: BorderSide | BorderSetting) => {
`;
case 'top-and-bottom':
return css`
box-shadow: inset 0 ${width}px ${color}, inset 0 -${width}px ${color};
box-shadow:
inset 0 ${width}px ${color},
inset 0 -${width}px ${color};
`;
case 'left-and-right':
return css`
box-shadow: inset ${width}px 0 ${color}, inset -${width}px 0 ${color};
box-shadow:
inset ${width}px 0 ${color},
inset -${width}px 0 ${color};
`;
case 'top':
return css`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,8 @@ const DictEntry = React.forwardRef(
props: React.ComponentProps<typeof DictEntryDiv>,
ref: React.ForwardedRef<HTMLButtonElement>,
) => {
const {hovered, onMouseEnter, onMouseLeave} = React.useContext(
HoveredDictEntryContext,
).useDictEntryHover();
const {hovered, onMouseEnter, onMouseLeave} =
React.useContext(HoveredDictEntryContext).useDictEntryHover();

return (
<DictEntryDiv2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ const StyledMenuItem = styled(BlueprintMenuItem)<StyledMenuItemProps>`
color: ${({$textColor}) => $textColor};
line-height: 20px;
padding: 6px 8px 6px 12px;
transition: background-color 50ms, box-shadow 150ms;
transition:
background-color 50ms,
box-shadow 150ms;
align-items: flex-start;
font-size: 14px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,8 @@ export type ConfigEditorHandle = {

export const NewConfigEditor = React.forwardRef<ConfigEditorHandle, ConfigEditorProps>(
(props, ref) => {
const {
configCode,
checkConfig,
readOnly,
configSchema,
onConfigChange,
onHelpContextChange,
} = props;
const {configCode, checkConfig, readOnly, configSchema, onConfigChange, onHelpContextChange} =
props;
const editor = React.useRef<CodeMirror.Editor | null>(null);

React.useImperativeHandle(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ export const StyledButton = styled.button<StyledButtonProps>`
font-size: 14px;
line-height: 20px;
padding: 6px 12px;
transition: background 100ms, box-shadow 150ms, filter 100ms, opacity 150ms;
transition:
background 100ms,
box-shadow 150ms,
filter 100ms,
opacity 150ms;
user-select: none;
white-space: nowrap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ const Blob = styled.div<BlobProps>`
justify-content: center;
outline: none;
text-transform: uppercase;
transition: background 50ms linear, color 50ms linear;
transition:
background 50ms linear,
color 50ms linear;
user-select: none;
width: ${({$blobSize}) => `${$blobSize}px`};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ export const Table = styled(HTMLTable)<TableProps>`
& tr th,
& tr td {
box-shadow: inset 0 1px 0 ${Colors.KeylineGray}, inset 1px 0 0 ${Colors.KeylineGray} !important;
box-shadow:
inset 0 1px 0 ${Colors.KeylineGray},
inset 1px 0 0 ${Colors.KeylineGray} !important;
}
& tr th {
Expand Down Expand Up @@ -47,7 +49,9 @@ export const Table = styled(HTMLTable)<TableProps>`
}
& tr:last-child td {
box-shadow: inset 0 1px 0 ${Colors.KeylineGray}, inset 1px 0 0 ${Colors.KeylineGray},
box-shadow:
inset 0 1px 0 ${Colors.KeylineGray},
inset 1px 0 0 ${Colors.KeylineGray},
inset 0 -1px 0 ${Colors.KeylineGray} !important;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ const RightContainer = styled.div`
export const TextInputStyles = css`
border: none;
border-radius: 8px;
box-shadow: ${Colors.Gray300} inset 0px 0px 0px 1px, ${Colors.KeylineGray} inset 2px 2px 1.5px;
box-shadow:
${Colors.Gray300} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px;
flex-grow: 1;
font-size: 14px;
line-height: 20px;
Expand All @@ -94,7 +96,9 @@ export const TextInputStyles = css`
transition: box-shadow 150ms;
:disabled {
box-shadow: ${Colors.Gray200} inset 0px 0px 0px 1px, ${Colors.KeylineGray} inset 2px 2px 1.5px;
box-shadow:
${Colors.Gray200} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px;
background-color: ${Colors.Gray50};
color: ${Colors.Gray400};
}
Expand All @@ -104,7 +108,9 @@ export const TextInputStyles = css`
}
:focus {
box-shadow: ${Colors.Gray300} inset 0px 0px 0px 1px, ${Colors.KeylineGray} inset 2px 2px 1.5px,
box-shadow:
${Colors.Gray300} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px,
rgba(58, 151, 212, 0.6) 0 0 0 3px;
outline: none;
}
Expand Down Expand Up @@ -133,8 +139,10 @@ const StyledInput = styled.input<StyledInputProps>`
padding: ${({$hasIcon}) => ($hasIcon ? '6px 6px 6px 28px' : '6px 6px 6px 12px')};
:focus {
box-shadow: ${({$strokeColor}) => $strokeColor} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px, rgba(58, 151, 212, 0.6) 0 0 0 3px;
box-shadow:
${({$strokeColor}) => $strokeColor} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px,
rgba(58, 151, 212, 0.6) 0 0 0 3px;
}
`;

Expand All @@ -150,8 +158,10 @@ export const TextArea = styled.textarea<TextAreaProps>`
${Colors.KeylineGray} inset 2px 2px 1.5px;
:focus {
box-shadow: ${({$strokeColor}) => $strokeColor || Colors.Gray300} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px, rgba(58, 151, 212, 0.6) 0 0 0 3px;
box-shadow:
${({$strokeColor}) => $strokeColor || Colors.Gray300} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px,
rgba(58, 151, 212, 0.6) 0 0 0 3px;
}
${({$resize}) => ($resize ? `resize: ${$resize};` : null)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -450,13 +450,17 @@ export const TokenizingField: React.FC<TokenizingFieldProps> = ({
export const StyledTagInput = styled(TagInput)<{$maxWidth?: any}>`
border: none;
border-radius: 8px;
box-shadow: ${Colors.Gray300} inset 0px 0px 0px 1px, ${Colors.KeylineGray} inset 2px 2px 1.5px;
box-shadow:
${Colors.Gray300} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px;
min-width: 400px;
max-width: ${(p) => (p.$maxWidth ? p.$maxWidth : '600px')};
transition: box-shadow 150ms;
&.bp4-active {
box-shadow: ${Colors.Gray300} inset 0px 0px 0px 1px, ${Colors.KeylineGray} inset 2px 2px 1.5px,
box-shadow:
${Colors.Gray300} inset 0px 0px 0px 1px,
${Colors.KeylineGray} inset 2px 2px 1.5px,
rgba(58, 151, 212, 0.6) 0 0 0 3px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ export const UnstyledButton = styled.button<Props>`
cursor: pointer;
padding: 0;
text-align: start;
transition: box-shadow 150ms, opacity 150ms;
transition:
box-shadow 150ms,
opacity 150ms;
user-select: none;
white-space: nowrap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,8 @@ const registerYamlHint = () => {
schema?: ConfigSchema;
},
): {list: Array<CodemirrorHint>; from: CodemirrorLocation; to: CodemirrorLocation} => {
const {
cursor,
context,
token,
start,
searchString,
prevToken,
} = expandAutocompletionContextAtCursor(editor);
const {cursor, context, token, start, searchString, prevToken} =
expandAutocompletionContextAtCursor(editor);

const from = {line: cursor.line, ch: start};
const to = {line: cursor.line, ch: token.end};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ export const useSuggestionsForString = (
const tokens = value.toLocaleLowerCase().trim().split(/\s+/);
const queryString = tokens[tokens.length - 1] || '';

const suggestions = React.useMemo(() => buildSuggestions(queryString), [
buildSuggestions,
queryString,
]);
const suggestions = React.useMemo(
() => buildSuggestions(queryString),
[buildSuggestions, queryString],
);

const onSelectSuggestion = React.useCallback(
(suggestion: string) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ const SIDEBAR_ASSET_FRAGMENT = gql`
autoMaterializePolicy {
policyType
rules {
className
decisionType
description
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ export const ASSET_NODE_DEFINITION_FRAGMENT = gql`
autoMaterializePolicy {
policyType
rules {
className
description
decisionType
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ export const AssetsGroupsGlobalGraphRoot: React.FC = () => {
<AssetGraphExplorerFilters
assetGroups={assetGroups}
visibleAssetGroups={React.useMemo(() => filters.groups || [], [filters.groups])}
setGroupFilters={React.useCallback((groups) => setFilters({...filters, groups}), [
filters,
setFilters,
])}
setGroupFilters={React.useCallback(
(groups) => setFilters({...filters, groups}),
[filters, setFilters],
)}
/>
}
options={{preferAssetRendering: true, explodeComposites: true}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,11 @@ export const automaterializePolicyDescription = (policy: {
<Box flex={{direction: 'column', gap: 12}}>
This asset will be automatically materialized if it is:
<ul style={{paddingLeft: 20, margin: 0}}>
{MATERIALIZE?.map((rule) => (
<li key={rule.description}>{rule.description}</li>
))}
{MATERIALIZE?.map((rule) => <li key={rule.description}>{rule.description}</li>)}
</ul>
and it is not:
<ul style={{paddingLeft: 20, margin: 0}}>
{SKIP?.map((rule) => (
<li key={rule.description}>{rule.description}</li>
))}
{SKIP?.map((rule) => <li key={rule.description}>{rule.description}</li>)}
</ul>
{DISCARD && DISCARD.length > 0 && (
<>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

2 comments on commit 0adef1b

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deploy preview for dagit-storybook ready!

✅ Preview
https://dagit-storybook-p95mc8m88-elementl.vercel.app

Built with commit 0adef1b.
This pull request is being automatically deployed with vercel-action

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deploy preview for dagit-core-storybook ready!

✅ Preview
https://dagit-core-storybook-nhjmlx5je-elementl.vercel.app

Built with commit 0adef1b.
This pull request is being automatically deployed with vercel-action

Please sign in to comment.