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

Brett/bq 19573#19655

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

Closed
brettkolodny wants to merge13 commits intomainfrombrett/bq-19573
Closed
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
13 commits
Select commitHold shift + click to select a range
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
2 changes: 1 addition & 1 deletionsite/src/api/api.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2695,7 +2695,7 @@ class ExperimentalApiMethods {
return response.data;
};

getTasks = async (filter: TasksFilter): Promise<Task[]> => {
getTasks = async (filter: TasksFilter = {}): Promise<Task[]> => {
const queryExpressions = ["has-ai-task:true"];

if (filter.username) {
Expand Down
57 changes: 47 additions & 10 deletionssite/src/pages/TaskPage/TaskPage.stories.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@ import {
MockFailedWorkspace,
MockStartingWorkspace,
MockStoppedWorkspace,
MockTasks,
MockUserOwner,
MockWorkspace,
MockWorkspaceAgentLogSource,
MockWorkspaceAgentReady,
Expand All@@ -13,20 +15,55 @@ import {
} from "testHelpers/entities";
import { withProxyProvider, withWebSocket } from "testHelpers/storybook";
import type { Meta, StoryObj } from "@storybook/react-vite";
import { API } from "api/api";
import { getAuthorizationKey } from "api/queries/authCheck";
import { meKey } from "api/queries/users";
import type {
Workspace,
WorkspaceApp,
WorkspaceResource,
} from "api/typesGenerated";
import { AuthProvider } from "contexts/auth/AuthProvider";
import { permissionChecks } from "modules/permissions";
import TasksLayout from "pages/TasksLayout/TasksLayout";
import { expect, spyOn, within } from "storybook/test";
import {
reactRouterNestedAncestors,
reactRouterParameters,
} from "storybook-addon-remix-react-router";
import TaskPage, { data, WorkspaceDoesNotHaveAITaskError } from "./TaskPage";

const MockTaskWorkspace = MockTasks[0].workspace;

const meta: Meta<typeof TaskPage> = {
title: "pages/TaskPage",
component: TaskPage,
decorators: [withProxyProvider()],
beforeEach: () => {
spyOn(API.experimental, "getTasks").mockResolvedValue(MockTasks);
},
parameters: {
layout: "fullscreen",
queries: [
{ key: meKey, data: MockUserOwner },
{ key: getAuthorizationKey({ checks: permissionChecks }), data: {} },
],
reactRouter: reactRouterParameters({
location: {
pathParams: {
user: MockTaskWorkspace.owner_name,
workspace: MockTaskWorkspace.name,
},
},
routing: reactRouterNestedAncestors({
path: "/tasks/:user/:workspace",
element: (
<AuthProvider>
<TasksLayout />
</AuthProvider>
),
}),
}),
},
};

Expand DownExpand Up@@ -96,7 +133,7 @@ export const WaitingOnStatus: Story = {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
...MockTaskWorkspace,
latest_app_status: null,
latest_build: {
...MockWorkspace.latest_build,
Expand All@@ -114,7 +151,7 @@ export const WaitingStartupScripts: Story = {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
...MockTaskWorkspace,
latest_build: {
...MockWorkspace.latest_build,
has_ai_task: true,
Expand DownExpand Up@@ -150,12 +187,12 @@ export const WaitingStartupScripts: Story = {
},
};

export constSidebarAppHealthDisabled: Story = {
export constChatAppHealthDisabled: Story = {
beforeEach: () => {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
...MockTaskWorkspace,
latest_build: {
...MockWorkspace.latest_build,
has_ai_task: true,
Expand All@@ -171,12 +208,12 @@ export const SidebarAppHealthDisabled: Story = {
},
};

export constSidebarAppLoading: Story = {
export constChatAppLoading: Story = {
beforeEach: () => {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
...MockTaskWorkspace,
latest_build: {
...MockWorkspace.latest_build,
has_ai_task: true,
Expand All@@ -192,12 +229,12 @@ export const SidebarAppLoading: Story = {
},
};

export constSidebarAppHealthy: Story = {
export constChatAppHealthy: Story = {
beforeEach: () => {
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
...MockTaskWorkspace,
latest_build: {
...MockWorkspace.latest_build,
has_ai_task: true,
Expand All@@ -218,7 +255,7 @@ const mainAppHealthStory = (health: WorkspaceApp["health"]) => ({
spyOn(data, "fetchTask").mockResolvedValue({
prompt: "Create competitors page",
workspace: {
...MockWorkspace,
...MockTaskWorkspace,
latest_build: {
...MockWorkspace.latest_build,
resources: mockResources({
Expand DownExpand Up@@ -302,7 +339,7 @@ const mockResources = (

const activeWorkspace = (apps: WorkspaceApp[]): Workspace => {
return {
...MockWorkspace,
...MockTaskWorkspace,
latest_build: {
...MockWorkspace.latest_build,
resources: mockResources({ apps }),
Expand Down
2 changes: 1 addition & 1 deletionsite/src/pages/TaskPage/TaskPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,7 @@ const TaskPage = () => {
<Helmet>
<title>{pageTitle("Loading task")}</title>
</Helmet>
<Loaderfullscreen />
<LoaderclassName="h-full" />
</>
);
}
Expand Down
17 changes: 1 addition & 16 deletionssite/src/pages/TaskPage/TaskTopbar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import {
} from "components/Tooltip/Tooltip";
import { useClipboard } from "hooks";
import {
ArrowLeftIcon,
CheckIcon,
CopyIcon,
LaptopMinimalIcon,
Expand All@@ -22,21 +21,7 @@ type TaskTopbarProps = { task: Task };

export const TaskTopbar: FC<TaskTopbarProps> = ({ task }) => {
return (
<header className="flex flex-shrink-0 items-center px-3 py-4 border-solid border-border border-0 border-b">
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<Button size="icon" variant="subtle" asChild>
<RouterLink to="/tasks">
<ArrowLeftIcon />
<span className="sr-only">Back to tasks</span>
</RouterLink>
</Button>
</TooltipTrigger>
<TooltipContent>Back to tasks</TooltipContent>
</Tooltip>
</TooltipProvider>

<header className="flex flex-shrink-0 items-center px-3 py-2 border-solid border-border border-0 border-b">
<h1 className="m-0 pl-2 text-base font-medium truncate">
{task.workspace.name}
</h1>
Expand Down
16 changes: 16 additions & 0 deletionssite/src/pages/TasksLayout/TasksLayout.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
import type { FC } from "react";
import { Outlet } from "react-router";
import { TasksSidebar } from "./TasksSidebar";

const TasksLayout: FC = () => {
return (
<div className="flex flex-1 min-h-0 h-full">
<TasksSidebar />
<main className="flex-1">
<Outlet />
</main>
</div>
);
};

export default TasksLayout;
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp