diff --git a/front/components/poke/data_source_views/table.tsx b/front/components/poke/data_source_views/table.tsx index 5145747cac04..e9fa5133f5e0 100644 --- a/front/components/poke/data_source_views/table.tsx +++ b/front/components/poke/data_source_views/table.tsx @@ -8,27 +8,32 @@ import { usePokeDataSourceViews } from "@app/poke/swr/data_source_views"; interface DataSourceViewsDataTableProps { owner: LightWorkspaceType; + spaceId?: string; } function prepareDataSourceViewsForDisplay( owner: LightWorkspaceType, - dataSourceViews: DataSourceViewType[] + dataSourceViews: DataSourceViewType[], + spaceId?: string ) { - return dataSourceViews.map((dsv) => { - return { - ...dsv, - dataSourceLink: `/poke/${owner.sId}/data_sources/${dsv.dataSource.sId}`, - dataSourceName: getDisplayNameForDataSource(dsv.dataSource), - dataSourceViewLink: `/poke/${owner.sId}/spaces/${dsv.spaceId}/data_source_views/${dsv.sId}`, - editedAt: dsv.editedByUser?.editedAt ?? undefined, - editedBy: dsv.editedByUser?.fullName ?? undefined, - name: dsv.sId, - }; - }); + return dataSourceViews + .map((dsv) => { + return { + ...dsv, + dataSourceLink: `/poke/${owner.sId}/data_sources/${dsv.dataSource.sId}`, + dataSourceName: getDisplayNameForDataSource(dsv.dataSource), + dataSourceViewLink: `/poke/${owner.sId}/spaces/${dsv.spaceId}/data_source_views/${dsv.sId}`, + editedAt: dsv.editedByUser?.editedAt ?? undefined, + editedBy: dsv.editedByUser?.fullName ?? undefined, + name: dsv.sId, + }; + }) + .filter((dsv) => !spaceId || dsv.spaceId === spaceId); } export function DataSourceViewsDataTable({ owner, + spaceId, }: DataSourceViewsDataTableProps) { return ( ( )} diff --git a/front/pages/poke/[wId]/spaces/[spaceId]/index.tsx b/front/pages/poke/[wId]/spaces/[spaceId]/index.tsx index da044d691ebc..a1ad2f0c56fb 100644 --- a/front/pages/poke/[wId]/spaces/[spaceId]/index.tsx +++ b/front/pages/poke/[wId]/spaces/[spaceId]/index.tsx @@ -6,6 +6,7 @@ import type { import type { InferGetServerSidePropsType } from "next"; import type { ReactElement } from "react"; +import { DataSourceViewsDataTable } from "@app/components/poke/data_source_views/table"; import { MembersDataTable } from "@app/components/poke/members/table"; import { ViewSpaceViewTable } from "@app/components/poke/spaces/view"; import { getMembers } from "@app/lib/api/workspace"; @@ -67,7 +68,7 @@ export const getServerSideProps = withSuperUserAuthRequirements<{ }; }); -export default function DataSourceViewPage({ +export default function SpacePage({ members, owner, space, @@ -77,11 +78,12 @@ export default function DataSourceViewPage({
+
); } -DataSourceViewPage.getLayout = (page: ReactElement) => { +SpacePage.getLayout = (page: ReactElement) => { return {page}; };