fix: migration error on 2fa (#268)

2026-07-14 11:16:13 +02:00 · 2026-04-24 21:42:20 +02:00
parent e29846ae25
commit a1ec7dbec2
5 changed files with 201 additions and 198 deletions
@@ -1,165 +1,165 @@
 "use client";
-import { DatabaseBackupActionsModal } from "@/components/wrappers/dashboard/database/backup/actions/backup-actions-modal";
-import { DatabaseTabs } from "@/components/wrappers/dashboard/projects/database/database-tabs";
-import { Setting } from "@/db/schema/01_setting";
-import { BackupWith, DatabaseWith, Restoration } from "@/db/schema/07_database";
-import { MemberWithUser } from "@/db/schema/03_organization";
-import { useBackupModal } from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
-import { DatabaseKpi } from "@/components/wrappers/dashboard/projects/database/database-kpi";
-import { useQuery } from "@tanstack/react-query";
-import { getDatabaseDataAction } from "@/components/wrappers/dashboard/database/backup/actions/get-data.action";
+import {DatabaseBackupActionsModal} from "@/components/wrappers/dashboard/database/backup/actions/backup-actions-modal";
+import {DatabaseTabs} from "@/components/wrappers/dashboard/projects/database/database-tabs";
+import {Setting} from "@/db/schema/01_setting";
+import {BackupWith, DatabaseWith, Restoration} from "@/db/schema/07_database";
+import {MemberWithUser} from "@/db/schema/03_organization";
+import {useBackupModal} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
+import {DatabaseKpi} from "@/components/wrappers/dashboard/projects/database/database-kpi";
+import {useQuery} from "@tanstack/react-query";
+import {getDatabaseDataAction} from "@/components/wrappers/dashboard/database/backup/actions/get-data.action";
 import {
-  PageContent,
-  PageDescription,
-  PageTitle,
+    PageContent,
+    PageDescription,
+    PageTitle,
 } from "@/features/layout/page";
-import { capitalizeFirstLetter } from "@/utils/text";
-import { RetentionPolicySheet } from "@/components/wrappers/dashboard/database/retention-policy/retention-policy-sheet";
-import { CronButton } from "@/components/wrappers/dashboard/database/cron-button/cron-button";
-import { ChannelPoliciesModal } from "@/components/wrappers/dashboard/database/channels-policy/policy-modal";
-import { HardDrive, Megaphone } from "lucide-react";
-import { ImportModal } from "@/components/wrappers/dashboard/database/import/import-modal";
-import { BackupButton } from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
+import {capitalizeFirstLetter} from "@/utils/text";
+import {RetentionPolicySheet} from "@/components/wrappers/dashboard/database/retention-policy/retention-policy-sheet";
+import {CronButton} from "@/components/wrappers/dashboard/database/cron-button/cron-button";
+import {ChannelPoliciesModal} from "@/components/wrappers/dashboard/database/channels-policy/policy-modal";
+import {HardDrive, Megaphone} from "lucide-react";
+import {ImportModal} from "@/components/wrappers/dashboard/database/import/import-modal";
+import {BackupButton} from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
 import {HealthModal} from "@/components/wrappers/dashboard/database/health/health-modal";
 import {HealthcheckLog} from "@/db/schema/15_healthcheck-log";

 export type DatabaseContentProps = {
-  settings: Setting;
-  backups: BackupWith[];
-  restorations: Restoration[];
-  isAlreadyRestore: boolean;
-  database: DatabaseWith;
-  activeMember: MemberWithUser;
-  totalBackups: number;
-  availableBackups: number;
-  successRate: number | null;
-  organizationId: string;
-  activeOrganizationChannels: any[];
-  activeOrganizationStorageChannels: any[];
-  databaseHealthLogs: HealthcheckLog[]
+    settings: Setting;
+    backups: BackupWith[];
+    restorations: Restoration[];
+    isAlreadyRestore: boolean;
+    database: DatabaseWith;
+    activeMember: MemberWithUser;
+    totalBackups: number;
+    availableBackups: number;
+    successRate: number | null;
+    organizationId: string;
+    activeOrganizationChannels: any[];
+    activeOrganizationStorageChannels: any[];
+    databaseHealthLogs: HealthcheckLog[]
 };

 export const DatabaseContent = (props: DatabaseContentProps) => {
-  const {} = useBackupModal();
+    const {} = useBackupModal();

-  const { data } = useQuery({
-    queryKey: ["database-data", props.database.id],
-    queryFn: async () => {
-      const result = await getDatabaseDataAction({
-        databaseId: props.database.id,
-      });
-      return result?.data;
-    },
-    initialData: {
-      // TODO : to be patched
-      // @ts-ignore
-      database: {
-        ...props.database,
-        project: props.database.project ?? null,
-      },
-      backups: props.backups,
-      restorations: props.restorations,
-      activeOrganizationChannels: props.activeOrganizationChannels,
-      activeOrganizationStorageChannels:
-        props.activeOrganizationStorageChannels,
-      stats: {
+    const {data} = useQuery({
+        queryKey: ["database-data", props.database.id],
+        queryFn: async () => {
+            const result = await getDatabaseDataAction({
+                databaseId: props.database.id,
+            });
+            return result?.data;
+        },
+        initialData: {
+            // TODO : to be patched
+            // @ts-ignore
+            database: {
+                ...props.database,
+                project: props.database.project ?? null,
+            },
+            backups: props.backups,
+            restorations: props.restorations,
+            activeOrganizationChannels: props.activeOrganizationChannels,
+            activeOrganizationStorageChannels:
+            props.activeOrganizationStorageChannels,
+            stats: {
+                totalBackups: props.totalBackups,
+                availableBackups: props.availableBackups,
+                successRate: props.successRate,
+            },
+            health: props.databaseHealthLogs
+        },
+        staleTime: 0,
+        gcTime: 0,
+        refetchInterval: 1000,
+    });
+
+    const database = data?.database ?? props.database;
+    const backups = data?.backups ?? props.backups;
+    const restorations = data?.restorations ?? props.restorations;
+    const activeOrganizationChannels =
+        data?.activeOrganizationChannels ?? props.activeOrganizationChannels;
+    const activeOrganizationStorageChannels =
+        data?.activeOrganizationStorageChannels ??
+        props.activeOrganizationStorageChannels;
+    const stats = data?.stats ?? {
        totalBackups: props.totalBackups,
        availableBackups: props.availableBackups,
        successRate: props.successRate,
-      },
-      health: props.databaseHealthLogs
-    },
-    staleTime: 0,
-    gcTime: 0,
-    refetchInterval: 1000,
-  });
+    };

-  const database = data?.database ?? props.database;
-  const backups = data?.backups ?? props.backups;
-  const restorations = data?.restorations ?? props.restorations;
-  const activeOrganizationChannels =
-    data?.activeOrganizationChannels ?? props.activeOrganizationChannels;
-  const activeOrganizationStorageChannels =
-    data?.activeOrganizationStorageChannels ??
-    props.activeOrganizationStorageChannels;
-  const stats = data?.stats ?? {
-    totalBackups: props.totalBackups,
-    availableBackups: props.availableBackups,
-    successRate: props.successRate,
-  };
+    const isAlreadyRestore = restorations.some((r) => r.status === "waiting");
+    const isAlreadyBackup = backups.some(
+        (b) => b.status === "waiting" || b.status === "ongoing",
+    );

-  const isAlreadyRestore = restorations.some((r) => r.status === "waiting");
-  const isAlreadyBackup = backups.some(
-    (b) => b.status === "waiting" || b.status === "ongoing",
-  );
+    const isMember = props.activeMember.role === "member";

-  const isMember = props.activeMember.role === "member";
-
-  return (
-    <>
-      <div className="justify-between gap-2 sm:flex">
-        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
-          <div className="min-w-full md:min-w-fit ">
-            {capitalizeFirstLetter(database.name)}
-          </div>
-          {!isMember && (
-            <div className="flex items-center gap-2 md:justify-between w-full ">
-              <div className="flex items-center gap-2">
-                <RetentionPolicySheet database={database} />
-                <CronButton database={database} />
-                <ChannelPoliciesModal
-                  database={database}
-                  kind={"notification"}
-                  icon={<Megaphone />}
-                  channels={activeOrganizationChannels}
-                  organizationId={props.organizationId}
-                />
-                <ChannelPoliciesModal
-                  database={database}
-                  icon={<HardDrive />}
-                  kind={"storage"}
-                  channels={activeOrganizationStorageChannels}
-                  organizationId={props.organizationId}
-                />
-                <ImportModal database={database} />
-                <HealthModal database={database} healthLogs={data?.health ?? []}/>
-              </div>
+    return (
+        <>
+            <div className="justify-between gap-2 sm:flex">
+                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    <div className="min-w-full md:min-w-fit ">
+                        {capitalizeFirstLetter(database.name)}
+                    </div>
+                    {!isMember && (
+                        <div className="flex items-center gap-2 md:justify-between w-full ">
+                            <div className="flex items-center gap-2">
+                                <RetentionPolicySheet database={database}/>
+                                <CronButton database={database}/>
+                                <ChannelPoliciesModal
+                                    database={database}
+                                    kind={"notification"}
+                                    icon={<Megaphone/>}
+                                    channels={activeOrganizationChannels}
+                                    organizationId={props.organizationId}
+                                />
+                                <ChannelPoliciesModal
+                                    database={database}
+                                    icon={<HardDrive/>}
+                                    kind={"storage"}
+                                    channels={activeOrganizationStorageChannels}
+                                    organizationId={props.organizationId}
+                                />
+                                <ImportModal database={database}/>
+                                <HealthModal database={database} healthLogs={data?.health ?? []}/>
+                            </div>


-              <div className="flex items-center gap-2">
-                <BackupButton
-                  disable={isAlreadyBackup || !database.lastContact}
-                  databaseId={database.id}
-                />
-              </div>
+                            <div className="flex items-center gap-2">
+                                <BackupButton
+                                    disable={isAlreadyBackup || !database.lastContact}
+                                    databaseId={database.id}
+                                />
+                            </div>
+                        </div>
+                    )}
+                </PageTitle>
            </div>
-          )}
-        </PageTitle>
-      </div>

-      {database.description && (
-        <PageDescription className="mt-5 sm:mt-0">
-          {database.description}
-        </PageDescription>
-      )}
+            {database.description && (
+                <PageDescription className="mt-5 sm:mt-0">
+                    {database.description}
+                </PageDescription>
+            )}

-      <PageContent className="flex flex-col w-full h-full">
-        <DatabaseKpi
-          successRate={stats.successRate}
-          database={database}
-          availableBackups={stats.availableBackups}
-          totalBackups={stats.totalBackups}
-        />
-        <DatabaseBackupActionsModal />
-        <DatabaseTabs
-          activeMember={props.activeMember}
-          settings={props.settings}
-          database={database}
-          isAlreadyRestore={isAlreadyRestore}
-          backups={backups}
-          restorations={restorations}
-        />
-      </PageContent>
-    </>
-  );
+            <PageContent className="flex flex-col w-full h-full">
+                <DatabaseKpi
+                    successRate={stats.successRate}
+                    database={database}
+                    availableBackups={stats.availableBackups}
+                    totalBackups={stats.totalBackups}
+                />
+                <DatabaseBackupActionsModal/>
+                <DatabaseTabs
+                    activeMember={props.activeMember}
+                    settings={props.settings}
+                    database={database}
+                    isAlreadyRestore={isAlreadyRestore}
+                    backups={backups}
+                    restorations={restorations}
+                />
+            </PageContent>
+        </>
+    );
 };
@@ -1 +1,4 @@
-ALTER TABLE "two_factor" ADD COLUMN "verified" boolean NOT NULL;
+ALTER TABLE "two_factor" ADD COLUMN IF NOT EXISTS "verified" boolean DEFAULT false;
+UPDATE "two_factor" SET "verified" = true WHERE "verified" = false;
+ALTER TABLE "two_factor" ALTER COLUMN "verified" SET NOT NULL;
+ALTER TABLE "two_factor" ALTER COLUMN "verified" DROP DEFAULT;
@@ -13,7 +13,7 @@ import { generateFileUrl } from "@/features/storages/helpers";
 import { Readable } from "node:stream";
 import { env } from "@/env.mjs";

-const BASE_DIR = path.join(env.PRIVATE_PATH, "/uploads");
+const BASE_DIR = path.join(env.PRIVATE_PATH!, "/uploads");

 export async function uploadLocal(
  config: { baseDir?: string },