Skip to content
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

Add connector stage to dropdown value #10677

Merged
merged 2 commits into from
Mar 1, 2022
Merged

Add connector stage to dropdown value #10677

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
cb4599c
Add connector stage to dropdown value
juliachvyrova Feb 27, 2022
1506d43
Fix img
juliachvyrova Feb 28, 2022
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
4 changes: 2 additions & 2 deletions airbyte-webapp/src/components/base/DropDown/components/SingleValue.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ export type IProps = {
data?: IDataItem;
} & SingleValueProps<OptionTypeBase>;

const ItemView = styled.div`
export const ItemView = styled.div`
display: flex;
flex-direction: row;
justify-content: left;
align-items: center;
`;

const Icon = styled.div`
export const Icon = styled.div`
margin-right: 6px;
display: inline-block;
`;
Expand Down
51 changes: 42 additions & 9 deletions ...ebapp/src/views/Connector/ServiceForm/components/Controls/ConnectorServiceTypeControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ import {
IProps as OptionProps,
OptionView,
} from "components/base/DropDown/components/Option";
import {
IProps as SingleValueProps,
Icon as SingleValueIcon,
ItemView as SingleValueView,
} from "components/base/DropDown/components/SingleValue";

const BottomElement = styled.div`
background: ${(props) => props.theme.greyColro0};
Expand Down Expand Up @@ -70,6 +75,15 @@ const Stage = styled.div`
color: ${({ theme }) => theme.textColor};
`;

const SingleValueContent = styled(components.SingleValue)`
width: 100%;
padding-right: 38px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
`;

type MenuWithRequestButtonProps = MenuListComponentProps<IDataItem, false>;

const ConnectorList: React.FC<MenuWithRequestButtonProps> = ({
Expand All @@ -88,6 +102,18 @@ const ConnectorList: React.FC<MenuWithRequestButtonProps> = ({
</>
);

const StageLabel: React.FC<{ releaseStage?: ReleaseStage }> = ({
releaseStage,
}) =>
releaseStage && releaseStage !== ReleaseStage.GENERALLY_AVAILABLE ? (
<Stage>
<FormattedMessage
id={`connector.releaseStage.${releaseStage}`}
defaultMessage={releaseStage}
/>
</Stage>
) : null;

const Option: React.FC<OptionProps> = (props) => {
return (
<components.Option {...props}>
Expand All @@ -100,20 +126,26 @@ const Option: React.FC<OptionProps> = (props) => {
{props.data.img || null}
<Label>{props.label}</Label>
</Text>
{props.data.releaseStage &&
props.data.releaseStage !== ReleaseStage.GENERALLY_AVAILABLE ? (
<Stage>
<FormattedMessage
id={`connector.releaseStage.${props.data.releaseStage}`}
defaultMessage={props.data.releaseStage}
/>
</Stage>
) : null}
<StageLabel releaseStage={props.data.releaseStage} />
</OptionView>
</components.Option>
);
};

const SingleValue: React.FC<SingleValueProps> = (props) => {
return (
<SingleValueView>
{props.data.img && <SingleValueIcon>{props.data.img}</SingleValueIcon>}
<div>
<SingleValueContent {...props}>
{props.data.label}
<StageLabel releaseStage={props.data.releaseStage} />
</SingleValueContent>
</div>
</SingleValueView>
);
};

const ConnectorServiceTypeControl: React.FC<{
property: FormBaseItem;
formType: "source" | "destination";
Expand Down Expand Up @@ -198,6 +230,7 @@ const ConnectorServiceTypeControl: React.FC<{
components={{
MenuList: ConnectorList,
Option,
SingleValue,
}}
selectProps={{ onOpenRequestConnectorModal }}
error={!!fieldMeta.error && fieldMeta.touched}
Expand Down