df78ef96d9
Closes this feature request: [https://triggerdev.featurebase.app/p/isolated-dev-sessions-for-multiple-local-trigger-dev-instances](https://triggerdev.featurebase.app/p/isolated-dev-sessions-for-multiple-local-trigger-dev-instances) ### Feature notes: - CLI `trigger dev` works as before - `trigger dev --branch my-branch` to create a new branch and run against it. - `trigger dev archive --branch my-branch` to archive (or in webapp). - New webapp page to manage and archive dev branches, currently feature flagged. ### Implementation details: - No changes to data model, no backfill. `isBranchableEnvironment` column is ignored for dev branches, we use `parentEnvironmentId IS NULL` instead. - `x-trigger-branch` overloaded for preview and dev branches - New `TRIGGER_DEV_BRANCH` env var available locally. `TRIGGER_PREVIEW_BRANCH` overloaded for child runs. - Lots of new glue code to sanitise the branch checks. ### Rollout - Deploy webapp/API changes (all backwards compatible) - Manual tests on some orgs - Deploy docs, release CLI, flip feature flag for webapp feature ### NB - `api.v1.projects.$projectRef.environments.ts` will return `isBranchableEnvironment: true` for all dev environments. ### Prerequisites - [x] Typecheck will not pass until we make a new release of `@trigger.dev/platform` and bump it here
88 lines
2.4 KiB
TypeScript
88 lines
2.4 KiB
TypeScript
import { type RuntimeEnvironmentType } from "@trigger.dev/database";
|
|
|
|
const environmentSortOrder: RuntimeEnvironmentType[] = [
|
|
"DEVELOPMENT",
|
|
"STAGING",
|
|
"PREVIEW",
|
|
"PRODUCTION",
|
|
];
|
|
|
|
type SortType = {
|
|
type: RuntimeEnvironmentType;
|
|
userName?: string | null;
|
|
lastActivity?: Date | undefined;
|
|
updatedAt?: Date | undefined;
|
|
};
|
|
|
|
export function sortEnvironments<T extends SortType>(
|
|
environments: T[],
|
|
sortOrder?: RuntimeEnvironmentType[]
|
|
): T[] {
|
|
const order = sortOrder ?? environmentSortOrder;
|
|
return environments.sort((a, b) => {
|
|
const aIndex = order.indexOf(a.type);
|
|
const bIndex = order.indexOf(b.type);
|
|
|
|
const difference = aIndex - bIndex;
|
|
|
|
if (difference === 0) {
|
|
if (a.type === "DEVELOPMENT" && b.type === "DEVELOPMENT") {
|
|
// Within the same env type, order by recency: most-recent dev activity
|
|
// first, falling back to updatedAt when there's no recorded activity,
|
|
// then to username when we have no timestamps at all.
|
|
const aTime = (a.lastActivity ?? a.updatedAt)?.getTime();
|
|
const bTime = (b.lastActivity ?? b.updatedAt)?.getTime();
|
|
|
|
if (aTime !== undefined && bTime !== undefined) {
|
|
return bTime - aTime;
|
|
}
|
|
if (aTime !== undefined) return -1;
|
|
if (bTime !== undefined) return 1;
|
|
}
|
|
|
|
const usernameA = a.userName || "";
|
|
const usernameB = b.userName || "";
|
|
return usernameA.localeCompare(usernameB);
|
|
}
|
|
|
|
return difference;
|
|
});
|
|
}
|
|
|
|
type FilterableEnvironment =
|
|
| {
|
|
type: RuntimeEnvironmentType;
|
|
orgMemberId?: string;
|
|
}
|
|
| {
|
|
type: RuntimeEnvironmentType;
|
|
//intentionally vague so we can match anything
|
|
orgMember?: Record<string, any>;
|
|
};
|
|
|
|
export function filterOrphanedEnvironments<T extends FilterableEnvironment>(
|
|
environments: T[]
|
|
): T[] {
|
|
return environments.filter((environment) => {
|
|
if (environment.type !== "DEVELOPMENT") return true;
|
|
|
|
if ("orgMemberId" in environment) {
|
|
return !!environment.orgMemberId;
|
|
}
|
|
|
|
if ("orgMember" in environment) {
|
|
return !!environment.orgMember;
|
|
}
|
|
|
|
return false;
|
|
});
|
|
}
|
|
|
|
export function onlyDevEnvironments<T extends FilterableEnvironment>(environments: T[]): T[] {
|
|
return environments.filter((e) => e.type === "DEVELOPMENT");
|
|
}
|
|
|
|
export function exceptDevEnvironments<T extends FilterableEnvironment>(environments: T[]): T[] {
|
|
return environments.filter((e) => e.type !== "DEVELOPMENT");
|
|
}
|