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.

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

[dashboard] Fix Arc favourites #20466

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,30 @@

import { Link } from "react-router-dom";
import { Button, ButtonProps } from "@podkit/buttons/Button";
import React from "react";
import { forwardRef, HTMLAttributeAnchorTarget } from "react";

export interface LinkButtonProps extends ButtonProps {
asChild?: false;
href: string;
target?: HTMLAttributeAnchorTarget;
isExternalUrl?: boolean;
}

/**
* A HTML anchor element styled as a button.
*/
export const LinkButton = React.forwardRef<HTMLButtonElement, LinkButtonProps>(
({ asChild, children, href, ...props }, ref) => {
export const LinkButton = forwardRef<HTMLButtonElement, LinkButtonProps>(
({ asChild, children, href, target, ...props }, ref) => {
return (
<Button ref={ref} {...props} asChild>
{props.isExternalUrl ? (
<a href={href} target="_blank" rel="noreferrer">
<a href={href} target={target ?? "_blank"} rel="noreferrer">
{children}
</a>
) : (
<Link to={href}>{children}</Link>
<Link to={href} target={target}>
{children}
</Link>
)}
</Button>
);
Expand Down
40 changes: 38 additions & 2 deletions components/dashboard/src/start/StartWorkspace.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
import { PartialMessage } from "@bufbuild/protobuf";
import { trackEvent } from "../Analytics";
import { fromWorkspaceName } from "../workspaces/RenameWorkspaceModal";
import { LinkButton } from "@podkit/buttons/LinkButton";

const sessionId = v4();

Expand Down Expand Up @@ -102,6 +103,10 @@ export interface StartWorkspaceState {
ideOptions?: IDEOptions;
isSSHModalVisible?: boolean;
ownerToken?: string;
/**
* Set to prevent multiple redirects to the same URL when the User Agent ignores our wish to open links in the same tab (by setting window.location.href).
*/
redirected?: boolean;
}

// TODO: use Function Components
Expand Down Expand Up @@ -183,7 +188,7 @@ export default class StartWorkspace extends React.Component<StartWorkspaceProps,
this.toDispose.dispose();
}

componentDidUpdate(prevPros: StartWorkspaceProps, prevState: StartWorkspaceState) {
componentDidUpdate(_prevProps: StartWorkspaceProps, prevState: StartWorkspaceState) {
const newPhase = this.state?.workspace?.status?.phase?.name;
const oldPhase = prevState.workspace?.status?.phase?.name;
const type = this.state.workspace?.spec?.type === WorkspaceSpec_WorkspaceType.PREBUILD ? "prebuild" : "regular";
Expand Down Expand Up @@ -458,11 +463,17 @@ export default class StartWorkspace extends React.Component<StartWorkspaceProps,
}

redirectTo(url: string) {
if (this.state.redirected) {
Copy link
Member

Choose a reason for hiding this comment

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

Nice!

🫧 What are situations where we need to reset this value? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

Good question: I'd say it's enough when React resets it when the page unmounts. On the page level, this prop should be permanent (or at least I don't see reasons why we'd forget about having redirected you somewhere).

console.info("Prevented another redirect", { url });
return;
}
if (this.props.runsInIFrame) {
this.ideFrontendService?.relocate(url);
} else {
window.location.href = url;
}

this.setState({ redirected: true });
}

private openDesktopLink(link: string) {
Expand Down Expand Up @@ -503,7 +514,7 @@ export default class StartWorkspace extends React.Component<StartWorkspaceProps,
return <ImageBuildView workspaceId={this.state.workspace.id} />;

// Pending means the workspace does not yet consume resources in the cluster, but rather is looking for
// some space within the cluster. If for example the cluster needs to scale up to accomodate the
// some space within the cluster. If for example the cluster needs to scale up to accommodate the
// workspace, the workspace will be in Pending state until that happened.
case WorkspacePhase_Phase.PENDING:
phase = StartPhase.Preparing;
Expand Down Expand Up @@ -746,6 +757,7 @@ export default class StartWorkspace extends React.Component<StartWorkspaceProps,
);
break;
}

return (
<StartPage
phase={phase}
Expand All @@ -755,6 +767,30 @@ export default class StartWorkspace extends React.Component<StartWorkspaceProps,
workspaceId={this.props.workspaceId}
>
{statusMessage}
{this.state.redirected && (
<>
<Alert type="info" className="mt-4 w-112">
geropl marked this conversation as resolved.
Show resolved Hide resolved
We redirected you to your workspace, but your browser probably opened it in another tab.
</Alert>

<div className="mt-4 justify-center flex space-x-2">
<LinkButton href={gitpodHostUrl.asWorkspacePage().toString()} target="_self" isExternalUrl>
Go to Dashboard
</LinkButton>
{this.state.workspace?.status?.workspaceUrl &&
this.state.workspace.status.phase?.name === WorkspacePhase_Phase.RUNNING && (
<LinkButton
variant={"secondary"}
href={this.state.workspace.status.workspaceUrl}
target="_self"
isExternalUrl
>
Re-open Workspace
</LinkButton>
)}
</div>
</>
)}
</StartPage>
);
}
Expand Down
Loading