fix: Create/delete plugins while restarting server

VitNode · Oct 21, 2024 · 113da9d · 113da9d
1 parent 7cf480a
commit 113da9d
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 70 deletions.
diff --git a/packages/backend/src/core/admin/plugins/helpers/change-files.service.ts b/packages/backend/src/core/admin/plugins/helpers/change-files.service.ts
@@ -151,6 +151,10 @@ export class ChangeFilesAdminPluginsService {
       }),
       getEntryName: code => `typeof ${code}`,
       reconstructFileContent: (imports, entries, originalContent) => {
+        // TODO: Remove console.log
+        // eslint-disable-next-line no-console
+        console.log({ imports, entries, originalContent });
+
         let newContent = '';
         imports.forEach((path, name) => {
           newContent += `import type ${name} from '${path}';\n`;

diff --git a/packages/create-vitnode-app/helpers/create-packages-json.ts b/packages/create-vitnode-app/helpers/create-packages-json.ts
@@ -99,7 +99,7 @@ export const createPackagesJSON = ({
       geist: '^1.3.1',
       'lucide-react': '^0.451.0',
       next: '15.0.0-rc.1',
-      'next-intl': '^3.21.0-canary.0',
+      'next-intl': '3.21.0-canary.0',
       react: '19.0.0-rc-6cf85185-20241014',
       'react-dom': '19.0.0-rc-6cf85185-20241014',
       'react-hook-form': '^7.53.0',

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -90,7 +90,7 @@
     "graphql-tag": "^2.12.6",
     "lucide-react": "^0.420.0",
     "next": "15.0.0-canary.179",
-    "next-intl": "^3.21.0-canary.0",
+    "next-intl": "3.21.0-canary.0",
     "postcss": "^8.4.42",
     "react": "^19.0.0-rc-d6cb4e77-20240911",
     "react-dom": "^19.0.0-rc-d6cb4e77-20240911",

diff --git a/packages/frontend/src/components/form/auto-form.tsx b/packages/frontend/src/components/form/auto-form.tsx
@@ -145,7 +145,12 @@ export function AutoForm<
         })}
 
         {children}
-        <div className="flex w-full flex-wrap items-center justify-end gap-2">
+        <div
+          className={cn('flex w-full flex-wrap items-center gap-2', {
+            'justify-end': !setOpen,
+            '[&>*]:flex-1': setOpen,
+          })}
+        >
           {setOpen ? (
             <Button
               disabled={form.formState.isSubmitting}

diff --git a/...d/src/views/admin/views/core/plugins/actions/create/hooks/use-create-edit-plugin-admin.ts b/...d/src/views/admin/views/core/plugins/actions/create/hooks/use-create-edit-plugin-admin.ts
@@ -5,7 +5,6 @@ import { UseFormReturn } from 'react-hook-form';
 import { toast } from 'sonner';
 import * as z from 'zod';
 
-import { checkConnectionMutationApi } from '../../../hooks/check-connection-mutation-api';
 import { mutationCreateApi } from './mutation-create-api';
 import { mutationEditApi } from './mutation-edit-api';
 
@@ -106,29 +105,6 @@ export const useCreateEditPluginAdmin = ({ data }: Args) => {
       return;
     }
 
-    if (!data) {
-      // Wait 3 seconds before reloading the page
-      await new Promise<void>(resolve =>
-        setTimeout(async () => {
-          form.reset({}, { keepValues: true });
-          const data = await checkConnectionMutationApi();
-
-          if (data?.error) {
-            toast.error(tCore('title'), {
-              description: tCore('internal_server_error'),
-            });
-
-            resolve();
-          }
-
-          window.location.reload();
-          resolve();
-        }, 3000),
-      );
-
-      return;
-    }
-
     toast.success(t('edit.success'), {
       description: values.name,
     });

diff --git a/packages/frontend/src/views/admin/views/core/plugins/hooks/check-connection-mutation-api.ts b/packages/frontend/src/views/admin/views/core/plugins/hooks/check-connection-mutation-api.ts
diff --git a/.../src/views/admin/views/core/plugins/table/actions/delete/hooks/use-delete-plugin-admin.ts b/.../src/views/admin/views/core/plugins/table/actions/delete/hooks/use-delete-plugin-admin.ts
@@ -1,7 +1,7 @@
 import { useTranslations } from 'next-intl';
 import { toast } from 'sonner';
 
-import { checkConnectionMutationApi } from '../../../../hooks/check-connection-mutation-api';
+// import { checkConnectionMutationApi } from '../../../../hooks/check-connection-mutation-api';
 import { mutationApi } from './mutation-api';
 
 export const useDeletePluginAdmin = ({ code }: { code: string }) => {
@@ -18,23 +18,23 @@ export const useDeletePluginAdmin = ({ code }: { code: string }) => {
       return;
     }
 
-    // Wait 3 seconds before reloading the page
-    await new Promise<void>(resolve =>
-      setTimeout(async () => {
-        const data = await checkConnectionMutationApi();
+    // // Wait 3 seconds before reloading the page
+    // await new Promise<void>(resolve =>
+    //   setTimeout(async () => {
+    //     const data = await checkConnectionMutationApi();
 
-        if (data?.error) {
-          toast.error(tCore('title'), {
-            description: tCore('internal_server_error'),
-          });
+    //     if (data?.error) {
+    //       toast.error(tCore('title'), {
+    //         description: tCore('internal_server_error'),
+    //       });
 
-          resolve();
-        }
+    //       resolve();
+    //     }
 
-        window.location.reload();
-        resolve();
-      }, 3000),
-    );
+    //     window.location.reload();
+    //     resolve();
+    //   }, 3000),
+    // );
   };
 
   return {

diff --git a/packages/frontend/src/views/admin/views/core/plugins/upload/hooks/use-upload-plugin-admin.ts b/packages/frontend/src/views/admin/views/core/plugins/upload/hooks/use-upload-plugin-admin.ts
@@ -4,7 +4,7 @@ import { UseFormReturn } from 'react-hook-form';
 import { toast } from 'sonner';
 import * as z from 'zod';
 
-import { checkConnectionMutationApi } from '../../hooks/check-connection-mutation-api';
+// import { checkConnectionMutationApi } from '../../hooks/check-connection-mutation-api';
 import { UploadPluginAdminProps } from '../upload';
 import { mutationApi } from './mutation-api';
 
@@ -49,23 +49,23 @@ export const useUploadPluginAdmin = ({ data }: UploadPluginAdminProps) => {
       return;
     }
 
-    // Wait 3 seconds before reloading the page
-    await new Promise<void>(resolve =>
-      setTimeout(async () => {
-        const data = await checkConnectionMutationApi();
+    // // Wait 3 seconds before reloading the page
+    // await new Promise<void>(resolve =>
+    //   setTimeout(async () => {
+    //     const data = await checkConnectionMutationApi();
 
-        if (data?.error) {
-          toast.error(tCore('title'), {
-            description: tCore('internal_server_error'),
-          });
+    //     if (data?.error) {
+    //       toast.error(tCore('title'), {
+    //         description: tCore('internal_server_error'),
+    //       });
 
-          resolve();
-        }
+    //       resolve();
+    //     }
 
-        window.location.reload();
-        resolve();
-      }, 3000),
-    );
+    //     window.location.reload();
+    //     resolve();
+    //   }, 3000),
+    // );
   };
 
   return { onSubmit, formSchema };