From 0a8427bd629a6e505c125c503d556381e7f92b71 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Thu, 27 Feb 2025 22:58:10 -0700 Subject: [PATCH] update imports --- web/package.json | 18 +++++++++--------- .../users/[userId]/permission-groups/page.tsx | 2 +- .../settings/(permissions)/users/page.tsx | 2 +- .../(restricted-width)/api-keys/page.tsx | 2 +- .../PermissionListUserContainer.tsx | 2 +- web/src/components/ui/sidebar/Sidebar.tsx | 4 ++++ web/src/components/ui/sidebar/SidebarItem.tsx | 2 ++ web/src/components/ui/sidebar/interfaces.ts | 2 +- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/web/package.json b/web/package.json index 9f66fb675..7737fb749 100644 --- a/web/package.json +++ b/web/package.json @@ -47,7 +47,7 @@ "ahooks": "^3.8.4", "antd": "5.23.3", "antd-style": "^3.7.1", - "axios": "^1.7.9", + "axios": "^1.8.1", "canvas-confetti": "^1.9.3", "chart.js": "^4.4.8", "chartjs": "^0.3.24", @@ -115,14 +115,14 @@ "virtua": "^0.40.0" }, "devDependencies": { - "@chromatic-com/storybook": "^3.2.4", - "@storybook/addon-essentials": "^8.6.0", - "@storybook/addon-interactions": "^8.6.0", - "@storybook/addon-onboarding": "^8.6.0", - "@storybook/blocks": "^8.6.0", - "@storybook/nextjs": "^8.6.0", - "@storybook/react": "^8.6.0", - "@storybook/test": "^8.6.0", + "@chromatic-com/storybook": "^3.2.5", + "@storybook/addon-essentials": "^8.6.2", + "@storybook/addon-interactions": "^8.6.2", + "@storybook/addon-onboarding": "^8.6.2", + "@storybook/blocks": "^8.6.2", + "@storybook/nextjs": "^8.6.2", + "@storybook/react": "^8.6.2", + "@storybook/test": "^8.6.2", "@tailwindcss/postcss": "^4.0.9", "@tanstack/eslint-plugin-query": "^5.66.1", "@testing-library/jest-dom": "^6.6.3", diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/page.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/page.tsx index b3c2361c8..4c28de17b 100644 --- a/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/page.tsx +++ b/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/page.tsx @@ -1,9 +1,9 @@ import { prefetchGetUserPermissionGroups } from '@/api/buster_rest/users'; import { HydrationBoundary, dehydrate } from '@tanstack/react-query'; import { UserPermissionGroupsController } from './UserPermissionGroupsController'; -import { useCheckIfUserIsAdmin_server } from '../../../../../../../server_context/user'; import { redirect } from 'next/navigation'; import { BusterRoutes, createBusterRoute } from '@/routes'; +import { useCheckIfUserIsAdmin_server } from '@/server_context/user'; export default async function Page({ params }: { params: { userId: string } }) { const isAdmin = await useCheckIfUserIsAdmin_server(); diff --git a/web/src/app/app/(settings_layout)/settings/(permissions)/users/page.tsx b/web/src/app/app/(settings_layout)/settings/(permissions)/users/page.tsx index 9af42cfbb..19dc923d5 100644 --- a/web/src/app/app/(settings_layout)/settings/(permissions)/users/page.tsx +++ b/web/src/app/app/(settings_layout)/settings/(permissions)/users/page.tsx @@ -6,7 +6,7 @@ import { useDebounceSearch } from '@/hooks/useDebounceSearch'; import { useGetOrganizationUsers } from '@/api/buster_rest'; import { useUserConfigContextSelector } from '@/context/Users'; import { ListUsersComponent } from './ListUsersComponent'; -import { PermissionSearch } from '../../../../../components/features/PermissionComponents'; +import { PermissionSearch } from '@/components/features/PermissionComponents'; export default function Page() { const userOrganization = useUserConfigContextSelector((x) => x.userOrganizations); diff --git a/web/src/app/app/(settings_layout)/settings/(restricted-width)/api-keys/page.tsx b/web/src/app/app/(settings_layout)/settings/(restricted-width)/api-keys/page.tsx index 0ec442262..e9a043fd6 100644 --- a/web/src/app/app/(settings_layout)/settings/(restricted-width)/api-keys/page.tsx +++ b/web/src/app/app/(settings_layout)/settings/(restricted-width)/api-keys/page.tsx @@ -1,4 +1,4 @@ -import { useCheckIfUserIsAdmin_server } from '../../../../../server_context/user'; +import { useCheckIfUserIsAdmin_server } from '@/server_context/user'; import { SettingsPageHeader } from '../../_components/SettingsPageHeader'; import { ApiKeysController } from './ApiKeysController'; import { createBusterRoute, BusterRoutes } from '@/routes'; diff --git a/web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx b/web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx index 9fd7b522d..0feba9100 100644 --- a/web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx +++ b/web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx @@ -8,7 +8,7 @@ import { } from '@/components/ui/list'; import { BusterInfiniteList } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { PermissionLineageBreadcrumb } from '../../../../../../../components/features/PermissionComponents'; +import { PermissionLineageBreadcrumb } from '@/components/features/PermissionComponents'; import { ListUserItem } from '@/components/features/lists'; export const PermissionListUserContainer: React.FC<{ diff --git a/web/src/components/ui/sidebar/Sidebar.tsx b/web/src/components/ui/sidebar/Sidebar.tsx index dd6650fd8..46580464a 100644 --- a/web/src/components/ui/sidebar/Sidebar.tsx +++ b/web/src/components/ui/sidebar/Sidebar.tsx @@ -21,6 +21,8 @@ export const Sidebar: React.FC = React.memo( } ); +Sidebar.displayName = 'Sidebar'; + const ContentSelector: React.FC<{ content: SidebarProps['content'][number]; activeItem: SidebarProps['activeItem']; @@ -45,6 +47,8 @@ const SidebarList: React.FC<{ ); }); +SidebarList.displayName = 'SidebarList'; + const isSidebarGroup = (content: SidebarProps['content'][number]): content is ISidebarGroup => { return 'label' in content && content.label !== undefined; }; diff --git a/web/src/components/ui/sidebar/SidebarItem.tsx b/web/src/components/ui/sidebar/SidebarItem.tsx index 9f1e5e714..660c7d801 100644 --- a/web/src/components/ui/sidebar/SidebarItem.tsx +++ b/web/src/components/ui/sidebar/SidebarItem.tsx @@ -70,3 +70,5 @@ export const SidebarItem: React.FC