From 799836ca432c4c04e09e06e03a95b65cf8f456d6 Mon Sep 17 00:00:00 2001 From: himanshudube97 Date: Wed, 16 Oct 2024 11:53:18 +0530 Subject: [PATCH 1/3] issue-Let the text in data insights say 'Select a table from the left pane to view' #1275 resolved --- .../FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx | 2 +- .../FlowEditor/Components/LowerSectionTabs/StatisticsPane.tsx | 2 +- .../LowerSectionTabs/__tests__/PreviewPane.test.tsx | 4 ++-- .../LowerSectionTabs/__tests__/StatisticsPane.test.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx index e3722925..df7c7107 100644 --- a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx +++ b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx @@ -295,7 +295,7 @@ const PreviewPane = ({ height }: { height: number }) => { height: height, }} > - Select a table to view + Select a table from the left pane to view ); }; diff --git a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/StatisticsPane.tsx b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/StatisticsPane.tsx index d77fc055..66b72e95 100644 --- a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/StatisticsPane.tsx +++ b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/StatisticsPane.tsx @@ -578,7 +578,7 @@ export const StatisticsPane: React.FC = ({ height }) => { height: debouncedHeight, }} > - Select a table to view + Select a table from the left pane to view ); }; diff --git a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/__tests__/PreviewPane.test.tsx b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/__tests__/PreviewPane.test.tsx index 0a5a8916..8f8d360b 100644 --- a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/__tests__/PreviewPane.test.tsx +++ b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/__tests__/PreviewPane.test.tsx @@ -109,11 +109,11 @@ describe('PreviewPane Component', () => { }); }); - test('renders "Select a table to view" message when no table is selected', () => { + test('renders "Select a table from the left pane to view " message when no table is selected', () => { usePreviewAction.mockReturnValue({ previewAction: { type: 'clear-preview' } }); render(); - expect(screen.getByText('Select a table to view')).toBeInTheDocument(); + expect(screen.getByText('Select a table from the left pane to view ')).toBeInTheDocument(); }); }); diff --git a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/__tests__/StatisticsPane.test.tsx b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/__tests__/StatisticsPane.test.tsx index f3277456..d5f79db1 100644 --- a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/__tests__/StatisticsPane.test.tsx +++ b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/__tests__/StatisticsPane.test.tsx @@ -122,7 +122,7 @@ describe('StatisticsPane', () => { ); // Check for the message when no model is selected - expect(screen.getByText(/Select a table to view/i)).toBeInTheDocument(); + expect(screen.getByText(/Select a table from the left pane to view /i)).toBeInTheDocument(); }); it('should resolve when status is completed', async () => { From 81d6370b832e54288b07e1fe4a20b2ad70d8c1af Mon Sep 17 00:00:00 2001 From: himanshudube97 Date: Wed, 16 Oct 2024 13:38:49 +0530 Subject: [PATCH 2/3] Data Insights: Remove the store folder #1273 --- .../FlowEditor/Components/ProjectTree.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/TransformWorkflow/FlowEditor/Components/ProjectTree.tsx b/src/components/TransformWorkflow/FlowEditor/Components/ProjectTree.tsx index 3315f41e..9c683ccf 100644 --- a/src/components/TransformWorkflow/FlowEditor/Components/ProjectTree.tsx +++ b/src/components/TransformWorkflow/FlowEditor/Components/ProjectTree.tsx @@ -11,8 +11,6 @@ import { trimString } from '@/utils/common'; import Image from 'next/image'; import ReplayIcon from '@mui/icons-material/Replay'; import { GlobalContext } from '@/contexts/ContextProvider'; -import SyncIcon from '@/assets/icons/sync.svg'; -import styles from '@/styles/Common.module.css'; const Node = ({ node, style, dragHandle, handleSyncClick, isSyncing }: any) => { const globalContext = useContext(GlobalContext); @@ -24,6 +22,11 @@ const Node = ({ node, style, dragHandle, handleSyncClick, isSyncing }: any) => { const data: DbtSourceModel = node.data; let name: string | JSX.Element = !node.isLeaf ? data.schema : data.input_name; name = trimString(name, stringLengthWithWidth); + useEffect(() => { + if (!node.isLeaf && node.level === 0 && !node.isOpen) { + node.toggle(); + } + }, [node]); return ( { width: (250 * width) / 270 + 'px', opacity: permissions.includes('can_create_dbt_model') ? 1 : 0.5, }} - onClick={() => (node.isLeaf ? undefined : node.toggle())} + onClick={() => (node.isLeaf || node.level === 0 ? undefined : node.toggle())} > {node.isLeaf ? ( Toc icon @@ -120,7 +123,7 @@ const ProjectTree = ({ }; }); - setProjectTreeData([{ id: '0', schema: 'Store', children: treeData }]); + setProjectTreeData([{ id: '0', schema: 'Schemas', children: treeData }]); }; useEffect(() => { @@ -128,7 +131,6 @@ const ProjectTree = ({ constructAndSetProjectTreeData(dbtSourceModels); } }, [dbtSourceModels]); - return ( Date: Wed, 16 Oct 2024 17:25:39 +0530 Subject: [PATCH 3/3] fixed the margis ui etc --- src/components/Explore/Explore.tsx | 7 ++++++- .../Components/LowerSectionTabs/PreviewPane.tsx | 14 +++++++------- .../Components/LowerSectionTabs/StatisticsPane.tsx | 14 ++++++++------ .../TransformWorkflow/FlowEditor/FlowEditor.tsx | 2 +- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/components/Explore/Explore.tsx b/src/components/Explore/Explore.tsx index 396c5000..db866e0c 100644 --- a/src/components/Explore/Explore.tsx +++ b/src/components/Explore/Explore.tsx @@ -120,7 +120,12 @@ export const Explore = () => { diff --git a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx index df7c7107..bafea67e 100644 --- a/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx +++ b/src/components/TransformWorkflow/FlowEditor/Components/LowerSectionTabs/PreviewPane.tsx @@ -184,16 +184,16 @@ const PreviewPane = ({ height }: { height: number }) => { alignItems: 'center', display: 'flex', justifyContent: 'space-between', - padding: '5px', + padding: '8px 8px 8px 44px', }} > - + {modelToPreview?.input_name}