Fix schedule limit counting (#2899)

Fix schedule counting
- Inactive TaskSchedule not counted
- Inactive environments (archived preview branches) not counted

Clarified per-project limits descriptions.

Author: matt-aitken

apps/webapp/app/presenters/v3/LimitsPresenter.server.ts

@@ -205,7 +205,7 @@ export class LimitsPresenter extends BasePresenter {
           schedulesLimit !== null
             ? {
                 name: "Schedules",
-                description: "Maximum number of schedules across all projects",
+                description: "Maximum number of schedules per project",
                 limit: schedulesLimit,
                 currentUsage: scheduleCount,
                 source: "plan",
@@ -229,7 +229,7 @@ export class LimitsPresenter extends BasePresenter {
           alertsLimit !== null
             ? {
                 name: "Alert channels",
-                description: "Maximum number of alert channels across all projects",
+                description: "Maximum number of alert channels per project",
                 limit: alertsLimit,
                 currentUsage: alertChannelCount,
                 source: "plan",
@@ -241,7 +241,7 @@ export class LimitsPresenter extends BasePresenter {
           branchesLimit !== null
             ? {
                 name: "Preview branches",
-                description: "Maximum number of active preview branches",
+                description: "Maximum number of active preview branches per project",
                 limit: branchesLimit,
                 currentUsage: activeBranchCount,
                 source: "plan",
@@ -297,8 +297,8 @@ export class LimitsPresenter extends BasePresenter {
       },
       features: {
         hasStagingEnvironment: {
-          name: "Staging environment",
-          description: "Access to staging environment for testing before production",
+          name: "Staging/Preview environments",
+          description: "Access to staging/preview environments for testing before production",
           enabled: hasStagingEnvironment,
         },
         support: {

apps/webapp/app/v3/services/checkSchedule.server.ts

@@ -113,12 +113,16 @@ export class CheckScheduleService extends BaseService {
     return await prisma.taskScheduleInstance.count({
       where: {
         projectId,
+        active: true,
         environment: {
           type: {
             not: "DEVELOPMENT",
           },
+          archivedAt: null,
+        },
+        taskSchedule: {
+          active: true,
         },
-        active: true,
       },
     });
   }