Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: olap-connectors #151

Merged
merged 5 commits into from
Nov 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/go.work

This file was deleted.

3 changes: 3 additions & 0 deletions apps/rath-service/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## WIP RATH Service :construction:

designed for RATH's server side persistent storage.
File renamed without changes.
1 change: 0 additions & 1 deletion buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ phases:
build:
commands:
- echo Building...
- yarn workspace @kanaries/graphic-walker build
- yarn workspace rath-client build2
artifacts:
files:
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "visual-insights",
"name": "Rath",
"private": true,
"version": "1.0.0",
"description": "![](https://www.travis-ci.org/ObservedObserver/showme.svg?branch=master) ![](https://img.shields.io/github/license/ObservedObserver/showme)",
"description": "![](https://img.shields.io/github/license/Kanaries/Rath)",
"scripts": {
"build": "yarn workspace graphic-walker build && yarn workspace frontend build",
"test": "yarn workspace frontend test",
"build": "yarn workspace rath-client build",
"test": "yarn workspace rath-client test",
"ui": "npm run test && npm run build && node start.js",
"devfront": "yarn workspace frontend start",
"devfront": "yarn workspace rath-client start",
"devback": "yarn workspace backend dev",
"count": "cloc --exclude-dir=$(tr '\n' ',' < .clocignore) ."
},
"repository": {
"type": "git",
"url": "git+https://github.com/ObservedObserver/showme.git"
"url": "git+https://github.com/Kanaries/Rath.git"
},
"keywords": [
"insights",
Expand All @@ -22,7 +22,7 @@
],
"author": "Observed Observer",
"bugs": {
"url": "https://github.com/ObservedObserver/showme/issues"
"url": "https://github.com/Kanaries/Rath/issues"
},
"workspaces": {
"packages": [
Expand All @@ -42,7 +42,7 @@
"@types/react-dom": "^17.x",
"vega-scenegraph": "4.10.1-kanaries-patch"
},
"homepage": "https://github.com/ObservedObserver/showme#readme",
"homepage": "https://github.com/Kanaries/Rath#readme",
"devDependencies": {
"concurrently": "^4.1.2",
"yarn": "^1.19.0"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "connectors",
"name": "olap-connector",
"version": "1.0.0",
"description": "",
"scripts": {
Expand Down
13 changes: 7 additions & 6 deletions packages/rath-client/public/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
},
"menu": {
"dataSource": "DataSource",
"editor": "Manual Exploration⭐️",
"editor": "Manual Exploration",
"vizPipe": "interactive Pipeline",
"support": "Support",
"megaAuto": "Mega-auto Exploration",
"semiAuto": "Semi-auto Exploration⭐️",
"semiAuto": "Semi-auto Exploration",
"devCollection": "Insiders(α)",
"dashBoardDesigner": "Dashboard Designer",
"painter": "Data Painter🚀",
"painter": "Data Painter",
"collection": "Collection",
"dashboard": "Dashboard📋"
"dashboard": "Dashboard"
},
"preference": {
"title": "preference",
Expand Down Expand Up @@ -79,8 +79,8 @@
"analysis": {
"start": "Start Analysis",
"checkResult": "Check Existed Results",
"pattern": "Data Copilot",
"manual": "Manual Explore"
"pattern": "Semi-auto Exploration",
"manual": "Manual Exploration"
},
"importStorage": {
"title": "Import History Storage",
Expand Down Expand Up @@ -123,6 +123,7 @@
"databaseName": "Database",
"schemaName": "Schema",
"tableName": "Table",
"editName": "Edit Name",
"preview": "Data Preview",
"query": "SQL Query",
"connectorConfig": "Connector Settings",
Expand Down
15 changes: 8 additions & 7 deletions packages/rath-client/public/locales/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
},
"menu": {
"dataSource": "数据源",
"editor": "自助分析⭐️",
"editor": "自助分析",
"support": "帮助",
"megaAuto": "全自动分析",
"semiAuto": "半自动探索⭐️",
"semiAuto": "半自动探索",
"devCollection": "实验特性(α)",
"dashBoardDesigner": "智能报表",
"painter": "数据绘板🚀",
"painter": "数据绘板",
"collection": "收藏夹",
"dashboard": "报表📋"
"dashboard": "报表"
},
"preference": {
"title": "个人偏好",
Expand Down Expand Up @@ -78,7 +78,7 @@
"analysis": {
"start": "开始分析",
"checkResult": "查看已有结果",
"pattern": "半自动化分析",
"pattern": "半自动化探索",
"manual": "自助分析"
},
"importStorage": {
Expand Down Expand Up @@ -119,9 +119,10 @@
"charset": "字符集编码",
"databaseType": "选择数据库",
"connectUri": "连接 URI",
"databaseName": "Database",
"databaseName": "数据库",
"schemaName": "Schema",
"tableName": "Table",
"tableName": "表",
"editName": "编辑名称",
"preview": "数据预览",
"query": "SQL 查询",
"connectorConfig": "连接器设置",
Expand Down
87 changes: 42 additions & 45 deletions packages/rath-client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,59 +18,56 @@ import Painter from './pages/painter';
import Collection from './pages/collection';
import Dashboard from './pages/dashboard';


function App() {
const { langStore, commonStore } = useGlobalStore();
const { appKey, navMode } = commonStore;
const { langStore, commonStore } = useGlobalStore();
const { appKey, navMode } = commonStore;

useEffect(() => {
initRathWorker(commonStore.computationEngine);
return () => {
destroyRathWorker();
};
}, [commonStore]);
useEffect(() => {
initRathWorker(commonStore.computationEngine);
return () => {
destroyRathWorker();
};
}, [commonStore]);

if (!langStore.loaded) {
if (!langStore.loaded) {
return (
<div style={{ marginTop: '6em' }}>
<Spinner label="Initializing Rath..." size={SpinnerSize.large} />
</div>
);
}
return (
<div style={{ marginTop: '6em' }}>
<Spinner label="Initializing Rath..." size={SpinnerSize.large} />
</div>
)
}
return (
<div>
<div className="main-app-container">
<div className="main-app-nav" style={{ flexBasis: navMode === 'text' ? '220px' : '20px' }}>
<AppNav />
</div>
<div className="main-app-content">
<div className="message-container">
<MessageSegment />
<div>
<div className="main-app-container">
<div className="main-app-nav" style={{ flexBasis: navMode === 'text' ? '220px' : '20px' }}>
<AppNav />
</div>
<div className="main-app-content">
<div className="message-container">
<MessageSegment />
</div>
{appKey === PIVOT_KEYS.dataSource && <DataSourceBoard />}
{appKey === PIVOT_KEYS.editor && <VisualInterface />}
{appKey === PIVOT_KEYS.support && <SupportPage />}
{appKey === PIVOT_KEYS.megaAuto && <LTSPage />}
{appKey === PIVOT_KEYS.semiAuto && <PatternPage />}
{appKey === PIVOT_KEYS.painter && <Painter />}
{appKey === PIVOT_KEYS.dashBoardDesigner && <ProgressiveDashboard />}
{appKey === PIVOT_KEYS.collection && <Collection />}
{appKey === PIVOT_KEYS.dashboard && <Dashboard />}
<CrInfo />
</div>
</div>
</div>
{appKey === PIVOT_KEYS.dataSource && (
<DataSourceBoard />
)}
{appKey === PIVOT_KEYS.editor && <VisualInterface />}
{appKey === PIVOT_KEYS.support && <SupportPage />}
{appKey === PIVOT_KEYS.megaAuto && <LTSPage />}
{appKey === PIVOT_KEYS.semiAuto && <PatternPage />}
{appKey === PIVOT_KEYS.painter && <Painter />}
{appKey === PIVOT_KEYS.dashBoardDesigner && <ProgressiveDashboard />}
{appKey === PIVOT_KEYS.collection && <Collection />}
{appKey === PIVOT_KEYS.dashboard && <Dashboard />}
<CrInfo />
</div>
</div>
</div>
)
);
}

const OBApp = observer(App);

export default function WrappedApp(): JSX.Element {
return (
<StoreWrapper>
<OBApp />
</StoreWrapper>
);
return (
<StoreWrapper>
<OBApp />
</StoreWrapper>
);
}
40 changes: 20 additions & 20 deletions packages/rath-client/src/components/dbGraph/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,27 +69,27 @@ export const DBBox = styled.span`
background-color: #f3f3f3;
}
`;
const Output = styled.div({
flexGrow: 1,
flexShrink: 1,
overflow: 'hidden',
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
border: '1px solid',
borderTop: 'none',
marginBottom: '1em',

'> span': {
flexGrow: 1,
flexShrink: 1,
padding: '0 1em',
overflow: 'hidden',
const Output = styled.div`
flex-grow: 1;
flex-shrink: 1;
overflow: hidden;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
border: 1px solid;
border-top: none;
margin-bottom: 1em;

> span {
flex-grow: 1;
flex-shrink: 1;
padding: 0 1em;
overflow: hidden;
// textOverflow: 'ellipsis',
maxWidth: '30vw',
},
});
max-width: 30vw;
}
`

const STROKE_RADIUS = 12;

Expand Down
1 change: 0 additions & 1 deletion packages/rath-client/src/components/fieldFilter/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { useGlobalStore } from '../../store';
import RangeSelection from './rangeSelection';
import SetSelection from './setSelection';


interface FieldFilterProps {
fid: string;
}
Expand Down
Loading