From 23c263cb16656d1043583adc8e8411fd5104839f Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 28 Feb 2025 11:30:39 -0700 Subject: [PATCH 1/8] move files --- .../chat/chatMessageInterfaces.ts | 29 ++++++++++--------- .../ChatItemsContainer.tsx | 3 +- .../ChatItemsSelectedPopup.tsx | 11 +++---- .../PermissionListUserContainer.tsx | 2 +- .../DatasetGroupDatasetsController.tsx | 2 +- .../users/DatasetGroupUsersListContainer.tsx | 2 +- .../PermissionGroupDatasetsController.tsx | 2 +- .../PermissionGroupUsersListContainer.tsx | 2 +- .../users/ListUsersComponent.tsx | 2 +- .../datasets/UserDatasetsController.tsx | 2 +- .../[userId]/teams/UserTeamsController.tsx | 2 +- .../[datasourceId]/_forms/FormWrapper.tsx | 2 +- .../SaveDashboardToCollectionButton.tsx | 6 ++-- .../Buttons/SaveMetricToCollectionButton.tsx | 2 +- .../Dropdowns/SaveToCollectionsDropdown.tsx | 2 +- .../CollectionsButton.tsx} | 0 .../context/Chats/ChatProvider/MOCK_CHAT.ts | 17 ++++++----- .../NewChatProvider/useAutoAppendThought.ts | 12 ++++---- web/src/controllers/AppLayout.tsx | 4 +-- .../CollectionIndividualContent.tsx | 2 +- .../CollectionIndividualHeader.tsx | 2 +- .../CollectionsListContent.tsx | 2 +- .../DashboardController.tsx | 2 +- .../DashboardListContent.tsx | 2 +- .../PermissionListUsersContainer.tsx | 2 +- .../DatasetsListController/DatasetsHeader.tsx | 2 +- .../DatasetsListController.tsx | 2 +- .../MetricItemsContainer.tsx | 4 +-- .../MetricItemsSelectedPopup.tsx | 2 +- .../ReasoningMessageContainer.tsx | 6 ++-- .../ReasoningMessage_Thought.tsx | 6 ++-- .../ReasoningMessage_ThoughtContainer.tsx | 4 +-- .../ReasoningMessage_ThoughtPills.tsx | 14 ++++----- .../TermsListController/TermsHeader.tsx | 2 +- 34 files changed, 78 insertions(+), 80 deletions(-) rename web/src/components/features/{Buttons/CollectionButton.tsx => buttons/CollectionsButton.tsx} (100%) diff --git a/web/src/api/asset_interfaces/chat/chatMessageInterfaces.ts b/web/src/api/asset_interfaces/chat/chatMessageInterfaces.ts index 6d5fdbb53..def0c24ec 100644 --- a/web/src/api/asset_interfaces/chat/chatMessageInterfaces.ts +++ b/web/src/api/asset_interfaces/chat/chatMessageInterfaces.ts @@ -6,6 +6,7 @@ export type BusterChatMessage = { response_messages: BusterChatMessageResponse[]; reasoning: BusterChatMessageReasoning[]; created_at: string; + final_reasoning_message: string | null; }; export type BusterChatMessageRequest = null | { @@ -43,36 +44,37 @@ export type BusterChatMessage_file = { }; export type BusterChatMessageReasoning = - | BusterChatMessageReasoning_thought + | BusterChatMessageReasoning_pills | BusterChatMessageReasoning_text | BusterChatMessageReasoning_file; -export type BusterChatMessageReasoning_thoughtPill = { +export type BusterChatMessageReasoning_pillsPill = { text: string; - type: ThoughtFileType; + type: ThoughtFileType | null; //if null then the pill will not link anywhere id: string; }; -export type BusterChatMessageReasoning_thoughtPillContainer = { +export type BusterChatMessageReasoning_pillsPillContainer = { title: string; - thought_pills: BusterChatMessageReasoning_thoughtPill[]; + thought_pills: BusterChatMessageReasoning_pillsPill[]; }; export type BusterChatMessageReasoning_status = 'loading' | 'completed' | 'failed'; -export type BusterChatMessageReasoning_thought = { +export type BusterChatMessageReasoning_pills = { id: string; - type: 'thought'; - thought_title: string; - thought_secondary_title: string; - thoughts?: BusterChatMessageReasoning_thoughtPillContainer[]; + type: 'pills'; + title: string; + secondary_title: string; + pill_containers?: BusterChatMessageReasoning_pillsPillContainer[]; status?: BusterChatMessageReasoning_status; //if left undefined, will automatically be set to 'loading' if the chat stream is in progress AND there is no message after it }; export type BusterChatMessageReasoning_text = { id: string; type: 'text'; - message: string; + title: string; + message?: string; message_chunk?: string; status?: BusterChatMessageReasoning_status; }; @@ -85,10 +87,9 @@ export type BusterChatMessageReasoning_file = { version_number: number; version_id: string; status?: BusterChatMessageReasoning_status; - //when we are streaming, the whole file will always be streamed back, not chunks file?: { text: string; line_number: number; - modified?: boolean; //defaults to true - }[]; //will be defined if the file has been completed OR on a page refresh + modified?: boolean; //only toggle to true if we want to hide previous lines + }[]; }; diff --git a/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx b/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx index 38be33b13..d377fde71 100644 --- a/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx +++ b/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx @@ -1,14 +1,13 @@ import { ShareAssetType, VerificationStatus, BusterChatListItem } from '@/api/asset_interfaces'; import { makeHumanReadble, formatDate } from '@/utils'; import React, { memo, useMemo, useRef, useState } from 'react'; -import { StatusBadgeIndicator, getShareStatus } from '../../../../components/features/Lists'; import { BusterUserAvatar, Text } from '@/components/ui'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import { BusterListColumn, BusterListRow } from '@/components/ui/list'; import { ChatSelectedOptionPopup } from './ChatItemsSelectedPopup'; import { BusterList, ListEmptyStateWithButton } from '@/components/ui/list'; -import { FavoriteStar } from '../../../../components/features/Lists'; +import { FavoriteStar, getShareStatus, StatusBadgeIndicator } from '@/components/features/lists'; import { useCreateListByDate } from '@/components/ui/list/useCreateListByDate'; export const ChatItemsContainer: React.FC<{ diff --git a/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx b/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx index 7e2e1ce78..e5aaa52c6 100644 --- a/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx +++ b/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx @@ -2,17 +2,14 @@ import React, { useState } from 'react'; import { AppMaterialIcons } from '@/components/ui'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { Button, Dropdown, DropdownProps } from 'antd'; -import { StatusBadgeButton } from '../../../../components/features/Lists'; import { VerificationStatus } from '@/api/asset_interfaces'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useUserConfigContextSelector } from '@/context/Users'; -import { - useBusterCollectionIndividualContextSelector, - useBusterCollectionListContextSelector -} from '@/context/Collections'; -import { useMemoizedFn, useMount } from 'ahooks'; -import { SaveToCollectionsDropdown } from '@/components/features/Dropdowns/SaveToCollectionsDropdown'; +import { useBusterCollectionListContextSelector } from '@/context/Collections'; +import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; +import { SaveToCollectionsDropdown } from '@/components/features/dropdowns/SaveToCollectionsDropdown'; +import { StatusBadgeButton } from '@/components/features/lists/StatusBadgeIndicator'; export const ChatSelectedOptionPopup: React.FC<{ selectedRowKeys: string[]; 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 2c5c3ca9b..9fd7b522d 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 @@ -9,7 +9,7 @@ import { import { BusterInfiniteList } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { PermissionLineageBreadcrumb } from '../../../../../../../components/features/PermissionComponents'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists'; export const PermissionListUserContainer: React.FC<{ className?: string; diff --git a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx index 5155cea04..9f29b55a1 100644 --- a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { DatasetGroupDatasetsListContainer } from './DatasetGroupDatasetsListContainer'; import { useMemoizedFn } from 'ahooks'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; export const DatasetGroupDatasetsController: React.FC<{ datasetGroupId: string; diff --git a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx index 98f4f1884..5c7f03d73 100644 --- a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx +++ b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx @@ -14,7 +14,7 @@ import { import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import React, { useMemo, useState } from 'react'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists'; import { DatasetGroupUsersSelectedPopup } from './DatasetGroupUsersSelectedPopup'; export const DatasetGroupUsersListContainer: React.FC<{ diff --git a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx index e456eae85..d2ec0c85a 100644 --- a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { PermissionGroupDatasetsListContainer } from './PermissionGroupDatasetsListContainer'; import { useMemoizedFn } from 'ahooks'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; export const PermissionGroupDatasetsController: React.FC<{ permissionGroupId: string; diff --git a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx index 85a47f4cd..1bb538602 100644 --- a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx +++ b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx @@ -11,7 +11,7 @@ import { import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import React, { useMemo, useState } from 'react'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists'; import { PermissionGroupUsersSelectedPopup } from './PermissionGroupUsersSelectedPopup'; export const PermissionGroupUsersListContainer: React.FC<{ diff --git a/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx b/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx index a26d765c0..514c2f09c 100644 --- a/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx +++ b/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx @@ -10,7 +10,7 @@ import React, { useMemo, useState } from 'react'; import { Text } from '@/components/ui'; import { OrganizationUserRoleText } from './config'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists'; export const ListUsersComponent: React.FC<{ users: OrganizationUser[]; diff --git a/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx b/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx index e33f87e2e..7a7a33770 100644 --- a/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx @@ -8,7 +8,7 @@ import { UserDatasetsListContainer } from './UserDatasetsListContainer'; import { Button } from 'antd'; import { useMemoizedFn } from 'ahooks'; import { AppMaterialIcons } from '@/components/ui'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; export const UserDatasetsController: React.FC<{ userId: string }> = ({ userId }) => { const { data: datasets } = useGetUserDatasets({ userId }); diff --git a/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx b/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx index 97f5fe751..6cd7d0b31 100644 --- a/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx +++ b/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { useMemoizedFn } from 'ahooks'; import { AppMaterialIcons } from '@/components/ui'; import { UserTeamsListContainer } from './UserTeamsListContainer'; -import { NewTeamModal } from '@/components/features/Modals/NewTeamModal'; +import { NewTeamModal } from '@/components/features/modals/NewTeamModal'; export const UserTeamsController: React.FC<{ userId: string }> = ({ userId }) => { const { data: teams, refetch } = useGetUserTeams({ userId }); diff --git a/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx b/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx index ac6cf2681..8365193ff 100644 --- a/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx +++ b/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx @@ -5,7 +5,7 @@ import React, { useImperativeHandle, useLayoutEffect } from 'react'; import { WhiteListBlock } from '../WhiteListBlock'; import type { DatasourceCreateCredentials } from '@/api/buster_socket/datasources'; import type { DataSource } from '@/api/asset_interfaces'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; const layout = { labelCol: { span: 7, offset: 0 }, diff --git a/web/src/components/features/Buttons/SaveDashboardToCollectionButton.tsx b/web/src/components/features/Buttons/SaveDashboardToCollectionButton.tsx index d41ebc76b..69b53bedf 100644 --- a/web/src/components/features/Buttons/SaveDashboardToCollectionButton.tsx +++ b/web/src/components/features/Buttons/SaveDashboardToCollectionButton.tsx @@ -1,10 +1,10 @@ import React, { useState } from 'react'; -import { SaveToCollectionsDropdown } from '../Dropdowns/SaveToCollectionsDropdown'; -import { useMemoizedFn, useMount } from 'ahooks'; +import { SaveToCollectionsDropdown } from '../dropdowns/SaveToCollectionsDropdown'; +import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useBusterDashboardContextSelector } from '@/context/Dashboards'; -import { CollectionButton } from './CollectionButton'; +import { CollectionButton } from './CollectionsButton'; export const SaveDashboardToCollectionButton: React.FC<{ dashboardIds: string[]; diff --git a/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx b/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx index 3d2e9a37a..828cadee6 100644 --- a/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx +++ b/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx @@ -3,7 +3,7 @@ import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useMemoizedFn } from 'ahooks'; import React, { useState } from 'react'; import { SaveToCollectionsDropdown } from '../Dropdowns/SaveToCollectionsDropdown'; -import { CollectionButton } from './CollectionButton'; +import { CollectionButton } from './CollectionsButton'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; export const SaveMetricToCollectionButton: React.FC<{ diff --git a/web/src/components/features/Dropdowns/SaveToCollectionsDropdown.tsx b/web/src/components/features/Dropdowns/SaveToCollectionsDropdown.tsx index aaf0a6d4e..d050062ff 100644 --- a/web/src/components/features/Dropdowns/SaveToCollectionsDropdown.tsx +++ b/web/src/components/features/Dropdowns/SaveToCollectionsDropdown.tsx @@ -8,7 +8,7 @@ import { useMemoizedFn } from 'ahooks'; import { Button } from 'antd'; import React, { useMemo } from 'react'; import type { BusterCollectionListItem } from '@/api/asset_interfaces'; -import { NewCollectionModal } from '../Modals/NewCollectionModal'; +import { NewCollectionModal } from '../modals/NewCollectionModal'; export const SaveToCollectionsDropdown: React.FC<{ children: React.ReactNode; diff --git a/web/src/components/features/Buttons/CollectionButton.tsx b/web/src/components/features/buttons/CollectionsButton.tsx similarity index 100% rename from web/src/components/features/Buttons/CollectionButton.tsx rename to web/src/components/features/buttons/CollectionsButton.tsx diff --git a/web/src/context/Chats/ChatProvider/MOCK_CHAT.ts b/web/src/context/Chats/ChatProvider/MOCK_CHAT.ts index 51faf597a..ff6b9bbb0 100644 --- a/web/src/context/Chats/ChatProvider/MOCK_CHAT.ts +++ b/web/src/context/Chats/ChatProvider/MOCK_CHAT.ts @@ -4,8 +4,8 @@ import { type BusterChatMessage_file, type BusterChatMessageRequest, BusterChatMessage_fileMetadata, - BusterChatMessageReasoning_thought, - BusterChatMessageReasoning_thoughtPill, + BusterChatMessageReasoning_pills, + BusterChatMessageReasoning_pillsPill, BusterChatMessageReasoning_file } from '@/api/asset_interfaces'; import { faker } from '@faker-js/faker'; @@ -29,9 +29,9 @@ export const createMockResponseMessageText = (): BusterChatMessage_text => ({ }) }); -export const createMockResponseMessageThought = (): BusterChatMessageReasoning_thought => { +export const createMockResponseMessageThought = (): BusterChatMessageReasoning_pills => { const randomPillCount = faker.number.int({ min: 0, max: 10 }); - const fourRandomPills: BusterChatMessageReasoning_thoughtPill[] = Array.from( + const fourRandomPills: BusterChatMessageReasoning_pillsPill[] = Array.from( { length: randomPillCount }, () => { return { @@ -43,10 +43,10 @@ export const createMockResponseMessageThought = (): BusterChatMessageReasoning_t ); return { id: faker.string.uuid(), - type: 'thought', - thought_title: `Found ${faker.number.int(100)} terms`, - thought_secondary_title: faker.lorem.word(), - thoughts: [ + type: 'pills', + title: `Found ${faker.number.int(100)} terms`, + secondary_title: faker.lorem.word(), + pill_containers: [ { title: `Found ${faker.number.int(100)} terms`, thought_pills: fourRandomPills @@ -128,6 +128,7 @@ export const MOCK_CHAT: BusterChat = { id: '123', created_at: '2025-01-01', request_message: createMockUserMessage(), + final_reasoning_message: null, reasoning: [ ...Array.from({ length: 1 }, () => createMockResponseMessageThought()), createMockReasoningMessageFile() diff --git a/web/src/context/Chats/NewChatProvider/useAutoAppendThought.ts b/web/src/context/Chats/NewChatProvider/useAutoAppendThought.ts index 744102d12..254415318 100644 --- a/web/src/context/Chats/NewChatProvider/useAutoAppendThought.ts +++ b/web/src/context/Chats/NewChatProvider/useAutoAppendThought.ts @@ -1,6 +1,6 @@ import { BusterChatMessageReasoning, - BusterChatMessageReasoning_thought + BusterChatMessageReasoning_pills } from '@/api/asset_interfaces'; import { useMemoizedFn } from 'ahooks'; import sample from 'lodash/sample'; @@ -75,13 +75,13 @@ const getRandomThought = (currentThought?: string): string => { }; const AUTO_THOUGHT_ID = 'stub-thought-id'; -const createAutoThought = (currentThought?: string): BusterChatMessageReasoning_thought => { +const createAutoThought = (currentThought?: string): BusterChatMessageReasoning_pills => { return { id: AUTO_THOUGHT_ID, - type: 'thought', - thought_title: getRandomThought(currentThought), - thought_secondary_title: '', - thoughts: [], + type: 'pills', + title: getRandomThought(currentThought), + secondary_title: '', + pill_containers: [], status: 'loading' }; }; diff --git a/web/src/controllers/AppLayout.tsx b/web/src/controllers/AppLayout.tsx index cb4992d15..229c34a78 100644 --- a/web/src/controllers/AppLayout.tsx +++ b/web/src/controllers/AppLayout.tsx @@ -4,12 +4,12 @@ import { ConfigProvider, Layout } from 'antd'; import React, { PropsWithChildren, useMemo } from 'react'; import { AppSidebar } from './AppSidebar'; import { NewChatModal } from '@/components/features/NewChatModal'; -import { InvitePeopleModal } from '@/components/features/Modals/InvitePeopleModal'; +import { InvitePeopleModal } from '@/components/features/modals/InvitePeopleModal'; import { AppSplitter } from '@/components/ui/layout'; import { createStyles } from 'antd-style'; import { useBusterStylesContext } from '@/context/BusterStyles/BusterStyles'; import { useUserConfigContextSelector } from '@/context/Users'; -import { SupportModal } from '@/components/features/Modals/SupportModal'; +import { SupportModal } from '@/components/features/modals/SupportModal'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { useMemoizedFn } from 'ahooks'; import { ThemeConfig } from 'antd/lib'; diff --git a/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx index a0533ec01..018cb7605 100644 --- a/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx +++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx @@ -15,7 +15,7 @@ import { } from '@/api/asset_interfaces'; import { Text } from '@/components/ui'; import { ListEmptyStateWithButton } from '@/components/ui/list'; -import { AddTypeModal } from '@/components/features/Modals/AddTypeModal'; +import { AddTypeModal } from '@/components/features/modals/AddTypeModal'; import { ShareAssetType } from '@/api/asset_interfaces'; import { useMemoizedFn } from 'ahooks'; import { BusterList, BusterListColumn, BusterListRow } from '@/components/ui/list'; diff --git a/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx index 06c98257d..00894d73c 100644 --- a/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx +++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx @@ -11,7 +11,7 @@ import Link from 'next/link'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { BusterRoutes } from '@/routes'; import { AppMaterialIcons, EditableTitle } from '@/components/ui'; -import { FavoriteStar } from '@/components/features/Lists/FavoriteStar'; +import { FavoriteStar } from '@/components/features/lists/FavoriteStar'; import { ShareMenu } from '@/components/features/ShareMenu'; import { BusterCollection, ShareAssetType } from '@/api/asset_interfaces'; import { Text } from '@/components/ui'; diff --git a/web/src/controllers/CollectionListController/CollectionsListContent.tsx b/web/src/controllers/CollectionListController/CollectionsListContent.tsx index a29d9232b..c1270dc31 100644 --- a/web/src/controllers/CollectionListController/CollectionsListContent.tsx +++ b/web/src/controllers/CollectionListController/CollectionsListContent.tsx @@ -12,7 +12,7 @@ import { ListEmptyStateWithButton } from '@/components/ui/list'; import { useMemoizedFn } from 'ahooks'; -import { NewCollectionModal } from '@/components/features/Modals/NewCollectionModal'; +import { NewCollectionModal } from '@/components/features/modals/NewCollectionModal'; import { BusterCollectionListItem } from '@/api/asset_interfaces'; import { CollectionListSelectedPopup } from './CollectionListSelectedPopup'; diff --git a/web/src/controllers/DashboardController/DashboardController.tsx b/web/src/controllers/DashboardController/DashboardController.tsx index aae3ff427..e222bdbcf 100644 --- a/web/src/controllers/DashboardController/DashboardController.tsx +++ b/web/src/controllers/DashboardController/DashboardController.tsx @@ -5,7 +5,7 @@ import { useBusterDashboardIndividual } from '@/context/Dashboards'; import { FileIndeterminateLoader } from '@/components/features/FileIndeterminateLoader'; import { DashboardFileView, useChatLayoutContextSelector } from '@layouts/ChatLayout'; import { DashboardViewComponents } from './config'; -import { AddTypeModal } from '@/components/features/Modals/AddTypeModal'; +import { AddTypeModal } from '@/components/features/modals/AddTypeModal'; import { useMemoizedFn } from 'ahooks'; export const DashboardController: React.FC<{ dashboardId: string }> = ({ dashboardId }) => { diff --git a/web/src/controllers/DashboardListController/DashboardListContent.tsx b/web/src/controllers/DashboardListController/DashboardListContent.tsx index 23c724f71..04cb7e69b 100644 --- a/web/src/controllers/DashboardListController/DashboardListContent.tsx +++ b/web/src/controllers/DashboardListController/DashboardListContent.tsx @@ -7,7 +7,7 @@ import { BusterUserAvatar } from '@/components/ui'; import { formatDate } from '@/utils'; import { BusterList, BusterListColumn, BusterListRow } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { getShareStatus } from '@/components/features/Lists'; +import { getShareStatus } from '@/components/features/lists'; import { ListEmptyStateWithButton } from '@/components/ui/list'; import { useMemoizedFn } from 'ahooks'; import { DashboardSelectedOptionPopup } from './DashboardSelectedPopup'; diff --git a/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx b/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx index a40869bd6..a46690870 100644 --- a/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx +++ b/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx @@ -16,7 +16,7 @@ import React, { useMemo, useState } from 'react'; import { PermissionUsersSelectedPopup } from './PermissionUsersSelectedPopup'; import { PERMISSION_USERS_OPTIONS } from './config'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists'; export const PermissionListUsersContainer: React.FC<{ filteredPermissionUsers: ListPermissionUsersResponse[]; diff --git a/web/src/controllers/DatasetsListController/DatasetsHeader.tsx b/web/src/controllers/DatasetsListController/DatasetsHeader.tsx index 5e759b107..046f8df3f 100644 --- a/web/src/controllers/DatasetsListController/DatasetsHeader.tsx +++ b/web/src/controllers/DatasetsListController/DatasetsHeader.tsx @@ -5,7 +5,7 @@ import { Breadcrumb, Button } from 'antd'; import Link from 'next/link'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { AppMaterialIcons, AppSegmented, AppTooltip } from '@/components/ui'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; import { AppContentHeader } from '@/components/ui/layout/AppContentHeader'; import { useIndividualDataset } from '@/context/Datasets'; import { useHotkeys } from 'react-hotkeys-hook'; diff --git a/web/src/controllers/DatasetsListController/DatasetsListController.tsx b/web/src/controllers/DatasetsListController/DatasetsListController.tsx index 46eeb784a..986dcfc40 100644 --- a/web/src/controllers/DatasetsListController/DatasetsListController.tsx +++ b/web/src/controllers/DatasetsListController/DatasetsListController.tsx @@ -6,7 +6,7 @@ import { useUserConfigContextSelector } from '@/context/Users'; import { useMemo, useState } from 'react'; import { DatasetListContent } from './DatasetListContent'; import { DatasetHeader } from './DatasetsHeader'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; export const DatasetsListController: React.FC<{}> = ({}) => { const isAdmin = useUserConfigContextSelector((state) => state.isAdmin); diff --git a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx index a25ae71fe..2515ca1b9 100644 --- a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx +++ b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx @@ -1,14 +1,14 @@ import { ShareAssetType, VerificationStatus, BusterMetricListItem } from '@/api/asset_interfaces'; import { makeHumanReadble, formatDate } from '@/utils'; import React, { memo, useMemo, useRef, useState } from 'react'; -import { StatusBadgeIndicator, getShareStatus } from '@/components/features/Lists'; +import { StatusBadgeIndicator, getShareStatus } from '@/components/features/lists'; import { BusterUserAvatar, Text } from '@/components/ui'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import { BusterListColumn, BusterListRow } from '@/components/ui/list'; import { MetricSelectedOptionPopup } from './MetricItemsSelectedPopup'; import { BusterList, ListEmptyStateWithButton } from '@/components/ui/list'; -import { FavoriteStar } from '@/components/features/Lists'; +import { FavoriteStar } from '@/components/features/lists'; import { useCreateListByDate } from '@/components/ui/list/useCreateListByDate'; export const MetricItemsContainer: React.FC<{ diff --git a/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx b/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx index f8260edb3..09893c6b8 100644 --- a/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx +++ b/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { AppMaterialIcons } from '@/components/ui'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { Button, Dropdown, DropdownProps } from 'antd'; -import { StatusBadgeButton } from '@/components/features/Lists'; +import { StatusBadgeButton } from '@/components/features/lists'; import { VerificationStatus } from '@/api/asset_interfaces'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useUserConfigContextSelector } from '@/context/Users'; diff --git a/web/src/controllers/ReasoningController/ReasoningMessageContainer.tsx b/web/src/controllers/ReasoningController/ReasoningMessageContainer.tsx index 1332ea130..e874bec78 100644 --- a/web/src/controllers/ReasoningController/ReasoningMessageContainer.tsx +++ b/web/src/controllers/ReasoningController/ReasoningMessageContainer.tsx @@ -14,7 +14,7 @@ export const ReasoningMessageContainer: React.FC<{ const typeClassRecord: Record = useMemo(() => { return { text: cx(styles.textCard, 'text-card'), - thought: cx(styles.thoughtCard, 'thought-card'), + pills: cx(styles.pillsCard, 'pills-card'), file: cx(styles.fileCard, 'file-card') }; }, []); @@ -60,7 +60,7 @@ const useStyles = createStyles(({ token, css }) => ({ display: none; } `, - thoughtCard: css` + pillsCard: css` .vertical-divider { display: none; } @@ -91,7 +91,7 @@ const useStyles = createStyles(({ token, css }) => ({ } } - &:has(+ .thought-card) { + &:has(+ .pills-card) { margin-bottom: 6px; } `, diff --git a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx index ee675ede1..93e92445e 100644 --- a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx +++ b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx @@ -1,4 +1,4 @@ -import type { BusterChatMessageReasoning_thought } from '@/api/asset_interfaces'; +import type { BusterChatMessageReasoning_pills } from '@/api/asset_interfaces'; import React from 'react'; import { ReasoningMessageProps } from '../ReasoningMessageSelector'; import { ReasoningMessage_ThoughtContainer } from './ReasoningMessage_ThoughtContainer'; @@ -7,10 +7,10 @@ import { BarContainer } from '../BarContainer'; export const ReasoningMessage_Thought: React.FC = React.memo( ({ reasoningMessage, isCompletedStream, isLastMessageItem }) => { const { thought_title, thought_secondary_title, thoughts, status, id } = - reasoningMessage as BusterChatMessageReasoning_thought; + reasoningMessage as BusterChatMessageReasoning_pills; const hasThoughts = !!thoughts && thoughts.length > 0; - const loadingStatus: NonNullable = + const loadingStatus: NonNullable = (status ?? (isLastMessageItem && !isCompletedStream)) ? status || 'loading' : 'completed'; return ( diff --git a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx index d0bd71d90..aa7bce6bf 100644 --- a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx +++ b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx @@ -1,4 +1,4 @@ -import { BusterChatMessageReasoning_thoughtPillContainer } from '@/api/asset_interfaces'; +import { BusterChatMessageReasoning_pillsPillContainer } from '@/api/asset_interfaces'; import React from 'react'; import { Text } from '@/components/ui'; import { PillContainer } from './ReasoningMessage_ThoughtPills'; @@ -6,7 +6,7 @@ import { itemAnimationConfig } from '../animationConfig'; import { AnimatePresence, motion } from 'framer-motion'; export const ReasoningMessage_ThoughtContainer: React.FC<{ - thought: BusterChatMessageReasoning_thoughtPillContainer; + thought: BusterChatMessageReasoning_pillsPillContainer; isCompletedStream: boolean; }> = React.memo(({ thought, isCompletedStream }) => { return ( diff --git a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx index 86886a818..5dfc9e605 100644 --- a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx +++ b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtPills.tsx @@ -1,4 +1,4 @@ -import type { BusterChatMessageReasoning_thoughtPill } from '@/api/asset_interfaces'; +import type { BusterChatMessageReasoning_pillsPill } from '@/api/asset_interfaces'; import { createStyles } from 'antd-style'; import React, { useMemo } from 'react'; import { AnimatePresence, motion } from 'framer-motion'; @@ -36,7 +36,7 @@ const pillVariants = { }; export const PillContainer: React.FC<{ - pills: BusterChatMessageReasoning_thoughtPill[]; + pills: BusterChatMessageReasoning_pillsPill[]; isCompletedStream: boolean; }> = React.memo(({ pills = [], isCompletedStream }) => { const { cx } = useStyles(); @@ -45,7 +45,7 @@ export const PillContainer: React.FC<{ const useAnimation = !isCompletedStream; const handlePillClick = useMemoizedFn( - (pill: Pick) => { + (pill: Pick) => { if (isOpenableFile(pill.type)) { onSetSelectedFile(pill as SelectedFile); } @@ -78,10 +78,10 @@ PillContainer.displayName = 'PillContainer'; const Pill: React.FC<{ text: string; id?: string; - type?: BusterChatMessageReasoning_thoughtPill['type']; + type?: BusterChatMessageReasoning_pillsPill['type']; useAnimation: boolean; className?: string; - onClick?: (pill: Pick) => void; + onClick?: (pill: Pick) => void; }> = React.memo(({ text, type, id, useAnimation, className = '', onClick }) => { const { styles, cx } = useStyles(); return ( @@ -110,9 +110,9 @@ const OverflowPill = React.memo( useAnimation, onClickPill }: { - hiddenPills: BusterChatMessageReasoning_thoughtPill[]; + hiddenPills: BusterChatMessageReasoning_pillsPill[]; useAnimation: boolean; - onClickPill: (pill: Pick) => void; + onClickPill: (pill: Pick) => void; }) => { const count = hiddenPills.length; diff --git a/web/src/controllers/TermsListController/TermsHeader.tsx b/web/src/controllers/TermsListController/TermsHeader.tsx index 6e638d3f4..57031acc6 100644 --- a/web/src/controllers/TermsListController/TermsHeader.tsx +++ b/web/src/controllers/TermsListController/TermsHeader.tsx @@ -12,7 +12,7 @@ import { useHotkeys } from 'react-hotkeys-hook'; import { useUserConfigContextSelector } from '@/context/Users'; import { useBusterTermsIndividual } from '@/context/Terms'; import { useMemoizedFn } from 'ahooks'; -import { NewTermModal } from '@/components/features/Modals/NewTermModal'; +import { NewTermModal } from '@/components/features/modals/NewTermModal'; export const TermsHeader: React.FC<{ termId?: string; From 401f1700b5c7d90b7792d9f4b5ae31bb929f18c7 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 28 Feb 2025 11:36:34 -0700 Subject: [PATCH 2/8] udpate names --- .../features/Buttons/SaveMetricToCollectionButton.tsx | 2 +- .../features/Buttons/SaveMetricToDashboardButton.tsx | 3 +-- web/src/components/features/buttons/CollectionsButton.tsx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx b/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx index 828cadee6..9a9671197 100644 --- a/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx +++ b/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx @@ -3,7 +3,7 @@ import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useMemoizedFn } from 'ahooks'; import React, { useState } from 'react'; import { SaveToCollectionsDropdown } from '../Dropdowns/SaveToCollectionsDropdown'; -import { CollectionButton } from './CollectionsButton'; +import { CollectionButton } from './SwagTest'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; export const SaveMetricToCollectionButton: React.FC<{ diff --git a/web/src/components/features/Buttons/SaveMetricToDashboardButton.tsx b/web/src/components/features/Buttons/SaveMetricToDashboardButton.tsx index a48986bc5..0720399e1 100644 --- a/web/src/components/features/Buttons/SaveMetricToDashboardButton.tsx +++ b/web/src/components/features/Buttons/SaveMetricToDashboardButton.tsx @@ -1,6 +1,5 @@ -import { useBusterDashboardListByFilter } from '@/context/Dashboards'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; -import { useMemoizedFn, useMount } from 'ahooks'; +import { useMemoizedFn } from 'ahooks'; import React from 'react'; import { SaveToDashboardDropdown } from '../Dropdowns/SaveToDashboardDropdown'; import { Button } from 'antd'; diff --git a/web/src/components/features/buttons/CollectionsButton.tsx b/web/src/components/features/buttons/CollectionsButton.tsx index d6e3103c3..226e30159 100644 --- a/web/src/components/features/buttons/CollectionsButton.tsx +++ b/web/src/components/features/buttons/CollectionsButton.tsx @@ -1,4 +1,4 @@ -import { AppMaterialIcons } from '@/components/ui'; +import { AppMaterialIcons } from '@/components/ui/icons'; import { Button } from 'antd'; import React from 'react'; From 3b0ad24f46eaae737a4ffd2f48cd8fd60093d752 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 28 Feb 2025 11:37:10 -0700 Subject: [PATCH 3/8] fix: reset case-sensitive folder names --- .../{Buttons => buttons}/SaveDashboardToCollectionButton.tsx | 0 .../{Buttons => buttons}/SaveMetricToCollectionButton.tsx | 0 .../features/{Buttons => buttons}/SaveMetricToDashboardButton.tsx | 0 web/src/components/features/{Buttons => buttons}/ShareButton.tsx | 0 .../features/{Buttons => buttons}/ShareDashboardButton.tsx | 0 .../features/{Buttons => buttons}/ShareMetricButton.tsx | 0 .../{Dropdowns => dropdowns}/SaveToCollectionsDropdown.tsx | 0 .../features/{Dropdowns => dropdowns}/SaveToDashboardDropdown.tsx | 0 web/src/components/features/{Lists => lists}/FavoriteStar.tsx | 0 web/src/components/features/{Lists => lists}/ListUserItem.tsx | 0 .../components/features/{Lists => lists}/StatusBadgeIndicator.tsx | 0 web/src/components/features/{Lists => lists}/index.ts | 0 web/src/components/features/{Modals => modals}/AddTypeModal.tsx | 0 .../components/features/{Modals => modals}/InvitePeopleModal.tsx | 0 .../components/features/{Modals => modals}/NewCollectionModal.tsx | 0 .../components/features/{Modals => modals}/NewDatasetModal.tsx | 0 web/src/components/features/{Modals => modals}/NewTeamModal.tsx | 0 web/src/components/features/{Modals => modals}/NewTermModal.tsx | 0 web/src/components/features/{Modals => modals}/SupportModal.tsx | 0 .../components/features/{Popups => popups}/SaveResetFilePopup.tsx | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename web/src/components/features/{Buttons => buttons}/SaveDashboardToCollectionButton.tsx (100%) rename web/src/components/features/{Buttons => buttons}/SaveMetricToCollectionButton.tsx (100%) rename web/src/components/features/{Buttons => buttons}/SaveMetricToDashboardButton.tsx (100%) rename web/src/components/features/{Buttons => buttons}/ShareButton.tsx (100%) rename web/src/components/features/{Buttons => buttons}/ShareDashboardButton.tsx (100%) rename web/src/components/features/{Buttons => buttons}/ShareMetricButton.tsx (100%) rename web/src/components/features/{Dropdowns => dropdowns}/SaveToCollectionsDropdown.tsx (100%) rename web/src/components/features/{Dropdowns => dropdowns}/SaveToDashboardDropdown.tsx (100%) rename web/src/components/features/{Lists => lists}/FavoriteStar.tsx (100%) rename web/src/components/features/{Lists => lists}/ListUserItem.tsx (100%) rename web/src/components/features/{Lists => lists}/StatusBadgeIndicator.tsx (100%) rename web/src/components/features/{Lists => lists}/index.ts (100%) rename web/src/components/features/{Modals => modals}/AddTypeModal.tsx (100%) rename web/src/components/features/{Modals => modals}/InvitePeopleModal.tsx (100%) rename web/src/components/features/{Modals => modals}/NewCollectionModal.tsx (100%) rename web/src/components/features/{Modals => modals}/NewDatasetModal.tsx (100%) rename web/src/components/features/{Modals => modals}/NewTeamModal.tsx (100%) rename web/src/components/features/{Modals => modals}/NewTermModal.tsx (100%) rename web/src/components/features/{Modals => modals}/SupportModal.tsx (100%) rename web/src/components/features/{Popups => popups}/SaveResetFilePopup.tsx (100%) diff --git a/web/src/components/features/Buttons/SaveDashboardToCollectionButton.tsx b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx similarity index 100% rename from web/src/components/features/Buttons/SaveDashboardToCollectionButton.tsx rename to web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx diff --git a/web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx similarity index 100% rename from web/src/components/features/Buttons/SaveMetricToCollectionButton.tsx rename to web/src/components/features/buttons/SaveMetricToCollectionButton.tsx diff --git a/web/src/components/features/Buttons/SaveMetricToDashboardButton.tsx b/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx similarity index 100% rename from web/src/components/features/Buttons/SaveMetricToDashboardButton.tsx rename to web/src/components/features/buttons/SaveMetricToDashboardButton.tsx diff --git a/web/src/components/features/Buttons/ShareButton.tsx b/web/src/components/features/buttons/ShareButton.tsx similarity index 100% rename from web/src/components/features/Buttons/ShareButton.tsx rename to web/src/components/features/buttons/ShareButton.tsx diff --git a/web/src/components/features/Buttons/ShareDashboardButton.tsx b/web/src/components/features/buttons/ShareDashboardButton.tsx similarity index 100% rename from web/src/components/features/Buttons/ShareDashboardButton.tsx rename to web/src/components/features/buttons/ShareDashboardButton.tsx diff --git a/web/src/components/features/Buttons/ShareMetricButton.tsx b/web/src/components/features/buttons/ShareMetricButton.tsx similarity index 100% rename from web/src/components/features/Buttons/ShareMetricButton.tsx rename to web/src/components/features/buttons/ShareMetricButton.tsx diff --git a/web/src/components/features/Dropdowns/SaveToCollectionsDropdown.tsx b/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx similarity index 100% rename from web/src/components/features/Dropdowns/SaveToCollectionsDropdown.tsx rename to web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx diff --git a/web/src/components/features/Dropdowns/SaveToDashboardDropdown.tsx b/web/src/components/features/dropdowns/SaveToDashboardDropdown.tsx similarity index 100% rename from web/src/components/features/Dropdowns/SaveToDashboardDropdown.tsx rename to web/src/components/features/dropdowns/SaveToDashboardDropdown.tsx diff --git a/web/src/components/features/Lists/FavoriteStar.tsx b/web/src/components/features/lists/FavoriteStar.tsx similarity index 100% rename from web/src/components/features/Lists/FavoriteStar.tsx rename to web/src/components/features/lists/FavoriteStar.tsx diff --git a/web/src/components/features/Lists/ListUserItem.tsx b/web/src/components/features/lists/ListUserItem.tsx similarity index 100% rename from web/src/components/features/Lists/ListUserItem.tsx rename to web/src/components/features/lists/ListUserItem.tsx diff --git a/web/src/components/features/Lists/StatusBadgeIndicator.tsx b/web/src/components/features/lists/StatusBadgeIndicator.tsx similarity index 100% rename from web/src/components/features/Lists/StatusBadgeIndicator.tsx rename to web/src/components/features/lists/StatusBadgeIndicator.tsx diff --git a/web/src/components/features/Lists/index.ts b/web/src/components/features/lists/index.ts similarity index 100% rename from web/src/components/features/Lists/index.ts rename to web/src/components/features/lists/index.ts diff --git a/web/src/components/features/Modals/AddTypeModal.tsx b/web/src/components/features/modals/AddTypeModal.tsx similarity index 100% rename from web/src/components/features/Modals/AddTypeModal.tsx rename to web/src/components/features/modals/AddTypeModal.tsx diff --git a/web/src/components/features/Modals/InvitePeopleModal.tsx b/web/src/components/features/modals/InvitePeopleModal.tsx similarity index 100% rename from web/src/components/features/Modals/InvitePeopleModal.tsx rename to web/src/components/features/modals/InvitePeopleModal.tsx diff --git a/web/src/components/features/Modals/NewCollectionModal.tsx b/web/src/components/features/modals/NewCollectionModal.tsx similarity index 100% rename from web/src/components/features/Modals/NewCollectionModal.tsx rename to web/src/components/features/modals/NewCollectionModal.tsx diff --git a/web/src/components/features/Modals/NewDatasetModal.tsx b/web/src/components/features/modals/NewDatasetModal.tsx similarity index 100% rename from web/src/components/features/Modals/NewDatasetModal.tsx rename to web/src/components/features/modals/NewDatasetModal.tsx diff --git a/web/src/components/features/Modals/NewTeamModal.tsx b/web/src/components/features/modals/NewTeamModal.tsx similarity index 100% rename from web/src/components/features/Modals/NewTeamModal.tsx rename to web/src/components/features/modals/NewTeamModal.tsx diff --git a/web/src/components/features/Modals/NewTermModal.tsx b/web/src/components/features/modals/NewTermModal.tsx similarity index 100% rename from web/src/components/features/Modals/NewTermModal.tsx rename to web/src/components/features/modals/NewTermModal.tsx diff --git a/web/src/components/features/Modals/SupportModal.tsx b/web/src/components/features/modals/SupportModal.tsx similarity index 100% rename from web/src/components/features/Modals/SupportModal.tsx rename to web/src/components/features/modals/SupportModal.tsx diff --git a/web/src/components/features/Popups/SaveResetFilePopup.tsx b/web/src/components/features/popups/SaveResetFilePopup.tsx similarity index 100% rename from web/src/components/features/Popups/SaveResetFilePopup.tsx rename to web/src/components/features/popups/SaveResetFilePopup.tsx From 754f2f2cf25e7e3aa2dbf0ec403bb21e60dd9429 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 28 Feb 2025 11:43:32 -0700 Subject: [PATCH 4/8] thought container update --- .../_ChatsListContainer/ChatItemsContainer.tsx | 2 +- .../_ChatsListContainer/ChatItemsSelectedPopup.tsx | 4 ++-- .../PermissionListUserContainer.tsx | 2 +- .../datasets/DatasetGroupDatasetsController.tsx | 2 +- .../users/DatasetGroupUsersListContainer.tsx | 2 +- .../PermissionGroupDatasetsController.tsx | 2 +- .../PermissionGroupUsersListContainer.tsx | 2 +- .../(permissions)/users/ListUsersComponent.tsx | 2 +- .../[userId]/datasets/UserDatasetsController.tsx | 2 +- .../users/[userId]/teams/UserTeamsController.tsx | 2 +- .../[datasourceId]/_forms/FormWrapper.tsx | 2 +- .../buttons/SaveDashboardToCollectionButton.tsx | 2 +- .../buttons/SaveMetricToCollectionButton.tsx | 2 +- .../dropdowns/SaveToCollectionsDropdown.tsx | 2 +- web/src/controllers/AppLayout.tsx | 4 ++-- .../CollectionIndividualContent.tsx | 2 +- .../CollectionIndividualHeader.tsx | 2 +- .../CollectionsListContent.tsx | 2 +- .../DashboardController/DashboardController.tsx | 2 +- .../DashboardListContent.tsx | 2 +- .../PermissionListUsersContainer.tsx | 2 +- .../DatasetsListController/DatasetsHeader.tsx | 2 +- .../DatasetsListController.tsx | 2 +- .../MetricListContainer/MetricItemsContainer.tsx | 4 ++-- .../MetricItemsSelectedPopup.tsx | 2 +- .../ReasoningMessages/ReasoningMessageSelector.tsx | 6 +++--- .../ReasoningMessage_Thought.tsx | 14 +++++++------- .../ReasoningMessage_ThoughtContainer.tsx | 11 +++++++---- .../TermsListController/TermsHeader.tsx | 2 +- .../ChatResponseMessages/ChatResponseReasoning.tsx | 8 ++++---- .../ChatLayout/ChatContext/useFileFallback.ts | 1 + .../ChatLayout/ChatLayoutContext/publicHelpers.ts | 3 ++- 32 files changed, 53 insertions(+), 48 deletions(-) diff --git a/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx b/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx index d377fde71..5562d5eab 100644 --- a/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx +++ b/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx @@ -7,7 +7,7 @@ import { useMemoizedFn } from 'ahooks'; import { BusterListColumn, BusterListRow } from '@/components/ui/list'; import { ChatSelectedOptionPopup } from './ChatItemsSelectedPopup'; import { BusterList, ListEmptyStateWithButton } from '@/components/ui/list'; -import { FavoriteStar, getShareStatus, StatusBadgeIndicator } from '@/components/features/lists'; +import { FavoriteStar, getShareStatus, StatusBadgeIndicator } from '@/components/features/Lists'; import { useCreateListByDate } from '@/components/ui/list/useCreateListByDate'; export const ChatItemsContainer: React.FC<{ diff --git a/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx b/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx index e5aaa52c6..7227398e1 100644 --- a/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx +++ b/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx @@ -8,8 +8,8 @@ import { useUserConfigContextSelector } from '@/context/Users'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; -import { SaveToCollectionsDropdown } from '@/components/features/dropdowns/SaveToCollectionsDropdown'; -import { StatusBadgeButton } from '@/components/features/lists/StatusBadgeIndicator'; +import { SaveToCollectionsDropdown } from '@/components/features/Dropdowns/SaveToCollectionsDropdown'; +import { StatusBadgeButton } from '@/components/features/Lists/StatusBadgeIndicator'; export const ChatSelectedOptionPopup: React.FC<{ selectedRowKeys: string[]; 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..2c5c3ca9b 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 @@ -9,7 +9,7 @@ import { import { BusterInfiniteList } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { PermissionLineageBreadcrumb } from '../../../../../../../components/features/PermissionComponents'; -import { ListUserItem } from '@/components/features/lists'; +import { ListUserItem } from '@/components/features/Lists'; export const PermissionListUserContainer: React.FC<{ className?: string; diff --git a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx index 9f29b55a1..5155cea04 100644 --- a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { DatasetGroupDatasetsListContainer } from './DatasetGroupDatasetsListContainer'; import { useMemoizedFn } from 'ahooks'; -import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; export const DatasetGroupDatasetsController: React.FC<{ datasetGroupId: string; diff --git a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx index 5c7f03d73..98f4f1884 100644 --- a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx +++ b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx @@ -14,7 +14,7 @@ import { import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import React, { useMemo, useState } from 'react'; -import { ListUserItem } from '@/components/features/lists'; +import { ListUserItem } from '@/components/features/Lists'; import { DatasetGroupUsersSelectedPopup } from './DatasetGroupUsersSelectedPopup'; export const DatasetGroupUsersListContainer: React.FC<{ diff --git a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx index d2ec0c85a..e456eae85 100644 --- a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { PermissionGroupDatasetsListContainer } from './PermissionGroupDatasetsListContainer'; import { useMemoizedFn } from 'ahooks'; -import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; export const PermissionGroupDatasetsController: React.FC<{ permissionGroupId: string; diff --git a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx index 1bb538602..85a47f4cd 100644 --- a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx +++ b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx @@ -11,7 +11,7 @@ import { import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import React, { useMemo, useState } from 'react'; -import { ListUserItem } from '@/components/features/lists'; +import { ListUserItem } from '@/components/features/Lists'; import { PermissionGroupUsersSelectedPopup } from './PermissionGroupUsersSelectedPopup'; export const PermissionGroupUsersListContainer: React.FC<{ diff --git a/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx b/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx index 514c2f09c..a26d765c0 100644 --- a/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx +++ b/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx @@ -10,7 +10,7 @@ import React, { useMemo, useState } from 'react'; import { Text } from '@/components/ui'; import { OrganizationUserRoleText } from './config'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { ListUserItem } from '@/components/features/lists'; +import { ListUserItem } from '@/components/features/Lists'; export const ListUsersComponent: React.FC<{ users: OrganizationUser[]; diff --git a/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx b/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx index 7a7a33770..e33f87e2e 100644 --- a/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx @@ -8,7 +8,7 @@ import { UserDatasetsListContainer } from './UserDatasetsListContainer'; import { Button } from 'antd'; import { useMemoizedFn } from 'ahooks'; import { AppMaterialIcons } from '@/components/ui'; -import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; export const UserDatasetsController: React.FC<{ userId: string }> = ({ userId }) => { const { data: datasets } = useGetUserDatasets({ userId }); diff --git a/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx b/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx index 6cd7d0b31..97f5fe751 100644 --- a/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx +++ b/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { useMemoizedFn } from 'ahooks'; import { AppMaterialIcons } from '@/components/ui'; import { UserTeamsListContainer } from './UserTeamsListContainer'; -import { NewTeamModal } from '@/components/features/modals/NewTeamModal'; +import { NewTeamModal } from '@/components/features/Modals/NewTeamModal'; export const UserTeamsController: React.FC<{ userId: string }> = ({ userId }) => { const { data: teams, refetch } = useGetUserTeams({ userId }); diff --git a/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx b/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx index 8365193ff..ac6cf2681 100644 --- a/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx +++ b/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx @@ -5,7 +5,7 @@ import React, { useImperativeHandle, useLayoutEffect } from 'react'; import { WhiteListBlock } from '../WhiteListBlock'; import type { DatasourceCreateCredentials } from '@/api/buster_socket/datasources'; import type { DataSource } from '@/api/asset_interfaces'; -import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; const layout = { labelCol: { span: 7, offset: 0 }, diff --git a/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx index 69b53bedf..894e4bde1 100644 --- a/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx +++ b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { SaveToCollectionsDropdown } from '../dropdowns/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '../Dropdowns/SaveToCollectionsDropdown'; import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; diff --git a/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx index 9a9671197..828cadee6 100644 --- a/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx +++ b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx @@ -3,7 +3,7 @@ import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useMemoizedFn } from 'ahooks'; import React, { useState } from 'react'; import { SaveToCollectionsDropdown } from '../Dropdowns/SaveToCollectionsDropdown'; -import { CollectionButton } from './SwagTest'; +import { CollectionButton } from './CollectionsButton'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; export const SaveMetricToCollectionButton: React.FC<{ diff --git a/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx b/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx index d050062ff..aaf0a6d4e 100644 --- a/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx +++ b/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx @@ -8,7 +8,7 @@ import { useMemoizedFn } from 'ahooks'; import { Button } from 'antd'; import React, { useMemo } from 'react'; import type { BusterCollectionListItem } from '@/api/asset_interfaces'; -import { NewCollectionModal } from '../modals/NewCollectionModal'; +import { NewCollectionModal } from '../Modals/NewCollectionModal'; export const SaveToCollectionsDropdown: React.FC<{ children: React.ReactNode; diff --git a/web/src/controllers/AppLayout.tsx b/web/src/controllers/AppLayout.tsx index 229c34a78..cb4992d15 100644 --- a/web/src/controllers/AppLayout.tsx +++ b/web/src/controllers/AppLayout.tsx @@ -4,12 +4,12 @@ import { ConfigProvider, Layout } from 'antd'; import React, { PropsWithChildren, useMemo } from 'react'; import { AppSidebar } from './AppSidebar'; import { NewChatModal } from '@/components/features/NewChatModal'; -import { InvitePeopleModal } from '@/components/features/modals/InvitePeopleModal'; +import { InvitePeopleModal } from '@/components/features/Modals/InvitePeopleModal'; import { AppSplitter } from '@/components/ui/layout'; import { createStyles } from 'antd-style'; import { useBusterStylesContext } from '@/context/BusterStyles/BusterStyles'; import { useUserConfigContextSelector } from '@/context/Users'; -import { SupportModal } from '@/components/features/modals/SupportModal'; +import { SupportModal } from '@/components/features/Modals/SupportModal'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { useMemoizedFn } from 'ahooks'; import { ThemeConfig } from 'antd/lib'; diff --git a/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx index 018cb7605..a0533ec01 100644 --- a/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx +++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx @@ -15,7 +15,7 @@ import { } from '@/api/asset_interfaces'; import { Text } from '@/components/ui'; import { ListEmptyStateWithButton } from '@/components/ui/list'; -import { AddTypeModal } from '@/components/features/modals/AddTypeModal'; +import { AddTypeModal } from '@/components/features/Modals/AddTypeModal'; import { ShareAssetType } from '@/api/asset_interfaces'; import { useMemoizedFn } from 'ahooks'; import { BusterList, BusterListColumn, BusterListRow } from '@/components/ui/list'; diff --git a/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx index 00894d73c..06c98257d 100644 --- a/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx +++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx @@ -11,7 +11,7 @@ import Link from 'next/link'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { BusterRoutes } from '@/routes'; import { AppMaterialIcons, EditableTitle } from '@/components/ui'; -import { FavoriteStar } from '@/components/features/lists/FavoriteStar'; +import { FavoriteStar } from '@/components/features/Lists/FavoriteStar'; import { ShareMenu } from '@/components/features/ShareMenu'; import { BusterCollection, ShareAssetType } from '@/api/asset_interfaces'; import { Text } from '@/components/ui'; diff --git a/web/src/controllers/CollectionListController/CollectionsListContent.tsx b/web/src/controllers/CollectionListController/CollectionsListContent.tsx index c1270dc31..a29d9232b 100644 --- a/web/src/controllers/CollectionListController/CollectionsListContent.tsx +++ b/web/src/controllers/CollectionListController/CollectionsListContent.tsx @@ -12,7 +12,7 @@ import { ListEmptyStateWithButton } from '@/components/ui/list'; import { useMemoizedFn } from 'ahooks'; -import { NewCollectionModal } from '@/components/features/modals/NewCollectionModal'; +import { NewCollectionModal } from '@/components/features/Modals/NewCollectionModal'; import { BusterCollectionListItem } from '@/api/asset_interfaces'; import { CollectionListSelectedPopup } from './CollectionListSelectedPopup'; diff --git a/web/src/controllers/DashboardController/DashboardController.tsx b/web/src/controllers/DashboardController/DashboardController.tsx index e222bdbcf..aae3ff427 100644 --- a/web/src/controllers/DashboardController/DashboardController.tsx +++ b/web/src/controllers/DashboardController/DashboardController.tsx @@ -5,7 +5,7 @@ import { useBusterDashboardIndividual } from '@/context/Dashboards'; import { FileIndeterminateLoader } from '@/components/features/FileIndeterminateLoader'; import { DashboardFileView, useChatLayoutContextSelector } from '@layouts/ChatLayout'; import { DashboardViewComponents } from './config'; -import { AddTypeModal } from '@/components/features/modals/AddTypeModal'; +import { AddTypeModal } from '@/components/features/Modals/AddTypeModal'; import { useMemoizedFn } from 'ahooks'; export const DashboardController: React.FC<{ dashboardId: string }> = ({ dashboardId }) => { diff --git a/web/src/controllers/DashboardListController/DashboardListContent.tsx b/web/src/controllers/DashboardListController/DashboardListContent.tsx index 04cb7e69b..23c724f71 100644 --- a/web/src/controllers/DashboardListController/DashboardListContent.tsx +++ b/web/src/controllers/DashboardListController/DashboardListContent.tsx @@ -7,7 +7,7 @@ import { BusterUserAvatar } from '@/components/ui'; import { formatDate } from '@/utils'; import { BusterList, BusterListColumn, BusterListRow } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { getShareStatus } from '@/components/features/lists'; +import { getShareStatus } from '@/components/features/Lists'; import { ListEmptyStateWithButton } from '@/components/ui/list'; import { useMemoizedFn } from 'ahooks'; import { DashboardSelectedOptionPopup } from './DashboardSelectedPopup'; diff --git a/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx b/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx index a46690870..a40869bd6 100644 --- a/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx +++ b/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx @@ -16,7 +16,7 @@ import React, { useMemo, useState } from 'react'; import { PermissionUsersSelectedPopup } from './PermissionUsersSelectedPopup'; import { PERMISSION_USERS_OPTIONS } from './config'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { ListUserItem } from '@/components/features/lists'; +import { ListUserItem } from '@/components/features/Lists'; export const PermissionListUsersContainer: React.FC<{ filteredPermissionUsers: ListPermissionUsersResponse[]; diff --git a/web/src/controllers/DatasetsListController/DatasetsHeader.tsx b/web/src/controllers/DatasetsListController/DatasetsHeader.tsx index 046f8df3f..5e759b107 100644 --- a/web/src/controllers/DatasetsListController/DatasetsHeader.tsx +++ b/web/src/controllers/DatasetsListController/DatasetsHeader.tsx @@ -5,7 +5,7 @@ import { Breadcrumb, Button } from 'antd'; import Link from 'next/link'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { AppMaterialIcons, AppSegmented, AppTooltip } from '@/components/ui'; -import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; import { AppContentHeader } from '@/components/ui/layout/AppContentHeader'; import { useIndividualDataset } from '@/context/Datasets'; import { useHotkeys } from 'react-hotkeys-hook'; diff --git a/web/src/controllers/DatasetsListController/DatasetsListController.tsx b/web/src/controllers/DatasetsListController/DatasetsListController.tsx index 986dcfc40..46eeb784a 100644 --- a/web/src/controllers/DatasetsListController/DatasetsListController.tsx +++ b/web/src/controllers/DatasetsListController/DatasetsListController.tsx @@ -6,7 +6,7 @@ import { useUserConfigContextSelector } from '@/context/Users'; import { useMemo, useState } from 'react'; import { DatasetListContent } from './DatasetListContent'; import { DatasetHeader } from './DatasetsHeader'; -import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; export const DatasetsListController: React.FC<{}> = ({}) => { const isAdmin = useUserConfigContextSelector((state) => state.isAdmin); diff --git a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx index 2515ca1b9..a25ae71fe 100644 --- a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx +++ b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx @@ -1,14 +1,14 @@ import { ShareAssetType, VerificationStatus, BusterMetricListItem } from '@/api/asset_interfaces'; import { makeHumanReadble, formatDate } from '@/utils'; import React, { memo, useMemo, useRef, useState } from 'react'; -import { StatusBadgeIndicator, getShareStatus } from '@/components/features/lists'; +import { StatusBadgeIndicator, getShareStatus } from '@/components/features/Lists'; import { BusterUserAvatar, Text } from '@/components/ui'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import { BusterListColumn, BusterListRow } from '@/components/ui/list'; import { MetricSelectedOptionPopup } from './MetricItemsSelectedPopup'; import { BusterList, ListEmptyStateWithButton } from '@/components/ui/list'; -import { FavoriteStar } from '@/components/features/lists'; +import { FavoriteStar } from '@/components/features/Lists'; import { useCreateListByDate } from '@/components/ui/list/useCreateListByDate'; export const MetricItemsContainer: React.FC<{ diff --git a/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx b/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx index 09893c6b8..f8260edb3 100644 --- a/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx +++ b/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { AppMaterialIcons } from '@/components/ui'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { Button, Dropdown, DropdownProps } from 'antd'; -import { StatusBadgeButton } from '@/components/features/lists'; +import { StatusBadgeButton } from '@/components/features/Lists'; import { VerificationStatus } from '@/api/asset_interfaces'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useUserConfigContextSelector } from '@/context/Users'; diff --git a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessageSelector.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessageSelector.tsx index af13f9a06..25ae78bb5 100644 --- a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessageSelector.tsx +++ b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessageSelector.tsx @@ -3,8 +3,8 @@ import type { BusterChatMessageReasoning, BusterChatMessageReasoning_text } from '@/api/asset_interfaces'; -import { ReasoningMessage_Thought } from './ReasoningMessage_Thought'; import { StreamingMessage_Text } from '@/components/features/Streaming/StreamingMessage_Text'; +import { ReasoningMessage_Thought } from './ReasoningMessage_Thought'; import { ReasoningMessage_File } from './ReasoningMessage_File'; export interface ReasoningMessageProps { @@ -18,11 +18,11 @@ const ReasoningMessageRecord: Record< BusterChatMessageReasoning['type'], React.FC > = { - thought: ReasoningMessage_Thought, + pills: ReasoningMessage_Thought, text: (props) => ( ), file: ReasoningMessage_File diff --git a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx index 93e92445e..e3f7af95b 100644 --- a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx +++ b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_Thought.tsx @@ -1,15 +1,15 @@ -import type { BusterChatMessageReasoning_pills } from '@/api/asset_interfaces'; import React from 'react'; +import type { BusterChatMessageReasoning_pills } from '@/api/asset_interfaces'; import { ReasoningMessageProps } from '../ReasoningMessageSelector'; import { ReasoningMessage_ThoughtContainer } from './ReasoningMessage_ThoughtContainer'; import { BarContainer } from '../BarContainer'; export const ReasoningMessage_Thought: React.FC = React.memo( ({ reasoningMessage, isCompletedStream, isLastMessageItem }) => { - const { thought_title, thought_secondary_title, thoughts, status, id } = + const { title, secondary_title, pill_containers, status, id } = reasoningMessage as BusterChatMessageReasoning_pills; - const hasThoughts = !!thoughts && thoughts.length > 0; + const hasThoughts = !!pill_containers && pill_containers.length > 0; const loadingStatus: NonNullable = (status ?? (isLastMessageItem && !isCompletedStream)) ? status || 'loading' : 'completed'; @@ -18,14 +18,14 @@ export const ReasoningMessage_Thought: React.FC = React.m showBar={hasThoughts || !isLastMessageItem} status={loadingStatus} isCompletedStream={isCompletedStream} - title={thought_title} - secondaryTitle={thought_secondary_title} + title={title} + secondaryTitle={secondary_title} contentClassName="mb-3"> {hasThoughts && - thoughts.map((thought, index) => ( + pill_containers.map((pill_container, index) => ( ))} diff --git a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx index aa7bce6bf..5a7d9dccc 100644 --- a/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx +++ b/web/src/controllers/ReasoningController/ReasoningMessages/ReasoningMessage_Thought/ReasoningMessage_ThoughtContainer.tsx @@ -6,17 +6,20 @@ import { itemAnimationConfig } from '../animationConfig'; import { AnimatePresence, motion } from 'framer-motion'; export const ReasoningMessage_ThoughtContainer: React.FC<{ - thought: BusterChatMessageReasoning_pillsPillContainer; + pillContainer: BusterChatMessageReasoning_pillsPillContainer; isCompletedStream: boolean; -}> = React.memo(({ thought, isCompletedStream }) => { +}> = React.memo(({ pillContainer, isCompletedStream }) => { return (
- {thought.title} + {pillContainer.title} - +
diff --git a/web/src/controllers/TermsListController/TermsHeader.tsx b/web/src/controllers/TermsListController/TermsHeader.tsx index 57031acc6..6e638d3f4 100644 --- a/web/src/controllers/TermsListController/TermsHeader.tsx +++ b/web/src/controllers/TermsListController/TermsHeader.tsx @@ -12,7 +12,7 @@ import { useHotkeys } from 'react-hotkeys-hook'; import { useUserConfigContextSelector } from '@/context/Users'; import { useBusterTermsIndividual } from '@/context/Terms'; import { useMemoizedFn } from 'ahooks'; -import { NewTermModal } from '@/components/features/modals/NewTermModal'; +import { NewTermModal } from '@/components/features/Modals/NewTermModal'; export const TermsHeader: React.FC<{ termId?: string; diff --git a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx index 7f22f49dc..777d020a1 100644 --- a/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx +++ b/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatResponseMessages/ChatResponseReasoning.tsx @@ -1,4 +1,4 @@ -import { BusterChatMessageReasoning } from '@/api/asset_interfaces'; +import type { BusterChatMessageReasoning } from '@/api/asset_interfaces'; import React, { useMemo } from 'react'; import last from 'lodash/last'; import { ShimmerText } from '@/components/ui'; @@ -31,8 +31,8 @@ export const ChatResponseReasoning: React.FC<{ switch (lastMessage.type) { case 'text': return lastMessage.message; - case 'thought': - return lastMessage.thought_title; + case 'pills': + return lastMessage.title; case 'file': return lastMessage.file_name; default: @@ -52,7 +52,7 @@ export const ChatResponseReasoning: React.FC<{ diff --git a/web/src/layouts/ChatLayout/ChatContext/useFileFallback.ts b/web/src/layouts/ChatLayout/ChatContext/useFileFallback.ts index 676d49dd3..bf9b3e762 100644 --- a/web/src/layouts/ChatLayout/ChatContext/useFileFallback.ts +++ b/web/src/layouts/ChatLayout/ChatContext/useFileFallback.ts @@ -110,6 +110,7 @@ const fallbackToFileChatMessage = ({ return { request_message: null, reasoning: [], + final_reasoning_message: null, response_messages: [ { id: 'init', diff --git a/web/src/layouts/ChatLayout/ChatLayoutContext/publicHelpers.ts b/web/src/layouts/ChatLayout/ChatLayoutContext/publicHelpers.ts index 0f095b0c8..7b92dfa00 100644 --- a/web/src/layouts/ChatLayout/ChatLayoutContext/publicHelpers.ts +++ b/web/src/layouts/ChatLayout/ChatLayoutContext/publicHelpers.ts @@ -2,6 +2,7 @@ import type { ThoughtFileType } from '@/api/asset_interfaces'; const OPENABLE_FILES = new Set(['metric', 'dashboard', 'reasoning']); -export const isOpenableFile = (type: ThoughtFileType): boolean => { +export const isOpenableFile = (type: ThoughtFileType | null): boolean => { + if (!type) return false; return OPENABLE_FILES.has(type); }; From e563280bd9b27868a41bc0e74e34cbf5ea3cf6e1 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 28 Feb 2025 11:44:50 -0700 Subject: [PATCH 5/8] Update button --- .../features/{buttons => button}/CollectionsButton.tsx | 0 .../{buttons => button}/SaveDashboardToCollectionButton.tsx | 0 .../{buttons => button}/SaveMetricToCollectionButton.tsx | 0 .../{buttons => button}/SaveMetricToDashboardButton.tsx | 0 .../components/features/{buttons => button}/ShareButton.tsx | 0 .../features/{buttons => button}/ShareDashboardButton.tsx | 0 .../features/{buttons => button}/ShareMetricButton.tsx | 0 .../FileContainerHeader/DashboardContainerHeaderButtons.tsx | 4 ++-- .../FileContainerHeader/MetricContainerHeaderButtons.tsx | 6 +++--- 9 files changed, 5 insertions(+), 5 deletions(-) rename web/src/components/features/{buttons => button}/CollectionsButton.tsx (100%) rename web/src/components/features/{buttons => button}/SaveDashboardToCollectionButton.tsx (100%) rename web/src/components/features/{buttons => button}/SaveMetricToCollectionButton.tsx (100%) rename web/src/components/features/{buttons => button}/SaveMetricToDashboardButton.tsx (100%) rename web/src/components/features/{buttons => button}/ShareButton.tsx (100%) rename web/src/components/features/{buttons => button}/ShareDashboardButton.tsx (100%) rename web/src/components/features/{buttons => button}/ShareMetricButton.tsx (100%) diff --git a/web/src/components/features/buttons/CollectionsButton.tsx b/web/src/components/features/button/CollectionsButton.tsx similarity index 100% rename from web/src/components/features/buttons/CollectionsButton.tsx rename to web/src/components/features/button/CollectionsButton.tsx diff --git a/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx b/web/src/components/features/button/SaveDashboardToCollectionButton.tsx similarity index 100% rename from web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx rename to web/src/components/features/button/SaveDashboardToCollectionButton.tsx diff --git a/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx b/web/src/components/features/button/SaveMetricToCollectionButton.tsx similarity index 100% rename from web/src/components/features/buttons/SaveMetricToCollectionButton.tsx rename to web/src/components/features/button/SaveMetricToCollectionButton.tsx diff --git a/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx b/web/src/components/features/button/SaveMetricToDashboardButton.tsx similarity index 100% rename from web/src/components/features/buttons/SaveMetricToDashboardButton.tsx rename to web/src/components/features/button/SaveMetricToDashboardButton.tsx diff --git a/web/src/components/features/buttons/ShareButton.tsx b/web/src/components/features/button/ShareButton.tsx similarity index 100% rename from web/src/components/features/buttons/ShareButton.tsx rename to web/src/components/features/button/ShareButton.tsx diff --git a/web/src/components/features/buttons/ShareDashboardButton.tsx b/web/src/components/features/button/ShareDashboardButton.tsx similarity index 100% rename from web/src/components/features/buttons/ShareDashboardButton.tsx rename to web/src/components/features/button/ShareDashboardButton.tsx diff --git a/web/src/components/features/buttons/ShareMetricButton.tsx b/web/src/components/features/button/ShareMetricButton.tsx similarity index 100% rename from web/src/components/features/buttons/ShareMetricButton.tsx rename to web/src/components/features/button/ShareMetricButton.tsx diff --git a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx index 7c3db68ae..9f2b8dce2 100644 --- a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx +++ b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx @@ -2,11 +2,11 @@ import React, { useMemo } from 'react'; import { FileContainerButtonsProps } from './interfaces'; import { FileButtonContainer } from './FileButtonContainer'; import { useChatIndividualContextSelector } from '../../ChatContext'; -import { SaveDashboardToCollectionButton } from '@/components/features/Buttons/SaveDashboardToCollectionButton'; +import { SaveDashboardToCollectionButton } from '@/components/features/button/SaveDashboardToCollectionButton'; import { HideButtonContainer } from './HideButtonContainer'; import { useChatLayoutContextSelector } from '../../ChatLayoutContext'; import { CreateChatButton } from './CreateChatButtont'; -import { ShareDashboardButton } from '@/components/features/Buttons/ShareDashboardButton'; +import { ShareDashboardButton } from '@/components/features/button/ShareDashboardButton'; import { Button, Dropdown } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { MenuProps } from 'antd/lib'; diff --git a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx index 8fb71d85e..3dde53300 100644 --- a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx +++ b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx @@ -8,9 +8,9 @@ import { FileButtonContainer } from './FileButtonContainer'; import { CreateChatButton } from './CreateChatButtont'; import { SelectableButton } from './SelectableButton'; import { useMetricIndividual } from '@/context/Metrics'; -import { SaveMetricToCollectionButton } from '../../../../components/features/Buttons/SaveMetricToCollectionButton'; -import { SaveMetricToDashboardButton } from '../../../../components/features/Buttons/SaveMetricToDashboardButton'; -import { ShareMetricButton } from '../../../../components/features/Buttons/ShareMetricButton'; +import { SaveMetricToCollectionButton } from '../../../../components/features/button/SaveMetricToCollectionButton'; +import { SaveMetricToDashboardButton } from '../../../../components/features/button/SaveMetricToDashboardButton'; +import { ShareMetricButton } from '../../../../components/features/button/ShareMetricButton'; export const MetricContainerHeaderButtons: React.FC = React.memo(() => { const renderViewLayoutKey = useChatLayoutContextSelector((x) => x.renderViewLayoutKey); From da90476acbf995f3dc2063a5ad546342a1e88165 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 28 Feb 2025 11:45:52 -0700 Subject: [PATCH 6/8] buttons --- .../features/{button => buttons}/CollectionsButton.tsx | 0 .../{button => buttons}/SaveDashboardToCollectionButton.tsx | 0 .../{button => buttons}/SaveMetricToCollectionButton.tsx | 0 .../{button => buttons}/SaveMetricToDashboardButton.tsx | 0 .../components/features/{button => buttons}/ShareButton.tsx | 0 .../features/{button => buttons}/ShareDashboardButton.tsx | 0 .../features/{button => buttons}/ShareMetricButton.tsx | 0 .../FileContainerHeader/DashboardContainerHeaderButtons.tsx | 4 ++-- .../FileContainerHeader/MetricContainerHeaderButtons.tsx | 6 +++--- 9 files changed, 5 insertions(+), 5 deletions(-) rename web/src/components/features/{button => buttons}/CollectionsButton.tsx (100%) rename web/src/components/features/{button => buttons}/SaveDashboardToCollectionButton.tsx (100%) rename web/src/components/features/{button => buttons}/SaveMetricToCollectionButton.tsx (100%) rename web/src/components/features/{button => buttons}/SaveMetricToDashboardButton.tsx (100%) rename web/src/components/features/{button => buttons}/ShareButton.tsx (100%) rename web/src/components/features/{button => buttons}/ShareDashboardButton.tsx (100%) rename web/src/components/features/{button => buttons}/ShareMetricButton.tsx (100%) diff --git a/web/src/components/features/button/CollectionsButton.tsx b/web/src/components/features/buttons/CollectionsButton.tsx similarity index 100% rename from web/src/components/features/button/CollectionsButton.tsx rename to web/src/components/features/buttons/CollectionsButton.tsx diff --git a/web/src/components/features/button/SaveDashboardToCollectionButton.tsx b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx similarity index 100% rename from web/src/components/features/button/SaveDashboardToCollectionButton.tsx rename to web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx diff --git a/web/src/components/features/button/SaveMetricToCollectionButton.tsx b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx similarity index 100% rename from web/src/components/features/button/SaveMetricToCollectionButton.tsx rename to web/src/components/features/buttons/SaveMetricToCollectionButton.tsx diff --git a/web/src/components/features/button/SaveMetricToDashboardButton.tsx b/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx similarity index 100% rename from web/src/components/features/button/SaveMetricToDashboardButton.tsx rename to web/src/components/features/buttons/SaveMetricToDashboardButton.tsx diff --git a/web/src/components/features/button/ShareButton.tsx b/web/src/components/features/buttons/ShareButton.tsx similarity index 100% rename from web/src/components/features/button/ShareButton.tsx rename to web/src/components/features/buttons/ShareButton.tsx diff --git a/web/src/components/features/button/ShareDashboardButton.tsx b/web/src/components/features/buttons/ShareDashboardButton.tsx similarity index 100% rename from web/src/components/features/button/ShareDashboardButton.tsx rename to web/src/components/features/buttons/ShareDashboardButton.tsx diff --git a/web/src/components/features/button/ShareMetricButton.tsx b/web/src/components/features/buttons/ShareMetricButton.tsx similarity index 100% rename from web/src/components/features/button/ShareMetricButton.tsx rename to web/src/components/features/buttons/ShareMetricButton.tsx diff --git a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx index 9f2b8dce2..2a28b7bee 100644 --- a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx +++ b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/DashboardContainerHeaderButtons.tsx @@ -2,11 +2,11 @@ import React, { useMemo } from 'react'; import { FileContainerButtonsProps } from './interfaces'; import { FileButtonContainer } from './FileButtonContainer'; import { useChatIndividualContextSelector } from '../../ChatContext'; -import { SaveDashboardToCollectionButton } from '@/components/features/button/SaveDashboardToCollectionButton'; +import { SaveDashboardToCollectionButton } from '@/components/features/buttons/SaveDashboardToCollectionButton'; import { HideButtonContainer } from './HideButtonContainer'; import { useChatLayoutContextSelector } from '../../ChatLayoutContext'; import { CreateChatButton } from './CreateChatButtont'; -import { ShareDashboardButton } from '@/components/features/button/ShareDashboardButton'; +import { ShareDashboardButton } from '@/components/features/buttons/ShareDashboardButton'; import { Button, Dropdown } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { MenuProps } from 'antd/lib'; diff --git a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx index 3dde53300..881444712 100644 --- a/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx +++ b/web/src/layouts/ChatLayout/FileContainer/FileContainerHeader/MetricContainerHeaderButtons.tsx @@ -8,9 +8,9 @@ import { FileButtonContainer } from './FileButtonContainer'; import { CreateChatButton } from './CreateChatButtont'; import { SelectableButton } from './SelectableButton'; import { useMetricIndividual } from '@/context/Metrics'; -import { SaveMetricToCollectionButton } from '../../../../components/features/button/SaveMetricToCollectionButton'; -import { SaveMetricToDashboardButton } from '../../../../components/features/button/SaveMetricToDashboardButton'; -import { ShareMetricButton } from '../../../../components/features/button/ShareMetricButton'; +import { SaveMetricToCollectionButton } from '../../../../components/features/buttons/SaveMetricToCollectionButton'; +import { SaveMetricToDashboardButton } from '../../../../components/features/buttons/SaveMetricToDashboardButton'; +import { ShareMetricButton } from '../../../../components/features/buttons/ShareMetricButton'; export const MetricContainerHeaderButtons: React.FC = React.memo(() => { const renderViewLayoutKey = useChatLayoutContextSelector((x) => x.renderViewLayoutKey); From 8290e1d454f5f2838bccb72a4584b3d3c2f9a835 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 28 Feb 2025 11:48:54 -0700 Subject: [PATCH 7/8] trigger file change --- .../app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx | 2 +- .../app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx | 4 ++-- .../_PermissionOverview/PermissionListUserContainer.tsx | 2 +- .../datasets/DatasetGroupDatasetsController.tsx | 2 +- .../[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx | 2 +- .../PermissionGroupDatasetsController.tsx | 2 +- .../PermissionGroupUsersListContainer.tsx | 2 +- .../app/settings/(permissions)/users/ListUsersComponent.tsx | 2 +- .../users/[userId]/datasets/UserDatasetsController.tsx | 2 +- .../users/[userId]/teams/UserTeamsController.tsx | 2 +- .../[datasourceId]/_forms/FormWrapper.tsx | 2 +- web/src/components/features/NewChatModal/NewChatModal.tsx | 2 +- .../features/buttons/SaveDashboardToCollectionButton.tsx | 2 +- .../features/buttons/SaveMetricToCollectionButton.tsx | 2 +- .../features/buttons/SaveMetricToDashboardButton.tsx | 2 +- .../{dropdowns => dropdowns2}/SaveToCollectionsDropdown.tsx | 2 +- .../{dropdowns => dropdowns2}/SaveToDashboardDropdown.tsx | 0 .../components/features/{lists => lists2}/FavoriteStar.tsx | 0 .../components/features/{lists => lists2}/ListUserItem.tsx | 0 .../features/{lists => lists2}/StatusBadgeIndicator.tsx | 0 web/src/components/features/{lists => lists2}/index.ts | 0 .../components/features/{modals => modals2}/AddTypeModal.tsx | 0 .../features/{modals => modals2}/InvitePeopleModal.tsx | 0 .../features/{modals => modals2}/NewCollectionModal.tsx | 0 .../features/{modals => modals2}/NewDatasetModal.tsx | 0 .../components/features/{modals => modals2}/NewTeamModal.tsx | 0 .../components/features/{modals => modals2}/NewTermModal.tsx | 0 .../components/features/{modals => modals2}/SupportModal.tsx | 0 .../features/{popups => popups2}/SaveResetFilePopup.tsx | 0 web/src/controllers/AppLayout.tsx | 4 ++-- .../CollectionIndividualContent.tsx | 2 +- .../CollectionIndividualHeader.tsx | 2 +- .../CollectionListController/CollectionsListContent.tsx | 2 +- .../controllers/DashboardController/DashboardController.tsx | 2 +- .../DashboardViewFileController.tsx | 2 +- .../DashboardListController/DashboardListContent.tsx | 2 +- .../DashboardListController/DashboardSelectedPopup.tsx | 2 +- .../DatasetPermissionUser/PermissionListUsersContainer.tsx | 2 +- web/src/controllers/DatasetsListController/DatasetsHeader.tsx | 2 +- .../DatasetsListController/DatasetsListController.tsx | 2 +- .../MetricController/MetricViewFile/MetricViewFile.tsx | 2 +- .../controllers/MetricListContainer/MetricItemsContainer.tsx | 4 ++-- .../MetricListContainer/MetricItemsSelectedPopup.tsx | 4 ++-- web/src/controllers/TermsListController/TermsHeader.tsx | 2 +- 44 files changed, 35 insertions(+), 35 deletions(-) rename web/src/components/features/{dropdowns => dropdowns2}/SaveToCollectionsDropdown.tsx (98%) rename web/src/components/features/{dropdowns => dropdowns2}/SaveToDashboardDropdown.tsx (100%) rename web/src/components/features/{lists => lists2}/FavoriteStar.tsx (100%) rename web/src/components/features/{lists => lists2}/ListUserItem.tsx (100%) rename web/src/components/features/{lists => lists2}/StatusBadgeIndicator.tsx (100%) rename web/src/components/features/{lists => lists2}/index.ts (100%) rename web/src/components/features/{modals => modals2}/AddTypeModal.tsx (100%) rename web/src/components/features/{modals => modals2}/InvitePeopleModal.tsx (100%) rename web/src/components/features/{modals => modals2}/NewCollectionModal.tsx (100%) rename web/src/components/features/{modals => modals2}/NewDatasetModal.tsx (100%) rename web/src/components/features/{modals => modals2}/NewTeamModal.tsx (100%) rename web/src/components/features/{modals => modals2}/NewTermModal.tsx (100%) rename web/src/components/features/{modals => modals2}/SupportModal.tsx (100%) rename web/src/components/features/{popups => popups2}/SaveResetFilePopup.tsx (100%) diff --git a/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx b/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx index 5562d5eab..8fe579aaa 100644 --- a/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx +++ b/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx @@ -7,7 +7,7 @@ import { useMemoizedFn } from 'ahooks'; import { BusterListColumn, BusterListRow } from '@/components/ui/list'; import { ChatSelectedOptionPopup } from './ChatItemsSelectedPopup'; import { BusterList, ListEmptyStateWithButton } from '@/components/ui/list'; -import { FavoriteStar, getShareStatus, StatusBadgeIndicator } from '@/components/features/Lists'; +import { FavoriteStar, getShareStatus, StatusBadgeIndicator } from '@/components/features/lists2'; import { useCreateListByDate } from '@/components/ui/list/useCreateListByDate'; export const ChatItemsContainer: React.FC<{ diff --git a/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx b/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx index 7227398e1..7501ae1c3 100644 --- a/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx +++ b/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx @@ -8,8 +8,8 @@ import { useUserConfigContextSelector } from '@/context/Users'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; -import { SaveToCollectionsDropdown } from '@/components/features/Dropdowns/SaveToCollectionsDropdown'; -import { StatusBadgeButton } from '@/components/features/Lists/StatusBadgeIndicator'; +import { SaveToCollectionsDropdown } from '@/components/features/dropdowns2/SaveToCollectionsDropdown'; +import { StatusBadgeButton } from '@/components/features/lists2/StatusBadgeIndicator'; export const ChatSelectedOptionPopup: React.FC<{ selectedRowKeys: string[]; 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 2c5c3ca9b..dbe7b68bf 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 @@ -9,7 +9,7 @@ import { import { BusterInfiniteList } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { PermissionLineageBreadcrumb } from '../../../../../../../components/features/PermissionComponents'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists2'; export const PermissionListUserContainer: React.FC<{ className?: string; diff --git a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx index 5155cea04..035fcb5f0 100644 --- a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { DatasetGroupDatasetsListContainer } from './DatasetGroupDatasetsListContainer'; import { useMemoizedFn } from 'ahooks'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; export const DatasetGroupDatasetsController: React.FC<{ datasetGroupId: string; diff --git a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx index 98f4f1884..afe441e81 100644 --- a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx +++ b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx @@ -14,7 +14,7 @@ import { import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import React, { useMemo, useState } from 'react'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists2'; import { DatasetGroupUsersSelectedPopup } from './DatasetGroupUsersSelectedPopup'; export const DatasetGroupUsersListContainer: React.FC<{ diff --git a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx index e456eae85..22eaa57f8 100644 --- a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { PermissionGroupDatasetsListContainer } from './PermissionGroupDatasetsListContainer'; import { useMemoizedFn } from 'ahooks'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; export const PermissionGroupDatasetsController: React.FC<{ permissionGroupId: string; diff --git a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx index 85a47f4cd..5cec1171c 100644 --- a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx +++ b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx @@ -11,7 +11,7 @@ import { import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import React, { useMemo, useState } from 'react'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists2'; import { PermissionGroupUsersSelectedPopup } from './PermissionGroupUsersSelectedPopup'; export const PermissionGroupUsersListContainer: React.FC<{ diff --git a/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx b/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx index a26d765c0..5a379457a 100644 --- a/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx +++ b/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx @@ -10,7 +10,7 @@ import React, { useMemo, useState } from 'react'; import { Text } from '@/components/ui'; import { OrganizationUserRoleText } from './config'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists2'; export const ListUsersComponent: React.FC<{ users: OrganizationUser[]; diff --git a/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx b/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx index e33f87e2e..f00db1575 100644 --- a/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx @@ -8,7 +8,7 @@ import { UserDatasetsListContainer } from './UserDatasetsListContainer'; import { Button } from 'antd'; import { useMemoizedFn } from 'ahooks'; import { AppMaterialIcons } from '@/components/ui'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; export const UserDatasetsController: React.FC<{ userId: string }> = ({ userId }) => { const { data: datasets } = useGetUserDatasets({ userId }); diff --git a/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx b/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx index 97f5fe751..abb55d202 100644 --- a/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx +++ b/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { useMemoizedFn } from 'ahooks'; import { AppMaterialIcons } from '@/components/ui'; import { UserTeamsListContainer } from './UserTeamsListContainer'; -import { NewTeamModal } from '@/components/features/Modals/NewTeamModal'; +import { NewTeamModal } from '@/components/features/modals2/NewTeamModal'; export const UserTeamsController: React.FC<{ userId: string }> = ({ userId }) => { const { data: teams, refetch } = useGetUserTeams({ userId }); diff --git a/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx b/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx index ac6cf2681..919d68771 100644 --- a/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx +++ b/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx @@ -5,7 +5,7 @@ import React, { useImperativeHandle, useLayoutEffect } from 'react'; import { WhiteListBlock } from '../WhiteListBlock'; import type { DatasourceCreateCredentials } from '@/api/buster_socket/datasources'; import type { DataSource } from '@/api/asset_interfaces'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; const layout = { labelCol: { span: 7, offset: 0 }, diff --git a/web/src/components/features/NewChatModal/NewChatModal.tsx b/web/src/components/features/NewChatModal/NewChatModal.tsx index cb87cb3de..90a786ab4 100644 --- a/web/src/components/features/NewChatModal/NewChatModal.tsx +++ b/web/src/components/features/NewChatModal/NewChatModal.tsx @@ -12,7 +12,7 @@ import { NewChatModalDataSourceSelect } from './NewChatModalDatasourceSelect'; import { NoDatasets } from './NoDatasets'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { useGetDatasets } from '@/api/buster_rest/datasets'; -import { NewDatasetModal } from '../Modals/NewDatasetModal'; +import { NewDatasetModal } from '../modals2/NewDatasetModal'; const { TextArea } = Input; diff --git a/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx index 894e4bde1..5f597b931 100644 --- a/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx +++ b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { SaveToCollectionsDropdown } from '../Dropdowns/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '../dropdowns2/SaveToCollectionsDropdown'; import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; diff --git a/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx index 828cadee6..da7f360be 100644 --- a/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx +++ b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx @@ -2,7 +2,7 @@ import { useBusterNotifications } from '@/context/BusterNotifications'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useMemoizedFn } from 'ahooks'; import React, { useState } from 'react'; -import { SaveToCollectionsDropdown } from '../Dropdowns/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '../dropdowns2/SaveToCollectionsDropdown'; import { CollectionButton } from './CollectionsButton'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; diff --git a/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx b/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx index 0720399e1..be825541b 100644 --- a/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx +++ b/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx @@ -1,7 +1,7 @@ import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useMemoizedFn } from 'ahooks'; import React from 'react'; -import { SaveToDashboardDropdown } from '../Dropdowns/SaveToDashboardDropdown'; +import { SaveToDashboardDropdown } from '../dropdowns2/SaveToDashboardDropdown'; import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import type { BusterMetric } from '@/api/asset_interfaces'; diff --git a/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx b/web/src/components/features/dropdowns2/SaveToCollectionsDropdown.tsx similarity index 98% rename from web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx rename to web/src/components/features/dropdowns2/SaveToCollectionsDropdown.tsx index aaf0a6d4e..68d72b17e 100644 --- a/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx +++ b/web/src/components/features/dropdowns2/SaveToCollectionsDropdown.tsx @@ -8,7 +8,7 @@ import { useMemoizedFn } from 'ahooks'; import { Button } from 'antd'; import React, { useMemo } from 'react'; import type { BusterCollectionListItem } from '@/api/asset_interfaces'; -import { NewCollectionModal } from '../Modals/NewCollectionModal'; +import { NewCollectionModal } from '../modals2/NewCollectionModal'; export const SaveToCollectionsDropdown: React.FC<{ children: React.ReactNode; diff --git a/web/src/components/features/dropdowns/SaveToDashboardDropdown.tsx b/web/src/components/features/dropdowns2/SaveToDashboardDropdown.tsx similarity index 100% rename from web/src/components/features/dropdowns/SaveToDashboardDropdown.tsx rename to web/src/components/features/dropdowns2/SaveToDashboardDropdown.tsx diff --git a/web/src/components/features/lists/FavoriteStar.tsx b/web/src/components/features/lists2/FavoriteStar.tsx similarity index 100% rename from web/src/components/features/lists/FavoriteStar.tsx rename to web/src/components/features/lists2/FavoriteStar.tsx diff --git a/web/src/components/features/lists/ListUserItem.tsx b/web/src/components/features/lists2/ListUserItem.tsx similarity index 100% rename from web/src/components/features/lists/ListUserItem.tsx rename to web/src/components/features/lists2/ListUserItem.tsx diff --git a/web/src/components/features/lists/StatusBadgeIndicator.tsx b/web/src/components/features/lists2/StatusBadgeIndicator.tsx similarity index 100% rename from web/src/components/features/lists/StatusBadgeIndicator.tsx rename to web/src/components/features/lists2/StatusBadgeIndicator.tsx diff --git a/web/src/components/features/lists/index.ts b/web/src/components/features/lists2/index.ts similarity index 100% rename from web/src/components/features/lists/index.ts rename to web/src/components/features/lists2/index.ts diff --git a/web/src/components/features/modals/AddTypeModal.tsx b/web/src/components/features/modals2/AddTypeModal.tsx similarity index 100% rename from web/src/components/features/modals/AddTypeModal.tsx rename to web/src/components/features/modals2/AddTypeModal.tsx diff --git a/web/src/components/features/modals/InvitePeopleModal.tsx b/web/src/components/features/modals2/InvitePeopleModal.tsx similarity index 100% rename from web/src/components/features/modals/InvitePeopleModal.tsx rename to web/src/components/features/modals2/InvitePeopleModal.tsx diff --git a/web/src/components/features/modals/NewCollectionModal.tsx b/web/src/components/features/modals2/NewCollectionModal.tsx similarity index 100% rename from web/src/components/features/modals/NewCollectionModal.tsx rename to web/src/components/features/modals2/NewCollectionModal.tsx diff --git a/web/src/components/features/modals/NewDatasetModal.tsx b/web/src/components/features/modals2/NewDatasetModal.tsx similarity index 100% rename from web/src/components/features/modals/NewDatasetModal.tsx rename to web/src/components/features/modals2/NewDatasetModal.tsx diff --git a/web/src/components/features/modals/NewTeamModal.tsx b/web/src/components/features/modals2/NewTeamModal.tsx similarity index 100% rename from web/src/components/features/modals/NewTeamModal.tsx rename to web/src/components/features/modals2/NewTeamModal.tsx diff --git a/web/src/components/features/modals/NewTermModal.tsx b/web/src/components/features/modals2/NewTermModal.tsx similarity index 100% rename from web/src/components/features/modals/NewTermModal.tsx rename to web/src/components/features/modals2/NewTermModal.tsx diff --git a/web/src/components/features/modals/SupportModal.tsx b/web/src/components/features/modals2/SupportModal.tsx similarity index 100% rename from web/src/components/features/modals/SupportModal.tsx rename to web/src/components/features/modals2/SupportModal.tsx diff --git a/web/src/components/features/popups/SaveResetFilePopup.tsx b/web/src/components/features/popups2/SaveResetFilePopup.tsx similarity index 100% rename from web/src/components/features/popups/SaveResetFilePopup.tsx rename to web/src/components/features/popups2/SaveResetFilePopup.tsx diff --git a/web/src/controllers/AppLayout.tsx b/web/src/controllers/AppLayout.tsx index cb4992d15..75dff509b 100644 --- a/web/src/controllers/AppLayout.tsx +++ b/web/src/controllers/AppLayout.tsx @@ -4,12 +4,12 @@ import { ConfigProvider, Layout } from 'antd'; import React, { PropsWithChildren, useMemo } from 'react'; import { AppSidebar } from './AppSidebar'; import { NewChatModal } from '@/components/features/NewChatModal'; -import { InvitePeopleModal } from '@/components/features/Modals/InvitePeopleModal'; +import { InvitePeopleModal } from '@/components/features/modals2/InvitePeopleModal'; import { AppSplitter } from '@/components/ui/layout'; import { createStyles } from 'antd-style'; import { useBusterStylesContext } from '@/context/BusterStyles/BusterStyles'; import { useUserConfigContextSelector } from '@/context/Users'; -import { SupportModal } from '@/components/features/Modals/SupportModal'; +import { SupportModal } from '@/components/features/modals2/SupportModal'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { useMemoizedFn } from 'ahooks'; import { ThemeConfig } from 'antd/lib'; diff --git a/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx index a0533ec01..c3a7b0691 100644 --- a/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx +++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx @@ -15,7 +15,7 @@ import { } from '@/api/asset_interfaces'; import { Text } from '@/components/ui'; import { ListEmptyStateWithButton } from '@/components/ui/list'; -import { AddTypeModal } from '@/components/features/Modals/AddTypeModal'; +import { AddTypeModal } from '@/components/features/modals2/AddTypeModal'; import { ShareAssetType } from '@/api/asset_interfaces'; import { useMemoizedFn } from 'ahooks'; import { BusterList, BusterListColumn, BusterListRow } from '@/components/ui/list'; diff --git a/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx index 06c98257d..ef6ca96c9 100644 --- a/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx +++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx @@ -11,7 +11,7 @@ import Link from 'next/link'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { BusterRoutes } from '@/routes'; import { AppMaterialIcons, EditableTitle } from '@/components/ui'; -import { FavoriteStar } from '@/components/features/Lists/FavoriteStar'; +import { FavoriteStar } from '@/components/features/lists2/FavoriteStar'; import { ShareMenu } from '@/components/features/ShareMenu'; import { BusterCollection, ShareAssetType } from '@/api/asset_interfaces'; import { Text } from '@/components/ui'; diff --git a/web/src/controllers/CollectionListController/CollectionsListContent.tsx b/web/src/controllers/CollectionListController/CollectionsListContent.tsx index a29d9232b..6079c1d99 100644 --- a/web/src/controllers/CollectionListController/CollectionsListContent.tsx +++ b/web/src/controllers/CollectionListController/CollectionsListContent.tsx @@ -12,7 +12,7 @@ import { ListEmptyStateWithButton } from '@/components/ui/list'; import { useMemoizedFn } from 'ahooks'; -import { NewCollectionModal } from '@/components/features/Modals/NewCollectionModal'; +import { NewCollectionModal } from '@/components/features/modals2/NewCollectionModal'; import { BusterCollectionListItem } from '@/api/asset_interfaces'; import { CollectionListSelectedPopup } from './CollectionListSelectedPopup'; diff --git a/web/src/controllers/DashboardController/DashboardController.tsx b/web/src/controllers/DashboardController/DashboardController.tsx index aae3ff427..524fd24cb 100644 --- a/web/src/controllers/DashboardController/DashboardController.tsx +++ b/web/src/controllers/DashboardController/DashboardController.tsx @@ -5,7 +5,7 @@ import { useBusterDashboardIndividual } from '@/context/Dashboards'; import { FileIndeterminateLoader } from '@/components/features/FileIndeterminateLoader'; import { DashboardFileView, useChatLayoutContextSelector } from '@layouts/ChatLayout'; import { DashboardViewComponents } from './config'; -import { AddTypeModal } from '@/components/features/Modals/AddTypeModal'; +import { AddTypeModal } from '@/components/features/modals2/AddTypeModal'; import { useMemoizedFn } from 'ahooks'; export const DashboardController: React.FC<{ dashboardId: string }> = ({ dashboardId }) => { diff --git a/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx b/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx index ada1b0e10..8f34187d6 100644 --- a/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx +++ b/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import { CodeCard } from '@/components/ui/card'; import { useMemoizedFn } from 'ahooks'; -import { SaveResetFilePopup } from '@/components/features/Popups/SaveResetFilePopup'; +import { SaveResetFilePopup } from '@/components/features/popups2/SaveResetFilePopup'; import { useBusterNotifications } from '@/context/BusterNotifications'; import { DashboardViewProps } from '../config'; import { diff --git a/web/src/controllers/DashboardListController/DashboardListContent.tsx b/web/src/controllers/DashboardListController/DashboardListContent.tsx index 23c724f71..fba0f4c90 100644 --- a/web/src/controllers/DashboardListController/DashboardListContent.tsx +++ b/web/src/controllers/DashboardListController/DashboardListContent.tsx @@ -7,7 +7,7 @@ import { BusterUserAvatar } from '@/components/ui'; import { formatDate } from '@/utils'; import { BusterList, BusterListColumn, BusterListRow } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { getShareStatus } from '@/components/features/Lists'; +import { getShareStatus } from '@/components/features/lists2'; import { ListEmptyStateWithButton } from '@/components/ui/list'; import { useMemoizedFn } from 'ahooks'; import { DashboardSelectedOptionPopup } from './DashboardSelectedPopup'; diff --git a/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx b/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx index c09fe169a..d78347dc6 100644 --- a/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx +++ b/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx @@ -5,7 +5,7 @@ import { Button, Dropdown, DropdownProps } from 'antd'; import { useUserConfigContextSelector } from '@/context/Users'; import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; -import { SaveToCollectionsDropdown } from '@/components/features/Dropdowns/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '@/components/features/dropdowns2/SaveToCollectionsDropdown'; import { useBusterDashboardContextSelector } from '@/context/Dashboards'; export const DashboardSelectedOptionPopup: React.FC<{ diff --git a/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx b/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx index a40869bd6..0b0abd658 100644 --- a/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx +++ b/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx @@ -16,7 +16,7 @@ import React, { useMemo, useState } from 'react'; import { PermissionUsersSelectedPopup } from './PermissionUsersSelectedPopup'; import { PERMISSION_USERS_OPTIONS } from './config'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { ListUserItem } from '@/components/features/Lists'; +import { ListUserItem } from '@/components/features/lists2'; export const PermissionListUsersContainer: React.FC<{ filteredPermissionUsers: ListPermissionUsersResponse[]; diff --git a/web/src/controllers/DatasetsListController/DatasetsHeader.tsx b/web/src/controllers/DatasetsListController/DatasetsHeader.tsx index 5e759b107..2cdab2770 100644 --- a/web/src/controllers/DatasetsListController/DatasetsHeader.tsx +++ b/web/src/controllers/DatasetsListController/DatasetsHeader.tsx @@ -5,7 +5,7 @@ import { Breadcrumb, Button } from 'antd'; import Link from 'next/link'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { AppMaterialIcons, AppSegmented, AppTooltip } from '@/components/ui'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; import { AppContentHeader } from '@/components/ui/layout/AppContentHeader'; import { useIndividualDataset } from '@/context/Datasets'; import { useHotkeys } from 'react-hotkeys-hook'; diff --git a/web/src/controllers/DatasetsListController/DatasetsListController.tsx b/web/src/controllers/DatasetsListController/DatasetsListController.tsx index 46eeb784a..3fbfbfcd5 100644 --- a/web/src/controllers/DatasetsListController/DatasetsListController.tsx +++ b/web/src/controllers/DatasetsListController/DatasetsListController.tsx @@ -6,7 +6,7 @@ import { useUserConfigContextSelector } from '@/context/Users'; import { useMemo, useState } from 'react'; import { DatasetListContent } from './DatasetListContent'; import { DatasetHeader } from './DatasetsHeader'; -import { NewDatasetModal } from '@/components/features/Modals/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; export const DatasetsListController: React.FC<{}> = ({}) => { const isAdmin = useUserConfigContextSelector((state) => state.isAdmin); diff --git a/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx b/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx index f54430961..8f2b76c36 100644 --- a/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx +++ b/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx @@ -3,7 +3,7 @@ import type { MetricViewProps } from '../config'; import { CodeCard } from '@/components/ui/card'; import { useMetricIndividual, useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useMemoizedFn } from 'ahooks'; -import { SaveResetFilePopup } from '@/components/features/Popups/SaveResetFilePopup'; +import { SaveResetFilePopup } from '@/components/features/popups2/SaveResetFilePopup'; import { useBusterNotifications } from '@/context/BusterNotifications'; export const MetricViewFile: React.FC = React.memo(({ metricId }) => { diff --git a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx index a25ae71fe..94dc1738f 100644 --- a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx +++ b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx @@ -1,14 +1,14 @@ import { ShareAssetType, VerificationStatus, BusterMetricListItem } from '@/api/asset_interfaces'; import { makeHumanReadble, formatDate } from '@/utils'; import React, { memo, useMemo, useRef, useState } from 'react'; -import { StatusBadgeIndicator, getShareStatus } from '@/components/features/Lists'; +import { StatusBadgeIndicator, getShareStatus } from '@/components/features/lists2'; import { BusterUserAvatar, Text } from '@/components/ui'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import { BusterListColumn, BusterListRow } from '@/components/ui/list'; import { MetricSelectedOptionPopup } from './MetricItemsSelectedPopup'; import { BusterList, ListEmptyStateWithButton } from '@/components/ui/list'; -import { FavoriteStar } from '@/components/features/Lists'; +import { FavoriteStar } from '@/components/features/lists2'; import { useCreateListByDate } from '@/components/ui/list/useCreateListByDate'; export const MetricItemsContainer: React.FC<{ diff --git a/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx b/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx index f8260edb3..b5583fff1 100644 --- a/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx +++ b/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx @@ -2,12 +2,12 @@ import React, { useState } from 'react'; import { AppMaterialIcons } from '@/components/ui'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { Button, Dropdown, DropdownProps } from 'antd'; -import { StatusBadgeButton } from '@/components/features/Lists'; +import { StatusBadgeButton } from '@/components/features/lists2'; import { VerificationStatus } from '@/api/asset_interfaces'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useUserConfigContextSelector } from '@/context/Users'; import { useMemoizedFn } from 'ahooks'; -import { SaveToCollectionsDropdown } from '@/components/features/Dropdowns/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '@/components/features/dropdowns2/SaveToCollectionsDropdown'; import { useBusterNotifications } from '@/context/BusterNotifications'; export const MetricSelectedOptionPopup: React.FC<{ diff --git a/web/src/controllers/TermsListController/TermsHeader.tsx b/web/src/controllers/TermsListController/TermsHeader.tsx index 6e638d3f4..a4a780ce7 100644 --- a/web/src/controllers/TermsListController/TermsHeader.tsx +++ b/web/src/controllers/TermsListController/TermsHeader.tsx @@ -12,7 +12,7 @@ import { useHotkeys } from 'react-hotkeys-hook'; import { useUserConfigContextSelector } from '@/context/Users'; import { useBusterTermsIndividual } from '@/context/Terms'; import { useMemoizedFn } from 'ahooks'; -import { NewTermModal } from '@/components/features/Modals/NewTermModal'; +import { NewTermModal } from '@/components/features/modals2/NewTermModal'; export const TermsHeader: React.FC<{ termId?: string; From 0af2134d4ec00f6b1aeb0f0e52f66086c2420d8f Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Fri, 28 Feb 2025 11:49:57 -0700 Subject: [PATCH 8/8] trigger file change 2 --- .../app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx | 2 +- .../app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx | 4 ++-- .../_PermissionOverview/PermissionListUserContainer.tsx | 2 +- .../datasets/DatasetGroupDatasetsController.tsx | 2 +- .../[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx | 2 +- .../PermissionGroupDatasetsController.tsx | 2 +- .../PermissionGroupUsersListContainer.tsx | 2 +- .../app/settings/(permissions)/users/ListUsersComponent.tsx | 2 +- .../users/[userId]/datasets/UserDatasetsController.tsx | 2 +- .../users/[userId]/teams/UserTeamsController.tsx | 2 +- .../[datasourceId]/_forms/FormWrapper.tsx | 2 +- web/src/components/features/NewChatModal/NewChatModal.tsx | 2 +- .../features/buttons/SaveDashboardToCollectionButton.tsx | 2 +- .../features/buttons/SaveMetricToCollectionButton.tsx | 2 +- .../features/buttons/SaveMetricToDashboardButton.tsx | 2 +- .../{dropdowns2 => dropdowns}/SaveToCollectionsDropdown.tsx | 2 +- .../{dropdowns2 => dropdowns}/SaveToDashboardDropdown.tsx | 0 .../components/features/{lists2 => lists}/FavoriteStar.tsx | 0 .../components/features/{lists2 => lists}/ListUserItem.tsx | 0 .../features/{lists2 => lists}/StatusBadgeIndicator.tsx | 0 web/src/components/features/{lists2 => lists}/index.ts | 0 .../components/features/{modals2 => modals}/AddTypeModal.tsx | 0 .../features/{modals2 => modals}/InvitePeopleModal.tsx | 0 .../features/{modals2 => modals}/NewCollectionModal.tsx | 0 .../features/{modals2 => modals}/NewDatasetModal.tsx | 0 .../components/features/{modals2 => modals}/NewTeamModal.tsx | 0 .../components/features/{modals2 => modals}/NewTermModal.tsx | 0 .../components/features/{modals2 => modals}/SupportModal.tsx | 0 .../features/{popups2 => popups}/SaveResetFilePopup.tsx | 0 web/src/controllers/AppLayout.tsx | 4 ++-- .../CollectionIndividualContent.tsx | 2 +- .../CollectionIndividualHeader.tsx | 2 +- .../CollectionListController/CollectionsListContent.tsx | 2 +- .../controllers/DashboardController/DashboardController.tsx | 2 +- .../DashboardViewFileController.tsx | 2 +- .../DashboardListController/DashboardListContent.tsx | 2 +- .../DashboardListController/DashboardSelectedPopup.tsx | 2 +- .../DatasetPermissionUser/PermissionListUsersContainer.tsx | 2 +- web/src/controllers/DatasetsListController/DatasetsHeader.tsx | 2 +- .../DatasetsListController/DatasetsListController.tsx | 2 +- .../MetricController/MetricViewFile/MetricViewFile.tsx | 2 +- .../controllers/MetricListContainer/MetricItemsContainer.tsx | 4 ++-- .../MetricListContainer/MetricItemsSelectedPopup.tsx | 4 ++-- web/src/controllers/TermsListController/TermsHeader.tsx | 2 +- 44 files changed, 35 insertions(+), 35 deletions(-) rename web/src/components/features/{dropdowns2 => dropdowns}/SaveToCollectionsDropdown.tsx (98%) rename web/src/components/features/{dropdowns2 => dropdowns}/SaveToDashboardDropdown.tsx (100%) rename web/src/components/features/{lists2 => lists}/FavoriteStar.tsx (100%) rename web/src/components/features/{lists2 => lists}/ListUserItem.tsx (100%) rename web/src/components/features/{lists2 => lists}/StatusBadgeIndicator.tsx (100%) rename web/src/components/features/{lists2 => lists}/index.ts (100%) rename web/src/components/features/{modals2 => modals}/AddTypeModal.tsx (100%) rename web/src/components/features/{modals2 => modals}/InvitePeopleModal.tsx (100%) rename web/src/components/features/{modals2 => modals}/NewCollectionModal.tsx (100%) rename web/src/components/features/{modals2 => modals}/NewDatasetModal.tsx (100%) rename web/src/components/features/{modals2 => modals}/NewTeamModal.tsx (100%) rename web/src/components/features/{modals2 => modals}/NewTermModal.tsx (100%) rename web/src/components/features/{modals2 => modals}/SupportModal.tsx (100%) rename web/src/components/features/{popups2 => popups}/SaveResetFilePopup.tsx (100%) diff --git a/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx b/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx index 8fe579aaa..d377fde71 100644 --- a/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx +++ b/web/src/app/app/chats/_ChatsListContainer/ChatItemsContainer.tsx @@ -7,7 +7,7 @@ import { useMemoizedFn } from 'ahooks'; import { BusterListColumn, BusterListRow } from '@/components/ui/list'; import { ChatSelectedOptionPopup } from './ChatItemsSelectedPopup'; import { BusterList, ListEmptyStateWithButton } from '@/components/ui/list'; -import { FavoriteStar, getShareStatus, StatusBadgeIndicator } from '@/components/features/lists2'; +import { FavoriteStar, getShareStatus, StatusBadgeIndicator } from '@/components/features/lists'; import { useCreateListByDate } from '@/components/ui/list/useCreateListByDate'; export const ChatItemsContainer: React.FC<{ diff --git a/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx b/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx index 7501ae1c3..e5aaa52c6 100644 --- a/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx +++ b/web/src/app/app/chats/_ChatsListContainer/ChatItemsSelectedPopup.tsx @@ -8,8 +8,8 @@ import { useUserConfigContextSelector } from '@/context/Users'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; -import { SaveToCollectionsDropdown } from '@/components/features/dropdowns2/SaveToCollectionsDropdown'; -import { StatusBadgeButton } from '@/components/features/lists2/StatusBadgeIndicator'; +import { SaveToCollectionsDropdown } from '@/components/features/dropdowns/SaveToCollectionsDropdown'; +import { StatusBadgeButton } from '@/components/features/lists/StatusBadgeIndicator'; export const ChatSelectedOptionPopup: React.FC<{ selectedRowKeys: string[]; 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 dbe7b68bf..9fd7b522d 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 @@ -9,7 +9,7 @@ import { import { BusterInfiniteList } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { PermissionLineageBreadcrumb } from '../../../../../../../components/features/PermissionComponents'; -import { ListUserItem } from '@/components/features/lists2'; +import { ListUserItem } from '@/components/features/lists'; export const PermissionListUserContainer: React.FC<{ className?: string; diff --git a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx index 035fcb5f0..9f29b55a1 100644 --- a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { DatasetGroupDatasetsListContainer } from './DatasetGroupDatasetsListContainer'; import { useMemoizedFn } from 'ahooks'; -import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; export const DatasetGroupDatasetsController: React.FC<{ datasetGroupId: string; diff --git a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx index afe441e81..5c7f03d73 100644 --- a/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx +++ b/web/src/app/app/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx @@ -14,7 +14,7 @@ import { import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import React, { useMemo, useState } from 'react'; -import { ListUserItem } from '@/components/features/lists2'; +import { ListUserItem } from '@/components/features/lists'; import { DatasetGroupUsersSelectedPopup } from './DatasetGroupUsersSelectedPopup'; export const DatasetGroupUsersListContainer: React.FC<{ diff --git a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx index 22eaa57f8..d2ec0c85a 100644 --- a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import { PermissionGroupDatasetsListContainer } from './PermissionGroupDatasetsListContainer'; import { useMemoizedFn } from 'ahooks'; -import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; export const PermissionGroupDatasetsController: React.FC<{ permissionGroupId: string; diff --git a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx index 5cec1171c..1bb538602 100644 --- a/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx +++ b/web/src/app/app/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx @@ -11,7 +11,7 @@ import { import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import React, { useMemo, useState } from 'react'; -import { ListUserItem } from '@/components/features/lists2'; +import { ListUserItem } from '@/components/features/lists'; import { PermissionGroupUsersSelectedPopup } from './PermissionGroupUsersSelectedPopup'; export const PermissionGroupUsersListContainer: React.FC<{ diff --git a/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx b/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx index 5a379457a..514c2f09c 100644 --- a/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx +++ b/web/src/app/app/settings/(permissions)/users/ListUsersComponent.tsx @@ -10,7 +10,7 @@ import React, { useMemo, useState } from 'react'; import { Text } from '@/components/ui'; import { OrganizationUserRoleText } from './config'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { ListUserItem } from '@/components/features/lists2'; +import { ListUserItem } from '@/components/features/lists'; export const ListUsersComponent: React.FC<{ users: OrganizationUser[]; diff --git a/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx b/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx index f00db1575..7a7a33770 100644 --- a/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx +++ b/web/src/app/app/settings/(permissions)/users/[userId]/datasets/UserDatasetsController.tsx @@ -8,7 +8,7 @@ import { UserDatasetsListContainer } from './UserDatasetsListContainer'; import { Button } from 'antd'; import { useMemoizedFn } from 'ahooks'; import { AppMaterialIcons } from '@/components/ui'; -import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; export const UserDatasetsController: React.FC<{ userId: string }> = ({ userId }) => { const { data: datasets } = useGetUserDatasets({ userId }); diff --git a/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx b/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx index abb55d202..6cd7d0b31 100644 --- a/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx +++ b/web/src/app/app/settings/(permissions)/users/[userId]/teams/UserTeamsController.tsx @@ -8,7 +8,7 @@ import { Button } from 'antd'; import { useMemoizedFn } from 'ahooks'; import { AppMaterialIcons } from '@/components/ui'; import { UserTeamsListContainer } from './UserTeamsListContainer'; -import { NewTeamModal } from '@/components/features/modals2/NewTeamModal'; +import { NewTeamModal } from '@/components/features/modals/NewTeamModal'; export const UserTeamsController: React.FC<{ userId: string }> = ({ userId }) => { const { data: teams, refetch } = useGetUserTeams({ userId }); diff --git a/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx b/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx index 919d68771..8365193ff 100644 --- a/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx +++ b/web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx @@ -5,7 +5,7 @@ import React, { useImperativeHandle, useLayoutEffect } from 'react'; import { WhiteListBlock } from '../WhiteListBlock'; import type { DatasourceCreateCredentials } from '@/api/buster_socket/datasources'; import type { DataSource } from '@/api/asset_interfaces'; -import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; const layout = { labelCol: { span: 7, offset: 0 }, diff --git a/web/src/components/features/NewChatModal/NewChatModal.tsx b/web/src/components/features/NewChatModal/NewChatModal.tsx index 90a786ab4..2c83943ce 100644 --- a/web/src/components/features/NewChatModal/NewChatModal.tsx +++ b/web/src/components/features/NewChatModal/NewChatModal.tsx @@ -12,7 +12,7 @@ import { NewChatModalDataSourceSelect } from './NewChatModalDatasourceSelect'; import { NoDatasets } from './NoDatasets'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { useGetDatasets } from '@/api/buster_rest/datasets'; -import { NewDatasetModal } from '../modals2/NewDatasetModal'; +import { NewDatasetModal } from '../modals/NewDatasetModal'; const { TextArea } = Input; diff --git a/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx index 5f597b931..69b53bedf 100644 --- a/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx +++ b/web/src/components/features/buttons/SaveDashboardToCollectionButton.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { SaveToCollectionsDropdown } from '../dropdowns2/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '../dropdowns/SaveToCollectionsDropdown'; import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; diff --git a/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx index da7f360be..584aa1dfa 100644 --- a/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx +++ b/web/src/components/features/buttons/SaveMetricToCollectionButton.tsx @@ -2,7 +2,7 @@ import { useBusterNotifications } from '@/context/BusterNotifications'; import { useBusterCollectionListContextSelector } from '@/context/Collections'; import { useMemoizedFn } from 'ahooks'; import React, { useState } from 'react'; -import { SaveToCollectionsDropdown } from '../dropdowns2/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '../dropdowns/SaveToCollectionsDropdown'; import { CollectionButton } from './CollectionsButton'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; diff --git a/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx b/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx index be825541b..34df41fa8 100644 --- a/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx +++ b/web/src/components/features/buttons/SaveMetricToDashboardButton.tsx @@ -1,7 +1,7 @@ import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useMemoizedFn } from 'ahooks'; import React from 'react'; -import { SaveToDashboardDropdown } from '../dropdowns2/SaveToDashboardDropdown'; +import { SaveToDashboardDropdown } from '../dropdowns/SaveToDashboardDropdown'; import { Button } from 'antd'; import { AppMaterialIcons } from '@/components/ui'; import type { BusterMetric } from '@/api/asset_interfaces'; diff --git a/web/src/components/features/dropdowns2/SaveToCollectionsDropdown.tsx b/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx similarity index 98% rename from web/src/components/features/dropdowns2/SaveToCollectionsDropdown.tsx rename to web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx index 68d72b17e..d050062ff 100644 --- a/web/src/components/features/dropdowns2/SaveToCollectionsDropdown.tsx +++ b/web/src/components/features/dropdowns/SaveToCollectionsDropdown.tsx @@ -8,7 +8,7 @@ import { useMemoizedFn } from 'ahooks'; import { Button } from 'antd'; import React, { useMemo } from 'react'; import type { BusterCollectionListItem } from '@/api/asset_interfaces'; -import { NewCollectionModal } from '../modals2/NewCollectionModal'; +import { NewCollectionModal } from '../modals/NewCollectionModal'; export const SaveToCollectionsDropdown: React.FC<{ children: React.ReactNode; diff --git a/web/src/components/features/dropdowns2/SaveToDashboardDropdown.tsx b/web/src/components/features/dropdowns/SaveToDashboardDropdown.tsx similarity index 100% rename from web/src/components/features/dropdowns2/SaveToDashboardDropdown.tsx rename to web/src/components/features/dropdowns/SaveToDashboardDropdown.tsx diff --git a/web/src/components/features/lists2/FavoriteStar.tsx b/web/src/components/features/lists/FavoriteStar.tsx similarity index 100% rename from web/src/components/features/lists2/FavoriteStar.tsx rename to web/src/components/features/lists/FavoriteStar.tsx diff --git a/web/src/components/features/lists2/ListUserItem.tsx b/web/src/components/features/lists/ListUserItem.tsx similarity index 100% rename from web/src/components/features/lists2/ListUserItem.tsx rename to web/src/components/features/lists/ListUserItem.tsx diff --git a/web/src/components/features/lists2/StatusBadgeIndicator.tsx b/web/src/components/features/lists/StatusBadgeIndicator.tsx similarity index 100% rename from web/src/components/features/lists2/StatusBadgeIndicator.tsx rename to web/src/components/features/lists/StatusBadgeIndicator.tsx diff --git a/web/src/components/features/lists2/index.ts b/web/src/components/features/lists/index.ts similarity index 100% rename from web/src/components/features/lists2/index.ts rename to web/src/components/features/lists/index.ts diff --git a/web/src/components/features/modals2/AddTypeModal.tsx b/web/src/components/features/modals/AddTypeModal.tsx similarity index 100% rename from web/src/components/features/modals2/AddTypeModal.tsx rename to web/src/components/features/modals/AddTypeModal.tsx diff --git a/web/src/components/features/modals2/InvitePeopleModal.tsx b/web/src/components/features/modals/InvitePeopleModal.tsx similarity index 100% rename from web/src/components/features/modals2/InvitePeopleModal.tsx rename to web/src/components/features/modals/InvitePeopleModal.tsx diff --git a/web/src/components/features/modals2/NewCollectionModal.tsx b/web/src/components/features/modals/NewCollectionModal.tsx similarity index 100% rename from web/src/components/features/modals2/NewCollectionModal.tsx rename to web/src/components/features/modals/NewCollectionModal.tsx diff --git a/web/src/components/features/modals2/NewDatasetModal.tsx b/web/src/components/features/modals/NewDatasetModal.tsx similarity index 100% rename from web/src/components/features/modals2/NewDatasetModal.tsx rename to web/src/components/features/modals/NewDatasetModal.tsx diff --git a/web/src/components/features/modals2/NewTeamModal.tsx b/web/src/components/features/modals/NewTeamModal.tsx similarity index 100% rename from web/src/components/features/modals2/NewTeamModal.tsx rename to web/src/components/features/modals/NewTeamModal.tsx diff --git a/web/src/components/features/modals2/NewTermModal.tsx b/web/src/components/features/modals/NewTermModal.tsx similarity index 100% rename from web/src/components/features/modals2/NewTermModal.tsx rename to web/src/components/features/modals/NewTermModal.tsx diff --git a/web/src/components/features/modals2/SupportModal.tsx b/web/src/components/features/modals/SupportModal.tsx similarity index 100% rename from web/src/components/features/modals2/SupportModal.tsx rename to web/src/components/features/modals/SupportModal.tsx diff --git a/web/src/components/features/popups2/SaveResetFilePopup.tsx b/web/src/components/features/popups/SaveResetFilePopup.tsx similarity index 100% rename from web/src/components/features/popups2/SaveResetFilePopup.tsx rename to web/src/components/features/popups/SaveResetFilePopup.tsx diff --git a/web/src/controllers/AppLayout.tsx b/web/src/controllers/AppLayout.tsx index 75dff509b..229c34a78 100644 --- a/web/src/controllers/AppLayout.tsx +++ b/web/src/controllers/AppLayout.tsx @@ -4,12 +4,12 @@ import { ConfigProvider, Layout } from 'antd'; import React, { PropsWithChildren, useMemo } from 'react'; import { AppSidebar } from './AppSidebar'; import { NewChatModal } from '@/components/features/NewChatModal'; -import { InvitePeopleModal } from '@/components/features/modals2/InvitePeopleModal'; +import { InvitePeopleModal } from '@/components/features/modals/InvitePeopleModal'; import { AppSplitter } from '@/components/ui/layout'; import { createStyles } from 'antd-style'; import { useBusterStylesContext } from '@/context/BusterStyles/BusterStyles'; import { useUserConfigContextSelector } from '@/context/Users'; -import { SupportModal } from '@/components/features/modals2/SupportModal'; +import { SupportModal } from '@/components/features/modals/SupportModal'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { useMemoizedFn } from 'ahooks'; import { ThemeConfig } from 'antd/lib'; diff --git a/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx index c3a7b0691..018cb7605 100644 --- a/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx +++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx @@ -15,7 +15,7 @@ import { } from '@/api/asset_interfaces'; import { Text } from '@/components/ui'; import { ListEmptyStateWithButton } from '@/components/ui/list'; -import { AddTypeModal } from '@/components/features/modals2/AddTypeModal'; +import { AddTypeModal } from '@/components/features/modals/AddTypeModal'; import { ShareAssetType } from '@/api/asset_interfaces'; import { useMemoizedFn } from 'ahooks'; import { BusterList, BusterListColumn, BusterListRow } from '@/components/ui/list'; diff --git a/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx index ef6ca96c9..00894d73c 100644 --- a/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx +++ b/web/src/controllers/CollectionIndividualController/CollectionIndividualHeader.tsx @@ -11,7 +11,7 @@ import Link from 'next/link'; import { useAppLayoutContextSelector } from '@/context/BusterAppLayout'; import { BusterRoutes } from '@/routes'; import { AppMaterialIcons, EditableTitle } from '@/components/ui'; -import { FavoriteStar } from '@/components/features/lists2/FavoriteStar'; +import { FavoriteStar } from '@/components/features/lists/FavoriteStar'; import { ShareMenu } from '@/components/features/ShareMenu'; import { BusterCollection, ShareAssetType } from '@/api/asset_interfaces'; import { Text } from '@/components/ui'; diff --git a/web/src/controllers/CollectionListController/CollectionsListContent.tsx b/web/src/controllers/CollectionListController/CollectionsListContent.tsx index 6079c1d99..c1270dc31 100644 --- a/web/src/controllers/CollectionListController/CollectionsListContent.tsx +++ b/web/src/controllers/CollectionListController/CollectionsListContent.tsx @@ -12,7 +12,7 @@ import { ListEmptyStateWithButton } from '@/components/ui/list'; import { useMemoizedFn } from 'ahooks'; -import { NewCollectionModal } from '@/components/features/modals2/NewCollectionModal'; +import { NewCollectionModal } from '@/components/features/modals/NewCollectionModal'; import { BusterCollectionListItem } from '@/api/asset_interfaces'; import { CollectionListSelectedPopup } from './CollectionListSelectedPopup'; diff --git a/web/src/controllers/DashboardController/DashboardController.tsx b/web/src/controllers/DashboardController/DashboardController.tsx index 524fd24cb..e222bdbcf 100644 --- a/web/src/controllers/DashboardController/DashboardController.tsx +++ b/web/src/controllers/DashboardController/DashboardController.tsx @@ -5,7 +5,7 @@ import { useBusterDashboardIndividual } from '@/context/Dashboards'; import { FileIndeterminateLoader } from '@/components/features/FileIndeterminateLoader'; import { DashboardFileView, useChatLayoutContextSelector } from '@layouts/ChatLayout'; import { DashboardViewComponents } from './config'; -import { AddTypeModal } from '@/components/features/modals2/AddTypeModal'; +import { AddTypeModal } from '@/components/features/modals/AddTypeModal'; import { useMemoizedFn } from 'ahooks'; export const DashboardController: React.FC<{ dashboardId: string }> = ({ dashboardId }) => { diff --git a/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx b/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx index 8f34187d6..a97b76ff8 100644 --- a/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx +++ b/web/src/controllers/DashboardController/DashboardViewFileController/DashboardViewFileController.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import { CodeCard } from '@/components/ui/card'; import { useMemoizedFn } from 'ahooks'; -import { SaveResetFilePopup } from '@/components/features/popups2/SaveResetFilePopup'; +import { SaveResetFilePopup } from '@/components/features/popups/SaveResetFilePopup'; import { useBusterNotifications } from '@/context/BusterNotifications'; import { DashboardViewProps } from '../config'; import { diff --git a/web/src/controllers/DashboardListController/DashboardListContent.tsx b/web/src/controllers/DashboardListController/DashboardListContent.tsx index fba0f4c90..04cb7e69b 100644 --- a/web/src/controllers/DashboardListController/DashboardListContent.tsx +++ b/web/src/controllers/DashboardListController/DashboardListContent.tsx @@ -7,7 +7,7 @@ import { BusterUserAvatar } from '@/components/ui'; import { formatDate } from '@/utils'; import { BusterList, BusterListColumn, BusterListRow } from '@/components/ui/list'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { getShareStatus } from '@/components/features/lists2'; +import { getShareStatus } from '@/components/features/lists'; import { ListEmptyStateWithButton } from '@/components/ui/list'; import { useMemoizedFn } from 'ahooks'; import { DashboardSelectedOptionPopup } from './DashboardSelectedPopup'; diff --git a/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx b/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx index d78347dc6..cb94194e4 100644 --- a/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx +++ b/web/src/controllers/DashboardListController/DashboardSelectedPopup.tsx @@ -5,7 +5,7 @@ import { Button, Dropdown, DropdownProps } from 'antd'; import { useUserConfigContextSelector } from '@/context/Users'; import { useMemoizedFn } from 'ahooks'; import { useBusterNotifications } from '@/context/BusterNotifications'; -import { SaveToCollectionsDropdown } from '@/components/features/dropdowns2/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '@/components/features/dropdowns/SaveToCollectionsDropdown'; import { useBusterDashboardContextSelector } from '@/context/Dashboards'; export const DashboardSelectedOptionPopup: React.FC<{ diff --git a/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx b/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx index 0b0abd658..a46690870 100644 --- a/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx +++ b/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx @@ -16,7 +16,7 @@ import React, { useMemo, useState } from 'react'; import { PermissionUsersSelectedPopup } from './PermissionUsersSelectedPopup'; import { PERMISSION_USERS_OPTIONS } from './config'; import { BusterRoutes, createBusterRoute } from '@/routes'; -import { ListUserItem } from '@/components/features/lists2'; +import { ListUserItem } from '@/components/features/lists'; export const PermissionListUsersContainer: React.FC<{ filteredPermissionUsers: ListPermissionUsersResponse[]; diff --git a/web/src/controllers/DatasetsListController/DatasetsHeader.tsx b/web/src/controllers/DatasetsListController/DatasetsHeader.tsx index 2cdab2770..046f8df3f 100644 --- a/web/src/controllers/DatasetsListController/DatasetsHeader.tsx +++ b/web/src/controllers/DatasetsListController/DatasetsHeader.tsx @@ -5,7 +5,7 @@ import { Breadcrumb, Button } from 'antd'; import Link from 'next/link'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { AppMaterialIcons, AppSegmented, AppTooltip } from '@/components/ui'; -import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; import { AppContentHeader } from '@/components/ui/layout/AppContentHeader'; import { useIndividualDataset } from '@/context/Datasets'; import { useHotkeys } from 'react-hotkeys-hook'; diff --git a/web/src/controllers/DatasetsListController/DatasetsListController.tsx b/web/src/controllers/DatasetsListController/DatasetsListController.tsx index 3fbfbfcd5..986dcfc40 100644 --- a/web/src/controllers/DatasetsListController/DatasetsListController.tsx +++ b/web/src/controllers/DatasetsListController/DatasetsListController.tsx @@ -6,7 +6,7 @@ import { useUserConfigContextSelector } from '@/context/Users'; import { useMemo, useState } from 'react'; import { DatasetListContent } from './DatasetListContent'; import { DatasetHeader } from './DatasetsHeader'; -import { NewDatasetModal } from '@/components/features/modals2/NewDatasetModal'; +import { NewDatasetModal } from '@/components/features/modals/NewDatasetModal'; export const DatasetsListController: React.FC<{}> = ({}) => { const isAdmin = useUserConfigContextSelector((state) => state.isAdmin); diff --git a/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx b/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx index 8f2b76c36..66f754f69 100644 --- a/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx +++ b/web/src/controllers/MetricController/MetricViewFile/MetricViewFile.tsx @@ -3,7 +3,7 @@ import type { MetricViewProps } from '../config'; import { CodeCard } from '@/components/ui/card'; import { useMetricIndividual, useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useMemoizedFn } from 'ahooks'; -import { SaveResetFilePopup } from '@/components/features/popups2/SaveResetFilePopup'; +import { SaveResetFilePopup } from '@/components/features/popups/SaveResetFilePopup'; import { useBusterNotifications } from '@/context/BusterNotifications'; export const MetricViewFile: React.FC = React.memo(({ metricId }) => { diff --git a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx index 94dc1738f..2515ca1b9 100644 --- a/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx +++ b/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx @@ -1,14 +1,14 @@ import { ShareAssetType, VerificationStatus, BusterMetricListItem } from '@/api/asset_interfaces'; import { makeHumanReadble, formatDate } from '@/utils'; import React, { memo, useMemo, useRef, useState } from 'react'; -import { StatusBadgeIndicator, getShareStatus } from '@/components/features/lists2'; +import { StatusBadgeIndicator, getShareStatus } from '@/components/features/lists'; import { BusterUserAvatar, Text } from '@/components/ui'; import { BusterRoutes, createBusterRoute } from '@/routes'; import { useMemoizedFn } from 'ahooks'; import { BusterListColumn, BusterListRow } from '@/components/ui/list'; import { MetricSelectedOptionPopup } from './MetricItemsSelectedPopup'; import { BusterList, ListEmptyStateWithButton } from '@/components/ui/list'; -import { FavoriteStar } from '@/components/features/lists2'; +import { FavoriteStar } from '@/components/features/lists'; import { useCreateListByDate } from '@/components/ui/list/useCreateListByDate'; export const MetricItemsContainer: React.FC<{ diff --git a/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx b/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx index b5583fff1..cc8c5b134 100644 --- a/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx +++ b/web/src/controllers/MetricListContainer/MetricItemsSelectedPopup.tsx @@ -2,12 +2,12 @@ import React, { useState } from 'react'; import { AppMaterialIcons } from '@/components/ui'; import { BusterListSelectedOptionPopupContainer } from '@/components/ui/list'; import { Button, Dropdown, DropdownProps } from 'antd'; -import { StatusBadgeButton } from '@/components/features/lists2'; +import { StatusBadgeButton } from '@/components/features/lists'; import { VerificationStatus } from '@/api/asset_interfaces'; import { useBusterMetricsIndividualContextSelector } from '@/context/Metrics'; import { useUserConfigContextSelector } from '@/context/Users'; import { useMemoizedFn } from 'ahooks'; -import { SaveToCollectionsDropdown } from '@/components/features/dropdowns2/SaveToCollectionsDropdown'; +import { SaveToCollectionsDropdown } from '@/components/features/dropdowns/SaveToCollectionsDropdown'; import { useBusterNotifications } from '@/context/BusterNotifications'; export const MetricSelectedOptionPopup: React.FC<{ diff --git a/web/src/controllers/TermsListController/TermsHeader.tsx b/web/src/controllers/TermsListController/TermsHeader.tsx index a4a780ce7..57031acc6 100644 --- a/web/src/controllers/TermsListController/TermsHeader.tsx +++ b/web/src/controllers/TermsListController/TermsHeader.tsx @@ -12,7 +12,7 @@ import { useHotkeys } from 'react-hotkeys-hook'; import { useUserConfigContextSelector } from '@/context/Users'; import { useBusterTermsIndividual } from '@/context/Terms'; import { useMemoizedFn } from 'ahooks'; -import { NewTermModal } from '@/components/features/modals2/NewTermModal'; +import { NewTermModal } from '@/components/features/modals/NewTermModal'; export const TermsHeader: React.FC<{ termId?: string;