Skip to content

Show tabs when clicking onboarding #163

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 3 commits into from
Aug 2, 2023
Merged

Show tabs when clicking onboarding #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1eaacc
fix show tabs
shalom938 Jul 24, 2023
b1b1e6f
change tab order and skip user installation selection
shaykeren Jul 27, 2023
61f759a
Merge branch 'main' into show-tabs-when-clicking-onboarding
kshmidt-digma Aug 2, 2023
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
60 changes: 30 additions & 30 deletions src/components/InstallationWizard/InstallStep/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const InstallStep = (props: InstallStepProps) => {
const [isAutoInstallationFinished, setIsAutoInstallationFinished] =
useState(false);
const [areTabsVisible, setAreTabsVisible] = useState(
!config.isDockerInstalled || !config.isDockerComposeInstalled
!config.isDigmaEngineInstalled && !isAutoInstallationFlow
);
const [isAutoInstallTabVisible, setIsAutoInstallTabVisible] = useState(false);
const [isEngineOperationInProgress, setIsEngineOperationInProgress] =
Expand Down Expand Up @@ -228,28 +228,31 @@ export const InstallStep = (props: InstallStepProps) => {
]
: []),
{
icon: DockerLogoIcon,
title: "Docker Desktop",
icon: CodeIcon,
title: "Docker Compose",
content: (
<>
<s.TabContentContainer>
<s.SectionTitle>
<DockerLogoIcon size={24} color={"#2396ed"} />
Install Digma Docker extension
Run the following from the terminal/command line to start the
Digma backend:
</s.SectionTitle>
<SectionDescription>
(You&apos;ll need{" "}
<Link onClick={() => openURLInDefaultBrowser(DOCKER_DESKTOP_URL)}>
Docker Desktop
<Link onClick={() => openURLInDefaultBrowser(DOCKER_URL)}>
Docker
</Link>{" "}
4.10.0 or higher installed)
and{" "}
<Link onClick={() => openURLInDefaultBrowser(DOCKER_COMPOSE_URL)}>
Docker Compose
</Link>{" "}
installed)
</SectionDescription>
<s.GetDockerExtensionButton
buttonType={"secondary"}
onClick={handleInstallDigmaButtonClick}
>
Get Digma Docker Extension
</s.GetDockerExtensionButton>
<s.DockerComposeTabs
tabs={dockerComposeOSTabs}
onSelect={handleSelectDockerComposeOSTab}
selectedTab={selectedDockerComposeOSTab}
/>
</s.TabContentContainer>
<s.CommonContentContainer>
{renderLoader()}
Expand All @@ -259,31 +262,28 @@ export const InstallStep = (props: InstallStepProps) => {
)
},
{
icon: CodeIcon,
title: "Docker Compose",
icon: DockerLogoIcon,
title: "Docker Desktop",
content: (
<>
<s.TabContentContainer>
<s.SectionTitle>
Run the following from the terminal/command line to start the
Digma backend:
<DockerLogoIcon size={24} color={"#2396ed"} />
Install Digma Docker extension
</s.SectionTitle>
<SectionDescription>
(You&apos;ll need{" "}
<Link onClick={() => openURLInDefaultBrowser(DOCKER_URL)}>
Docker
</Link>{" "}
and{" "}
<Link onClick={() => openURLInDefaultBrowser(DOCKER_COMPOSE_URL)}>
Docker Compose
<Link onClick={() => openURLInDefaultBrowser(DOCKER_DESKTOP_URL)}>
Docker Desktop
</Link>{" "}
installed)
4.10.0 or higher installed)
</SectionDescription>
<s.DockerComposeTabs
tabs={dockerComposeOSTabs}
onSelect={handleSelectDockerComposeOSTab}
selectedTab={selectedDockerComposeOSTab}
/>
<s.GetDockerExtensionButton
buttonType={"secondary"}
onClick={handleInstallDigmaButtonClick}
>
Get Digma Docker Extension
</s.GetDockerExtensionButton>
</s.TabContentContainer>
<s.CommonContentContainer>
{renderLoader()}
Expand Down
8 changes: 5 additions & 3 deletions src/components/InstallationWizard/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ export const InstallationWizard = () => {
InstallationType | undefined
>(preselectedInstallationType);

const isStartAutoInstall = true;

const theme = useTheme();
const themeKind = getThemeKind(theme);
const [email, setEmail] = useState(config.userEmail);
Expand Down Expand Up @@ -338,7 +340,7 @@ export const InstallationWizard = () => {

return (
<s.Container>
{installationType ? (
{isStartAutoInstall || installationType ? (
<s.Header>
<s.HeaderTitle>Install Digma</s.HeaderTitle>
<s.HeaderSubtitle>
Expand Down Expand Up @@ -440,7 +442,7 @@ export const InstallationWizard = () => {
</s.InstallationTypeButtonsContainer>
</s.WelcomeContainer>
)}
{installationType &&
{(isStartAutoInstall || installationType) &&
steps.map((step, i) => (
<Step
key={step.key}
Expand All @@ -453,7 +455,7 @@ export const InstallationWizard = () => {
))}

<s.Footer>
{installationType && (
{(isStartAutoInstall || installationType) && (
<CSSTransition
in={currentStep === steps.length - 1}
timeout={TRANSITION_DURATION}
Expand Down