wip

MediaQuad · Aug 20, 2024 · 361efdb · 361efdb
1 parent 8db6ba8
commit 361efdb
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 25 deletions.
diff --git a/apps/dashboard/src/app/[locale]/(app)/(sidebar)/vault/[[...folders]]/page.tsx b/apps/dashboard/src/app/[locale]/(app)/(sidebar)/vault/[[...folders]]/page.tsx
@@ -6,11 +6,18 @@ export const metadata: Metadata = {
 };
 
 type Props = {
-  params: {
-    folders: string[];
-  };
+  params: { folders: string[] };
 };
 
 export default function Vault({ params }: Props) {
-  return <Table folders={params.folders ?? []} />;
+  const disableActions = [
+    "exports",
+    "inbox",
+    "imports",
+    "transactions",
+  ].includes(params.folders?.[0] ?? "");
+
+  return (
+    <Table folders={params.folders ?? []} disableActions={disableActions} />
+  );
 }
diff --git a/apps/dashboard/src/components/tables/vault/data-table-row.tsx b/apps/dashboard/src/components/tables/vault/data-table-row.tsx
@@ -217,7 +217,7 @@ export function DataTableRow({ data, teamId }) {
                       path={folderPath}
                     />
 
-                    {data?.metadata?.size && (
+                    {data?.metadata?.size > 0 && (
                       <span className="text-[#878787]">
                         {formatSize(data.metadata.size)}
                       </span>

diff --git a/apps/dashboard/src/components/tables/vault/data-table.server.tsx b/apps/dashboard/src/components/tables/vault/data-table.server.tsx
@@ -10,7 +10,7 @@ type Props = {
 };
 
 export async function DataTableServer({ folders }: Props) {
-  const path = folders?.join("/");
+  const path = folders.at(-1);
 
   const { data } = await getVault({
     path: path && decodeURIComponent(path),

diff --git a/apps/dashboard/src/components/vault-activity.tsx b/apps/dashboard/src/components/vault-activity.tsx
@@ -19,7 +19,7 @@ export async function VaultActivity() {
 
   const { data: storageData } = await getVaultActivityQuery(
     supabase,
-    userData.id,
+    userData?.team_id,
   );
 
   const files = storageData

diff --git a/apps/dashboard/src/hooks/use-enter-submit.tsx b/apps/dashboard/src/hooks/use-enter-submit.tsx
@@ -7,7 +7,7 @@ export function useEnterSubmit(): {
   const formRef = useRef<HTMLFormElement>(null);
 
   const handleKeyDown = (
-    event: React.KeyboardEvent<HTMLTextAreaElement>
+    event: React.KeyboardEvent<HTMLTextAreaElement>,
   ): void => {
     if (
       event.key === "Enter" &&

diff --git a/packages/supabase/src/queries/cached-queries.ts b/packages/supabase/src/queries/cached-queries.ts
@@ -245,7 +245,7 @@ export const getMetrics = async (params: Omit<GetMetricsParams, "teamId">) => {
 };
 
 export const getVault = async (params: GetVaultParams) => {
-  const supabase = createClient();
+  const supabase = createClient({ db: { schema: "storage" } });
 
   const user = await getUser();
   const teamId = user?.data?.team_id;

diff --git a/packages/supabase/src/queries/index.ts b/packages/supabase/src/queries/index.ts
@@ -520,10 +520,19 @@ export async function getMetricsQuery(
 export type GetVaultParams = {
   teamId: string;
   path?: string;
+  limit?: number;
 };
 
 export async function getVaultQuery(supabase: Client, params: GetVaultParams) {
-  const { teamId, path } = params;
+  const { teamId, path, limit = 10000 } = params;
+
+  const { data } = await supabase
+    .from("objects")
+    .select("*")
+    .eq("team_id", teamId)
+    .eq("bucket_id", "vault")
+    .limit(limit)
+    .order("name", { ascending: true });
 
   const defaultFolders = path
     ? []
@@ -534,21 +543,34 @@ export async function getVaultQuery(supabase: Client, params: GetVaultParams) {
         { name: "transactions", isFolder: true },
       ];
 
-  let basePath = teamId;
+  // We get all the files in the current "folder" we know if it's a folder if it includes the .emptyFolderPlaceholder file name
+  // Otherwise we need to get all folders from the path_tokens array, and only add if they are not already in the array
+  // We need to sort the data so that folders are always at the top of the list
 
-  if (path) {
-    basePath = `${basePath}/${path}`;
-  }
-
-  // TODO: Change to real sql query and index
-  const { data } = await supabase.storage.from("vault").list(basePath, {
-    sortBy: { column: "name", order: "asc" },
-  });
+  const folders = Array.from(
+    new Set(
+      data?.map((item) => item.path_tokens?.at(-2)).filter(Boolean) || [],
+    ),
+  );
 
-  const filteredData =
-    data
-      ?.filter((file) => file.name !== EMPTY_FOLDER_PLACEHOLDER_FILE_NAME)
-      .map((item) => ({ ...item, isFolder: !item.id })) ?? [];
+  // const filteredData = (data ?? [])
+  //   .map((item) => ({
+  //     ...item,
+  //     name:
+  //       item.path_tokens?.at(-1) === EMPTY_FOLDER_PLACEHOLDER_FILE_NAME
+  //         ? item.path_tokens?.at(-2)
+  //         : item.path_tokens?.at(-1),
+  //     isFolder: item.path_tokens?.at(-1) === EMPTY_FOLDER_PLACEHOLDER_FILE_NAME,
+  //   }))
+  //   .sort((a, b) => {
+  //     if (a.isFolder && !b.isFolder) return -1;
+  //     if (!a.isFolder && b.isFolder) return 1;
+  //     return 0;
+  //   });
+
+  // console.log("filteredData", filteredData);
+
+  const filteredData = [];
 
   const mergedMap = new Map(
     [...defaultFolders, ...filteredData].map((obj) => [obj.name, obj]),
@@ -561,11 +583,11 @@ export async function getVaultQuery(supabase: Client, params: GetVaultParams) {
   };
 }
 
-export async function getVaultActivityQuery(supabase: Client, userId: string) {
+export async function getVaultActivityQuery(supabase: Client, teamId: string) {
   return supabase
     .from("objects")
     .select("*")
-    .eq("owner_id", userId)
+    .eq("team_id", teamId)
     .limit(20)
     .order("created_at", { ascending: false });
 }