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

chore!: fix workspace apps response#17700

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
BrunoQuaresma merged 1 commit intomainfrombq/fix-workspaceapps-response
May 7, 2025
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
6 changes: 3 additions & 3 deletionscodersdk/workspaceapps.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,14 +60,14 @@ type WorkspaceApp struct {
ID uuid.UUID `json:"id" format:"uuid"`
// URL is the address being proxied to inside the workspace.
// If external is specified, this will be opened on the client.
URL string `json:"url"`
URL string `json:"url,omitempty"`
// External specifies whether the URL should be opened externally on
// the client or not.
External bool `json:"external"`
// Slug is a unique identifier within the agent.
Slug string `json:"slug"`
// DisplayName is a friendly name for the app.
DisplayName string `json:"display_name"`
DisplayName string `json:"display_name,omitempty"`
Command string `json:"command,omitempty"`
// Icon is a relative path or external URL that specifies
// an icon to be displayed in the dashboard.
Expand All@@ -81,7 +81,7 @@ type WorkspaceApp struct {
SubdomainName string `json:"subdomain_name,omitempty"`
SharingLevel WorkspaceAppSharingLevel `json:"sharing_level" enums:"owner,authenticated,public"`
// Healthcheck specifies the configuration for checking app health.
Healthcheck Healthcheck `json:"healthcheck"`
Healthcheck Healthcheck `json:"healthcheck,omitempty"`
Health WorkspaceAppHealth `json:"health"`
Hidden bool `json:"hidden"`
OpenIn WorkspaceAppOpenIn `json:"open_in"`
Expand Down
6 changes: 3 additions & 3 deletionssite/src/api/typesGenerated.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

4 changes: 2 additions & 2 deletionssite/src/modules/resources/AgentRow.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -150,9 +150,9 @@ describe.each<{

for (const app of props.agent.apps) {
if (app.hidden) {
expect(screen.queryByText(app.display_name)).toBeNull();
expect(screen.queryByText(app.display_name as string)).toBeNull();
} else {
expect(screen.getByText(app.display_name)).toBeVisible();
expect(screen.getByText(app.display_name as string)).toBeVisible();
}
}
});
Expand Down
6 changes: 4 additions & 2 deletionssite/src/modules/resources/AgentRowPreview.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,8 +91,10 @@ describe("AgentRowPreviewApps", () => {
"<AgentRowPreview agent={$testName} /> displays appropriately",
({ workspaceAgent }) => {
renderComponent(<AgentRowPreview agent={workspaceAgent} />);
for (const module of workspaceAgent.apps) {
expect(screen.getByText(module.display_name)).toBeInTheDocument();
for (const app of workspaceAgent.apps) {
expect(
screen.getByText(app.display_name as string),
).toBeInTheDocument();
}

for (const app of workspaceAgent.display_apps) {
Expand Down
2 changes: 1 addition & 1 deletionsite/src/modules/resources/AgentRowPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ export const AgentRowPreview: FC<AgentRowPreviewProps> = ({
>
<Stack direction="row" alignItems="baseline">
<div css={styles.agentStatusWrapper}>
<div css={styles.agentStatusPreview}></div>
<div css={styles.agentStatusPreview} />
</div>
<Stack
alignItems="baseline"
Expand Down
23 changes: 6 additions & 17 deletionssite/src/modules/resources/AppLink/AppLink.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,24 +43,15 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
const appsHost = proxy.preferredWildcardHostname;
const [fetchingSessionToken, setFetchingSessionToken] = useState(false);
const [iconError, setIconError] = useState(false);

const theme = useTheme();
const username = workspace.owner_name;

let appSlug = app.slug;
let appDisplayName = app.display_name;
if (!appSlug) {
appSlug = appDisplayName;
}
if (!appDisplayName) {
appDisplayName = appSlug;
}
const displayName = app.display_name || app.slug;

const href = createAppLinkHref(
window.location.protocol,
preferredPathBase,
appsHost,
appSlug,
app.slug,
username,
workspace,
agent,
Expand DownExpand Up@@ -118,7 +109,7 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
// This is an external URI like "vscode://", so
// it needs to be opened with the browser protocol handler.
const shouldOpenAppExternally =
app.external &&!app.url.startsWith("http");
app.external && app.url?.startsWith("http");

if (shouldOpenAppExternally) {
// This is a magic undocumented string that is replaced
Expand All@@ -140,9 +131,7 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
// an error message will be displayed.
const openAppExternallyFailedTimeout = 500;
const openAppExternallyFailed = setTimeout(() => {
displayError(
`${app.display_name !== "" ? app.display_name : app.slug} must be installed first.`,
);
displayError(`${displayName} must be installed first.`);
}, openAppExternallyFailedTimeout);
window.addEventListener("blur", () => {
clearTimeout(openAppExternallyFailed);
Expand All@@ -156,7 +145,7 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
case "slim-window": {
window.open(
href,
Language.appTitle(appDisplayName, generateRandomString(12)),
Language.appTitle(displayName, generateRandomString(12)),
"width=900,height=600",
);
return;
Expand All@@ -169,7 +158,7 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {
}}
>
{icon}
{appDisplayName}
{displayName}
{canShare && <ShareIcon app={app} />}
</a>
</AgentButton>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,12 +124,11 @@ export const WorkspaceAppStatus = ({

let appHref: string | undefined;
if (app && agent) {
const appSlug = app.slug || app.display_name;
appHref = createAppLinkHref(
window.location.protocol,
preferredPathBase,
appsHost,
appSlug,
app.slug,
workspace.owner_name,
workspace,
agent,
Expand Down
3 changes: 1 addition & 2 deletionssite/src/pages/WorkspacePage/AppStatuses.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,12 +198,11 @@ export const AppStatuses: FC<AppStatusesProps> = ({
const agent = agents.find((agent) => agent.id === status.agent_id);

if (currentApp && agent) {
const appSlug = currentApp.slug || currentApp.display_name;
appHref = createAppLinkHref(
window.location.protocol,
preferredPathBase,
appsHost,
appSlug,
currentApp.slug,
workspace.owner_name,
workspace,
agent,
Expand Down
2 changes: 1 addition & 1 deletionsite/src/utils/apps.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ export const createAppLinkHref = (
app: TypesGen.WorkspaceApp,
): string => {
if (app.external) {
return app.url;
return app.url as string;
}

// The backend redirects if the trailing slash isn't included, so we add it
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp