forked from github-starred/komodo
improve build cancel disabled logic to prevent redundant cancels
This commit is contained in:
@@ -12,6 +12,12 @@ export const RunBuild = ({ id }: { id: string }) => {
|
|||||||
{ build: id },
|
{ build: id },
|
||||||
{ refetchInterval: 5000 }
|
{ refetchInterval: 5000 }
|
||||||
).data?.building;
|
).data?.building;
|
||||||
|
const updates = useRead("ListUpdates", {
|
||||||
|
query: {
|
||||||
|
"target.type": "Build",
|
||||||
|
"target.id": id,
|
||||||
|
},
|
||||||
|
}).data;
|
||||||
const { mutate: run_mutate, isPending: runPending } = useExecute("RunBuild");
|
const { mutate: run_mutate, isPending: runPending } = useExecute("RunBuild");
|
||||||
const { mutate: cancel_mutate, isPending: cancelPending } =
|
const { mutate: cancel_mutate, isPending: cancelPending } =
|
||||||
useExecute("CancelBuild");
|
useExecute("CancelBuild");
|
||||||
@@ -24,6 +30,18 @@ export const RunBuild = ({ id }: { id: string }) => {
|
|||||||
)
|
)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
|
// updates come in in descending order, so 'find' will find latest update matching operation
|
||||||
|
const latestBuild = updates?.updates.find(
|
||||||
|
(u) => u.operation === Types.Operation.RunBuild
|
||||||
|
);
|
||||||
|
const latestCancel = updates?.updates.find(
|
||||||
|
(u) => u.operation === Types.Operation.CancelBuild
|
||||||
|
);
|
||||||
|
const cancelDisabled =
|
||||||
|
cancelPending || (latestCancel && latestBuild)
|
||||||
|
? latestCancel!.start_ts > latestBuild!.start_ts
|
||||||
|
: false;
|
||||||
|
|
||||||
if (building) {
|
if (building) {
|
||||||
return (
|
return (
|
||||||
<ConfirmButton
|
<ConfirmButton
|
||||||
@@ -31,7 +49,7 @@ export const RunBuild = ({ id }: { id: string }) => {
|
|||||||
variant="destructive"
|
variant="destructive"
|
||||||
icon={<Ban className="h-4 w-4" />}
|
icon={<Ban className="h-4 w-4" />}
|
||||||
onClick={() => cancel_mutate({ build: id })}
|
onClick={() => cancel_mutate({ build: id })}
|
||||||
disabled={cancelPending}
|
disabled={cancelDisabled}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import { Section } from "@components/layouts";
|
|||||||
import { UpdateDetails, UpdateUser } from "./details";
|
import { UpdateDetails, UpdateUser } from "./details";
|
||||||
import { UpdateStatus } from "@monitor/client/dist/types";
|
import { UpdateStatus } from "@monitor/client/dist/types";
|
||||||
import { fmt_date, fmt_version } from "@lib/formatting";
|
import { fmt_date, fmt_version } from "@lib/formatting";
|
||||||
import { usableResourcePath, version_is_none } from "@lib/utils";
|
import { getUpdateQuery, usableResourcePath, version_is_none } from "@lib/utils";
|
||||||
import { Card } from "@ui/card";
|
import { Card } from "@ui/card";
|
||||||
import { UsableResource } from "@types";
|
import { UsableResource } from "@types";
|
||||||
|
|
||||||
@@ -108,35 +108,3 @@ export const ResourceUpdates = ({ type, id }: Types.ResourceTarget) => {
|
|||||||
</Section>
|
</Section>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const getUpdateQuery = (
|
|
||||||
target: Types.ResourceTarget,
|
|
||||||
deployments: Types.DeploymentListItem[] | undefined
|
|
||||||
) => {
|
|
||||||
const build_id =
|
|
||||||
target.type === "Deployment"
|
|
||||||
? deployments?.find((d) => d.id === target.id)?.info.build_id
|
|
||||||
: undefined;
|
|
||||||
if (build_id) {
|
|
||||||
return {
|
|
||||||
$or: [
|
|
||||||
{
|
|
||||||
"target.type": target.type,
|
|
||||||
"target.id": target.id,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target.type": "Build",
|
|
||||||
"target.id": build_id,
|
|
||||||
operation: {
|
|
||||||
$in: [Types.Operation.RunBuild, Types.Operation.CancelBuild],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
return {
|
|
||||||
"target.type": target.type,
|
|
||||||
"target.id": target.id,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -125,3 +125,35 @@ export const logToHtml = (log: string) => {
|
|||||||
});
|
});
|
||||||
return convert.toHtml(sanitized);
|
return convert.toHtml(sanitized);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const getUpdateQuery = (
|
||||||
|
target: Types.ResourceTarget,
|
||||||
|
deployments: Types.DeploymentListItem[] | undefined
|
||||||
|
) => {
|
||||||
|
const build_id =
|
||||||
|
target.type === "Deployment"
|
||||||
|
? deployments?.find((d) => d.id === target.id)?.info.build_id
|
||||||
|
: undefined;
|
||||||
|
if (build_id) {
|
||||||
|
return {
|
||||||
|
$or: [
|
||||||
|
{
|
||||||
|
"target.type": target.type,
|
||||||
|
"target.id": target.id,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"target.type": "Build",
|
||||||
|
"target.id": build_id,
|
||||||
|
operation: {
|
||||||
|
$in: [Types.Operation.RunBuild, Types.Operation.CancelBuild],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
return {
|
||||||
|
"target.type": target.type,
|
||||||
|
"target.id": target.id,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user