fix get resources

Author: Pallavikumarimdb

server/routers/resource/getResource.ts

@@ -24,7 +24,6 @@ const getResourceHostnamesParamsSchema = z
     })
     .strict();
 
-
 async function query(resourceId?: number, niceId?: string, orgId?: string) {
     if (resourceId) {
         const [res] = await db
@@ -43,8 +42,7 @@ async function query(resourceId?: number, niceId?: string, orgId?: string) {
     }
 }
 
-export type GetResourceResponseWithHostnames = {
-    data: Resource;
+export type GetResourceResponse = Resource & {
     hostMode: string;
     hostnames: Array<{
         hostnameId: number;
@@ -53,12 +51,9 @@ export type GetResourceResponseWithHostnames = {
         fullDomain: string;
         baseDomain: string;
         primary: boolean;
-        createdAt: string;
     }>;
 };
 
-export type GetResourceResponse = Resource;
-
 
 registry.registerPath({
     method: "get",
@@ -87,6 +82,7 @@ registry.registerPath({
     },
     responses: {}
 });
+
 export async function getResource(
     req: Request,
     res: Response,
@@ -105,7 +101,6 @@ export async function getResource(
 
         const { resourceId, niceId, orgId } = parsedParams.data;
 
-        // Use new query helper
         const resource = await query(resourceId, niceId, orgId);
 
         if (!resource) {
@@ -114,19 +109,6 @@ export async function getResource(
             );
         }
 
-        // Only HTTP resources have hostnames
-        if (!resource.http) {
-            return response<GetResourceResponse>(res, {
-                data: resource,
-                success: true,
-                error: false,
-                message: "Resource retrieved successfully",
-                status: HttpCode.OK
-            });
-        }
-
-
-        // Get hostnames for the resource
         const hostnames = await db
             .select({
                 hostnameId: resourceHostnames.hostnameId,
@@ -141,9 +123,9 @@ export async function getResource(
             .where(eq(resourceHostnames.resourceId, resource.resourceId))
             .orderBy(resourceHostnames.primary, resourceHostnames.createdAt);
 
-        return response<GetResourceResponseWithHostnames>(res, {
+        return response<GetResourceResponse>(res, {
             data: {
-                data: resource,
+                ...resource,
                 hostMode: resource.hostMode || "multi",
                 hostnames: hostnames.map(h => ({
                     hostnameId: h.hostnameId,
@@ -152,18 +134,17 @@ export async function getResource(
                     fullDomain: h.fullDomain,
                     baseDomain: h.baseDomain,
                     primary: h.primary,
-                    createdAt: h.createdAt
-                }))
+                })),
             },
             success: true,
             error: false,
-            message: "Resource hostnames retrieved successfully",
-            status: HttpCode.OK
+            message: "Resource retrieved successfully",
+            status: HttpCode.OK,
         });
     } catch (error) {
         logger.error(error);
         return next(
             createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
         );
     }
-}
+}

src/app/[orgId]/settings/resources/[niceId]/general/page.tsx

@@ -371,11 +371,13 @@ export default function GeneralForm() {
             ? `${sanitizedSubdomain}.${pendingDomain.baseDomain}`
             : pendingDomain.baseDomain;
 
+        setResourceFullDomain(`${resource.ssl ? "https" : "http"}://${sanitizedFullDomain}`);
+
 
         const updatedHostname: HostnameEntry = {
             ...currentHostname,
             domainId: pendingDomain.domainId,
-            subdomain: sanitizedSubdomain || undefined,
+            subdomain: pendingDomain.subdomain,
             baseDomain: pendingDomain.baseDomain,
             fullDomain: sanitizedFullDomain
         };
@@ -644,7 +646,7 @@ export default function GeneralForm() {
                                                     <div className="border p-2 rounded-md flex items-center justify-between">
                                                         <span className="text-sm text-muted-foreground flex items-center gap-2">
                                                             <Globe size="14" />
-                                                            {resourceFullDomain}
+                                                            {toUnicode(resourceFullDomain || "")}
                                                         </span>
                                                     </div>
                                                 </div>
@@ -757,13 +759,7 @@ export default function GeneralForm() {
                                                                 >
                                                                     <div className="min-w-0">
                                                                         <div className="font-mono text-sm truncate">
-                                                                            {h.fullDomain}
-                                                                        </div>
-                                                                        <div className="text-[11px] text-muted-foreground">
-                                                                            {h.subdomain
-                                                                                ? `${h.subdomain}.`
-                                                                                : ""}
-                                                                            {h.baseDomain}
+                                                                            {toUnicode(h.fullDomain || "")}
                                                                         </div>
                                                                     </div>
 
@@ -902,10 +898,12 @@ export default function GeneralForm() {
                                         const sanitizedSubdomain = pendingDomain.subdomain
                                             ? finalizeSubdomainSanitize(pendingDomain.subdomain)
                                             : "";
-
+                                            
                                         const sanitizedFullDomain = sanitizedSubdomain
                                             ? `${sanitizedSubdomain}.${pendingDomain.baseDomain}`
                                             : pendingDomain.baseDomain;
+                                        
+                                        setResourceFullDomain(`${resource.ssl ? "https" : "http"}://${sanitizedFullDomain}`);
 
                                         upsertHostname({
                                             domainId: pendingDomain.domainId,