🚧 redirect create form

server/db/pg/schema/schema.ts

@@ -248,7 +248,7 @@ export const redirects = pgTable("redirects", {
         .$type<"exact" | "prefix" | "regex">()
         .notNull()
         .default("regex"), // exact, prefix, regex
-    matchPath: varchar("matchPath").notNull().default("*"),
+    matchPath: varchar("matchPath").notNull().default(".*"),
     rewritePath: varchar("rewritePath"), // if set, rewrites the path to this value,
     //  else, the original path will be kept
     rewritePathType: varchar("rewritePathType").$type<

server/db/sqlite/schema/schema.ts

@@ -258,6 +258,7 @@ export const redirects = sqliteTable("redirects", {
     }),
     niceId: text("niceId").notNull(),
     name: text("name").notNull(),
+    subdomain: text("subdomain"),
     destinationDomain: text("destinationDomain").notNull(),
     pathMatchType: text("pathMatchType")
         .$type<"exact" | "prefix" | "regex">()

server/routers/redirect/createRedirect.ts

@@ -29,6 +29,7 @@ const bodySchema = z.strictObject({
     name: z.string().nonempty(),
     resourceId: z.number().int().positive().optional().nullable(),
     domainId: z.string().nonempty().optional().nullable(),
+    subdomain: z.string().nonempty().optional().nullable(),
     destinationDomain: z.string().nonempty(),
     pathMatchType: redirectPathMatchTypeSchema.optional(),
     matchPath: redirectMatchPathSchema,
@@ -103,6 +104,7 @@ export async function createRedirect(
             name,
             resourceId,
             domainId,
+            subdomain,
             destinationDomain,
             pathMatchType,
             matchPath,
@@ -170,6 +172,7 @@ export async function createRedirect(
                 niceId,
                 resourceId: resourceId ?? null,
                 domainId: domainId ?? null,
+                subdomain: subdomain ?? null,
                 destinationDomain,
                 pathMatchType: pathMatchType ?? "regex",
                 matchPath,

server/routers/redirect/getRedirect.ts

@@ -16,6 +16,7 @@ export type GetRedirectResponse = {
         orgId: string;
         niceId: string;
         name: string;
+        subdomain: string | null;
         destinationDomain: string;
         pathMatchType: "exact" | "prefix" | "regex";
         matchPath: string;
@@ -39,6 +40,7 @@ const redirectColumns = {
     orgId: redirects.orgId,
     niceId: redirects.niceId,
     name: redirects.name,
+    subdomain: redirects.subdomain,
     destinationDomain: redirects.destinationDomain,
     pathMatchType: redirects.pathMatchType,
     matchPath: redirects.matchPath,

server/routers/redirect/listRedirects.ts

@@ -16,6 +16,7 @@ export type ListRedirectsResponse = PaginatedResponse<{
         orgId: string;
         niceId: string;
         name: string;
+        subdomain: string | null;
         destinationDomain: string;
         pathMatchType: "exact" | "prefix" | "regex";
         matchPath: string;
@@ -137,6 +138,7 @@ export async function listRedirects(
                 orgId: redirects.orgId,
                 niceId: redirects.niceId,
                 name: redirects.name,
+                subdomain: redirects.subdomain,
                 destinationDomain: redirects.destinationDomain,
                 pathMatchType: redirects.pathMatchType,
                 matchPath: redirects.matchPath,

server/routers/redirect/updateRedirect.ts

@@ -31,6 +31,7 @@ const bodySchema = z.strictObject({
     niceId: redirectNiceIdSchema.optional(),
     resourceId: z.number().int().positive().optional().nullable(),
     domainId: z.string().nonempty().optional().nullable(),
+    subdomain: z.string().nonempty().optional().nullable(),
     destinationDomain: z.string().nonempty().optional(),
     pathMatchType: redirectPathMatchTypeSchema.optional(),
     matchPath: redirectMatchPathSchema.optional(),
@@ -196,6 +197,9 @@ export async function updateRedirect(
         if (body.domainId !== undefined) {
             updateData.domainId = body.domainId;
         }
+        if (body.subdomain !== undefined) {
+            updateData.subdomain = body.subdomain;
+        }
         if (body.destinationDomain !== undefined) {
             updateData.destinationDomain = body.destinationDomain;
         }