Merge pull request #16 from foghorn-tech/feat-merge-master-0619

Feat merge master 0619
Kanaries · Jun 19, 2023 · 4d016f2 · 4d016f2
2 parents 85c2cb9 + 9017a42
commit 4d016f2
Show file tree

Hide file tree

Showing 35 changed files with 49 additions and 1,666 deletions.
diff --git a/packages/rath-client/src/components/dbGraph/index.tsx b/packages/rath-client/src/components/dbGraph/index.tsx
@@ -3,7 +3,7 @@ import produce from 'immer';
 import { DragEvent, memo, MouseEvent, useCallback, useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
 import intl from 'react-intl-universal';
-import type { TableInfo } from '../../pages/dataSource/selection/database/type';
+import type { TableInfo } from '../../pages/dataConnection/database/interfaces';
 import Link from './link';
 import { IDBGraph } from './localTypes';
 import DBNode from './node';

diff --git a/packages/rath-client/src/components/dbGraph/utils.ts b/packages/rath-client/src/components/dbGraph/utils.ts
@@ -1,4 +1,4 @@
-import type { TableInfo } from "../../pages/dataSource/selection/database/type";
+import type { TableInfo } from "../../pages/dataConnection/database/interfaces";
 import { BOX_HEIGHT, BOX_WIDTH, STROKE_RADIUS } from "./config";
 import type { IDBEdge, IDBGraph } from "./localTypes";
 

diff --git a/packages/rath-client/src/pages/dataConnection/create.tsx b/packages/rath-client/src/pages/dataConnection/create.tsx
@@ -26,9 +26,9 @@ import { DataSourceTag, IDBMeta, setDataStorage } from '../../utils/storage';
 import DataLoadingStatus from '../dataSource/dataLoadingStatus';
 import { useGlobalStore } from '../../store';
 import { PIVOT_KEYS } from '../../constants';
-import DatabaseConnector from '../dataSource/selection/database';
 import { notify } from '../../components/error';
 import { putCloudDataset } from '../../loggers/dataImport';
+import DatabaseConnector from './database/main';
 import FileData from './file';
 import DemoData from './demo';
 // import RestfulData from './restful';

diff --git a/packages/rath-client/src/pages/dataConnection/database/api.ts b/packages/rath-client/src/pages/dataConnection/database/api.ts
diff --git a/.../database/components/nested-list-item.tsx → .../database/components/nested-list-item.tsx b/.../database/components/nested-list-item.tsx → .../database/components/nested-list-item.tsx
diff --git a/...ction/database/components/nested-list.tsx → ...ction/database/components/nested-list.tsx b/...ction/database/components/nested-list.tsx → ...ction/database/components/nested-list.tsx
diff --git a/...abase/components/server-dropdown-item.tsx → ...abase/components/server-dropdown-item.tsx b/...abase/components/server-dropdown-item.tsx → ...abase/components/server-dropdown-item.tsx
@@ -1,6 +1,6 @@
 import styled from "styled-components";
 import { Icon, IconButton, Spinner, IContextualMenuItem, SpinnerSize } from "@fluentui/react";
-import { defaultServers } from '..';
+import { defaultServers } from '../main';
 
 
 const ServerItem = styled.div`