-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
refactor(ui): Misc improvements to the setup ingestion flow (ingest uplift 1/2) #10764
Merged
jjoyce0510
merged 48 commits into
datahub-project:master
from
jjoyce0510:jj--refactor-pre-ingestion-run-steps
Jul 1, 2024
Merged
Changes from 46 commits
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
5f127c2
Adding refactoring to the authoring flow on ingestion sources
4dc1f6e
Merge remote-tracking branch 'acryl/jj--refactor-pre-ingestion-run-st…
2cba85e
Adding missing files
bb88a86
Merge remote-tracking branch 'acryl/jj--refactor-pre-ingestion-run-st…
3de0b22
fix lint
03d7d7f
Merge remote-tracking branch 'acryl/jj--refactor-pre-ingestion-run-st…
02a8ab0
Adding formatter
800f1a3
Adding test fixes
ada7c2c
Update IngestionSourceBuilderModal.tsx
jjoyce0510 58cbcb7
Attempt to fix smoke tests
8a5bdfc
Finalize test fixups
88b12ba
Minor - update to use new scroll command
dad7f0d
Update commands.js
jjoyce0510 68cf0a3
Update commands.js
jjoyce0510 82a0b65
Adding prettier formatting
20a97d4
Update SelectTemplateStep.tsx
jjoyce0510 04068b9
Force click the visible thing
287c8c4
Force clear
016fcef
Adding some polish
4782fd5
Adding more focused
b0b7dba
Adding change
0e031d4
Adding timeout
e5af95d
Add click timeout as well
509795f
Update TimezoneSelect.tsx
jjoyce0510 7b3493b
Update sources.json
jjoyce0510 2abe8fc
prettier
b6cd98f
Timezone select
e6c0417
remove the focused focus
3e693d6
Adding focused
bba3053
Update IngestionSourceBuilderModal.tsx - set min width
jjoyce0510 d43c577
Merge branch 'master' into jj--refactor-pre-ingestion-run-steps
jjoyce0510 ce26037
try to force it more
f22d47c
prettier
51c0f3f
Adding debug
d72da85
another damn try
5b34761
Adding changes
a5d2a9a
Trigger CI again
a07f837
Update IngestionSourceBuilderModal.tsx
jjoyce0510 e9a212c
fix monaco
96ea2b8
Update RecipeBuilder.tsx
jjoyce0510 30a5868
Update managed_ingestion.js
jjoyce0510 d63c85e
Add forces
f17f731
Adding first
49e6c17
force check
7759abf
Managed ingestion
e0b52f0
Final attempt - add more waiting
92c8fa8
Prettier is lacking
7276c57
Disabling test that wont pass in CI
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
datahub-web-react/src/app/ingest/source/builder/DataPlatformCard.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
import React from 'react'; | ||
import { Button, Image } from 'antd'; | ||
import styled from 'styled-components'; | ||
|
||
import { REDESIGN_COLORS } from '../../../entity/shared/constants'; | ||
|
||
const Container = styled(Button)` | ||
padding: 32px; | ||
height: 200px; | ||
display: flex; | ||
justify-content: center; | ||
border-radius: 8px; | ||
align-items: start; | ||
flex-direction: column; | ||
border: 1px solid #e0e0e0; | ||
background-color: #ffffff; | ||
&&:hover { | ||
border: 1px solid ${REDESIGN_COLORS.BLUE}; | ||
background-color: #ffffff; | ||
} | ||
white-space: unset; | ||
`; | ||
|
||
const PlatformLogo = styled(Image)` | ||
max-height: 32px; | ||
height: 32px; | ||
width: auto; | ||
object-fit: contain; | ||
background-color: transparent; | ||
`; | ||
|
||
const LogoContainer = styled.div` | ||
margin-bottom: 14px; | ||
`; | ||
|
||
const Title = styled.div` | ||
word-break: break-word; | ||
color: #464646; | ||
font-weight: bold; | ||
font-size: 16px; | ||
margin-bottom: 8px; | ||
`; | ||
|
||
const Description = styled.div` | ||
word-break: break-word; | ||
text-align: left; | ||
color: #7c7c7c; | ||
`; | ||
|
||
type Props = { | ||
logoUrl?: string; | ||
logoComponent?: React.ReactNode; | ||
name: string; | ||
description?: string; | ||
onClick?: () => void; | ||
}; | ||
|
||
export const DataPlatformCard = ({ logoUrl, logoComponent, name, description, onClick }: Props) => { | ||
return ( | ||
<Container type="link" onClick={onClick}> | ||
<LogoContainer> | ||
{(logoUrl && <PlatformLogo preview={false} src={logoUrl} alt={name} />) || logoComponent} | ||
</LogoContainer> | ||
<Title>{name}</Title> | ||
<Description>{description}</Description> | ||
</Container> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
datahub-web-react/src/app/ingest/source/builder/IngestionDocumentationHint.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
import React from 'react'; | ||
import styled from 'styled-components'; | ||
import { Button, Tooltip } from 'antd'; | ||
import { CloseOutlined } from '@ant-design/icons'; | ||
|
||
import { SourceConfig } from './types'; | ||
import { ANTD_GRAY } from '../../../entity/shared/constants'; | ||
|
||
const Container = styled.div` | ||
background-color: #ffffff; | ||
border-radius: 8px; | ||
padding: 12px 12px 16px 24px; | ||
border: 1px solid #e0e0e0; | ||
margin-bottom: 20px; | ||
`; | ||
|
||
const Header = styled.div` | ||
display: flex; | ||
align-items: center; | ||
justify-content: space-between; | ||
margin-bottom: 12px; | ||
`; | ||
|
||
const Title = styled.div` | ||
font-size: 16px; | ||
font-weight: bold; | ||
`; | ||
|
||
const Description = styled.div` | ||
font-size: 14px; | ||
max-width: 90%; | ||
`; | ||
|
||
const StyledCloseOutlined = styled(CloseOutlined)` | ||
color: ${ANTD_GRAY[6]}; | ||
`; | ||
|
||
interface Props { | ||
sourceConfigs: SourceConfig; | ||
onHide: () => void; | ||
} | ||
|
||
export const IngestionDocumentationHint = ({ sourceConfigs, onHide }: Props) => { | ||
const { displayName, docsUrl } = sourceConfigs; | ||
return ( | ||
<Container> | ||
<Header> | ||
<Title>Let's get connected! 🎉</Title> | ||
<Tooltip showArrow={false} title="Hide"> | ||
<Button type="text" icon={<StyledCloseOutlined />} onClick={onHide} /> | ||
</Tooltip> | ||
</Header> | ||
<Description> | ||
<div style={{ marginBottom: 8 }}> | ||
To import from {displayName}, we'll need some more information to connect to your instance. | ||
</div> | ||
<div> | ||
Check out the{' '} | ||
<a href={docsUrl} target="_blank" rel="noopener noreferrer"> | ||
{displayName} Guide | ||
</a>{' '} | ||
to understand the prerequisites, learn about available settings, and view examples to help connect | ||
to the data source. | ||
</div> | ||
</Description> | ||
</Container> | ||
); | ||
}; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Super nit but for some reason checkbox seems unintuitive. I'd expect it on a new line with a chevron down (collapsible/accordion style)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I felt that it was too much vertical with that and the "Runs at" stacked on one another.
Previously this checkbox was directly above the schedule builder, which I also didn't like..