Don't show (or count) archived branches/projects against allocated concurrency (#2698)

Archived preview branches were being counted. Also archived projects.

Author: matt-aitken

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

@@ -63,9 +63,15 @@ export class ManageConcurrencyPresenter extends BasePresenter {
             userId: true,
           },
         },
+        project: {
+          select: {
+            deletedAt: true,
+          },
+        },
       },
       where: {
         organizationId,
+        archivedAt: null,
       },
     });
 
@@ -78,6 +84,9 @@ export class ManageConcurrencyPresenter extends BasePresenter {
       // Don't count parent environments
       if (environment.isBranchableEnvironment) continue;
 
+      // Don't count deleted projects
+      if (environment.project.deletedAt) continue;
+
       const limit = currentPlan
         ? getDefaultEnvironmentLimitFromPlan(environment.type, currentPlan)
         : 0;