Merge pull request #1449 from AletheiaFact/prepare-nextjs-upgrade

Refactor the ViewService NextJS render interface in preparation for the lib upgrade
AletheiaFact · Nov 12, 2024 · 5359403 · 5359403
2 parents d375901 + d199e6d
commit 5359403
Show file tree

Hide file tree

Showing 41 changed files with 385 additions and 420 deletions.
diff --git a/server/auth/name-space/name-space.controller.ts b/server/auth/name-space/name-space.controller.ts
@@ -91,14 +91,10 @@ export class NameSpaceController {
         const nameSpaces = await this.nameSpaceService.listAll();
         const users = await this.usersService.findAll({});
         const parsedUrl = parse(req.url, true);
-        await this.viewService
-            .getNextServer()
-            .render(
-                req,
-                res,
-                "/admin-namespaces",
-                Object.assign(parsedUrl.query, { nameSpaces, users })
-            );
+
+        const query = Object.assign(parsedUrl.query, { nameSpaces, users });
+
+        await this.viewService.render(req, res, "/admin-namespaces", query);
     }
 
     private async updateNameSpaceUsers(users, key) {

diff --git a/server/auth/ory/ory.controller.ts b/server/auth/ory/ory.controller.ts
@@ -52,10 +52,6 @@ export default class OryController {
         @Res() res: NextApiResponse
     ) {
         const parsedUrl = parse(req.url, true);
-        await this.viewService.getNextServer().getRequestHandler()(
-            req,
-            res,
-            parsedUrl
-        );
+        await this.viewService.getRequestHandler()(req, res, parsedUrl);
     }
 }
diff --git a/server/badge/badge.controller.ts b/server/badge/badge.controller.ts
@@ -151,15 +151,13 @@ export class BadgeController {
             },
         });
         const parsedUrl = parse(req.url, true);
-        await this.viewService.getNextServer().render(
-            req,
-            res,
-            "/admin-badges",
-            Object.assign(parsedUrl.query, {
-                badges,
-                users,
-                nameSpace: req.params.namespace,
-            })
-        );
+
+        const query = Object.assign(parsedUrl.query, {
+            badges,
+            users,
+            nameSpace: req.params.namespace,
+        });
+
+        await this.viewService.render(req, res, "/admin-badges", query);
     }
 }