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: remove unecessary API.getWorkspaceParameters#20462

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 3 commits intomainfrombq/fix-parameters-api
Oct 27, 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
13 changes: 0 additions & 13 deletionssite/src/api/api.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2385,19 +2385,6 @@ class ApiMethods {
return response.data;
};

getWorkspaceParameters = async (workspace: TypesGen.Workspace) => {
const latestBuild = workspace.latest_build;
const [templateVersionRichParameters, buildParameters] = await Promise.all([
this.getTemplateVersionRichParameters(latestBuild.template_version_id),
this.getWorkspaceBuildParameters(latestBuild.id),
]);

return {
templateVersionRichParameters,
buildParameters,
};
};

getInsightsUserLatency = async (
filters: InsightsParams,
): Promise<TypesGen.UserLatencyInsightsResponse> => {
Expand Down
8 changes: 7 additions & 1 deletionsite/src/api/queries/templates.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -249,9 +249,15 @@ export const templateVersionLogs = (versionId: string) => {
};
};

export const richParametersKey = (versionId: string) => [
templateVersionRoot,
versionId,
"richParameters",
];

export const richParameters = (versionId: string) => {
return {
queryKey:[templateVersionRoot,versionId, "richParameters"],
queryKey:richParametersKey(versionId),
queryFn: () => API.getTemplateVersionRichParameters(versionId),
};
};
Expand Down
2 changes: 1 addition & 1 deletionsite/src/api/queries/workspaceBuilds.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import type {
} from "api/typesGenerated";
import type { QueryOptions, UseInfiniteQueryOptions } from "react-query";

function workspaceBuildParametersKey(workspaceBuildId: string) {
exportfunction workspaceBuildParametersKey(workspaceBuildId: string) {
return ["workspaceBuilds", workspaceBuildId, "parameters"] as const;
}

Expand Down
10 changes: 5 additions & 5 deletionssite/src/pages/TaskPage/TaskPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { API } from "api/api";
import { getErrorDetail, getErrorMessage, isApiError } from "api/errors";
import { template as templateQueryOptions } from "api/queries/templates";
import { workspaceBuildParameters } from "api/queries/workspaceBuilds";
import {
startWorkspace,
workspaceByOwnerAndName,
Expand DownExpand Up@@ -198,10 +199,9 @@ type WorkspaceNotRunningProps = {
const WorkspaceNotRunning: FC<WorkspaceNotRunningProps> = ({ workspace }) => {
const queryClient = useQueryClient();

const { data: parameters } = useQuery({
queryKey: ["workspace", workspace.id, "parameters"],
queryFn: () => API.getWorkspaceParameters(workspace),
});
const { data: buildParameters } = useQuery(
workspaceBuildParameters(workspace.latest_build.id),
);

const mutateStartWorkspace = useMutation({
...startWorkspace(workspace, queryClient),
Expand DownExpand Up@@ -237,7 +237,7 @@ const WorkspaceNotRunning: FC<WorkspaceNotRunningProps> = ({ workspace }) => {
disabled={isWaitingForStart}
onClick={() => {
mutateStartWorkspace.mutate({
buildParameters: parameters?.buildParameters,
buildParameters,
});
}}
>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import { useTheme } from "@emotion/react";
import visuallyHidden from "@mui/utils/visuallyHidden";
import { API } from "api/api";
import { richParameters } from "api/queries/templates";
import { workspaceBuildParameters } from "api/queries/workspaceBuilds";
import type {
TemplateVersionParameter,
Workspace,
Expand DownExpand Up@@ -48,12 +49,15 @@ export const BuildParametersPopover: FC<BuildParametersPopoverProps> = ({
onSubmit,
}) => {
const [isOpen, setIsOpen] = useState(false);
const { data: parameters } = useQuery({
queryKey: ["workspace", workspace.id, "parameters"],
queryFn: () => API.getWorkspaceParameters(workspace),
});
const ephemeralParameters = parameters
? parameters.templateVersionRichParameters.filter((p) => p.ephemeral)
const build = workspace.latest_build;
const { data: templateVersionParameters } = useQuery(
richParameters(build.template_version_id),
);
const { data: buildParameters } = useQuery(
workspaceBuildParameters(build.id),
);
const ephemeralParameters = templateVersionParameters
? templateVersionParameters.filter((p) => p.ephemeral)
: undefined;

return (
Expand All@@ -75,7 +79,7 @@ export const BuildParametersPopover: FC<BuildParametersPopoverProps> = ({
<BuildParametersPopoverContent
workspace={workspace}
ephemeralParameters={ephemeralParameters}
buildParameters={parameters?.buildParameters}
buildParameters={buildParameters}
onSubmit={onSubmit}
setIsOpen={setIsOpen}
/>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
import { MockWorkspace } from "testHelpers/entities";
import {
MockTemplateVersionParameter1,
MockWorkspace,
} from "testHelpers/entities";
import type { Meta, StoryObj } from "@storybook/react-vite";
import { richParametersKey } from "api/queries/templates";
import { workspaceBuildParametersKey } from "api/queries/workspaceBuilds";
import { expect, screen, userEvent, waitFor } from "storybook/test";
import { DebugButton } from "./DebugButton";

Expand All@@ -21,8 +26,12 @@ export const WithBuildParameters: Story = {
parameters: {
queries: [
{
key: ["workspace", MockWorkspace.id, "parameters"],
data: { templateVersionRichParameters: [], buildParameters: [] },
key: richParametersKey(MockWorkspace.latest_build.template_version_id),
data: [],
},
{
key: workspaceBuildParametersKey(MockWorkspace.latest_build.id),
data: [],
},
],
},
Expand All@@ -36,8 +45,12 @@ export const WithOpenBuildParameters: Story = {
parameters: {
queries: [
{
key: ["workspace", MockWorkspace.id, "parameters"],
data: { templateVersionRichParameters: [], buildParameters: [] },
key: richParametersKey(MockWorkspace.latest_build.template_version_id),
data: [MockTemplateVersionParameter1],
},
{
key: workspaceBuildParametersKey(MockWorkspace.latest_build.id),
data: [],
},
],
},
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
import {
MockNonClassicParameterFlowWorkspace,
MockTemplateVersionParameter1,
MockTemplateVersionParameter6,
MockWorkspace,
} from "testHelpers/entities";
import type { Meta, StoryObj } from "@storybook/react-vite";
import { richParametersKey } from "api/queries/templates";
import { workspaceBuildParametersKey } from "api/queries/workspaceBuilds";
import { expect, screen, userEvent, waitFor } from "storybook/test";
import { RetryButton } from "./RetryButton";

Expand All@@ -25,8 +28,12 @@ export const WithBuildParameters: Story = {
parameters: {
queries: [
{
key: ["workspace", MockWorkspace.id, "parameters"],
data: { templateVersionRichParameters: [], buildParameters: [] },
key: richParametersKey(MockWorkspace.latest_build.template_version_id),
data: [],
},
{
key: workspaceBuildParametersKey(MockWorkspace.latest_build.id),
data: [],
},
],
},
Expand All@@ -40,8 +47,12 @@ export const WithOpenBuildParameters: Story = {
parameters: {
queries: [
{
key: ["workspace", MockWorkspace.id, "parameters"],
data: { templateVersionRichParameters: [], buildParameters: [] },
key: richParametersKey(MockWorkspace.latest_build.template_version_id),
data: [MockTemplateVersionParameter1],
},
{
key: workspaceBuildParametersKey(MockWorkspace.latest_build.id),
data: [],
},
],
},
Expand All@@ -63,11 +74,12 @@ export const WithOpenEphemeralBuildParameters: Story = {
parameters: {
queries: [
{
key: ["workspace", MockWorkspace.id, "parameters"],
data: {
templateVersionRichParameters: [MockTemplateVersionParameter6],
buildParameters: [],
},
key: richParametersKey(MockWorkspace.latest_build.template_version_id),
data: [MockTemplateVersionParameter6],
},
{
key: workspaceBuildParametersKey(MockWorkspace.latest_build.id),
data: [],
},
],
},
Expand All@@ -91,15 +103,12 @@ export const WithOpenEphemeralBuildParametersNotClassic: Story = {
parameters: {
queries: [
{
key: [
"workspace",
MockNonClassicParameterFlowWorkspace.id,
"parameters",
],
data: {
templateVersionRichParameters: [MockTemplateVersionParameter6],
buildParameters: [],
},
key: richParametersKey(MockWorkspace.latest_build.template_version_id),
data: [MockTemplateVersionParameter6],
},
{
key: workspaceBuildParametersKey(MockWorkspace.latest_build.id),
data: [],
},
],
},
Expand Down
25 changes: 12 additions & 13 deletionssite/src/pages/WorkspacePage/WorkspacePage.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ const renderWorkspacePage = async (
) => {
jest.spyOn(API, "getWorkspaceByOwnerAndName").mockResolvedValue(workspace);
jest.spyOn(API, "getTemplate").mockResolvedValueOnce(MockTemplate);
jest.spyOn(API, "getTemplateVersionRichParameters").mockResolvedValueOnce([]);
jest
.spyOn(API, "getDeploymentConfig")
.mockResolvedValueOnce(MockDeploymentConfig);
Expand DownExpand Up@@ -380,18 +379,18 @@ describe("WorkspacePage", () => {

it("restart the workspace with one time parameters when having the confirmation dialog", async () => {
localStorage.removeItem(`${MockUserOwner.id}_ignoredWarnings`);
jest.spyOn(API, "getWorkspaceParameters").mockResolvedValue({
templateVersionRichParameters: [
{
...MockTemplateVersionParameter1,
ephemeral: true,
name: "rebuild",
description: "Rebuild",
required: false,
},
],
buildParameters: [{ name: "rebuild", value: "false" }],
});
jest.spyOn(API, "getTemplateVersionRichParameters").mockResolvedValue([
{
...MockTemplateVersionParameter1,
ephemeral: true,
name: "rebuild",
description: "Rebuild",
required: false,
},
]);
jest
.spyOn(API, "getWorkspaceBuildParameters")
.mockResolvedValue([{ name: "rebuild", value: "false" }]);
const restartWorkspaceSpy = jest.spyOn(API, "restartWorkspace");
const user = userEvent.setup();
await renderWorkspacePage(MockWorkspace);
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,22 +21,19 @@ const meta: Meta<typeof WorkspaceParametersPageView> = {
workspace: MockWorkspace,
canChangeVersions: true,
onCancel: action("onCancel"),

data: {
buildParameters: [
MockWorkspaceBuildParameter1,
MockWorkspaceBuildParameter2,
MockWorkspaceBuildParameter3,
],
templateVersionRichParameters: [
MockTemplateVersionParameter1,
MockTemplateVersionParameter2,
{
...MockTemplateVersionParameter3,
mutable: false,
},
],
},
buildParameters: [
MockWorkspaceBuildParameter1,
MockWorkspaceBuildParameter2,
MockWorkspaceBuildParameter3,
],
templateVersionParameters: [
MockTemplateVersionParameter1,
MockTemplateVersionParameter2,
{
...MockTemplateVersionParameter3,
mutable: false,
},
],
},
};

Expand All@@ -47,54 +44,48 @@ const Example: Story = {};

export const Empty: Story = {
args: {
data: {
buildParameters: [],
templateVersionRichParameters: [],
},
buildParameters: [],
templateVersionParameters: [],
},
};

export const RequireActiveVersionNoChangeVersion: Story = {
args: {
workspace: MockOutdatedStoppedWorkspaceRequireActiveVersion,
canChangeVersions: false,
data: {
buildParameters: [
MockWorkspaceBuildParameter1,
MockWorkspaceBuildParameter2,
MockWorkspaceBuildParameter3,
],
templateVersionRichParameters: [
MockTemplateVersionParameter1,
MockTemplateVersionParameter2,
{
...MockTemplateVersionParameter3,
mutable: false,
},
],
},
buildParameters: [
MockWorkspaceBuildParameter1,
MockWorkspaceBuildParameter2,
MockWorkspaceBuildParameter3,
],
templateVersionParameters: [
MockTemplateVersionParameter1,
MockTemplateVersionParameter2,
{
...MockTemplateVersionParameter3,
mutable: false,
},
],
},
};

export const RequireActiveVersionCanChangeVersion: Story = {
args: {
workspace: MockOutdatedStoppedWorkspaceRequireActiveVersion,
canChangeVersions: true,
data: {
buildParameters: [
MockWorkspaceBuildParameter1,
MockWorkspaceBuildParameter2,
MockWorkspaceBuildParameter3,
],
templateVersionRichParameters: [
MockTemplateVersionParameter1,
MockTemplateVersionParameter2,
{
...MockTemplateVersionParameter3,
mutable: false,
},
],
},
buildParameters: [
MockWorkspaceBuildParameter1,
MockWorkspaceBuildParameter2,
MockWorkspaceBuildParameter3,
],
templateVersionParameters: [
MockTemplateVersionParameter1,
MockTemplateVersionParameter2,
{
...MockTemplateVersionParameter3,
mutable: false,
},
],
},
};

Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp