update drag and drop logic for dashboard

web/src/controllers/DashboardController/DashboardController.tsx

@@ -1,47 +0,0 @@
-'use client';
-
-import React from 'react';
-import { FileIndeterminateLoader } from '@/components/features/FileIndeterminateLoader';
-import { DashboardFileView, useChatLayoutContextSelector } from '@/layouts/ChatLayout';
-import { DashboardViewComponents } from './config';
-import { useGetDashboard } from '@/api/buster_rest/dashboards';
-import { useDashboardContentStore } from '@/context/Dashboards';
-import { AddToDashboardModal } from '@/components/features/modal/AddToDashboardModal';
-import { canEdit } from '@/lib/share';
-
-export const DashboardController: React.FC<{ dashboardId: string }> = ({ dashboardId }) => {
-  const { isFetched: isFetchedDashboard, data: permission } = useGetDashboard(
-    { id: dashboardId },
-    (x) => x.permission
-  );
-  const chatId = useChatLayoutContextSelector((x) => x.chatId);
-  const selectedFileView = useChatLayoutContextSelector((x) => x.selectedFileView) || 'dashboard';
-  const isEditor = canEdit(permission);
-
-  const Component =
-    selectedFileView && isFetchedDashboard && selectedFileView in DashboardViewComponents
-      ? DashboardViewComponents[selectedFileView as DashboardFileView]
-      : () => null;
-
-  return (
-    <>
-      {!isFetchedDashboard && <FileIndeterminateLoader />}
-      <Component dashboardId={dashboardId} readOnly={!isEditor} chatId={chatId} />
-
-      {isEditor && <MemoizedAddToDashboardModal dashboardId={dashboardId} />}
-    </>
-  );
-};
-
-const MemoizedAddToDashboardModal = React.memo(({ dashboardId }: { dashboardId: string }) => {
-  const { openAddContentModal, onCloseAddContentModal } = useDashboardContentStore();
-  return (
-    <AddToDashboardModal
-      open={openAddContentModal}
-      onClose={onCloseAddContentModal}
-      dashboardId={dashboardId}
-    />
-  );
-});
-
-MemoizedAddToDashboardModal.displayName = 'MemoizedAddToDashboardModal';

web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardContentController/DashboardMetricItem/MetricTitle.tsx

@@ -39,11 +39,8 @@ export const MetricTitle: React.FC<{
     });
 
     return (
-      <Link className="flex" href={metricLink} prefetch>
+      <Link className="flex" href={metricLink} prefetch {...attributes} {...listeners}>
-        <div
+        <div className={'flex cursor-pointer flex-col space-y-0.5 overflow-hidden'}>
-          {...attributes}
-          {...listeners}
-          className={'flex cursor-pointer flex-col space-y-0.5 overflow-hidden'}>
           <div className="flex w-full justify-between space-x-0.5 overflow-hidden">
             <Title
               as="h4"

web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardEditTitle.tsx

@@ -1,6 +1,5 @@
 import { useDebounceFn, useMemoizedFn } from '@/hooks';
 import { EditableTitle } from '@/components/ui/typography/EditableTitle';
-import { Input } from '@/components/ui/inputs';
 import React from 'react';
 import { type useUpdateDashboard } from '@/api/buster_rest/dashboards';
 import { InputTextArea } from '@/components/ui/inputs/InputTextArea';

web/src/controllers/DashboardController/DashboardViewDashboardController/DashboardViewDashboardController.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import { DashboardViewProps } from '../config';
 import React from 'react';
 import { DashboardEditTitles } from './DashboardEditTitle';
 import { DashboardContentController } from './DashboardContentController';
@@ -11,12 +10,13 @@ import {
 } from '@/api/buster_rest/dashboards';
 import { useDashboardContentStore } from '@/context/Dashboards';
 import { ScrollArea } from '@/components/ui/scroll-area';
+import { canEdit } from '@/lib/share';
 
-export const DashboardViewDashboardController: React.FC<DashboardViewProps> = ({
+export const DashboardViewDashboardController: React.FC<{
-  dashboardId,
+  dashboardId: string;
-  chatId,
+  chatId: string | undefined;
-  readOnly = false
+  readOnly?: boolean;
-}) => {
+}> = ({ dashboardId, chatId, readOnly: readOnlyProp = false }) => {
   const { data: dashboardResponse } = useGetDashboard({ id: dashboardId });
   const { mutateAsync: onUpdateDashboard } = useUpdateDashboard();
   const { mutateAsync: onUpdateDashboardConfig } = useUpdateDashboardConfig();
@@ -24,6 +24,7 @@ export const DashboardViewDashboardController: React.FC<DashboardViewProps> = ({
 
   const metrics = dashboardResponse?.metrics;
   const dashboard = dashboardResponse?.dashboard;
+  const readOnly = readOnlyProp || !canEdit(dashboardResponse?.permission);
 
   return (
     <ScrollArea className="h-full">

web/src/controllers/DashboardController/config.ts

@@ -1,15 +0,0 @@
-import type { DashboardFileView } from '@/layouts/ChatLayout';
-import { DashboardViewDashboardController } from './DashboardViewDashboardController';
-import { DashboardViewFileController } from './DashboardViewFileController';
-import React from 'react';
-
-export interface DashboardViewProps {
-  dashboardId: string;
-  chatId: string | undefined;
-  readOnly?: boolean;
-}
-
-export const DashboardViewComponents: Record<DashboardFileView, React.FC<DashboardViewProps>> = {
-  dashboard: DashboardViewDashboardController,
-  file: DashboardViewFileController
-};

web/src/controllers/DashboardController/index.ts

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

web/src/lib/metrics/canEditChart.ts

@@ -1,20 +0,0 @@
-import { BusterMetricData, BusterChartConfigProps } from '@/api/asset_interfaces/metric';
-import isEmpty from 'lodash/isEmpty';
-import { isNumericColumnType } from '../messages';
-
-export const canEditChart = (
-  metricId: string | undefined | null,
-  isFetchedMetricData: boolean,
-  metricData: BusterMetricData | undefined,
-  columnLabelFormats: BusterChartConfigProps['columnLabelFormats']
-): boolean => {
-  return (
-    !!metricId &&
-    !isFetchedMetricData &&
-    !isEmpty(metricData?.data) &&
-    !columnLabelFormats &&
-    !!Object.values(columnLabelFormats! || {}).some((column) =>
-      isNumericColumnType(column.columnType)
-    )
-  );
-};

web/src/lib/metrics/index.ts

@@ -1,4 +1,3 @@
 export * from './resolve';
-export * from './canEditChart';
 export * from './upgradeToIMetric';
 export * from './saveToServerHelpers';