move fonts around

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

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

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

@@ -1,5 +1,5 @@
 import type { BusterChartConfigProps } from '@/components/charts';
-import { BusterShare, VerificationStatus } from '../share';
+import { type BusterShare, type VerificationStatus } from '../share';
 
 export type BusterMetric = {
   id: string;

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

@@ -1,8 +1,4 @@
-import {
+import { useCreateReactMutation, useCreateReactQuery } from '@/api/createReactQuery';
-  PREFETCH_STALE_TIME,
-  useCreateReactMutation,
-  useCreateReactQuery
-} from '@/api/createReactQuery';
 import {
   createDataset,
   deployDataset,
@@ -17,6 +13,10 @@ import {
 import { useMemoizedFn } from 'ahooks';
 import { QueryClient, useQueryClient } from '@tanstack/react-query';
 import { queryKeys } from '@/api/query_keys';
+import { datasetQueryKeys } from '@/api/query_keys/datasets';
+
+const options = datasetQueryKeys.datasetsListQueryOptions();
+const baseDatasetQueryKey = options.queryKey;
 
 export const useGetDatasets = (params?: Parameters<typeof getDatasets>[0]) => {
   const queryFn = useMemoizedFn(() => {
@@ -24,7 +24,7 @@ export const useGetDatasets = (params?: Parameters<typeof getDatasets>[0]) => {
   });
 
   const res = useCreateReactQuery({
-    ...queryKeys.datasetsList(params),
+    ...queryKeys.datasetsListQueryOptions(params),
     queryFn
   });
 
@@ -41,7 +41,7 @@ export const prefetchGetDatasets = async (
   const queryClient = queryClientProp || new QueryClient();
 
   await queryClient.prefetchQuery({
-    ...queryKeys.datasetsList(params),
+    ...queryKeys.datasetsListQueryOptions(params),
     queryFn: () => getDatasets_server(params)
   });
 
@@ -84,7 +84,7 @@ export const useCreateDataset = () => {
   const queryClient = useQueryClient();
 
   const onSuccess = useMemoizedFn(() => {
-    queryClient.invalidateQueries({ queryKey: queryKeys.datasetsList().queryKey, exact: true });
+    queryClient.invalidateQueries({ queryKey: baseDatasetQueryKey, exact: true });
   });
 
   return useCreateReactMutation({
@@ -102,7 +102,7 @@ export const useDeployDataset = () => {
   return useCreateReactMutation({
     mutationFn,
     onSuccess: (data, variables, context) => {
-      queryClient.invalidateQueries({ queryKey: queryKeys.datasetsList().queryKey, exact: true });
+      queryClient.invalidateQueries({ queryKey: baseDatasetQueryKey, exact: true });
     }
   });
 };
@@ -116,7 +116,7 @@ export const useUpdateDataset = () => {
 export const useDeleteDataset = () => {
   const queryClient = useQueryClient();
   const onSuccess = useMemoizedFn(() => {
-    queryClient.invalidateQueries({ queryKey: queryKeys.datasetsList().queryKey, exact: true });
+    queryClient.invalidateQueries({ queryKey: baseDatasetQueryKey, exact: true });
   });
   return useCreateReactMutation({
     mutationFn: deleteDataset,

web/src/api/query_keys/datasets.ts

@@ -1,10 +1,9 @@
-'use client';
-
 import { queryOptions } from '@tanstack/react-query';
-import type { BusterDataset, BusterDatasetListItem, IDataResult } from '../asset_interfaces';
+import type { BusterDataset, BusterDatasetListItem } from '../asset_interfaces/datasets/interfaces';
-import type { GetDatasetsParams } from '../request_interfaces/dataset';
+import type { IDataResult } from '../asset_interfaces/metric/interfaces';
+import type { GetDatasetsParams } from '../request_interfaces/dataset/interfaces';
 
-const datasetsList = (params?: GetDatasetsParams) =>
+const datasetsListQueryOptions = (params?: GetDatasetsParams) =>
   queryOptions<BusterDatasetListItem[]>({
     queryKey: ['datasets', params]
   });
@@ -21,7 +20,7 @@ const datasetMetadata = (datasetId: string) =>
   });
 
 export const datasetQueryKeys = {
-  datasetsList,
+  datasetsListQueryOptions,
   datasetData,
   datasetMetadata
 };

web/src/api/query_keys/index.ts

@@ -11,6 +11,7 @@ import { datasetQueryKeys } from './datasets';
 import { permissionGroupQueryKeys } from './permission_groups';
 
 export const queryKeys = {
+  ...datasetQueryKeys,
   ...chatQueryKeys,
   ...collectionQueryKeys,
   ...userQueryKeys,
@@ -20,6 +21,5 @@ export const queryKeys = {
   ...termsQueryKeys,
   ...datasourceQueryKeys,
   ...datasetGroupQueryKeys,
-  ...datasetQueryKeys,
   ...permissionGroupQueryKeys
 };

web/src/styles/styles.scss

@@ -1,13 +1,12 @@
-@import './base/_fonts';
+@import './tailwind';
-@import './base/_tailwind';
+@import './fonts';
-@import './base/_antd';
+@import './antd';
-@import './base/_reset';
+@import './reset';
-@import './base/_sql';
+@import './sql';
 @import './loaders';
-@import './transitions.scss';
+@import './animations';
-@import './animations.scss';
+@import './monaco';
-@import './monaco.scss';
+@import '../components/layout/AppSplitter/SplitPane/themes/default';
-@import '../components/layout/AppSplitter/SplitPane/themes/default.scss';
 @import 'react-data-grid/lib/styles.css';
 
 h1,

web/src/styles/tailwind.scss

@@ -1,9 +1,3 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-
-@layer base {
-  img {
-    @apply inline-block;
-  }
-}

web/src/styles/transitions.scss

@@ -1,9 +0,0 @@
-@keyframes pop {
-  0% {
-    transform: translate3d(var(--translate-x, 0), var(--translate-y, 0), 0) scale(1);
-  }
-  100% {
-    transform: translate3d(var(--translate-x, 0), var(--translate-y, 0), 0) scale(var(--scale));
-    box-shadow: var(--box-shadow);
-  }
-}