feat: Add langs in config.json

VitNode · Jun 13, 2024 · 0574a78 · 0574a78
1 parent 02ef9a4
commit 0574a78
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 15 deletions.
diff --git a/backend/src/config.ts b/backend/src/config.ts
@@ -141,6 +141,10 @@ export interface ConfigType {
     };
     sticky: boolean;
   };
+  langs: {
+    code: string;
+    enabled: boolean;
+  }[];
   rebuild_required: {
     langs: boolean;
     plugins: boolean;

diff --git a/backend/src/functions/update-object.ts b/backend/src/functions/update-object.ts
@@ -1,12 +1,28 @@
-export function updateObject<T>(config: T, defaultData: T): T {
+export function updateObject<T extends Record<string, any>>(
+  config: T,
+  defaultData: T
+): T {
   const updatedConfig = config;
   for (const key in defaultData) {
-    if (typeof defaultData[key] === "object" && defaultData[key] !== null) {
+    if (Array.isArray(defaultData[key])) {
+      // If the key corresponds to an array and it's not empty, don't edit
+      if (!config[key] || config[key].length === 0) {
+        updatedConfig[key] = [] as any;
+      }
+    } else if (
+      typeof defaultData[key] === "object" &&
+      defaultData[key] !== null
+    ) {
+      // Handle nested objects
       if (!config[key]) {
         updatedConfig[key] = {} as T[Extract<keyof T, string>];
       }
-      updateObject(config[key], defaultData[key]);
+      updatedConfig[key] = updateObject(
+        (config[key] || {}) as T[Extract<keyof T, string>],
+        defaultData[key]
+      );
     } else {
+      // Handle primitive values
       if (!config[key]) {
         updatedConfig[key] = defaultData[key];
       }

diff --git a/backend/src/plugins/core/admin/members/edit/edit.resolver.ts b/backend/src/plugins/core/admin/members/edit/edit.resolver.ts
@@ -3,9 +3,9 @@ import { UseGuards } from "@nestjs/common";
 
 import { EditAdminMembersService } from "./edit.service";
 import { EditAdminMembersArgs } from "./dto/edit.args";
+import { EditAdminMembersObj } from "./dto/edit.obj";
 
 import { AdminAuthGuards } from "@/utils/guards/admin-auth.guard";
-import { EditAdminMembersObj } from "./dto/edit.obj";
 
 @Resolver()
 export class EditAdminMembersResolver {

diff --git a/backend/src/plugins/core/admin/members/edit/edit.service.ts b/backend/src/plugins/core/admin/members/edit/edit.service.ts
@@ -1,13 +1,12 @@
 import { Injectable } from "@nestjs/common";
 import { eq } from "drizzle-orm";
+import { NotFoundError, AccessDeniedError } from "@vitnode/backend";
 
 import { EditAdminMembersArgs } from "./dto/edit.args";
+import { EditAdminMembersObj } from "./dto/edit.obj";
 
 import { core_users } from "@/plugins/core/admin/database/schema/users";
 import { DatabaseService } from "@/database/database.service";
-import { NotFoundError } from "@vitnode/backend";
-import { AccessDeniedError } from "@vitnode/backend";
-import { EditAdminMembersObj } from "./dto/edit.obj";
 
 @Injectable()
 export class EditAdminMembersService {

diff --git a/frontend/config/generate-config.ts b/frontend/config/generate-config.ts
@@ -9,7 +9,17 @@ import { DEFAULT_CONFIG_DATA } from ".";
   if (!fs.existsSync(configPath)) {
     fs.writeFile(
       configPath,
-      JSON.stringify(DEFAULT_CONFIG_DATA, null, 2),
+      JSON.stringify(
+        {
+          ...DEFAULT_CONFIG_DATA,
+          lang: [
+            { code: "en", enabled: true },
+            { code: "pl", enabled: true }
+          ]
+        },
+        null,
+        2
+      ),
       "utf8",
       err => {
         if (err) throw err;

diff --git a/frontend/config/helpers.ts b/frontend/config/helpers.ts
@@ -5,15 +5,31 @@ import { ConfigType } from ".";
 
 export const configPath = join(process.cwd(), "config", "config.json");
 
-export function updateObject<T>(config: T, defaultData: T): T {
+export function updateObject<T extends Record<string, any>>(
+  config: T,
+  defaultData: T
+): T {
   const updatedConfig = config;
   for (const key in defaultData) {
-    if (typeof defaultData[key] === "object" && defaultData[key] !== null) {
+    if (Array.isArray(defaultData[key])) {
+      // If the key corresponds to an array and it's not empty, don't edit
+      if (!config[key] || config[key].length === 0) {
+        updatedConfig[key] = [] as any;
+      }
+    } else if (
+      typeof defaultData[key] === "object" &&
+      defaultData[key] !== null
+    ) {
+      // Handle nested objects
       if (!config[key]) {
         updatedConfig[key] = {} as T[Extract<keyof T, string>];
       }
-      updateObject(config[key], defaultData[key]);
+      updatedConfig[key] = updateObject(
+        (config[key] || {}) as T[Extract<keyof T, string>],
+        defaultData[key]
+      );
     } else {
+      // Handle primitive values
       if (!config[key]) {
         updatedConfig[key] = defaultData[key];
       }

diff --git a/frontend/config/index.ts b/frontend/config/index.ts
@@ -5,6 +5,10 @@ export interface ConfigType {
     };
     sticky: boolean;
   };
+  langs: {
+    code: string;
+    enabled: boolean;
+  }[];
   rebuild_required: {
     langs: boolean;
     plugins: boolean;
@@ -43,7 +47,17 @@ export const DEFAULT_CONFIG_DATA: ConfigType = {
       color_primary: "hsl(220, 74%, 50%)",
       color_primary_foreground: "hsl(210, 40%, 98%)"
     }
-  }
+  },
+  langs: [
+    {
+      code: "en",
+      enabled: true
+    },
+    {
+      code: "pl",
+      enabled: true
+    }
+  ]
 };
 
 const ENVS = {

diff --git a/packages/backend/src/decorators/user.decorator.ts b/packages/backend/src/decorators/user.decorator.ts
@@ -1,5 +1,6 @@
 import { createParamDecorator, ExecutionContext } from "@nestjs/common";
 import { Field, GqlExecutionContext, Int, ObjectType } from "@nestjs/graphql";
+
 import { TextLanguage } from "../utils";
 
 export const CurrentUser = createParamDecorator(

diff --git a/packages/backend/src/utils/context.ts b/packages/backend/src/utils/context.ts
@@ -1,4 +1,5 @@
 import { Request, Response } from "express";
+
 import { User } from "../decorators";
 
 export interface AuthRequest extends Request {

diff --git a/packages/frontend/src/helpers/flatten-tree.ts b/packages/frontend/src/helpers/flatten-tree.ts
@@ -8,7 +8,6 @@ export type WithChildren<T extends object> = Omit<
 
 export type FlatTree<T extends object> = WithChildren<T> & {
   depth: number;
-  index: number;
   parentId: number | string | null;
 };
 
@@ -21,7 +20,7 @@ export function flattenTree<T extends object>({
   depth?: number;
   parentId?: number | string | null;
 }): FlatTree<T>[] {
-  return tree.reduce<FlatTree<T>[]>((previousValue, currentValue, index) => {
+  return tree.reduce<FlatTree<T>[]>((previousValue, currentValue) => {
     const children = currentValue.children
       ? flattenTree({
           tree: currentValue.children,
@@ -36,7 +35,6 @@ export function flattenTree<T extends object>({
         ...currentValue,
         parentId: parentId,
         depth: depth,
-        index,
         children
       },
       ...children