mirror of
https://github.com/fosrl/pangolin.git
synced 2026-05-23 01:05:27 +00:00
Fix the linking out and deleting for target ones
This commit is contained in:
@@ -17,7 +17,7 @@ import HttpCode from "@server/types/HttpCode";
|
|||||||
import createHttpError from "http-errors";
|
import createHttpError from "http-errors";
|
||||||
import logger from "@server/logger";
|
import logger from "@server/logger";
|
||||||
import { OpenAPITags, registry } from "@server/openApi";
|
import { OpenAPITags, registry } from "@server/openApi";
|
||||||
import { and, eq, like, sql } from "drizzle-orm";
|
import { and, eq, isNotNull, like, sql } from "drizzle-orm";
|
||||||
import { NextFunction, Request, Response } from "express";
|
import { NextFunction, Request, Response } from "express";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { fromError } from "zod-validation-error";
|
import { fromError } from "zod-validation-error";
|
||||||
@@ -85,6 +85,7 @@ export async function listHealthChecks(
|
|||||||
|
|
||||||
const whereClause = and(
|
const whereClause = and(
|
||||||
eq(targetHealthCheck.orgId, orgId),
|
eq(targetHealthCheck.orgId, orgId),
|
||||||
|
isNotNull(targetHealthCheck.hcMode), // filter out the null ones attached to targets
|
||||||
query
|
query
|
||||||
? like(
|
? like(
|
||||||
sql`LOWER(${targetHealthCheck.name})`,
|
sql`LOWER(${targetHealthCheck.name})`,
|
||||||
|
|||||||
@@ -329,7 +329,7 @@ export default function HealthChecksTable({
|
|||||||
</DropdownMenuTrigger>
|
</DropdownMenuTrigger>
|
||||||
<DropdownMenuContent align="end">
|
<DropdownMenuContent align="end">
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
disabled={!isPaid}
|
disabled={!isPaid || !!r.resourceId}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setSelected(r);
|
setSelected(r);
|
||||||
setDeleteOpen(true);
|
setDeleteOpen(true);
|
||||||
@@ -339,8 +339,19 @@ export default function HealthChecksTable({
|
|||||||
{t("delete")}
|
{t("delete")}
|
||||||
</span>
|
</span>
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
|
|
||||||
</DropdownMenuContent>
|
</DropdownMenuContent>
|
||||||
</DropdownMenu>
|
</DropdownMenu>
|
||||||
|
{r.resourceId && r.resourceName && r.resourceNiceId ? (
|
||||||
|
<Link href={`/${orgId}/settings/resources/proxy/${r.resourceNiceId}`}>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
disabled={!isPaid}
|
||||||
|
>
|
||||||
|
{t("edit")}
|
||||||
|
</Button>
|
||||||
|
</Link>
|
||||||
|
) : (
|
||||||
<Button
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
disabled={!isPaid}
|
disabled={!isPaid}
|
||||||
@@ -351,6 +362,8 @@ export default function HealthChecksTable({
|
|||||||
>
|
>
|
||||||
{t("edit")}
|
{t("edit")}
|
||||||
</Button>
|
</Button>
|
||||||
|
)}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user