move dataset to shared asset

web/src/api/asset_interfaces/datasets/interfaces.ts

@@ -1,4 +1,4 @@
-import { DataSource, DataSourceTypes } from '../datasources';
+import type { DataSourceTypes } from '../datasources';
 
 export interface BusterDatasetListItem {
   id: string;

web/src/api/asset_interfaces/datasources/interfaces.ts

@@ -1,4 +1,4 @@
-import { BusterDataset } from '../../datasets';
+import type { BusterDataset } from '../datasets';
 
 export enum DataSourceStatus {
   ACTIVE = 'active',

web/src/api/asset_interfaces/index.ts

@@ -4,3 +4,5 @@ export type * from './collection';
 export type * from './dashboard';
 export type * from './chat';
 export type * from './search';
+export * from './datasets';
+export * from './datasources';

web/src/api/buster_rest/datasets/index.ts

@@ -1,4 +1,3 @@
-export * from './responseInterfaces';
 export * from './requests';
 export * from './queryRequests';
 export * from './permissions';

web/src/api/buster_rest/datasets/queryRequests.ts

@@ -12,7 +12,11 @@ import {
   updateDataset,
   deleteDataset
 } from './requests';
-import { BusterDataset, BusterDatasetData, BusterDatasetListItem } from './responseInterfaces';
+import type {
+  BusterDataset,
+  BusterDatasetData,
+  BusterDatasetListItem
+} from '../../asset_interfaces/datasets';
 import { useMemoizedFn } from 'ahooks';
 import { QueryClient, useQueryClient } from '@tanstack/react-query';
 import { getDatasetMetadata_server } from './serverRequests';

web/src/api/buster_rest/datasets/requests.ts

@@ -1,4 +1,8 @@
-import { BusterDataset, BusterDatasetData, BusterDatasetListItem } from './responseInterfaces';
+import type {
+  BusterDataset,
+  BusterDatasetData,
+  BusterDatasetListItem
+} from '../../asset_interfaces/datasets';
 import { mainApi } from '../instances';
 import * as config from './config';
 import { serverFetch } from '@/api/createServerInstance';

web/src/api/buster_rest/datasets/serverRequests.ts

@@ -1,7 +1,7 @@
 'use server';
 
 import { serverFetch } from '../../createServerInstance';
-import { BusterDataset } from './responseInterfaces';
+import type { BusterDataset } from '../../asset_interfaces/datasets';
 import * as config from './config';
 
 export const getDatasetMetadata_server = async (datasetId: string) => {

web/src/api/buster_rest/index.ts

@@ -1,5 +1,4 @@
 export * from './users';
-export * from './datasources';
 export * from './terms';
 export * from './assets';
 export * from './api_keys';

web/src/api/buster_rest/permissions/index.ts

@@ -1,5 +1,5 @@
-import { BusterDatasetListItem } from '../datasets';
+import type { BusterDatasetListItem } from '../../asset_interfaces/datasets';
-import { BusterOrganizationRole } from '../users';
+import type { BusterOrganizationRole } from '../users';
 
 export interface BusterPermissionListUser {
   id: string;

web/src/api/buster_socket/datasets/datasetResponses.ts

@@ -1,4 +1,4 @@
-import { BusterDataset, BusterDatasetListItem } from '@/api/buster_rest/datasets';
+import { BusterDataset, BusterDatasetListItem } from '@/api/asset_interfaces';
 
 export enum DatasetResponses {
   '/datasets/list:listDatasetsAdmin' = '/datasets/list:listDatasetsAdmin',

web/src/api/buster_socket/datasources/datasourceRequests.ts

@@ -1,6 +1,5 @@
-import { DataSourceTypes } from '@/api/buster_rest';
+import type { BusterSocketRequestBase } from '../base_interfaces';
-import { BusterSocketRequestBase } from '../base_interfaces';
+import type { DatasourceCreateCredentials } from './interface';
-import { DatasourceCreateCredentials } from './interface';
 
 export type DatasourceListRequest = BusterSocketRequestBase<
   '/data_sources/list',

web/src/api/buster_socket/datasources/datasourceResponses.ts

@@ -1,4 +1,4 @@
-import { DataSource, DataSourceListItem } from '@/api/buster_rest';
+import type { DataSource, DataSourceListItem } from '@/api/asset_interfaces/datasources';
 
 export enum DatasourceResponses {
   '/data_sources/list:listDataSources' = '/data_sources/list:listDataSources',

web/src/api/buster_socket/datasources/index.ts

@@ -0,0 +1 @@
+export * from './interface';

web/src/api/buster_socket/datasources/interface.ts

@@ -1,5 +1,3 @@
-import { StringColorFormat } from '@faker-js/faker';
-
 export interface PostgresCreateCredentials {
   datasource_name: string;
   host: string;

web/src/app/app/_components/NewChatModal/NewChatModalDatasourceSelect.tsx

@@ -1,4 +1,4 @@
-import { BusterDatasetListItem } from '@/api/buster_rest/datasets';
+import type { BusterDatasetListItem } from '@/api/asset_interfaces';
 import { AppMaterialIcons } from '@/components';
 import { SelectProps, Select } from 'antd';
 import isEmpty from 'lodash/isEmpty';

web/src/app/app/datasets/[datasetId]/editor/DataContainer.tsx

@@ -1,4 +1,4 @@
-import { BusterDatasetData } from '@/api/buster_rest/datasets';
+import type { BusterDatasetData } from '@/api/asset_interfaces/datasets';
 import { createStyles } from 'antd-style';
 import React from 'react';
 import isEmpty from 'lodash/isEmpty';

web/src/app/app/datasets/[datasetId]/editor/EditorContent.tsx

@@ -6,8 +6,7 @@ import { AppSplitter, AppSplitterRef } from '@/components';
 import { SQLContainer } from './SQLContainer';
 import { DataContainer } from './DataContainer';
 import { useMemoizedFn, useRequest } from 'ahooks';
-import { BusterDatasetData } from '@/api/buster_rest/datasets';
+import type { BusterDatasetData } from '@/api/asset_interfaces/datasets';
-import { timeout } from '@/utils';
 import { EditorApps, EditorContainerSubHeader } from './EditorContainerSubHeader';
 import { createStyles } from 'antd-style';
 import { MetadataContainer } from './MetadataContainer';

web/src/app/app/datasets/[datasetId]/overview/OverviewData.tsx

@@ -1,4 +1,4 @@
-import { BusterDatasetData } from '@/api/buster_rest/datasets';
+import type { BusterDatasetData } from '@/api/asset_interfaces/datasets';
 import { ShimmerText } from '@/components';
 import AppDataGrid from '@/components/table/AppDataGrid';
 import { useUserConfigContextSelector } from '@/context/Users';

web/src/app/app/datasets/_DatasetListContent.tsx

@@ -6,7 +6,7 @@ import { BusterUserAvatar } from '@/components';
 import { formatDate } from '@/utils';
 import { BusterList, BusterListColumn, BusterListRow } from '@/components/list';
 import { BusterRoutes, createBusterRoute } from '@/routes';
-import { BusterDatasetListItem } from '@/api/buster_rest/datasets';
+import type { BusterDatasetListItem } from '@/api/asset_interfaces/datasets';
 import { ListEmptyStateWithButton } from '../../../components/list';
 import { useDatasetContextSelector } from '@/context/Datasets';
 import { useMemoizedFn } from 'ahooks';

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_DatasourceForm.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { DataSource } from '@/api/buster_rest';
+import type { DataSource } from '@/api/asset_interfaces/datasources';
 import { AppMaterialIcons, PulseLoader } from '@/components';
 import { AppDataSourceIcon } from '@/components/icons/AppDataSourceIcons';
 import { useAntToken } from '@/styles/useAntToken';

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_DatasourceFormContent.tsx

@@ -1,10 +1,10 @@
-import { DataSource, DataSourceTypes } from '@/api/buster_rest';
+import type { DataSource, DataSourceTypes } from '@/api/asset_interfaces/datasources';
 import { useAppLayoutContextSelector } from '@/context/BusterAppLayout';
 import { useDataSourceContextSelector } from '@/context/DataSources';
 import { BusterRoutes } from '@/routes';
 import { useAntToken } from '@/styles/useAntToken';
 import { useMemoizedFn } from 'ahooks';
-import React, { useContext, useState } from 'react';
+import React, { useState } from 'react';
 import { PostgresForm } from './_forms/PostgresForm';
 import { DatasourceCreateCredentials } from '@/api/buster_socket/datasources/interface';
 import { MySqlForm } from './_forms/MySqlForm';

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/BigQueryForm.tsx

@@ -1,7 +1,7 @@
-import React, { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import React, { useMemo, useRef, useState } from 'react';
 import { FormWrapper, FormWrapperHandle } from './FormWrapper';
-import { DataSource } from '@/api/buster_rest';
+import type { DataSource } from '@/api/asset_interfaces/datasources';
-import {
+import type {
   BigQueryCreateCredentials,
   DatasourceCreateCredentials
 } from '@/api/buster_socket/datasources/interface';

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/DataBricksForm.tsx

@@ -1,9 +1,8 @@
 import {
   DatabricksCreateCredentials,
-  DatasourceCreateCredentials,
+  DatasourceCreateCredentials
-  PostgresCreateCredentials
 } from '@/api/buster_socket/datasources/interface';
-import { DataSource } from '@/api/buster_rest';
+import type { DataSource } from '@/api/asset_interfaces/datasources';
 import React from 'react';
 import { FormWrapper } from './FormWrapper';
 import { Form, Input } from 'antd';

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/FormWrapper.tsx

@@ -3,8 +3,8 @@ import { Button, Form, FormInstance, Input } from 'antd';
 import { createStyles } from 'antd-style';
 import React, { useImperativeHandle, useLayoutEffect } from 'react';
 import { WhiteListBlock } from '../WhiteListBlock';
-import { DatasourceCreateCredentials } from '@/api/buster_socket/datasources/interface';
+import type { DatasourceCreateCredentials } from '@/api/buster_socket/datasources';
-import { DataSource } from '@/api/buster_rest';
+import type { DataSource } from '@/api/asset_interfaces/datasources';
 import { NewDatasetModal } from '@appComponents/NewDatasetModal';
 
 const layout = {

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/MySqlForm.tsx

@@ -1,13 +1,12 @@
 import {
   DatasourceCreateCredentials,
-  MySqlCreateCredentials,
+  MySqlCreateCredentials
-  PostgresCreateCredentials
 } from '@/api/buster_socket/datasources/interface';
-import { DataSource } from '@/api/buster_rest';
+import type { DataSource } from '@/api/asset_interfaces';
 import { AppSelectTagInput } from '@/components/select/AppSelectTagInput';
-import { Form, Select, Input, InputNumber } from 'antd';
+import { Form, Input, InputNumber } from 'antd';
-import React, { useEffect, useLayoutEffect, useRef } from 'react';
+import React from 'react';
-import { FormWrapper, FormWrapperHandle } from './FormWrapper';
+import { FormWrapper } from './FormWrapper';
 
 export const MySqlForm: React.FC<{
   dataSource?: DataSource;

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/PostgresForm.tsx

@@ -1,5 +1,5 @@
-import { DataSource } from '@/api/buster_rest';
+import { DataSource } from '@/api/asset_interfaces';
-import React, { useEffect, useLayoutEffect, useRef } from 'react';
+import React, { useRef } from 'react';
 import { Form, Input, InputNumber, Select } from 'antd';
 import { useKeyPress } from 'ahooks';
 import { AppSelectTagInput } from '@/components/select/AppSelectTagInput';

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/RedshiftForm.tsx

@@ -1,10 +1,8 @@
 import {
   DatasourceCreateCredentials,
-  MySqlCreateCredentials,
-  PostgresCreateCredentials,
   RedshiftCreateCredentials
 } from '@/api/buster_socket/datasources/interface';
-import { DataSource } from '@/api/buster_rest';
+import type { DataSource } from '@/api/asset_interfaces';
 import { AppSelectTagInput } from '@/components/select/AppSelectTagInput';
 import { Form, Input, InputNumber } from 'antd';
 

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/SnowflakeForm.tsx

@@ -1,10 +1,10 @@
-import React, { useEffect, useLayoutEffect, useRef } from 'react';
+import React from 'react';
-import { FormWrapper, FormWrapperHandle } from './FormWrapper';
+import { FormWrapper } from './FormWrapper';
 import {
   DatasourceCreateCredentials,
   MySqlCreateCredentials
 } from '@/api/buster_socket/datasources/interface';
-import { DataSource } from '@/api/buster_rest';
+import type { DataSource } from '@/api/asset_interfaces';
 import { AppSelectTagInput } from '@/components/select/AppSelectTagInput';
 import { Form, Input } from 'antd';
 import { RuleObject } from 'antd/es/form';

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/[datasourceId]/_forms/SqlServerForm.tsx

@@ -2,7 +2,7 @@ import {
   DatasourceCreateCredentials,
   SqlServerCreateCredentials
 } from '@/api/buster_socket/datasources/interface';
-import { DataSource } from '@/api/buster_rest';
+import type { DataSource } from '@/api/asset_interfaces';
 import React from 'react';
 import { FormWrapper } from './FormWrapper';
 import { Form, Input, InputNumber } from 'antd';

web/src/app/app/settings/(restricted-width)/datasources/(admin-restricted-space)/add/page.tsx

@@ -4,7 +4,7 @@ import React from 'react';
 import { BusterRoutes, createBusterRoute } from '@/routes';
 import { HeaderContainer } from '../../_HeaderContainer';
 import { useState } from 'react';
-import { DatabaseNames, DataSourceTypes, SUPPORTED_DATASOURCES } from '@/api/buster_rest';
+import { DatabaseNames, DataSourceTypes, SUPPORTED_DATASOURCES } from '@/api/asset_interfaces';
 
 import { AppDataSourceIcon } from '@/components/icons/AppDataSourceIcons';
 import { useAntToken } from '@/styles/useAntToken';

web/src/app/app/settings/(restricted-width)/datasources/_DatasourceList.tsx

@@ -6,7 +6,7 @@ import { Button, Dropdown, Skeleton } from 'antd';
 import { AppMaterialIcons } from '@/components';
 import { useAntToken } from '@/styles/useAntToken';
 import { AppDataSourceIcon } from '@/components/icons/AppDataSourceIcons';
-import { DataSourceListItem } from '@/api/buster_rest';
+import type { DataSourceListItem } from '@/api/asset_interfaces';
 import { createStyles } from 'antd-style';
 import { MenuProps } from 'antd/lib';
 import Link from 'next/link';

web/src/components/icons/AppDataSourceIcons.tsx

@@ -10,7 +10,7 @@ import { SupabaseIcon } from './customIcons/supabase';
 import { RedUsersIcons } from './customIcons/redUsers';
 import { AthenaIcon } from './customIcons/athena';
 import React from 'react';
-import { DataSourceTypes } from '@/api/buster_rest';
+import { DataSourceTypes } from '@/api/asset_interfaces';
 import { AppMaterialIcons } from './AppMaterialIcons';
 
 const IconRecord: Record<DataSourceTypes, any> = {

web/src/context/Chats/NewChatProvider.tsx

@@ -5,8 +5,8 @@ import {
   useContextSelector
 } from '@fluentui/react-context-selector';
 import { useMemoizedFn } from 'ahooks';
-import { BusterSearchResult } from '@/api/asset_interfaces';
+import type { BusterSearchResult } from '@/api/asset_interfaces';
-import type { BusterDatasetListItem } from '@/api/buster_rest';
+import type { BusterDatasetListItem } from '@/api/asset_interfaces/datasets';
 
 export const useBusterNewChat = () => {
   const [prompt, setPrompt] = useState('');

web/src/context/DataSources/DataSourceProvider.tsx

@@ -1,9 +1,9 @@
 import React, { PropsWithChildren, useEffect, useRef, useState } from 'react';
 import { useBusterWebSocket } from '../BusterWebSocket';
-import { DataSource, DataSourceListItem } from '@/api/buster_rest/datasources';
+import type { DataSource, DataSourceListItem } from '@/api/asset_interfaces/datasources';
 import { useSelectedLayoutSegments } from 'next/navigation';
 import { useMemoizedFn, useMount } from 'ahooks';
-import { DatasourceCreateCredentials } from '@/api/buster_socket/datasources/interface';
+import type { DatasourceCreateCredentials } from '@/api/buster_socket/datasources/interface';
 import { useAppLayoutContextSelector } from '../BusterAppLayout';
 import { BusterRoutes } from '@/routes';
 import { DatasourceUpdateRequest } from '@/api/buster_socket/datasources/datasourceRequests';

web/src/context/Permissions/usePermissionDatasets.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { useBusterWebSocket } from '../BusterWebSocket';
-import { BusterDatasetListItem } from '@/api/buster_rest/datasets';
+import type { BusterDatasetListItem } from '@/api/asset_interfaces';
 import { useMemoizedFn } from 'ahooks';
 import { useUserConfigContextSelector } from '../Users';
 import { usePermissionsContextSelector } from './PermissionsConfigProvider';