diff --git a/apps/webapp/app/components/BlankStatePanels.tsx b/apps/webapp/app/components/BlankStatePanels.tsx
index 6c0dca843a..c730c797c1 100644
--- a/apps/webapp/app/components/BlankStatePanels.tsx
+++ b/apps/webapp/app/components/BlankStatePanels.tsx
@@ -10,7 +10,11 @@ import {
ServerStackIcon,
Squares2X2Icon,
} from "@heroicons/react/20/solid";
+import { useLocation } from "react-use";
import { TaskIcon } from "~/assets/icons/TaskIcon";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
import { type MinimumEnvironment } from "~/presenters/SelectBestEnvironmentPresenter.server";
import {
docsPath,
@@ -22,20 +26,15 @@ import {
import { InlineCode } from "./code/InlineCode";
import { environmentFullTitle } from "./environments/EnvironmentLabel";
import { Feedback } from "./Feedback";
+import { EnvironmentSelector } from "./navigation/EnvironmentSelector";
import { Button, LinkButton } from "./primitives/Buttons";
import { Header1 } from "./primitives/Headers";
import { InfoPanel } from "./primitives/InfoPanel";
import { Paragraph } from "./primitives/Paragraph";
import { StepNumber } from "./primitives/StepNumber";
+import { TextLink } from "./primitives/TextLink";
import { InitCommandV3, PackageManagerProvider, TriggerDevStepV3 } from "./SetupCommands";
import { StepContentContainer } from "./StepContentContainer";
-import { useLocation } from "react-use";
-import { useEnvironment } from "~/hooks/useEnvironment";
-import { useOrganization } from "~/hooks/useOrganizations";
-import { useProject } from "~/hooks/useProject";
-import { TextLink } from "./primitives/TextLink";
-import { EnvironmentSelector } from "./navigation/EnvironmentSelector";
-import { Pi } from "lucide-react";
export function HasNoTasksDev() {
return (
@@ -79,20 +78,24 @@ export function HasNoTasksDev() {
export function HasNoTasksDeployed({ environment }: { environment: MinimumEnvironment }) {
return (
+ How to deploy tasks
+
+ }
>
- You don't have any deployed tasks in {environmentFullTitle(environment)}.
+ Run the CLI deploy command to
+ deploy your tasks to the {environmentFullTitle(environment)} environment.
-
- How to deploy tasks
-
);
}
@@ -104,18 +107,20 @@ export function SchedulesNoPossibleTaskPanel() {
icon={ClockIcon}
iconClassName="text-sun-500"
panelClassName="max-w-full"
+ accessory={
+
+ How to schedule tasks
+
+ }
>
You have no scheduled tasks in your project. Before you can schedule a task you need to
create a schedules.task.
-
- View the docs
-
);
}
@@ -140,15 +145,16 @@ export function SchedulesNoneAttached() {
Use the dashboard
@@ -166,14 +172,16 @@ export function BatchesNone() {
icon={Squares2X2Icon}
iconClassName="text-blue-500"
panelClassName="max-w-full"
+ accessory={
+
+ How to trigger batches
+
+ }
>
You have no batches in this environment. You can trigger batches from your backend or from
inside other tasks.
-
- How to trigger batches
-
);
}
@@ -182,23 +190,27 @@ export function TestHasNoTasks() {
const organization = useOrganization();
const project = useProject();
const environment = useEnvironment();
-
return (
+ Create a task
+
+ }
>
- You have no tasks in this environment.
+ Before testing a task, you must first create one. Follow the instructions on the{" "}
+ Tasks page{" "}
+ to create a task, then return here to test it.
-
- Add tasks
-
);
}
@@ -346,7 +358,15 @@ export function AlertsNoneDeployed() {
and webhooks.
-
+
+
+ Alerts docs
+
New alert
-
- Alert docs
-
@@ -376,20 +388,26 @@ export function QueuesHasNoTasks() {
return (
+ Create a task
+
+ }
>
- This means you haven't got any tasks yet in this environment.
+ Queues will appear here when you have created a task in this environment. Follow the
+ instructions on the{" "}
+ Tasks page{" "}
+ to create a task, then return here to see its queue.
-
- Add tasks
-
);
}
diff --git a/apps/webapp/app/components/navigation/SideMenu.tsx b/apps/webapp/app/components/navigation/SideMenu.tsx
index 0412b9a3ae..20c95b7e4e 100644
--- a/apps/webapp/app/components/navigation/SideMenu.tsx
+++ b/apps/webapp/app/components/navigation/SideMenu.tsx
@@ -3,7 +3,6 @@ import {
ArrowRightOnRectangleIcon,
BeakerIcon,
BellAlertIcon,
- BookOpenIcon,
ChartBarIcon,
ChevronRightIcon,
ClockIcon,
@@ -59,16 +58,11 @@ import {
import connectedImage from "../../assets/images/cli-connected.png";
import disconnectedImage from "../../assets/images/cli-disconnected.png";
import { FreePlanUsage } from "../billing/FreePlanUsage";
+import { InlineCode } from "../code/InlineCode";
import { useDevPresence } from "../DevPresence";
import { ImpersonationBanner } from "../ImpersonationBanner";
import { Button, ButtonContent, LinkButton } from "../primitives/Buttons";
-import {
- Dialog,
- DialogContent,
- DialogFooter,
- DialogHeader,
- DialogTrigger,
-} from "../primitives/Dialog";
+import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "../primitives/Dialog";
import { Paragraph } from "../primitives/Paragraph";
import {
Popover,
@@ -86,7 +80,6 @@ import { HelpAndFeedback } from "./HelpAndFeedbackPopover";
import { SideMenuHeader } from "./SideMenuHeader";
import { SideMenuItem } from "./SideMenuItem";
import { SideMenuSection } from "./SideMenuSection";
-import { InlineCode } from "../code/InlineCode";
type SideMenuUser = Pick & { isImpersonating: boolean };
export type SideMenuProject = Pick<
@@ -280,7 +273,7 @@ function ProjectSelector({
let plan: string | undefined = undefined;
if (currentPlan?.v3Subscription?.isPaying === false) {
- plan = "Free plan";
+ plan = "Free";
} else if (currentPlan?.v3Subscription?.isPaying === true) {
plan = currentPlan.v3Subscription.plan?.title;
}
@@ -326,7 +319,7 @@ function ProjectSelector({
className="text-xs"
to={v3BillingPath(organization)}
>
- {plan}
+ {plan} plan
)}
setMenuOpen(open)} open={isMenuOpen}>