@@ -389,7 +420,11 @@ export function UpdatedAtCell({
}, [dateValue])
return (
-
+
{datePart}{' '}
{timePart}{' '}
UTC
diff --git a/src/features/dashboard/templates/list/table-config.tsx b/src/features/dashboard/templates/list/table-config.tsx
index 23a3771c8..a6fa820f0 100644
--- a/src/features/dashboard/templates/list/table-config.tsx
+++ b/src/features/dashboard/templates/list/table-config.tsx
@@ -69,7 +69,7 @@ export const useColumns = (deps: unknown[]) => {
() => [
{
accessorKey: 'name',
- accessorFn: (row) => row.aliases?.[0],
+ accessorFn: (row) => row.names.join(', '),
header: 'Name',
size: 180,
minSize: 140,
diff --git a/src/server/api/routers/templates.ts b/src/server/api/routers/templates.ts
index 9e785f9fd..1705b67b6 100644
--- a/src/server/api/routers/templates.ts
+++ b/src/server/api/routers/templates.ts
@@ -264,7 +264,7 @@ async function getDefaultTemplatesCached() {
const { data: aliases, error: aliasesError } = await supabaseAdmin
.from('env_aliases')
- .select('alias')
+ .select('alias, namespace')
.eq('env_id', env.id)
if (aliasesError) {
@@ -299,6 +299,12 @@ async function getDefaultTemplatesCached() {
envdVersion: latestBuild.envd_version,
public: env.public,
aliases: aliases.map((a) => a.alias),
+ names: aliases.map((a) => {
+ if (a.namespace && a.namespace.length > 0) {
+ return `${a.namespace}/${a.alias}`
+ }
+ return a.alias
+ }),
createdAt: env.created_at,
updatedAt: env.updated_at,
createdBy: null,
diff --git a/src/types/api.types.ts b/src/types/api.types.ts
index 9bf5cc44a..f13dddeb5 100644
--- a/src/types/api.types.ts
+++ b/src/types/api.types.ts
@@ -20,6 +20,7 @@ type Template = Pick<
| 'diskSizeMB'
| 'public'
| 'aliases'
+ | 'names'
| 'createdAt'
| 'updatedAt'
| 'createdBy'
diff --git a/src/types/database.types.ts b/src/types/database.types.ts
index fa2c34974..b0e743b42 100644
--- a/src/types/database.types.ts
+++ b/src/types/database.types.ts
@@ -177,17 +177,23 @@ export type Database = {
Row: {
alias: string
env_id: string
+ id: string
is_renamable: boolean
+ namespace: string | null
}
Insert: {
alias: string
env_id: string
+ id?: string
is_renamable?: boolean
+ namespace?: string | null
}
Update: {
alias?: string
env_id?: string
+ id?: string
is_renamable?: boolean
+ namespace?: string | null
}
Relationships: [
{
@@ -199,9 +205,56 @@ export type Database = {
},
]
}
+ env_build_assignments: {
+ Row: {
+ build_id: string
+ created_at: string | null
+ env_id: string
+ id: string
+ source: string
+ tag: string
+ }
+ Insert: {
+ build_id: string
+ created_at?: string | null
+ env_id: string
+ id?: string
+ source?: string
+ tag: string
+ }
+ Update: {
+ build_id?: string
+ created_at?: string | null
+ env_id?: string
+ id?: string
+ source?: string
+ tag?: string
+ }
+ Relationships: [
+ {
+ foreignKeyName: "fk_env_build_assignments_build"
+ columns: ["build_id"]
+ isOneToOne: false
+ referencedRelation: "env_builds"
+ referencedColumns: ["id"]
+ },
+ {
+ foreignKeyName: "fk_env_build_assignments_env"
+ columns: ["env_id"]
+ isOneToOne: false
+ referencedRelation: "envs"
+ referencedColumns: ["id"]
+ },
+ ]
+ }
env_builds: {
Row: {
- cluster_node_id: string
+ cluster_node_id: string | null
+ cpu_architecture: string | null
+ cpu_family: string | null
+ cpu_flags: string[] | null
+ cpu_model: string | null
+ cpu_model_name: string | null
created_at: string
dockerfile: string | null
env_id: string
@@ -222,7 +275,12 @@ export type Database = {
version: string | null
}
Insert: {
- cluster_node_id: string
+ cluster_node_id?: string | null
+ cpu_architecture?: string | null
+ cpu_family?: string | null
+ cpu_flags?: string[] | null
+ cpu_model?: string | null
+ cpu_model_name?: string | null
created_at?: string
dockerfile?: string | null
env_id: string
@@ -243,7 +301,12 @@ export type Database = {
version?: string | null
}
Update: {
- cluster_node_id?: string
+ cluster_node_id?: string | null
+ cpu_architecture?: string | null
+ cpu_family?: string | null
+ cpu_flags?: string[] | null
+ cpu_model?: string | null
+ cpu_model_name?: string | null
created_at?: string
dockerfile?: string | null
env_id?: string
@@ -401,6 +464,7 @@ export type Database = {
allow_internet_access: boolean | null
auto_pause: boolean
base_env_id: string
+ config: Json | null
created_at: string | null
env_id: string
env_secure: boolean
@@ -415,6 +479,7 @@ export type Database = {
allow_internet_access?: boolean | null
auto_pause?: boolean
base_env_id: string
+ config?: Json | null
created_at?: string | null
env_id: string
env_secure?: boolean
@@ -429,6 +494,7 @@ export type Database = {
allow_internet_access?: boolean | null
auto_pause?: boolean
base_env_id?: string
+ config?: Json | null
created_at?: string | null
env_id?: string
env_secure?: boolean
@@ -630,6 +696,38 @@ export type Database = {
}
Relationships: []
}
+ users: {
+ Row: {
+ created_at: string
+ email: string
+ id: string
+ normalized_email: string | null
+ updated_at: string
+ }
+ Insert: {
+ created_at?: string
+ email: string
+ id: string
+ normalized_email?: string | null
+ updated_at?: string
+ }
+ Update: {
+ created_at?: string
+ email?: string
+ id?: string
+ normalized_email?: string | null
+ updated_at?: string
+ }
+ Relationships: [
+ {
+ foreignKeyName: "users_id_fkey"
+ columns: ["id"]
+ isOneToOne: true
+ referencedRelation: "auth_users"
+ referencedColumns: ["id"]
+ },
+ ]
+ }
users_teams: {
Row: {
added_by: string | null
@@ -734,7 +832,9 @@ export type Database = {
Args: { _team_id: string; _user_id: string }
Returns: boolean
}
+ normalize_email: { Args: { email: string }; Returns: string }
temp_create_access_token: { Args: never; Returns: string }
+ try_cast_uuid: { Args: { p_value: string }; Returns: string }
unaccent: { Args: { "": string }; Returns: string }
}
Enums: {
diff --git a/src/types/infra-api.types.ts b/src/types/infra-api.types.ts
index c86ee374f..1c4537e3a 100644
--- a/src/types/infra-api.types.ts
+++ b/src/types/infra-api.types.ts
@@ -1021,7 +1021,10 @@ export interface paths {
};
options?: never;
head?: never;
- /** @description Update template */
+ /**
+ * @deprecated
+ * @description Update template
+ */
patch: {
parameters: {
query?: never;
@@ -1136,6 +1139,51 @@ export interface paths {
patch?: never;
trace?: never;
};
+ "/v2/templates/{templateID}": {
+ parameters: {
+ query?: never;
+ header?: never;
+ path?: never;
+ cookie?: never;
+ };
+ get?: never;
+ put?: never;
+ post?: never;
+ delete?: never;
+ options?: never;
+ head?: never;
+ /** @description Update template */
+ patch: {
+ parameters: {
+ query?: never;
+ header?: never;
+ path: {
+ templateID: components["parameters"]["templateID"];
+ };
+ cookie?: never;
+ };
+ requestBody: {
+ content: {
+ "application/json": components["schemas"]["TemplateUpdateRequest"];
+ };
+ };
+ responses: {
+ /** @description The template was updated successfully */
+ 200: {
+ headers: {
+ [name: string]: unknown;
+ };
+ content: {
+ "application/json": components["schemas"]["TemplateUpdateResponse"];
+ };
+ };
+ 400: components["responses"]["400"];
+ 401: components["responses"]["401"];
+ 500: components["responses"]["500"];
+ };
+ };
+ trace?: never;
+ };
"/templates/{templateID}/builds/{buildID}/status": {
parameters: {
query?: never;
@@ -1235,6 +1283,118 @@ export interface paths {
patch?: never;
trace?: never;
};
+ "/templates/tags": {
+ parameters: {
+ query?: never;
+ header?: never;
+ path?: never;
+ cookie?: never;
+ };
+ get?: never;
+ put?: never;
+ /** @description Assign tag(s) to a template build */
+ post: {
+ parameters: {
+ query?: never;
+ header?: never;
+ path?: never;
+ cookie?: never;
+ };
+ requestBody: {
+ content: {
+ "application/json": components["schemas"]["AssignTemplateTagsRequest"];
+ };
+ };
+ responses: {
+ /** @description Tag assigned successfully */
+ 201: {
+ headers: {
+ [name: string]: unknown;
+ };
+ content: {
+ "application/json": components["schemas"]["AssignedTemplateTags"];
+ };
+ };
+ 400: components["responses"]["400"];
+ 401: components["responses"]["401"];
+ 404: components["responses"]["404"];
+ 500: components["responses"]["500"];
+ };
+ };
+ /** @description Delete multiple tags from templates */
+ delete: {
+ parameters: {
+ query?: never;
+ header?: never;
+ path?: never;
+ cookie?: never;
+ };
+ requestBody: {
+ content: {
+ "application/json": components["schemas"]["DeleteTemplateTagsRequest"];
+ };
+ };
+ responses: {
+ /** @description Tags deleted successfully */
+ 204: {
+ headers: {
+ [name: string]: unknown;
+ };
+ content?: never;
+ };
+ 400: components["responses"]["400"];
+ 401: components["responses"]["401"];
+ 404: components["responses"]["404"];
+ 500: components["responses"]["500"];
+ };
+ };
+ options?: never;
+ head?: never;
+ patch?: never;
+ trace?: never;
+ };
+ "/templates/aliases/{alias}": {
+ parameters: {
+ query?: never;
+ header?: never;
+ path?: never;
+ cookie?: never;
+ };
+ /** @description Check if template with given alias exists */
+ get: {
+ parameters: {
+ query?: never;
+ header?: never;
+ path: {
+ alias: string;
+ };
+ cookie?: never;
+ };
+ requestBody?: never;
+ responses: {
+ /** @description Successfully queried template by alias */
+ 200: {
+ headers: {
+ [name: string]: unknown;
+ };
+ content: {
+ "application/json": components["schemas"]["TemplateAliasResponse"];
+ };
+ };
+ 400: components["responses"]["400"];
+ 403: components["responses"]["403"];
+ 404: components["responses"]["404"];
+ 500: components["responses"]["500"];
+ };
+ };
+ put?: never;
+ post?: never;
+ delete?: never;
+ options?: never;
+ head?: never;
+ patch?: never;
+ trace?: never;
+ };
"/nodes": {
parameters: {
query?: never;
@@ -1627,6 +1787,10 @@ export interface components {
/** @description Whether the template is public or only accessible by the team */
public?: boolean;
};
+ TemplateUpdateResponse: {
+ /** @description Names of the template (namespace/alias format when namespaced) */
+ names: string[];
+ };
/**
* Format: int32
* @description CPU cores for the sandbox
@@ -1931,8 +2095,13 @@ export interface components {
diskSizeMB: components["schemas"]["DiskSizeMB"];
/** @description Whether the template is public or only accessible by the team */
public: boolean;
- /** @description Aliases of the template */
+ /**
+ * @deprecated
+ * @description Aliases of the template
+ */
aliases: string[];
+ /** @description Names of the template (namespace/alias format when namespaced) */
+ names: string[];
/**
* Format: date-time
* @description Time when the template was created
@@ -1969,7 +2138,14 @@ export interface components {
buildID: string;
/** @description Whether the template is public or only accessible by the team */
public: boolean;
- /** @description Aliases of the template */
+ /** @description Names of the template */
+ names: string[];
+ /** @description Tags assigned to the template build */
+ tags: string[];
+ /**
+ * @deprecated
+ * @description Aliases of the template
+ */
aliases: string[];
};
TemplateLegacy: {
@@ -2044,8 +2220,13 @@ export interface components {
templateID: string;
/** @description Whether the template is public or only accessible by the team */
public: boolean;
- /** @description Aliases of the template */
+ /**
+ * @deprecated
+ * @description Aliases of the template
+ */
aliases: string[];
+ /** @description Names of the template (namespace/alias format when namespaced) */
+ names: string[];
/**
* Format: date-time
* @description Time when the template was created
@@ -2069,6 +2250,12 @@ export interface components {
/** @description List of builds for the template */
builds: components["schemas"]["TemplateBuild"][];
};
+ TemplateAliasResponse: {
+ /** @description Identifier of the template */
+ templateID: string;
+ /** @description Whether the template is public or only accessible by the team */
+ public: boolean;
+ };
TemplateBuildRequest: {
/** @description Alias of the template */
alias?: string;
@@ -2101,9 +2288,19 @@ export interface components {
force: boolean;
};
TemplateBuildRequestV3: {
- /** @description Alias of the template */
- alias: string;
- /** @description Identifier of the team */
+ /** @description Name of the template. Can include a tag with colon separator (e.g. "my-template" or "my-template:v1"). If tag is included, it will be treated as if the tag was provided in the tags array. */
+ name?: string;
+ /** @description Tags to assign to the template build */
+ tags?: string[];
+ /**
+ * @deprecated
+ * @description Alias of the template. Deprecated, use name instead.
+ */
+ alias?: string;
+ /**
+ * @deprecated
+ * @description Identifier of the team
+ */
teamID?: string;
cpuCount?: components["schemas"]["CPUCount"];
memoryMB?: components["schemas"]["MemoryMB"];
@@ -2111,7 +2308,10 @@ export interface components {
TemplateBuildRequestV2: {
/** @description Alias of the template */
alias: string;
- /** @description Identifier of the team */
+ /**
+ * @deprecated
+ * @description Identifier of the team
+ */
teamID?: string;
cpuCount?: components["schemas"]["CPUCount"];
memoryMB?: components["schemas"]["MemoryMB"];
@@ -2468,6 +2668,27 @@ export interface components {
/** @description New name for the API key */
name: string;
};
+ AssignedTemplateTags: {
+ /** @description Assigned tags of the template */
+ tags: string[];
+ /**
+ * Format: uuid
+ * @description Identifier of the build associated with these tags
+ */
+ buildID: string;
+ };
+ AssignTemplateTagsRequest: {
+ /** @description Target template in "name:tag" format */
+ target: string;
+ /** @description Tags to assign to the template */
+ tags: string[];
+ };
+ DeleteTemplateTagsRequest: {
+ /** @description Name of the template */
+ name: string;
+ /** @description Tags to delete */
+ tags: string[];
+ };
Error: {
/**
* Format: int32
@@ -2552,6 +2773,7 @@ export interface components {
nodeID: string;
apiKeyID: string;
accessTokenID: string;
+ tag: string;
/** @description Maximum number of items to return per page */
paginationLimit: number;
/** @description Cursor to start the list from */