Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix: display app templates correctly in build preview#10994

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Kira-Pilot merged 5 commits intomainfrompreview-display-apps/kira-pilot
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes fromall 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
133 changes: 133 additions & 0 deletionssite/src/components/Resources/AgentRowPreview.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
import { MockWorkspaceAgent } from "testHelpers/entities";
import { WorkspaceAgent, DisplayApps, DisplayApp } from "api/typesGenerated";
import { renderComponent } from "testHelpers/renderHelpers";
import { AgentRowPreview } from "./AgentRowPreview";
import { screen } from "@testing-library/react";
import { DisplayAppNameMap } from "./AppLink/AppLink";

const AllDisplayAppsAndModule = MockWorkspaceAgent;
const VSCodeNoInsiders = {
...MockWorkspaceAgent,
display_apps: [
"ssh_helper",
"port_forwarding_helper",
"vscode",
"web_terminal",
] as DisplayApp[],
};
const VSCodeWithInsiders = {
...MockWorkspaceAgent,
display_apps: [
"ssh_helper",
"port_forwarding_helper",
"vscode",
"vscode_insiders",
"web_terminal",
] as DisplayApp[],
};
const NoVSCode = {
...MockWorkspaceAgent,
display_apps: [
"ssh_helper",
"port_forwarding_helper",
"web_terminal",
] as DisplayApp[],
};

const NoModulesJustApps = {
...MockWorkspaceAgent,
apps: [],
};

const NoAppsJustModules = {
...MockWorkspaceAgent,
display_apps: [] as DisplayApp[],
};

const EmptyAppPreview = {
...MockWorkspaceAgent,
apps: [],
display_apps: [] as DisplayApp[],
};

describe("AgentRowPreviewApps", () => {
it.each<{
workspaceAgent: WorkspaceAgent;
testName: string;
}>([
{
workspaceAgent: AllDisplayAppsAndModule,
testName: "AllDisplayAppsAndModule",
},
{
workspaceAgent: VSCodeNoInsiders,
testName: "VSCodeNoInsiders",
},
{
workspaceAgent: VSCodeWithInsiders,
testName: "VSCodeWithInsiders",
},
{
workspaceAgent: NoVSCode,
testName: "NoVSCode",
},
{
workspaceAgent: NoModulesJustApps,
testName: "NoModulesJustApps",
},
{
workspaceAgent: NoAppsJustModules,
testName: "NoAppsJustModules",
},
{
workspaceAgent: EmptyAppPreview,
testName: "EmptyAppPreview",
},
])(
`<AgentRowPreview agent={$testName} /> displays appropriately`,
({ workspaceAgent }) => {
renderComponent(<AgentRowPreview agent={workspaceAgent} />);
workspaceAgent.apps.forEach((module) => {
expect(screen.getByText(module.display_name)).toBeInTheDocument();
});
workspaceAgent.display_apps
.filter((app) => app !== "vscode" && app !== "vscode_insiders") // these get special treatment
.forEach((app) => {
expect(screen.getByText(DisplayAppNameMap[app])).toBeInTheDocument();
});

// test VS Code display
if (workspaceAgent.display_apps.includes("vscode")) {
expect(
screen.getByText(DisplayAppNameMap["vscode"]),
).toBeInTheDocument();
} else if (workspaceAgent.display_apps.includes("vscode_insiders")) {
expect(
screen.getByText(DisplayAppNameMap["vscode_insiders"]),
).toBeInTheDocument();
} else {
expect(screen.queryByText("vscode")).not.toBeInTheDocument();
expect(screen.queryByText("vscode_insiders")).not.toBeInTheDocument();
}

// difference between all possible display apps and those displayed
const excludedApps = DisplayApps.filter(
(a) => !workspaceAgent.display_apps.includes(a),
);

excludedApps.forEach((app) => {
expect(
screen.queryByText(DisplayAppNameMap[app]),
).not.toBeInTheDocument();
});

// test empty state
if (
workspaceAgent.display_apps.length === 0 &&
workspaceAgent.apps.length === 0
) {
expect(screen.getByText("None")).toBeInTheDocument();
}
},
);
});
42 changes: 39 additions & 3 deletionssite/src/components/Resources/AgentRowPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { type Interpolation, type Theme } from "@emotion/react";
import { type FC } from "react";
import type { WorkspaceAgent } from "api/typesGenerated";
import { Stack } from "../Stack/Stack";
import { AppPreviewLink } from "./AppLink/AppPreviewLink";
import { AppPreview } from "./AppLink/AppPreview";
import { BaseIcon } from "./AppLink/BaseIcon";
import { VSCodeIcon } from "components/Icons/VSCodeIcon";
import { DisplayAppNameMap } from "./AppLink/AppLink";

interface AgentRowPreviewStyles {
// Helpful when there are more than one row so the values are aligned
Expand DownExpand Up@@ -86,10 +89,43 @@ export const AgentRowPreview: FC<AgentRowPreviewProps> = ({
spacing={0.5}
wrap="wrap"
>
{/* We display all modules returned in agent.apps */}
{agent.apps.map((app) => (
<AppPreviewLink key={app.slug} app={app} />
<AppPreview key={app.slug}>
<>
<BaseIcon app={app} />
{app.display_name}
</>
</AppPreview>
))}
{agent.apps.length === 0 && (
{/* Additionally, we display any apps that are visible, e.g.
apps that are included in agent.display_apps */}
{agent.display_apps.includes("web_terminal") && (
<AppPreview>{DisplayAppNameMap["web_terminal"]}</AppPreview>
)}
{agent.display_apps.includes("ssh_helper") && (
<AppPreview>{DisplayAppNameMap["ssh_helper"]}</AppPreview>
)}
{agent.display_apps.includes("port_forwarding_helper") && (
<AppPreview>
{DisplayAppNameMap["port_forwarding_helper"]}
</AppPreview>
)}
{/* VSCode display apps (vscode, vscode_insiders) get special presentation */}
{agent.display_apps.includes("vscode") ? (
<AppPreview>
<VSCodeIcon sx={{ width: 12, height: 12 }} />
{DisplayAppNameMap["vscode"]}
</AppPreview>
) : (
agent.display_apps.includes("vscode_insiders") && (
<AppPreview>
<VSCodeIcon sx={{ width: 12, height: 12 }} />
{DisplayAppNameMap["vscode_insiders"]}
</AppPreview>
)
)}
{agent.apps.length === 0 && agent.display_apps.length === 0 && (
<span css={styles.agentDataValue}>None</span>
)}
</Stack>
Expand Down
8 changes: 8 additions & 0 deletionssite/src/components/Resources/AppLink/AppLink.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,14 @@ import { generateRandomString } from "utils/random";
import { BaseIcon } from "./BaseIcon";
import { ShareIcon } from "./ShareIcon";

export const DisplayAppNameMap: Record<TypesGen.DisplayApp, string> = {
port_forwarding_helper: "Ports",
ssh_helper: "SSH",
vscode: "VS Code Desktop",
vscode_insiders: "VS Code Insiders",
web_terminal: "Terminal",
};

const Language = {
appTitle: (appName: string, identifier: string): string =>
`${appName} - ${identifier}`,
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
import { Stack } from "components/Stack/Stack";
import { type FC } from "react";
import type * as TypesGen from "api/typesGenerated";
import { BaseIcon } from "./BaseIcon";
import { ShareIcon } from "./ShareIcon";
import { type FC, type PropsWithChildren } from "react";

interface AppPreviewProps {
app: TypesGen.WorkspaceApp;
}

export const AppPreviewLink: FC<AppPreviewProps> = ({ app }) => {
export const AppPreview: FC<PropsWithChildren> = ({ children }) => {
return (
<Stack
css={(theme) => ({
Expand All@@ -29,9 +22,7 @@ export const AppPreviewLink: FC<AppPreviewProps> = ({ app }) => {
direction="row"
spacing={1}
>
<BaseIcon app={app} />
{app.display_name}
<ShareIcon app={app} />
{children}
</Stack>
);
};
3 changes: 2 additions & 1 deletionsite/src/components/Resources/PortForwardButton.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "components/Popover/Popover";
import { DisplayAppNameMap } from "./AppLink/AppLink";

export interface PortForwardButtonProps {
host: string;
Expand All@@ -50,7 +51,7 @@ export const PortForwardButton: FC<PortForwardButtonProps> = (props) => {
<Popover>
<PopoverTrigger>
<AgentButton disabled={!portsQuery.data}>
Ports
{DisplayAppNameMap["port_forwarding_helper"]}
{portsQuery.data ? (
<div css={styles.portCount}>{portsQuery.data.ports.length}</div>
) : (
Expand Down
3 changes: 2 additions & 1 deletionsite/src/components/Resources/SSHButton/SSHButton.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import {
} from "components/Popover/Popover";
import { Stack } from "components/Stack/Stack";
import { AgentButton } from "../AgentButton";
import { DisplayAppNameMap } from "../AppLink/AppLink";

export interface SSHButtonProps {
workspaceName: string;
Expand All@@ -34,7 +35,7 @@ export const SSHButton: FC<PropsWithChildren<SSHButtonProps>> = ({
return (
<Popover isDefaultOpen={isDefaultOpen}>
<PopoverTrigger>
<AgentButton>SSH</AgentButton>
<AgentButton>{DisplayAppNameMap["ssh_helper"]}</AgentButton>
</PopoverTrigger>

<PopoverContent horizontal="right" classes={{ paper }}>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,9 @@ import { AgentButton } from "components/Resources/AgentButton";
import { FC } from "react";
import * as TypesGen from "api/typesGenerated";
import { generateRandomString } from "utils/random";
import { DisplayAppNameMap } from "../AppLink/AppLink";

export const Language = {
linkText: "Terminal",
terminalTitle: (identifier: string): string => `Terminal - ${identifier}`,
};

Expand DownExpand Up@@ -46,7 +46,7 @@ export const TerminalLink: FC<React.PropsWithChildren<TerminalLinkProps>> = ({
}}
data-testid="terminal"
>
<AgentButton>{Language.linkText}</AgentButton>
<AgentButton>{DisplayAppNameMap["web_terminal"]}</AgentButton>
</Link>
);
};
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import { useLocalStorage } from "hooks";
import Menu from "@mui/material/Menu";
import MenuItem from "@mui/material/MenuItem";
import { DisplayApp } from "api/typesGenerated";
import { DisplayAppNameMap } from "../AppLink/AppLink";

export interface VSCodeDesktopButtonProps {
userName: string;
Expand DownExpand Up@@ -97,7 +98,7 @@ export const VSCodeDesktopButton: FC<
}}
>
<VSCodeIcon css={{ width: 12, height: 12 }} />
VS Code Desktop
{DisplayAppNameMap["vscode"]}
</MenuItem>
<MenuItem
css={{ fontSize: 14 }}
Expand All@@ -106,7 +107,7 @@ export const VSCodeDesktopButton: FC<
}}
>
<VSCodeInsidersIcon css={{ width: 12, height: 12 }} />
VS Code Insiders
{DisplayAppNameMap["vscode_insiders"]}
</MenuItem>
</Menu>
</div>
Expand DownExpand Up@@ -156,7 +157,7 @@ const VSCodeButton = ({
});
}}
>
VS Code Desktop
{DisplayAppNameMap["vscode"]}
</AgentButton>
);
};
Expand DownExpand Up@@ -200,7 +201,7 @@ const VSCodeInsidersButton = ({
});
}}
>
VS Code Insiders
{DisplayAppNameMap["vscode_insiders"]}
</AgentButton>
);
};
[8]ページ先頭
©2009-2025 Movatter.jp