Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion apps/webapp/app/components/BulkActionFilterSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { ArrowPathIcon, CheckIcon, XCircleIcon } from "@heroicons/react/20/solid
import assertNever from "assert-never";
import { AppliedFilter } from "./primitives/AppliedFilter";
import { runStatusTitle } from "./runs/v3/TaskRunStatus";
import { type TaskRunStatus } from "@trigger.dev/database";
import type { TaskRunStatus } from "@trigger.dev/database";

export const BulkActionMode = z.union([z.literal("selected"), z.literal("filter")]);
export type BulkActionMode = z.infer<typeof BulkActionMode>;
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/components/navigation/AccountSideMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LockClosedIcon, ShieldCheckIcon, UserCircleIcon } from "@heroicons/react/20/solid";
import { ArrowLeftIcon } from "@heroicons/react/24/solid";
import { type User } from "@trigger.dev/database";
import type { User } from "@trigger.dev/database";
import { cn } from "~/utils/cn";
import {
accountPath,
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/components/primitives/Avatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
RocketLaunchIcon,
StarIcon,
} from "@heroicons/react/20/solid";
import { type Prisma } from "@trigger.dev/database";
import type { Prisma } from "@trigger.dev/database";
import { z } from "zod";
import { logger } from "~/services/logger.server";
import { cn } from "~/utils/cn";
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/components/runs/v3/BatchStatus.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CheckCircleIcon, XCircleIcon } from "@heroicons/react/20/solid";
import { BatchTaskRunStatus } from "@trigger.dev/database";
import type { BatchTaskRunStatus } from "@trigger.dev/database";
import assertNever from "assert-never";
import { Spinner } from "~/components/primitives/Spinner";
import { cn } from "~/utils/cn";
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/components/runs/v3/BulkAction.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ArrowPathIcon, CheckCircleIcon, NoSymbolIcon } from "@heroicons/react/20/solid";
import { BulkActionStatus, type BulkActionType } from "@trigger.dev/database";
import type { BulkActionStatus, BulkActionType } from "@trigger.dev/database";
import assertNever from "assert-never";
import { Spinner } from "~/components/primitives/Spinner";
import { cn } from "~/utils/cn";
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/components/runs/v3/DeploymentStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
NoSymbolIcon,
XCircleIcon,
} from "@heroicons/react/20/solid";
import { WorkerDeploymentStatus } from "@trigger.dev/database";
import type { WorkerDeploymentStatus } from "@trigger.dev/database";
import assertNever from "assert-never";
import { Spinner } from "~/components/primitives/Spinner";
import { cn } from "~/utils/cn";
Expand Down
1 change: 0 additions & 1 deletion apps/webapp/app/components/runs/v3/ScheduleFilters.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { MagnifyingGlassIcon, XMarkIcon } from "@heroicons/react/20/solid";
import { useNavigate } from "@remix-run/react";
import { type RuntimeEnvironment } from "@trigger.dev/database";
import { useCallback } from "react";
import { z } from "zod";
import { Input } from "~/components/primitives/Input";
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/components/runs/v3/TaskRunStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
TrashIcon,
XCircleIcon,
} from "@heroicons/react/20/solid";
import { type TaskRunStatus } from "@trigger.dev/database";
import type { TaskRunStatus } from "@trigger.dev/database";
import assertNever from "assert-never";
import { HourglassIcon } from "lucide-react";
import { TimedOutIcon } from "~/assets/icons/TimedOutIcon";
Expand Down
2 changes: 1 addition & 1 deletion apps/webapp/app/components/runs/v3/TaskTriggerSource.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ClockIcon } from "@heroicons/react/20/solid";
import { type TaskTriggerSource } from "@trigger.dev/database";
import type { TaskTriggerSource } from "@trigger.dev/database";
import { TaskIconSmall } from "~/assets/icons/TaskIcon";
import { cn } from "~/utils/cn";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Link, useRevalidator, useSubmit } from "@remix-run/react";
import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
import { DiscordIcon } from "@trigger.dev/companyicons";
import { formatDurationMilliseconds } from "@trigger.dev/core/v3";
import { type TaskRunStatus } from "@trigger.dev/database";
import type { TaskRunStatus } from "@trigger.dev/database";
import { Fragment, Suspense, useEffect, useState } from "react";
import { Bar, BarChart, ResponsiveContainer, Tooltip, type TooltipProps } from "recharts";
import { TypedAwait, typeddefer, useTypedLoaderData } from "remix-typedjson";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import { Form, type MetaFunction, Outlet, useActionData, useNavigation } from "@remix-run/react";
import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
import { SlackIcon } from "@trigger.dev/companyicons";
import { type ProjectAlertChannelType, type ProjectAlertType } from "@trigger.dev/database";
import type { ProjectAlertChannelType, ProjectAlertType } from "@trigger.dev/database";
import assertNever from "assert-never";
import { typedjson, useTypedLoaderData } from "remix-typedjson";
import { z } from "zod";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ArrowPathIcon } from "@heroicons/react/20/solid";
import { Form, useRevalidator } from "@remix-run/react";
import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
import { tryCatch } from "@trigger.dev/core";
import { BulkActionStatus, BulkActionType } from "@trigger.dev/database";
import type { BulkActionType } from "@trigger.dev/database";
import { motion } from "framer-motion";
import { useEffect } from "react";
import { typedjson, useTypedLoaderData } from "remix-typedjson";
Expand Down Expand Up @@ -135,7 +135,7 @@ export default function Page() {
const project = useProject();
const environment = useEnvironment();

const disabled = bulkAction.status !== BulkActionStatus.PENDING;
const disabled = bulkAction.status !== "PENDING";

const streamedEvents = useEventSource(
`/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.id}/runs/bulkaction/${bulkAction.friendlyId}/stream`,
Expand Down Expand Up @@ -239,7 +239,7 @@ export default function Page() {
<BulkActionFilterSummary
selected={bulkAction.totalCount}
mode={bulkAction.mode}
action={bulkAction.type === BulkActionType.REPLAY ? "replay" : "cancel"}
action={bulkAction.type === "REPLAY" ? "replay" : "cancel"}
filters={bulkAction.filters}
final={true}
/>
Expand Down Expand Up @@ -327,7 +327,7 @@ function Meter({ type, successCount, failureCount, totalCount }: MeterProps) {
<div className="h-2 w-2 rounded-[1px] bg-charcoal-550" />
<Paragraph variant="extra-small">
{formatNumber(failureCount)} {typeText(type)} failed{" "}
{type === BulkActionType.CANCEL ? " (already finished)" : ""}
{type === "CANCEL" ? " (already finished)" : ""}
</Paragraph>
</div>
</div>
Expand All @@ -337,9 +337,9 @@ function Meter({ type, successCount, failureCount, totalCount }: MeterProps) {

function typeText(type: BulkActionType) {
switch (type) {
case BulkActionType.CANCEL:
case "CANCEL":
return "canceled";
case BulkActionType.REPLAY:
case "REPLAY":
return "replayed";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
type MetaFunction,
} from "@remix-run/react";
import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
import { type RuntimeEnvironmentType } from "@trigger.dev/database";
import type { RuntimeEnvironmentType } from "@trigger.dev/database";
import { useEffect, useState } from "react";
import { typedjson, useTypedLoaderData } from "remix-typedjson";
import { z } from "zod";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
nanosecondsToMilliseconds,
tryCatch,
} from "@trigger.dev/core/v3";
import { type RuntimeEnvironmentType } from "@trigger.dev/database";
import type { RuntimeEnvironmentType } from "@trigger.dev/database";
import { motion } from "framer-motion";
import { useCallback, useEffect, useRef, useState } from "react";
import { useHotkeys } from "react-hotkeys-hook";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { BulkActionStatus } from "@trigger.dev/database";
import { z } from "zod";
import { $replica } from "~/db.server";
import { env } from "~/env.server";
import { devPresence } from "~/presenters/v3/DevPresence.server";
import { logger } from "~/services/logger.server";
import { requireUserId } from "~/services/session.server";
import { EnvironmentParamSchema, ProjectParamSchema } from "~/utils/pathBuilder";
import { EnvironmentParamSchema } from "~/utils/pathBuilder";
import { createSSELoader, type SendFunction } from "~/utils/sse";

const Params = EnvironmentParamSchema.extend({
Expand Down Expand Up @@ -82,7 +80,7 @@ export const loader = createSSELoader({

send({ event: "time", data: new Date().toISOString() });

if (bulkAction?.status !== BulkActionStatus.PENDING) {
if (bulkAction?.status !== "PENDING") {
return false;
}

Expand All @@ -91,7 +89,7 @@ export const loader = createSSELoader({
iterator: async ({ send, date }) => {
const bulkAction = await getBulkActionProgress(send);

if (bulkAction?.status !== BulkActionStatus.PENDING) {
if (bulkAction?.status !== "PENDING") {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { parse } from "@conform-to/zod";
import { ArrowPathIcon, CheckIcon, InformationCircleIcon } from "@heroicons/react/20/solid";
import { ArrowPathIcon, InformationCircleIcon } from "@heroicons/react/20/solid";
import { XCircleIcon } from "@heroicons/react/24/outline";
import { Form } from "@remix-run/react";
import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/router";
import { tryCatch } from "@trigger.dev/core";
import { type TaskRunStatus } from "@trigger.dev/database";
import assertNever from "assert-never";
import { useEffect, useState } from "react";
import { typedjson, useTypedFetcher } from "remix-typedjson";
import simplur from "simplur";
Expand All @@ -25,7 +23,6 @@ import {
AccordionItem,
AccordionTrigger,
} from "~/components/primitives/Accordion";
import { AppliedFilter } from "~/components/primitives/AppliedFilter";
import { Button, LinkButton } from "~/components/primitives/Buttons";
import { CheckboxWithLabel } from "~/components/primitives/Checkbox";
import {
Expand All @@ -43,19 +40,7 @@ import { InputGroup } from "~/components/primitives/InputGroup";
import { Label } from "~/components/primitives/Label";
import { Paragraph } from "~/components/primitives/Paragraph";
import { RadioGroup, RadioGroupItem } from "~/components/primitives/RadioButton";
import { SpinnerWhite } from "~/components/primitives/Spinner";
import {
filterIcon,
filterTitle,
type TaskRunListSearchFilterKey,
type TaskRunListSearchFilters,
} from "~/components/runs/v3/RunFilters";
import {
appliedSummary,
dateFromString,
timeFilterRenderValues,
} from "~/components/runs/v3/SharedFilters";
import { runStatusTitle } from "~/components/runs/v3/TaskRunStatus";
import { type TaskRunListSearchFilters } from "~/components/runs/v3/RunFilters";
import { useEnvironment } from "~/hooks/useEnvironment";
import { useOptimisticLocation } from "~/hooks/useOptimisticLocation";
import { useOrganization } from "~/hooks/useOrganizations";
Expand All @@ -69,7 +54,6 @@ import { CreateBulkActionPresenter } from "~/presenters/v3/CreateBulkActionPrese
import { logger } from "~/services/logger.server";
import { requireUserId } from "~/services/session.server";
import { cn } from "~/utils/cn";
import { formatNumber } from "~/utils/numberFormatter";
import { EnvironmentParamSchema, v3BulkActionPath, v3RunsPath } from "~/utils/pathBuilder";
import { BulkActionService } from "~/v3/services/bulk/BulkActionV2.server";

Expand Down
Loading