feat: To make the project build successfully, remove no-store from th…

…e request.ts file #1841 (#2125) ### What problem does this PR solve? feat: To make the project build successfully, remove no-store from the request.ts file #1841 ### Type of change - [x] New Feature (non-breaking change which adds functionality)
infiniflow · Oct 29, 2024 · 7655e17 · 7655e17
1 parent 71cbee8
commit 7655e17
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 33 deletions.
diff --git a/gui/app/(dashboard)/database/[databaseId]/table/[tableId]/indexes.tsx b/gui/app/(dashboard)/database/[databaseId]/table/[tableId]/indexes.tsx
@@ -4,7 +4,7 @@ import { ITableIndex } from '@/lib/databse-interface';
 import { ColumnDef } from '@tanstack/react-table';
 import { useFetchTableIndexes } from 'app/(dashboard)/database/hooks';
 import { DataTable } from 'app/(dashboard)/database/infinity-table';
-import { DatabaseRouteParams } from 'app/(dashboard)/database/interface';
+import { PureDatabaseRouteParams } from 'app/(dashboard)/database/interface';
 
 export const columns: ColumnDef<ITableIndex>[] = [
   {
@@ -21,10 +21,7 @@ export const columns: ColumnDef<ITableIndex>[] = [
   }
 ];
 
-export function TableIndexes({
-  tableId,
-  databaseId
-}: DatabaseRouteParams['params']) {
+export function TableIndexes({ tableId, databaseId }: PureDatabaseRouteParams) {
   const { tableIndexes } = useFetchTableIndexes({ tableId, databaseId });
 
   return (

diff --git a/gui/app/(dashboard)/database/[databaseId]/table/[tableId]/page.tsx b/gui/app/(dashboard)/database/[databaseId]/table/[tableId]/page.tsx
@@ -1,5 +1,8 @@
 import { Leaf } from 'app/(dashboard)/database/constants';
-import { DatabaseRouteParams } from 'app/(dashboard)/database/interface';
+import {
+  DatabaseRouteParams,
+  PureDatabaseRouteParams
+} from 'app/(dashboard)/database/interface';
 import React from 'react';
 // import { TableColumns } from './columns';
 import { TableIndexes } from './indexes';
@@ -25,7 +28,7 @@ export default async function DatabasePage(props: DatabaseRouteParams) {
 
   const { tab } = searchParams;
 
-  const DatabaseTable: React.FunctionComponent<DatabaseRouteParams['params']> =
+  const DatabaseTable: React.FunctionComponent<PureDatabaseRouteParams> =
     TableMap[tab] ?? Empty;
 
   return (

diff --git a/gui/app/(dashboard)/database/[databaseId]/table/[tableId]/segments.tsx b/gui/app/(dashboard)/database/[databaseId]/table/[tableId]/segments.tsx
@@ -4,7 +4,7 @@ import { ITableSegment } from '@/lib/databse-interface';
 import { ColumnDef } from '@tanstack/react-table';
 import { useFetchTableSegments } from 'app/(dashboard)/database/hooks';
 import { DataTable } from 'app/(dashboard)/database/infinity-table';
-import { DatabaseRouteParams } from 'app/(dashboard)/database/interface';
+import { PureDatabaseRouteParams } from 'app/(dashboard)/database/interface';
 
 export const columns: ColumnDef<ITableSegment>[] = [
   {
@@ -24,7 +24,7 @@ export const columns: ColumnDef<ITableSegment>[] = [
 export function TableSegments({
   tableId,
   databaseId
-}: DatabaseRouteParams['params']) {
+}: PureDatabaseRouteParams) {
   const { tableSegments } = useFetchTableSegments({ tableId, databaseId });
 
   return (

diff --git a/gui/app/(dashboard)/database/[databaseId]/table/[tableId]/table-columns.tsx b/gui/app/(dashboard)/database/[databaseId]/table/[tableId]/table-columns.tsx
@@ -4,7 +4,7 @@ import { ITableColumns } from '@/lib/databse-interface';
 import { ColumnDef } from '@tanstack/react-table';
 import { useFetchTableColumns } from 'app/(dashboard)/database/hooks';
 import { DataTable } from 'app/(dashboard)/database/infinity-table';
-import { DatabaseRouteParams } from 'app/(dashboard)/database/interface';
+import { PureDatabaseRouteParams } from 'app/(dashboard)/database/interface';
 import { DataTableColumnHeader } from 'app/(dashboard)/database/table-column-header';
 
 export const columns: ColumnDef<ITableColumns>[] = [
@@ -31,10 +31,7 @@ export const columns: ColumnDef<ITableColumns>[] = [
   }
 ];
 
-export function TableColumns({
-  tableId,
-  databaseId
-}: DatabaseRouteParams['params']) {
+export function TableColumns({ tableId, databaseId }: PureDatabaseRouteParams) {
   const { tableColumns } = useFetchTableColumns({ tableId, databaseId });
 
   return (

diff --git a/gui/app/(dashboard)/database/hooks.ts b/gui/app/(dashboard)/database/hooks.ts
@@ -13,7 +13,7 @@ import {
   showTableIndexes,
   showTableSegments
 } from '../actions';
-import { DatabaseRouteParams, TreeParentId } from './interface';
+import { PureDatabaseRouteParams, TreeParentId } from './interface';
 import { buildLeafData, getParentIdById, updateTreeData } from './utils';
 
 export const useHandleClickTreeName = () => {
@@ -186,7 +186,7 @@ export const useBuildTreeData = () => {
 export const useFetchTableColumns = ({
   databaseId,
   tableId
-}: DatabaseRouteParams['params']) => {
+}: PureDatabaseRouteParams) => {
   const [tableColumns, setTableColumns] = useState<ITableColumns[]>([]);
 
   const fetchTableColumns = useCallback(async () => {
@@ -208,7 +208,7 @@ export const useFetchTableColumns = ({
 export const useFetchTableIndexes = ({
   databaseId,
   tableId
-}: DatabaseRouteParams['params']) => {
+}: PureDatabaseRouteParams) => {
   const [tableIndexes, setTableIndexes] = useState<ITableIndex[]>([]);
 
   const fetchTableIndexes = useCallback(async () => {
@@ -230,7 +230,7 @@ export const useFetchTableIndexes = ({
 export const useFetchTableSegments = ({
   databaseId,
   tableId
-}: DatabaseRouteParams['params']) => {
+}: PureDatabaseRouteParams) => {
   const [tableSegments, setTableSegments] = useState<ITableSegment[]>([]);
 
   const fetchTableSegments = useCallback(async () => {

diff --git a/gui/app/(dashboard)/database/interface.ts b/gui/app/(dashboard)/database/interface.ts
@@ -2,7 +2,12 @@ import { Leaf } from './constants';
 
 export type TreeParentId = string | number | null;
 
+export interface PureDatabaseRouteParams {
+  databaseId: string;
+  tableId: string;
+}
+
 export interface DatabaseRouteParams {
-  params: { databaseId: string; tableId: string };
-  searchParams: { tab: Leaf };
+  params: Promise<PureDatabaseRouteParams>;
+  searchParams: Promise<{ tab: Leaf }>;
 }
diff --git a/gui/app/(dashboard)/databases/page.tsx b/gui/app/(dashboard)/databases/page.tsx
@@ -5,9 +5,7 @@ import { listDatabase } from '../actions';
 import { DatabaseCard } from '../database-card';
 import { DatabaseCreatingDialog } from '../database-creating-dialog';
 
-export default async function HomePage({}: {
-  searchParams: { q: string; offset: string };
-}) {
+export default async function HomePage() {
   const ret = await listDatabase();
 
   return (

diff --git a/gui/app/(dashboard)/system/page.tsx b/gui/app/(dashboard)/system/page.tsx
@@ -6,14 +6,10 @@ import {
   CardTitle
 } from '@/components/ui/card';
 import { showConfigs, showVariables } from '../actions';
-// import { getProducts } from '@/lib/db';
 
-export default async function ProductsPage({}: {
-  searchParams: { q: string; offset: string };
-}) {
+export default async function ProductsPage() {
   const configs = await showConfigs();
   const variables = await showVariables();
-  console.log(variables);
 
   return (
     <div>

diff --git a/gui/app/(dashboard)/tables/page.tsx b/gui/app/(dashboard)/tables/page.tsx
@@ -20,7 +20,7 @@ async function InfinityTable() {
         </TableRow>
       </TableHeader>
       <TableBody>
-        {tables.tables.map((table: string) => (
+        {tables.tables?.map((table: string) => (
           <TableRow key={table}>
             <TableCell className="font-medium">{table}</TableCell>
           </TableRow>
@@ -30,9 +30,7 @@ async function InfinityTable() {
   );
 }
 
-export default async function DatabasePage({}: {
-  searchParams: { q: string; offset: string };
-}) {
+export default async function DatabasePage() {
   const items: MenuItem[] = [
     {
       key: 'sub1',

diff --git a/gui/lib/request.ts b/gui/lib/request.ts
@@ -10,7 +10,6 @@ export const request = async (
     headers: {
       accept: 'application/json'
     },
-    cache: 'no-store',
     method
   };