From fa7713f51092b087873b0e994dd60ef0d8e0e51b Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 4 Jul 2025 07:49:54 -0600 Subject: [PATCH] Update api imports to be a little more direct --- apps/web/src/api/buster_rest/index.ts | 10 ---------- .../[datasetId]/_DatasetsLayout/DatasetPageContext.tsx | 2 +- .../DatasetIndividualThreeDotMenu.tsx | 2 +- .../datasets/[datasetId]/editor/EditorContent.tsx | 2 +- .../datasets/[datasetId]/overview/OverviewHeader.tsx | 2 +- .../[datasetId]/permissions/PermissionAppSegments.tsx | 2 +- .../PermissionDatasetGroupSelectedPopup.tsx | 2 +- .../PermissionDatasetGroups.tsx | 2 +- .../PermissionListDatasetGroupContainer.tsx | 2 +- .../PermissionGroupSelectedPopup.tsx | 2 +- .../PermissionPermissionGroup.tsx | 2 +- .../DatasetGroupTitleAndDescription.tsx | 2 +- .../datasets/DatasetGroupDatasetSelectedPopup.tsx | 2 +- .../datasets/DatasetGroupDatasetsController.tsx | 2 +- .../datasets/DatasetGroupDatasetsListContainer.tsx | 9 +++++++-- .../dataset-groups/[datasetGroupId]/datasets/page.tsx | 2 +- .../dataset-groups/[datasetGroupId]/layout.tsx | 2 +- .../DatasetGroupPermissionGroupSelectedPopup.tsx | 2 +- .../DatasetGroupPermissionGroupsController.tsx | 2 +- .../DatasetGroupPermissionGroupsListContainer.tsx | 2 +- .../[datasetGroupId]/permission-groups/page.tsx | 2 +- .../users/DatasetGroupUsersController.tsx | 2 +- .../users/DatasetGroupUsersListContainer.tsx | 9 +++++++-- .../users/DatasetGroupUsersSelectedPopup.tsx | 2 +- .../dataset-groups/[datasetGroupId]/users/page.tsx | 2 +- .../settings/(permissions)/dataset-groups/page.tsx | 2 +- .../PermissionGroupTitleAndDescription.tsx | 5 ++++- .../PermissionGroupDatasetGroupsController.tsx | 2 +- .../PermissionGroupDatasetSelectedPopup.tsx | 2 +- .../PermissionGroupDatasetsListContainer.tsx | 9 +++++++-- .../[permissionGroupId]/dataset-groups/page.tsx | 2 +- .../PermissionGroupDatasetSelectedPopup.tsx | 2 +- .../PermissionGroupDatasetsController.tsx | 2 +- .../PermissionGroupDatasetsListContainer.tsx | 9 +++++++-- .../[permissionGroupId]/datasets/page.tsx | 2 +- .../permission-groups/[permissionGroupId]/layout.tsx | 2 +- .../PermissionGroupUsersController.tsx | 2 +- .../PermissionGroupUsersListContainer.tsx | 9 +++++++-- .../PermissionGroupUsersSelectedPopup.tsx | 2 +- .../[permissionGroupId]/users/page.tsx | 2 +- .../settings/(permissions)/permission-groups/page.tsx | 2 +- .../_LayoutHeaderAndSegment/LayoutHeaderAndSegment.tsx | 2 +- .../users/[userId]/_overview/UserDefaultAccess.tsx | 2 +- .../[userId]/_overview/UserOverviewController.tsx | 2 +- .../[userId]/attributes/UserAttributesController.tsx | 2 +- .../dataset-groups/UserDatasetGroupListContainer.tsx | 2 +- .../dataset-groups/UserDatasetGroupSelectedPopup.tsx | 2 +- .../dataset-groups/UserDatasetGroupsController.tsx | 2 +- .../users/[userId]/datasets/UserDatasetsController.tsx | 2 +- .../[userId]/datasets/UserDatasetsListContainer.tsx | 9 +++++++-- .../[userId]/datasets/UserDatasetsSelectedPopup.tsx | 2 +- .../settings/(permissions)/users/[userId]/layout.tsx | 2 +- .../UserPermissionGroupSelectedPopup.tsx | 2 +- .../UserPermissionGroupsController.tsx | 2 +- .../UserPermissionGroupsListContainer.tsx | 9 +++++++-- .../users/[userId]/teams/UserTeamsController.tsx | 2 +- .../users/[userId]/teams/UserTeamsListContainer.tsx | 2 +- .../users/[userId]/teams/UserTeamsSelectedPopup.tsx | 2 +- .../settings/(permissions)/users/page.tsx | 2 +- 59 files changed, 103 insertions(+), 75 deletions(-) delete mode 100644 apps/web/src/api/buster_rest/index.ts diff --git a/apps/web/src/api/buster_rest/index.ts b/apps/web/src/api/buster_rest/index.ts deleted file mode 100644 index 24239d091..000000000 --- a/apps/web/src/api/buster_rest/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -export * from './api_keys'; -export * from './dataset_groups'; -export * from './datasets'; -export * from './organizations'; -export * from './permission_groups'; -export * from './sql'; -export * from './sql'; -export * from './teams'; -export * from './users'; -export * from './currency'; diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetPageContext.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetPageContext.tsx index 392807984..d90e3bb26 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetPageContext.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetPageContext.tsx @@ -4,7 +4,7 @@ import { useSelectedLayoutSegment } from 'next/navigation'; import type React from 'react'; import { type PropsWithChildren, useEffect, useMemo, useState } from 'react'; import { createContext, useContextSelector } from 'use-context-selector'; -import { useDeployDataset, useIndividualDataset } from '@/api/buster_rest'; +import { useDeployDataset, useIndividualDataset } from '@/api/buster_rest/datasets'; import { useDebounce, useMemoizedFn, useDocumentTitle } from '@/hooks'; import { DataSetAppText, type DatasetApps } from './config'; diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetIndividualThreeDotMenu.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetIndividualThreeDotMenu.tsx index a37059bf2..2f5bf3c10 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetIndividualThreeDotMenu.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetIndividualThreeDotMenu.tsx @@ -1,5 +1,5 @@ import React, { useMemo } from 'react'; -import { useDeleteDataset } from '@/api/buster_rest'; +import { useDeleteDataset } from '@/api/buster_rest/datasets'; import { Button } from '@/components/ui/buttons'; import { Dropdown, type DropdownItems } from '@/components/ui/dropdown'; import { Dots, Trash } from '@/components/ui/icons'; diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/EditorContent.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/EditorContent.tsx index 3d62a278a..9d955ff61 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/EditorContent.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/EditorContent.tsx @@ -4,7 +4,7 @@ import isEmpty from 'lodash/isEmpty'; import type React from 'react'; import { useMemo, useRef, useState } from 'react'; import type { DataResult } from '@buster/server-shared/metrics'; -import { useRunSQL } from '@/api/buster_rest'; +import { useRunSQL } from '@/api/buster_rest/sql'; import { AppVerticalCodeSplitter } from '@/components/features/layouts/AppVerticalCodeSplitter'; import type { AppSplitterRef } from '@/components/ui/layouts/AppSplitter'; import { useMemoizedFn, useRequest } from '@/hooks'; diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/OverviewHeader.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/OverviewHeader.tsx index 913c25955..ca4501909 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/OverviewHeader.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/OverviewHeader.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdateDataset } from '@/api/buster_rest'; +import { useUpdateDataset } from '@/api/buster_rest/datasets'; import { Text } from '@/components/ui/typography'; import { EditableTitle } from '@/components/ui/typography/EditableTitle'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionAppSegments.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionAppSegments.tsx index 7b872032b..4e3e3080e 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionAppSegments.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionAppSegments.tsx @@ -5,7 +5,7 @@ import { useDatasetListDatasetGroups, useDatasetListPermissionGroups, useDatasetListPermissionUsers -} from '@/api/buster_rest'; +} from '@/api/buster_rest/datasets'; import { AppSegmented, type SegmentedItem } from '@/components/ui/segmented'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { PermissionApps } from './config'; diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroupSelectedPopup.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroupSelectedPopup.tsx index b724da5d8..8d166e06e 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroupSelectedPopup.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroupSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useDatasetUpdateDatasetGroups } from '@/api/buster_rest'; +import { useDatasetUpdateDatasetGroups } from '@/api/buster_rest/datasets'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroups.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroups.tsx index 73d507dc5..8620a73ca 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroups.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroups.tsx @@ -1,7 +1,7 @@ 'use client'; import React, { useState } from 'react'; -import { useDatasetListDatasetGroups } from '@/api/buster_rest'; +import { useDatasetListDatasetGroups } from '@/api/buster_rest/datasets'; import { NewDatasetGroupModal, PermissionSearchAndListWrapper diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx index 908d297e2..cfa82a804 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx @@ -3,7 +3,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; import type { ListDatasetGroupsResponse } from '@/api/asset_interfaces'; -import { useDatasetUpdateDatasetGroups } from '@/api/buster_rest'; +import { useDatasetUpdateDatasetGroups } from '@/api/buster_rest/datasets'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { type BusterListColumn, diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionGroupSelectedPopup.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionGroupSelectedPopup.tsx index a300a768c..087cb23da 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionGroupSelectedPopup.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionGroupSelectedPopup.tsx @@ -1,5 +1,5 @@ import React, { useMemo } from 'react'; -import { useDatasetUpdatePermissionGroups } from '@/api/buster_rest'; +import { useDatasetUpdatePermissionGroups } from '@/api/buster_rest/datasets'; import { PERMISSION_OPTIONS_ASSIGNED } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons'; import { Dropdown, type DropdownItem } from '@/components/ui/dropdown'; diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionPermissionGroup.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionPermissionGroup.tsx index 2e93fb0fc..db0fa865b 100644 --- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionPermissionGroup.tsx +++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionPermissionGroup.tsx @@ -1,7 +1,7 @@ 'use client'; import React, { useState } from 'react'; -import { useDatasetListPermissionGroups } from '@/api/buster_rest'; +import { useDatasetListPermissionGroups } from '@/api/buster_rest/datasets'; import { NewPermissionGroupModal, PermissionSearchAndListWrapper diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/DatasetGroupTitleAndDescription.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/DatasetGroupTitleAndDescription.tsx index 548585a65..f2a3aaf37 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/DatasetGroupTitleAndDescription.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/DatasetGroupTitleAndDescription.tsx @@ -1,7 +1,7 @@ 'use client'; import React from 'react'; -import { useGetDatasetGroup, useUpdateDatasetGroup } from '@/api/buster_rest'; +import { useGetDatasetGroup, useUpdateDatasetGroup } from '@/api/buster_rest/dataset_groups'; import { EditableTitle } from '@/components/ui/typography/EditableTitle'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetSelectedPopup.tsx index 243c13b60..0160c376f 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdateDatasetGroupDatasets } from '@/api/buster_rest'; +import { useUpdateDatasetGroupDatasets } from '@/api/buster_rest/dataset_groups'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx index 9bfd83655..889b48bb8 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetDatasetGroupDatasets } from '@/api/buster_rest'; +import { useGetDatasetGroupDatasets } from '@/api/buster_rest/dataset_groups'; import { NewDatasetModal } from '@/components/features/modal/NewDatasetModal'; import { PermissionSearchAndListWrapper } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx index 36174b539..a30d2eeb5 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx @@ -5,7 +5,7 @@ import type { GetDatasetGroupDatasetsResponse, GetPermissionGroupUsersResponse } from '@/api/asset_interfaces'; -import { useUpdateDatasetGroupDatasets } from '@/api/buster_rest'; +import { useUpdateDatasetGroupDatasets } from '@/api/buster_rest/dataset_groups'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { type BusterListColumn, @@ -134,7 +134,12 @@ export const DatasetGroupDatasetsListContainer: React.FC<{ useRowClickSelectChange={false} selectedRowKeys={selectedRowKeys} onSelectChange={setSelectedRowKeys} - emptyState={useMemo(() => , [])} + emptyState={useMemo( + () => ( + + ), + [] + )} /> ); diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/page.tsx index c0e7afc0e..82bb19c7e 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/page.tsx @@ -1,5 +1,5 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; -import { prefetchDatasetGroupDatasets } from '@/api/buster_rest'; +import { prefetchDatasetGroupDatasets } from '@/api/buster_rest/dataset_groups'; import { DatasetGroupDatasetsController } from './DatasetGroupDatasetsController'; export default async function Page(props: { params: Promise<{ datasetGroupId: string }> }) { diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/layout.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/layout.tsx index f8a3df682..d9f0857ba 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/layout.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/layout.tsx @@ -1,6 +1,6 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; import type React from 'react'; -import { prefetchDatasetGroup } from '@/api/buster_rest'; +import { prefetchDatasetGroup } from '@/api/buster_rest/dataset_groups'; import { DatasetGroupAppSegments } from './DatasetGroupAppSegments'; import { DatasetGroupBackButton } from './DatasetGroupBackButton'; import { DatasetGroupTitleAndDescription } from './DatasetGroupTitleAndDescription'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupSelectedPopup.tsx index a02537ad2..2b29657c2 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdateDatasetGroupPermissionGroups } from '@/api/buster_rest'; +import { useUpdateDatasetGroupPermissionGroups } from '@/api/buster_rest/dataset_groups'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsController.tsx index c201092e9..e52758cc4 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetDatasetGroupPermissionGroups } from '@/api/buster_rest'; +import { useGetDatasetGroupPermissionGroups } from '@/api/buster_rest/dataset_groups'; import { NewDatasetGroupModal, PermissionSearchAndListWrapper diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx index 60a29997a..dbe9758bd 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx @@ -5,7 +5,7 @@ import type { GetDatasetGroupPermissionGroupsResponse, GetPermissionGroupDatasetGroupsResponse } from '@/api/asset_interfaces'; -import { useUpdateDatasetGroupPermissionGroups } from '@/api/buster_rest'; +import { useUpdateDatasetGroupPermissionGroups } from '@/api/buster_rest/dataset_groups'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { type BusterListColumn, diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/page.tsx index b8c84a63b..18f2b8341 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/page.tsx @@ -1,5 +1,5 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; -import { prefetchDatasetGroupPermissionGroups } from '@/api/buster_rest'; +import { prefetchDatasetGroupPermissionGroups } from '@/api/buster_rest/dataset_groups'; import { DatasetGroupPermissionGroupsController } from './DatasetGroupPermissionGroupsController'; export default async function Page(props: { params: Promise<{ datasetGroupId: string }> }) { diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersController.tsx index 940259f24..1908de81a 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo } from 'react'; -import { useGetDatasetGroupUsers } from '@/api/buster_rest'; +import { useGetDatasetGroupUsers } from '@/api/buster_rest/dataset_groups'; import { PermissionSearchAndListWrapper } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons'; import { Plus } from '@/components/ui/icons'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx index 7113f1bb0..a5f3821a9 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx @@ -5,7 +5,7 @@ import type { GetDatasetGroupUsersResponse, GetPermissionGroupUsersResponse } from '@/api/asset_interfaces'; -import { useUpdateDatasetGroupUsers } from '@/api/buster_rest'; +import { useUpdateDatasetGroupUsers } from '@/api/buster_rest/dataset_groups'; import { ListUserItem } from '@/components/features/list/ListUserItem'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { @@ -138,7 +138,12 @@ export const DatasetGroupUsersListContainer: React.FC<{ useRowClickSelectChange={false} selectedRowKeys={selectedRowKeys} onSelectChange={setSelectedRowKeys} - emptyState={useMemo(() => , [])} + emptyState={useMemo( + () => ( + + ), + [] + )} /> ); diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersSelectedPopup.tsx index e26936f4b..baf0d103c 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdateDatasetGroupUsers } from '@/api/buster_rest'; +import { useUpdateDatasetGroupUsers } from '@/api/buster_rest/dataset_groups'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/page.tsx index 551b61c33..72e7f6644 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/page.tsx @@ -1,5 +1,5 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; -import { prefetchDatasetGroupUsers } from '@/api/buster_rest'; +import { prefetchDatasetGroupUsers } from '@/api/buster_rest/dataset_groups'; import { DatasetGroupUsersController } from './DatasetGroupUsersController'; export default async function Page(props: { params: Promise<{ datasetGroupId: string }> }) { diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/page.tsx index 71fd6fe66..14e692697 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/page.tsx @@ -1,7 +1,7 @@ 'use client'; import { useState } from 'react'; -import { useListDatasetGroups } from '@/api/buster_rest'; +import { useListDatasetGroups } from '@/api/buster_rest/dataset_groups'; import { NewDatasetGroupModal, PermissionSearch } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons'; import { Plus } from '@/components/ui/icons'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/_PermissionGroupIndividualLayout/PermissionGroupTitleAndDescription.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/_PermissionGroupIndividualLayout/PermissionGroupTitleAndDescription.tsx index f54ef319d..92a8409e5 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/_PermissionGroupIndividualLayout/PermissionGroupTitleAndDescription.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/_PermissionGroupIndividualLayout/PermissionGroupTitleAndDescription.tsx @@ -1,7 +1,10 @@ 'use client'; import React from 'react'; -import { useGetPermissionGroup, useUpdatePermissionGroup } from '@/api/buster_rest'; +import { + useGetPermissionGroup, + useUpdatePermissionGroup +} from '@/api/buster_rest/permission_groups'; import { EditableTitle } from '@/components/ui/typography/EditableTitle'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetGroupsController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetGroupsController.tsx index 7bc0d7d28..37bff85cf 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetGroupsController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetGroupsController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetPermissionGroupDatasetGroups } from '@/api/buster_rest'; +import { useGetPermissionGroupDatasetGroups } from '@/api/buster_rest/permission_groups'; import { NewDatasetGroupModal, PermissionSearchAndListWrapper diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetSelectedPopup.tsx index c7c903b51..d92602628 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdatePermissionGroupDatasetGroups } from '@/api/buster_rest'; +import { useUpdatePermissionGroupDatasetGroups } from '@/api/buster_rest/permission_groups'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx index a0e66ca29..7433f4756 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx @@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react'; import type { GetPermissionGroupDatasetGroupsResponse } from '@/api/asset_interfaces'; -import { useUpdatePermissionGroupDatasetGroups } from '@/api/buster_rest'; +import { useUpdatePermissionGroupDatasetGroups } from '@/api/buster_rest/permission_groups'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { type BusterListColumn, @@ -129,7 +129,12 @@ export const PermissionGroupDatasetGroupsListContainer: React.FC<{ useRowClickSelectChange={false} selectedRowKeys={selectedRowKeys} onSelectChange={setSelectedRowKeys} - emptyState={useMemo(() => , [])} + emptyState={useMemo( + () => ( + + ), + [] + )} /> ); diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/page.tsx index eea5cfac7..0a59caf02 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/page.tsx @@ -1,5 +1,5 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; -import { prefetchPermissionGroupDatasetGroups } from '@/api/buster_rest'; +import { prefetchPermissionGroupDatasetGroups } from '@/api/buster_rest/permission_groups'; import { PermissionGroupDatasetGroupsController } from './_PermissionGroupDatasetGroupsController'; export default async function Page(props: { params: Promise<{ permissionGroupId: string }> }) { diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetSelectedPopup.tsx index d9383c628..f6300c3a0 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdatePermissionGroupDatasets } from '@/api/buster_rest'; +import { useUpdatePermissionGroupDatasets } from '@/api/buster_rest/permission_groups'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx index 6804c2730..0270d8685 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetPermissionGroupDatasets } from '@/api/buster_rest'; +import { useGetPermissionGroupDatasets } from '@/api/buster_rest/permission_groups'; import { NewDatasetModal } from '@/components/features/modal/NewDatasetModal'; import { PermissionSearchAndListWrapper } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx index 060bf168f..ee6c5cd70 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx @@ -5,7 +5,7 @@ import type { GetPermissionGroupDatasetsResponse, GetPermissionGroupUsersResponse } from '@/api/asset_interfaces'; -import { useUpdatePermissionGroupDatasets } from '@/api/buster_rest'; +import { useUpdatePermissionGroupDatasets } from '@/api/buster_rest/permission_groups'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { type BusterListColumn, @@ -134,7 +134,12 @@ export const PermissionGroupDatasetsListContainer: React.FC<{ useRowClickSelectChange={false} selectedRowKeys={selectedRowKeys} onSelectChange={setSelectedRowKeys} - emptyState={useMemo(() => , [])} + emptyState={useMemo( + () => ( + + ), + [] + )} /> ); diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/page.tsx index b675eccce..0cadbe9db 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/page.tsx @@ -1,5 +1,5 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; -import { prefetchPermissionGroupDatasets } from '@/api/buster_rest'; +import { prefetchPermissionGroupDatasets } from '@/api/buster_rest/permission_groups'; import { PermissionGroupDatasetsController } from './_PermissionGroupDatasetsController'; export default async function Page(props: { params: Promise<{ permissionGroupId: string }> }) { diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/layout.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/layout.tsx index c093e28e3..d0c9cb286 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/layout.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/layout.tsx @@ -1,6 +1,6 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; import type React from 'react'; -import { prefetchPermissionGroup } from '@/api/buster_rest'; +import { prefetchPermissionGroup } from '@/api/buster_rest/permission_groups'; import { PermissionGroupIndividualLayout } from './_PermissionGroupIndividualLayout'; export default async function Layout(props: { diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersController.tsx index 10a200e65..dd4015cfc 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo } from 'react'; -import { useGetPermissionGroupUsers } from '@/api/buster_rest'; +import { useGetPermissionGroupUsers } from '@/api/buster_rest/permission_groups'; import { PermissionSearchAndListWrapper } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons'; import { Plus } from '@/components/ui/icons'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx index d77851030..63000b951 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx @@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react'; import type { GetPermissionGroupUsersResponse } from '@/api/asset_interfaces'; -import { useUpdatePermissionGroupUsers } from '@/api/buster_rest'; +import { useUpdatePermissionGroupUsers } from '@/api/buster_rest/permission_groups'; import { ListUserItem } from '@/components/features/list'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { @@ -133,7 +133,12 @@ export const PermissionGroupUsersListContainer: React.FC<{ useRowClickSelectChange={false} selectedRowKeys={selectedRowKeys} onSelectChange={setSelectedRowKeys} - emptyState={useMemo(() => , [])} + emptyState={useMemo( + () => ( + + ), + [] + )} /> ); diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersSelectedPopup.tsx index 27e00f181..7a98a0778 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdatePermissionGroupUsers } from '@/api/buster_rest'; +import { useUpdatePermissionGroupUsers } from '@/api/buster_rest/permission_groups'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/page.tsx index 003b3bc0b..d55d98c9b 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/page.tsx @@ -1,5 +1,5 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; -import { prefetchPermissionGroupUsers } from '@/api/buster_rest'; +import { prefetchPermissionGroupUsers } from '@/api/buster_rest/permission_groups'; import { PermissionGroupUsersController } from './_PermissionGroupUsersController'; export default async function Page(props: { params: Promise<{ permissionGroupId: string }> }) { diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/page.tsx index 8e1aabb7e..70b68a243 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/page.tsx @@ -1,7 +1,7 @@ 'use client'; import { useState } from 'react'; -import { useListAllPermissionGroups } from '@/api/buster_rest'; +import { useListAllPermissionGroups } from '@/api/buster_rest/permission_groups'; import { NewPermissionGroupModal, PermissionSearch diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_LayoutHeaderAndSegment/LayoutHeaderAndSegment.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_LayoutHeaderAndSegment/LayoutHeaderAndSegment.tsx index 798a81e6e..89c09a2d9 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_LayoutHeaderAndSegment/LayoutHeaderAndSegment.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_LayoutHeaderAndSegment/LayoutHeaderAndSegment.tsx @@ -1,7 +1,7 @@ 'use client'; import React, { useLayoutEffect, useState } from 'react'; -import { useGetUser } from '@/api/buster_rest'; +import { useGetUser } from '@/api/buster_rest/users'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { useUserConfigContextSelector } from '@/context/Users'; import { UserHeader } from './UserHeader'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDefaultAccess.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDefaultAccess.tsx index 5ecd45060..00633ffb1 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDefaultAccess.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDefaultAccess.tsx @@ -5,7 +5,7 @@ import { type BusterUser, type OrganizationUser } from '@/api/asset_interfaces'; -import { useUpdateUser } from '@/api/buster_rest'; +import { useUpdateUser } from '@/api/buster_rest/users'; import { Card, CardContent, diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserOverviewController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserOverviewController.tsx index a74853d40..2057c4795 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserOverviewController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserOverviewController.tsx @@ -1,7 +1,7 @@ 'use client'; import React from 'react'; -import { useGetUser } from '@/api/buster_rest'; +import { useGetUser } from '@/api/buster_rest/users'; import { useUserConfigContextSelector } from '@/context/Users'; import { UserDatasetSearch } from './UserDatasetSearch'; import { UserDefaultAccess } from './UserDefaultAccess'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesController.tsx index 413c73420..b5ef1f1ba 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetUserAttributes } from '@/api/buster_rest'; +import { useGetUserAttributes } from '@/api/buster_rest/users/permissions'; import { NewPermissionGroupModal, PermissionSearchAndListWrapper diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupListContainer.tsx index 75a6f2206..3934d4cf6 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupListContainer.tsx @@ -3,7 +3,7 @@ import pluralize from 'pluralize'; import React, { useMemo, useState } from 'react'; import type { BusterUserDatasetGroup } from '@/api/asset_interfaces'; -import { useUpdateUserDatasetGroups } from '@/api/buster_rest'; +import { useUpdateUserDatasetGroups } from '@/api/buster_rest/users/permissions'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { type BusterListColumn, diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupSelectedPopup.tsx index ed7358310..63dfe182d 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdateUserDatasetGroups } from '@/api/buster_rest'; +import { useUpdateUserDatasetGroups } from '@/api/buster_rest/users/permissions'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupsController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupsController.tsx index 55babde3a..7083eaea7 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupsController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupsController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetUserDatasetGroups } from '@/api/buster_rest'; +import { useGetUserDatasetGroups } from '@/api/buster_rest/users/permissions'; import { NewDatasetGroupModal, PermissionSearchAndListWrapper diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx index 20af64862..688a8096b 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetUserDatasets } from '@/api/buster_rest'; +import { useGetUserDatasets } from '@/api/buster_rest/users/permissions'; import { NewDatasetModal } from '@/components/features/modal/NewDatasetModal'; import { PermissionSearchAndListWrapper } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx index 3f815ff02..82e69c4d5 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx @@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react'; import type { BusterUserDataset, BusterUserPermissionGroup } from '@/api/asset_interfaces'; -import { useUpdateUserDatasets } from '@/api/buster_rest'; +import { useUpdateUserDatasets } from '@/api/buster_rest/users/permissions'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { type BusterListColumn, @@ -134,7 +134,12 @@ export const UserDatasetsListContainer: React.FC<{ useRowClickSelectChange={false} selectedRowKeys={selectedRowKeys} onSelectChange={setSelectedRowKeys} - emptyState={useMemo(() => , [])} + emptyState={useMemo( + () => ( + + ), + [] + )} /> ); diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsSelectedPopup.tsx index a6d0640c3..527dd4e65 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdateUserDatasets } from '@/api/buster_rest'; +import { useUpdateUserDatasets } from '@/api/buster_rest/users/permissions'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/layout.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/layout.tsx index 89beffdc8..8f4f35f0d 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/layout.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/layout.tsx @@ -2,7 +2,7 @@ import { dehydrate, HydrationBoundary } from '@tanstack/react-query'; import type { Metadata } from 'next'; import { cache } from 'react'; import type React from 'react'; -import { prefetchGetUser } from '@/api/buster_rest'; +import { prefetchGetUser } from '@/api/buster_rest/users'; import { LayoutHeaderAndSegment, UsersBackButton } from './_LayoutHeaderAndSegment'; import { queryKeys } from '@/api/query_keys'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupSelectedPopup.tsx index 3e97d5d8f..ec6829572 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupSelectedPopup.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useUpdateUserPermissionGroups } from '@/api/buster_rest'; +import { useUpdateUserPermissionGroups } from '@/api/buster_rest/users/permissions'; import { PermissionAssignedButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsController.tsx index b0bcb4a20..cf25f9a36 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetUserPermissionGroups } from '@/api/buster_rest'; +import { useGetUserPermissionGroups } from '@/api/buster_rest/users/permissions'; import { NewPermissionGroupModal, PermissionSearchAndListWrapper diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx index 8d8e27ca4..ce91b2dc9 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx @@ -3,7 +3,7 @@ import pluralize from 'pluralize'; import React, { useMemo, useState } from 'react'; import type { BusterUserPermissionGroup } from '@/api/asset_interfaces'; -import { useUpdateUserPermissionGroups } from '@/api/buster_rest'; +import { useUpdateUserPermissionGroups } from '@/api/buster_rest/users/permissions'; import { PermissionAssignedCell } from '@/components/features/PermissionComponents'; import { type BusterListColumn, @@ -140,7 +140,12 @@ export const UserPermissionGroupsListContainer: React.FC<{ useRowClickSelectChange={false} selectedRowKeys={selectedRowKeys} onSelectChange={setSelectedRowKeys} - emptyState={useMemo(() => , [])} + emptyState={useMemo( + () => ( + + ), + [] + )} /> ); diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx index 2658094a2..e93a26f3a 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useMemo, useState } from 'react'; -import { useGetUserTeams } from '@/api/buster_rest'; +import { useGetUserTeams } from '@/api/buster_rest/users/permissions'; import { NewTeamModal } from '@/components/features/modal/NewTeamModal'; import { PermissionSearchAndListWrapper } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsListContainer.tsx index 329bec402..a08d84b76 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsListContainer.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsListContainer.tsx @@ -3,7 +3,7 @@ import pluralize from 'pluralize'; import React, { useMemo, useState } from 'react'; import type { BusterUserTeamListItem, TeamRole } from '@/api/asset_interfaces'; -import { useUpdateUserTeams } from '@/api/buster_rest'; +import { useUpdateUserTeams } from '@/api/buster_rest/users/permissions'; import { PermissionAssignTeamRole } from '@/components/features/PermissionComponents'; import { type BusterListColumn, diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsSelectedPopup.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsSelectedPopup.tsx index b93486ca9..bc9908617 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsSelectedPopup.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsSelectedPopup.tsx @@ -1,6 +1,6 @@ import React from 'react'; import type { TeamRole } from '@/api/asset_interfaces'; -import { useUpdateUserTeams } from '@/api/buster_rest'; +import { useUpdateUserTeams } from '@/api/buster_rest/users/permissions'; import { PermissionAssignTeamRoleButton } from '@/components/features/PermissionComponents'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { useMemoizedFn } from '@/hooks'; diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/page.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/page.tsx index 0e1ec4319..30f64fd92 100644 --- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/page.tsx +++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/page.tsx @@ -1,6 +1,6 @@ 'use client'; -import { useGetOrganizationUsers } from '@/api/buster_rest'; +import { useGetOrganizationUsers } from '@/api/buster_rest/organizations'; import { InvitePeopleModal } from '@/components/features/modal/InvitePeopleModal'; import { PermissionSearch } from '@/components/features/PermissionComponents'; import { Button } from '@/components/ui/buttons';