Merge pull request #380 from aXenDeveloper/performerce/reduce_query_t…

…o_backend_in_middleware

perf(frontend): Reduce calls to API

backend/schema.gql

@@ -136,6 +136,12 @@ input HslColorInput {
   s: Int!
 }
 
+type LanguagesCoreMiddleware {
+  code: String!
+  default: Boolean!
+  enabled: Boolean!
+}
+
 enum LayoutAdminInstallEnum {
   ACCOUNT
   DATABASE
@@ -231,6 +237,7 @@ type Query {
   core_files__show(cursor: Int, first: Int, last: Int, search: String, sortBy: ShowCoreFilesSortByArgs): ShowCoreFilesObj!
   core_languages__show(cursor: Int, first: Int, last: Int, search: String, sortBy: ShowCoreLanguagesSortByArgs): ShowCoreLanguagesObj!
   core_members__show(cursor: Int, first: Int, last: Int, name_seo: String, search: String, sortBy: ShowCoreMembersSortByArgs): ShowCoreMembersObj!
+  core_middleware__show: ShowCoreMiddlewareObj!
   core_nav__show(cursor: Int, first: Int, last: Int): ShowCoreNavObj!
   core_plugins__show: [ShowCorePluginsObj!]!
   core_sessions__authorization: AuthorizationCoreSessionsObj!
@@ -563,6 +570,11 @@ enum ShowCoreMembersSortingColumnEnum {
   reactions
 }
 
+type ShowCoreMiddlewareObj {
+  languages: [LanguagesCoreMiddleware!]!
+  plugins: [String!]!
+}
+
 type ShowCoreNav {
   children: [ShowCoreNavItem!]!
   description: [TextLanguage!]!

backend/src/config.ts

@@ -141,6 +141,11 @@ export interface ConfigType {
     };
     sticky: boolean;
   };
+  langs: {
+    code: string;
+    default: boolean;
+    enabled: boolean;
+  }[];
   rebuild_required: {
     langs: boolean;
     plugins: boolean;

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];
       }

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 {

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 {

backend/src/plugins/core/middleware/middleware.module.ts

@@ -1,8 +1,14 @@
 import { Module } from "@nestjs/common";
 
 import { CoreMiddlewareCron } from "./middleware.cron";
+import { ShowCoreMiddlewareService } from "./show/show.service";
+import { ShowCoreMiddlewareResolver } from "./show/show.resolver";
 
 @Module({
-  providers: [CoreMiddlewareCron]
+  providers: [
+    CoreMiddlewareCron,
+    ShowCoreMiddlewareService,
+    ShowCoreMiddlewareResolver
+  ]
 })
 export class CoreMiddlewareModule {}

backend/src/plugins/core/middleware/show/dto/languages.obj.ts

@@ -0,0 +1,22 @@
+import { Field, ObjectType } from "@nestjs/graphql";
+
+@ObjectType()
+export class LanguagesCoreMiddleware {
+  @Field(() => String)
+  code: string;
+
+  @Field(() => Boolean)
+  enabled: boolean;
+
+  @Field(() => Boolean)
+  default: boolean;
+}
+
+@ObjectType()
+export class ShowCoreMiddlewareObj {
+  @Field(() => [LanguagesCoreMiddleware])
+  languages: LanguagesCoreMiddleware[];
+
+  @Field(() => [String])
+  plugins: string[];
+}

backend/src/plugins/core/middleware/show/show.resolver.ts

@@ -0,0 +1,14 @@
+import { Query, Resolver } from "@nestjs/graphql";
+
+import { ShowCoreMiddlewareService } from "./show.service";
+import { ShowCoreMiddlewareObj } from "./dto/languages.obj";
+
+@Resolver()
+export class ShowCoreMiddlewareResolver {
+  constructor(private readonly service: ShowCoreMiddlewareService) {}
+
+  @Query(() => ShowCoreMiddlewareObj)
+  async core_middleware__show(): Promise<ShowCoreMiddlewareObj> {
+    return this.service.languages();
+  }
+}

backend/src/plugins/core/middleware/show/show.service.ts

@@ -0,0 +1,24 @@
+import { readdir } from "fs/promises";
+
+import { Injectable } from "@nestjs/common";
+
+import { ShowCoreMiddlewareObj } from "./dto/languages.obj";
+
+import { ABSOLUTE_PATHS, getConfigFile } from "@/config";
+
+@Injectable()
+export class ShowCoreMiddlewareService {
+  async languages(): Promise<ShowCoreMiddlewareObj> {
+    const config = getConfigFile();
+
+    const plugins = await readdir(ABSOLUTE_PATHS.plugins);
+
+    return {
+      languages: config.langs,
+      plugins: [
+        "admin",
+        ...plugins.filter(plugin => !["plugins.module.ts"].includes(plugin))
+      ]
+    };
+  }
+}

backend/src/utils/actions/finish-build.ts

@@ -18,9 +18,7 @@ import { db } from "@/database/client";
   fs.readdir(join(process.cwd(), "src", "plugins"), async (err, plugins) => {
     await Promise.all(
       plugins
-        .filter(
-          plugin => !["database", "plugins.module.ts", "core"].includes(plugin)
-        )
+        .filter(plugin => !["plugins.module.ts", "core"].includes(plugin))
         .map(async plugin => {
           try {
             await migrate({ pluginCode: plugin });

frontend/app/[locale]/(admin)/admin/(auth)/blog/categories/page.tsx

@@ -17,8 +17,7 @@ const getData = async () => {
     Admin_Blog_Categories__ShowQuery,
     Admin_Blog_Categories__ShowQueryVariables
   >({
-    query: Admin_Blog_Categories__Show,
-    cache: "force-cache"
+    query: Admin_Blog_Categories__Show
   });
 
   return data;

frontend/app/[locale]/(admin)/admin/(auth)/core/advanced/files/page.tsx

@@ -14,7 +14,7 @@ import {
   SearchParamsPagination
 } from "@/plugins/core/hooks/utils/use-pagination-api-ssr";
 import { fetcher } from "@/graphql/fetcher";
-import { FilesAdvancedCoreAdminView } from "@/plugins/admin/views/core/advanced/files/files-advanced-core-adminpview";
+import { FilesAdvancedCoreAdminView } from "@/plugins/admin/views/core/advanced/files/files-advanced-core-admin-view";
 
 const getData = async (variables: Admin__Core_Files__ShowQueryVariables) => {
   const { data } = await fetcher<

frontend/app/[locale]/(admin)/admin/(auth)/core/plugins/[code]/dev/query-api.ts

@@ -4,7 +4,6 @@ import {
   Admin__Core_Plugins__Show__ItemQueryVariables
 } from "@/graphql/hooks";
 import { fetcher, ErrorType } from "@/graphql/fetcher";
-import { AdminCoreApiTags } from "@/plugins/admin/api-tags";
 
 export const getPluginDataAdmin = async (
   variables: Admin__Core_Plugins__Show__ItemQueryVariables
@@ -15,11 +14,7 @@ export const getPluginDataAdmin = async (
       Admin__Core_Plugins__Show__ItemQueryVariables
     >({
       query: Admin__Core_Plugins__Show__Item,
-      variables,
-      cache: "force-cache",
-      next: {
-        tags: [AdminCoreApiTags.Admin__Core_Plugins__Show__Item]
-      }
+      variables
     });
 
     return { data };

frontend/app/[locale]/(admin)/admin/(auth)/core/plugins/page.tsx

@@ -28,10 +28,7 @@ const getData = async (variables: Admin__Core_Plugins__ShowQueryVariables) => {
     Admin__Core_Plugins__ShowQueryVariables
   >({
     query: Admin__Core_Plugins__Show,
-    variables,
-    next: {
-      tags: ["Admin__Core_Plugins__Show"]
-    }
+    variables
   });
 
   return data;

frontend/app/[locale]/(admin)/admin/(auth)/get-session-admin.ts

@@ -18,7 +18,8 @@ export const getSessionAdminData = async () => {
     Admin__Sessions__AuthorizationQuery,
     Admin__Sessions__AuthorizationQueryVariables
   >({
-    query: Admin__Sessions__Authorization
+    query: Admin__Sessions__Authorization,
+    cache: "force-cache"
   });
 
   return data;

frontend/app/[locale]/(admin)/admin/(configs)/install/layout.tsx

@@ -20,7 +20,8 @@ const getData = async () => {
     Admin__Install__LayoutQuery,
     Admin__Install__LayoutQueryVariables
   >({
-    query: Admin__Install__Layout
+    query: Admin__Install__Layout,
+    cache: "force-cache"
   });
 
   return data;

frontend/app/[locale]/(main)/(container)/settings/files/page.tsx

@@ -19,7 +19,8 @@ const getData = async (variables: Core_Members__Files__ShowQueryVariables) => {
     Core_Members__Files__ShowQueryVariables
   >({
     query: Core_Members__Files__Show,
-    variables
+    variables,
+    cache: "force-cache"
   });
 
   return data;

frontend/app/[locale]/layout.tsx

@@ -23,7 +23,8 @@ const getData = async () => {
     Core_MiddlewareQuery,
     Core_MiddlewareQueryVariables
   >({
-    query: Core_Middleware
+    query: Core_Middleware,
+    cache: "force-cache"
   });
 
   return data;

frontend/components/editor/extensions/files/hooks/upload-mutation-api.ts

@@ -1,14 +1,13 @@
 "use server";
 
-import { revalidateTag } from "next/cache";
+import { revalidatePath } from "next/cache";
 
 import {
   Core_Editor_Files__Upload,
   Core_Editor_Files__UploadMutation,
   Core_Editor_Files__UploadMutationVariables
 } from "@/graphql/hooks";
 import { fetcher } from "@/graphql/fetcher";
-import { CoreApiTags } from "@/plugins/admin/api-tags";
 
 export const uploadMutationApi = async (formData: FormData) => {
   const file = formData.get("file") as File;
@@ -33,7 +32,7 @@ export const uploadMutationApi = async (formData: FormData) => {
       ]
     });
 
-    revalidateTag(CoreApiTags.Core_Sessions__Authorization);
+    revalidatePath("/settings/files", "page");
 
     return { data };
   } catch (error) {

frontend/components/editor/footer/files/item/hooks/delete-mutation-api.ts

@@ -1,5 +1,7 @@
 "use server";
 
+import { revalidatePath } from "next/cache";
+
 import {
   Core_Editor_Files__Delete,
   Core_Editor_Files__DeleteMutation,
@@ -19,6 +21,8 @@ export const deleteMutationApi = async (
       variables
     });
 
+    revalidatePath("/settings/files", "page");
+
     return { data };
   } catch (error) {
     return { error };

frontend/components/switchers/theme/mutation-api.ts

@@ -1,5 +1,7 @@
 "use server";
 
+import { revalidatePath } from "next/cache";
+
 import {
   Core_Themes__Change,
   Core_Themes__ChangeMutation,
@@ -23,6 +25,8 @@ export const mutationApi = async (
     // Set cookie
     setCookieFromApi({ res });
 
+    revalidatePath("/", "layout");
+
     return { data };
   } catch (error) {
     return { error };