1
0
mirror of https://github.com/lana-k/sqliteviz.git synced 2025-12-07 02:28:54 +08:00

91 Commits

Author SHA1 Message Date
lana-k
b59c21c14e update tests 2025-10-19 18:25:03 +02:00
lana-k
4ed4b54a28 fix warnings 2025-10-17 21:01:40 +02:00
lana-k
2c2bb7d6d3 0.27.1 2025-10-16 22:29:56 +02:00
lana-k
efbd985b36 #128 tests 2025-10-16 22:28:33 +02:00
lana-k
9cf7d0e5dc #128 fix save and close 2025-10-09 22:49:54 +02:00
lana-k
0a8c09b58d #127 fix for new inquiry 2025-10-08 21:04:17 +02:00
lana-k
931cf380bc #127 tests 2025-10-08 19:39:56 +02:00
lana-k
f0f96ac663 tests 2025-10-05 20:59:34 +02:00
lana-k
45530cc9d6 add save as event 2025-10-05 14:27:50 +02:00
lana-k
6fbf75b601 fix tests 2025-10-03 22:13:33 +02:00
lana-k
d3fbf08569 #31 fix deleting inquiry 2025-09-29 21:17:36 +02:00
lana-k
be6a19a30f #127 fix copy to clipboard 2025-09-28 22:11:18 +02:00
lana-k
07d7a9d54b #31 handle concurrent saving 2025-09-27 21:59:32 +02:00
lana-k
cdd925b8af #16 save as 2025-09-27 17:01:50 +02:00
lana-k
12fa0749b1 Update package.json 2025-07-30 23:27:35 +02:00
saaj
75bf849823 Build SQLite 3.50.3 (#124)
* Build SQLite 3.50.3

* Update pivot_vtab, base in Dockerfile.test, fix test after SQLite 3.47

* Update CI image for tests
2025-07-30 23:26:22 +02:00
lana-k
3ee825defe fix standart chart resize in pivot, improve performance 2025-04-03 22:36:50 +02:00
lana-k
77df3a8446 use only camel case for props 2025-03-30 21:01:06 +02:00
lana-k
559e04200c fix config name 2025-03-30 16:40:43 +02:00
lana-k
4568780526 fix release action 2025-03-30 16:33:23 +02:00
lana-k
fa9108bc08 add source maps 2025-03-30 16:23:51 +02:00
lana-k
df16383d49 linter 2025-03-30 15:57:47 +02:00
lana-k
6f7961e1b4 #63 update node and npm 2025-03-30 15:13:55 +02:00
lana-k
2741aa6f33 add titles, align row title to the left 2025-03-30 15:13:36 +02:00
lana-k
6ceac83db9 update version 2025-03-29 17:32:33 +01:00
lana-k
a46625ebe7 #122 add tests 2025-03-29 17:09:33 +01:00
lana-k
5ef0b32549 #63 test for lot resize 2025-03-29 16:09:33 +01:00
lana-k
f49fa0ea96 #63 test for chart updating 2025-03-29 13:32:20 +01:00
lana-k
108ae454c1 #122 add line wrapping 2025-03-26 22:18:55 +01:00
lana-k
43b6110c28 minimize column name cell in record view 2025-03-26 21:50:55 +01:00
lana-k
5a805fba80 fix plot update 2025-03-26 20:59:17 +01:00
lana-k
58cdab94c1 fix styles 2025-03-25 21:19:22 +01:00
lana-k
b3d81666be add more chunks 2025-03-25 21:18:23 +01:00
lana-k
fdf180d340 fix plot resize 2025-03-23 21:09:12 +01:00
lana-k
f2ff5aa2af slot comment 2025-03-20 22:17:16 +01:00
lana-k
0c1b91ab2f format 2025-03-20 22:04:15 +01:00
lana-k
5e2b34a856 fix codemirror styles 2025-03-17 21:43:07 +01:00
lana-k
24786c9069 add service worker 2025-03-16 23:04:03 +01:00
lana-k
c28d31b019 fix tests 2025-03-11 22:24:57 +01:00
lana-k
6009ebb447 fix resize 2025-03-09 22:26:53 +01:00
lana-k
b5504b91ce fix tests 2025-03-09 21:57:36 +01:00
lana-k
828cad6439 migrate to vite 2025-02-01 20:54:26 +01:00
lana-k
8fa3c2ae58 fix tests 2025-01-23 21:36:11 +01:00
lana-k
aa5c907095 Merge branch 'master' of github.com:lana-k/sqliteviz into migrate_to_vue3 2025-01-13 22:19:00 +01:00
lana-k
3a05b27400 #121 0.25.1 2025-01-12 22:03:06 +01:00
lana-k
108d96a753 #121 fix lint 2025-01-12 22:00:48 +01:00
lana-k
f55a8caa92 #121 tests 2025-01-12 21:42:17 +01:00
lana-k
87f9f9eb01 use actions, add store tests 2025-01-05 22:30:12 +01:00
lana-k
d6408bdd85 #121 save inquiries in store 2025-01-05 21:06:06 +01:00
lana-k
e14696b59e update tests 2025-01-05 17:13:55 +01:00
lana-k
eee67763b5 plotly in pivot 2024-12-10 21:41:07 +01:00
lana-k
637d8d26dd #63 migrate to Vue 3 2024-10-13 16:12:21 +02:00
lana-k
b30b2181e4 #63 update slot syntax 2024-10-05 15:43:22 +02:00
lana-k
378b9fb580 #113 upgrade plotly 2024-09-23 16:46:50 +02:00
lana-k
244ba9eb08 #116 add JSON/NDJSON 2024-09-17 11:35:53 +02:00
lana-k
53e5194295 #116 update tests 2024-09-16 23:49:02 +02:00
lana-k
04274ef19a #116 fix lint 2024-09-15 18:08:46 +02:00
lana-k
3893a66f4e Merge branch 'master' of github.com:lana-k/sqliteviz 2024-09-05 22:15:38 +02:00
lana-k
1b6b7c71e9 #116 JSON file import 2024-09-05 22:15:12 +02:00
saaj
3f6427ff0e Build sqlitelua for scalar, aggregate & table-valued UDFs in Lua (#118)
* Update base Docker images

* Use performance.now() instead of Date.now() for time promise tests

* Build sqlitelua: user scalar, aggregate & table-valued functions in Lua
2024-08-25 21:03:34 +02:00
lana-k
a2464d839f #115 fix version number 2024-01-07 13:55:38 +01:00
lana-k
316e603c3c #115 style fixes 2024-01-07 13:37:21 +01:00
lana-k
88466eca5e #115 fix lint 2024-01-07 12:31:53 +01:00
lana-k
5123e39a60 #115 version 2024-01-07 12:14:08 +01:00
lana-k
4c8401f32f #115 scroll record to beginning 2024-01-06 20:36:43 +01:00
lana-k
d949629ee4 #115 fix new lines - use pre 2024-01-06 18:55:45 +01:00
lana-k
7a18e415c8 #115 add styles for blob and null 2024-01-06 16:51:35 +01:00
lana-k
878689b3f7 fix svg button state 2024-01-06 12:03:06 +01:00
lana-k
42f040975d #115 tests 2024-01-06 11:23:23 +01:00
lana-k
78e9ca2120 #115 fix tests 2024-01-03 18:26:07 +01:00
lana-k
96af391f20 #115 clear message 2024-01-02 13:57:42 +01:00
lana-k
f58b62eb0c #115 add messages 2023-12-27 23:00:05 +01:00
lana-k
b17040d3ef #115 copy cell value 2023-12-27 22:22:49 +01:00
lana-k
bc6154b9ad #115 add icons 2023-12-27 21:30:43 +01:00
lana-k
3aea8c951b #115 update value when switch row 2023-12-26 20:45:11 +01:00
lana-k
1e982a1196 #115 unselect on paging 2023-10-31 22:27:47 +01:00
lana-k
6ecbde7fd3 #115 style fixes 2023-10-31 20:48:30 +01:00
lana-k
5ee881432a #115 select cell between modes; pass record number 2023-10-29 20:01:51 +01:00
lana-k
735e4ec7f6 #115 record and row navigator 2023-10-28 22:51:28 +02:00
lana-k
07d31dbfe9 #115 unselect 2023-10-28 19:48:36 +02:00
lana-k
ac1f7de62c #115 formats and call selections 2023-10-27 22:50:54 +02:00
lana-k
96877de532 #115 move focus 2023-10-27 18:47:45 +02:00
lana-k
b60fc28e47 #115 json view 2023-10-27 17:14:14 +02:00
lana-k
bec3d9c737 #115 add split in result set 2023-10-25 20:43:22 +02:00
lana-k
8aac7af481 update package.json 2023-07-03 23:33:52 +02:00
lana-k
6982204e68 Update currentTab when close tabs #112 2023-07-03 23:13:09 +02:00
lana-k
41e0ae7332 fix test for firefox #110 2023-06-29 23:14:08 +02:00
lana-k
ebb5af4f10 send event when sharing 2023-06-29 22:57:39 +02:00
lana-k
ae26358b25 add test #110 2023-06-29 22:28:41 +02:00
lana-k
d9ee702b8e update papaparse #111 2023-06-29 22:14:28 +02:00
lana-k
446045fa55 Catch parsing errors in compete #110 2023-06-29 22:13:56 +02:00
184 changed files with 22321 additions and 41338 deletions

29
.eslintrc.cjs Normal file
View File

@@ -0,0 +1,29 @@
module.exports = {
root: true,
env: {
node: true,
es2022: true
},
extends: ['eslint:recommended', 'plugin:vue/vue3-recommended', 'prettier'],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-case-declarations': 'off',
'max-len': [2, 100, 4, { ignoreUrls: true }],
'vue/multi-word-component-names': 'off',
'vue/no-mutating-props': 'warn',
'vue/no-reserved-component-names': 'warn',
'vue/no-v-model-argument': 'off',
'vue/require-default-prop': 'off',
'vue/custom-event-name-casing': ['error', 'camelCase'],
'vue/attribute-hyphenation': ['error', 'never']
},
overrides: [
{
files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/**/*.spec.{j,t}s?(x)'],
env: {
mocha: true
}
}
]
}

View File

@@ -1,30 +0,0 @@
module.exports = {
root: true,
env: {
node: true
},
extends: [
'plugin:vue/essential',
'@vue/standard'
],
parserOptions: {
parser: 'babel-eslint'
},
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-case-declarations': 'off',
'max-len': [2, 100, 4, { ignoreUrls: true }]
},
overrides: [
{
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/**/*.spec.{j,t}s?(x)'
],
env: {
mocha: true
}
}
]
}

14
.github/workflows/config.grenrc.cjs vendored Normal file
View File

@@ -0,0 +1,14 @@
module.exports = {
dataSource: 'milestones',
ignoreIssuesWith: ['wontfix', 'duplicate'],
milestoneMatch: 'v{{tag_name}}',
template: {
issue: '- {{name}} [{{text}}]({{url}})',
changelogTitle: '',
release: '{{body}}'
},
groupBy: {
Enhancements: ['enhancement', 'internal'],
'Bug fixes': ['bug']
}
}

View File

@@ -1,17 +0,0 @@
module.exports = {
dataSource: 'milestones',
ignoreIssuesWith: [
'wontfix',
'duplicate'
],
milestoneMatch: 'v{{tag_name}}',
template: {
issue: '- {{name}} [{{text}}]({{url}})',
changelogTitle: "",
release: "{{body}}",
},
groupBy: {
'Enhancements': ["enhancement", "internal"],
'Bug fixes': ["bug"]
}
}

View File

@@ -3,43 +3,43 @@ on:
workflow_dispatch: workflow_dispatch:
push: push:
tags: tags:
- '*' - '*'
jobs: jobs:
deploy: deploy:
name: Create release name: Create release
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: 10.x node-version: 18.x
- name: Update npm - name: Update npm
run: npm install -g npm@7 run: npm install -g npm@10
- name: npm install and build - name: npm install and build
run: | run: |
npm install npm install
npm run build npm run build
- name: Create archives - name: Create archives
run: | run: |
cd dist cd dist
zip -9 -r ../dist.zip . -x "js/*.map" -x "/*.map" zip -9 -r ../dist.zip . -x "*.map"
zip -9 -r ../dist_map.zip . zip -9 -r ../dist_map.zip .
- name: Create Release Notes - name: Create Release Notes
run: | run: |
npm install github-release-notes@0.16.0 -g npm install github-release-notes@0.16.0 -g
gren changelog --generate --config="/.github/workflows/config.grenrc.js" gren changelog --generate --config="/.github/workflows/config.grenrc.cjs"
env: env:
GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create release - name: Create release
uses: ncipollo/release-action@v1 uses: ncipollo/release-action@v1
with: with:
artifacts: "dist.zip,dist_map.zip" artifacts: 'dist.zip,dist_map.zip'
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
bodyFile: "CHANGELOG.md" bodyFile: 'CHANGELOG.md'

View File

@@ -3,35 +3,36 @@ on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: branches:
- 'master' - 'master'
pull_request: pull_request:
branches: branches:
- 'master' - 'master'
jobs: jobs:
test: test:
name: Run tests name: Run tests
runs-on: ubuntu-20.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Use Node.js - name: Use Node.js
uses: actions/setup-node@v1 uses: actions/setup-node@v1
with: with:
node-version: 10.x node-version: 18.x
- name: Install browsers - name: Install browsers
run: | run: |
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
sudo apt-get update sudo add-apt-repository -y ppa:mozillateam/ppa
sudo apt-get install -y chromium-browser firefox sudo apt-get update
sudo apt-get install -y chromium-browser firefox-esr
- name: Update npm - name: Update npm
run: npm install -g npm@7 run: npm install -g npm@10
- name: Install the project - name: Install the project
run: npm install run: npm install
- name: Run lint - name: Run lint
run: npm run lint -- --no-fix run: npm run lint -- --no-fix
- name: Run karma tests - name: Run karma tests
run: npm run test run: npm run test

7
.prettierrc Normal file
View File

@@ -0,0 +1,7 @@
{
"trailingComma": "none",
"tabWidth": 2,
"semi": false,
"singleQuote": true,
"arrowParens": "avoid"
}

View File

@@ -3,7 +3,7 @@
# docker build -t sqliteviz/test -f Dockerfile.test . # docker build -t sqliteviz/test -f Dockerfile.test .
# #
FROM node:12 FROM node:12.22-bullseye
RUN set -ex; \ RUN set -ex; \
apt update; \ apt update; \

View File

@@ -4,11 +4,13 @@
# sqliteviz # sqliteviz
Sqliteviz is a single-page offline-first PWA for fully client-side visualisation of SQLite databases or CSV files. Sqliteviz is a single-page offline-first PWA for fully client-side visualisation
of SQLite databases, CSV, JSON or NDJSON files.
With sqliteviz you can: With sqliteviz you can:
- run SQL queries against a SQLite database and create [Plotly][11] charts and pivot tables based on the result sets - run SQL queries against a SQLite database and create [Plotly][11] charts and pivot tables based on the result sets
- import a CSV file into a SQLite database and visualize imported data - import a CSV/JSON/NDJSON file into a SQLite database and visualize imported data
- export result set to CSV file - export result set to CSV file
- manage inquiries and run them against different databases - manage inquiries and run them against different databases
- import/export inquiries from/to a JSON file - import/export inquiries from/to a JSON file
@@ -18,15 +20,19 @@ With sqliteviz you can:
https://user-images.githubusercontent.com/24638357/128249848-f8fab0f5-9add-46e0-a9c1-dd5085a8623e.mp4 https://user-images.githubusercontent.com/24638357/128249848-f8fab0f5-9add-46e0-a9c1-dd5085a8623e.mp4
## Quickstart ## Quickstart
The latest release of sqliteviz is deployed on [sqliteviz.com/app][6]. The latest release of sqliteviz is deployed on [sqliteviz.com/app][6].
## Wiki ## Wiki
For user documentation, check out sqliteviz [documentation][7]. For user documentation, check out sqliteviz [documentation][7].
## Motivation ## Motivation
It's a kind of middleground between [Plotly Falcon][1] and [Redash][2]. It's a kind of middleground between [Plotly Falcon][1] and [Redash][2].
## Components ## Components
It is built on top of [react-chart-editor][3], [PivotTable.js][12], [sql.js][4] and [Vue-Codemirror][8] in [Vue.js][5]. CSV parsing is performed with [Papa Parse][9]. It is built on top of [react-chart-editor][3], [PivotTable.js][12], [sql.js][4] and [Vue-Codemirror][8] in [Vue.js][5]. CSV parsing is performed with [Papa Parse][9].
[1]: https://github.com/plotly/falcon [1]: https://github.com/plotly/falcon

View File

@@ -1,5 +1,3 @@
module.exports = { module.exports = {
presets: [ presets: ['@vue/cli-plugin-babel/preset']
'@vue/cli-plugin-babel/preset'
]
} }

View File

@@ -1,12 +1,12 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>favicon.png"> <link rel="icon" href="favicon.png" />
<link rel="manifest" href="<%= BASE_URL %>manifest.webmanifest"> <link rel="manifest" href="manifest.webmanifest" />
<title><%= htmlWebpackPlugin.options.title %></title> <title>sqliteviz</title>
<style> <style>
#sqliteviz-loading-wrapper { #sqliteviz-loading-wrapper {
position: fixed; position: fixed;
@@ -16,7 +16,7 @@
top: 0; top: 0;
background-color: white; background-color: white;
} }
#sqliteviz-loading-text { #sqliteviz-loading-text {
display: block; display: block;
position: absolute; position: absolute;
@@ -27,7 +27,7 @@
font-family: sans-serif; font-family: sans-serif;
font-size: 20px; font-size: 20px;
} }
#sqliteviz-loading-wrapper svg { #sqliteviz-loading-wrapper svg {
display: block; display: block;
position: absolute; position: absolute;
@@ -38,15 +38,18 @@
#sqliteviz-loading-wrapper circle { #sqliteviz-loading-wrapper circle {
position: absolute; position: absolute;
left: 0; right: 0; top: 0; bottom: 0; left: 0;
right: 0;
top: 0;
bottom: 0;
fill: none; fill: none;
stroke-width: 5px; stroke-width: 5px;
stroke-linecap: round; stroke-linecap: round;
stroke: #119DFF; stroke: #119dff;
} }
#sqliteviz-loading-wrapper circle.bg { #sqliteviz-loading-wrapper circle.bg {
stroke: #C8D4E3; stroke: #c8d4e3;
} }
#sqliteviz-loading-wrapper circle.front { #sqliteviz-loading-wrapper circle.front {
@@ -74,29 +77,22 @@
</head> </head>
<body> <body>
<noscript> <noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong> <strong>
We're sorry but this app doesn't work properly without JavaScript
enabled. Please enable it to continue.
</strong>
</noscript> </noscript>
<div id="app"> <div id="app">
<div id="sqliteviz-loading-wrapper"> <div id="sqliteviz-loading-wrapper">
<div id="sqliteviz-loading-text">LOADING</div> <div id="sqliteviz-loading-text">LOADING</div>
<svg height="170" width="170" viewBox="0 0 170 170"> <svg height="170" width="170" viewBox="0 0 170 170">
<circle <circle class="bg" cx="85" cy="85" r="80" />
class="bg" <circle class="front" cx="85" cy="85" r="80" />
cx="85"
cy="85"
r="80"
/>
<circle
class="front"
cx="85"
cy="85"
r="80"
/>
</svg> </svg>
</div> </div>
</div> </div>
<!-- extention slot start --> <!-- extention slot start -->
<!-- extention slot end --> <!-- extention slot end -->
<!-- built files will be auto injected --> <script type="module" src="/src/main.js"></script>
</body> </body>
</html> </html>

10
jsconfig.json Normal file
View File

@@ -0,0 +1,10 @@
{
"include": ["src/**/*", "tests/**/*"],
"exclude": ["node_modules", "dist"],
"compilerOptions": {
"baseUrl": "./",
"paths": {
"@*": ["./src/*"]
}
}
}

122
karma.conf.cjs Normal file
View File

@@ -0,0 +1,122 @@
module.exports = function (config) {
config.set({
vite: {
config: {
resolve: {
alias: {
vue: 'vue/dist/vue.esm-bundler.js'
}
},
server: {
preTransformRequests: false
}
},
coverage: {
enable: true,
include: 'src/*',
exclude: ['node_modules', 'src/components/svg/*'],
extension: ['.js', '.vue'],
requireEnv: false
}
},
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',
// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['mocha', 'sinon-chai', 'vite'],
// list of files / patterns to load in the browser
files: [
{
pattern: 'test.setup.js',
type: 'module',
watched: false,
served: false
},
{
pattern: 'tests/**/*.spec.js',
type: 'module',
watched: false,
served: false
},
{
pattern: 'src/assets/styles/*.css',
type: 'css',
watched: false,
served: false
}
],
plugins: [
'karma-vite',
'karma-mocha',
'karma-sinon-chai',
'karma-firefox-launcher',
'karma-chrome-launcher',
'karma-spec-reporter',
'karma-coverage'
],
// list of files / patterns to exclude
exclude: [],
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['spec', 'coverage'],
coverageReporter: {
dir: 'coverage',
reporters: [{ type: 'lcov', subdir: '.' }, { type: 'text-summary' }]
},
// web server port
port: 9876,
// enable / disable colors in the output (reporters and logs)
colors: true,
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN ||
// config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,
// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,
customLaunchers: {
FirefoxHeadlessTouch: {
base: 'FirefoxHeadless',
prefs: {
'dom.w3c_touch_events.enabled': 1,
'dom.events.asyncClipboard.clipboardItem': true
}
}
},
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['ChromiumHeadless', 'FirefoxHeadlessTouch'],
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: true,
// Concurrency level
// how many browser should be started simultaneous
concurrency: 2,
client: {
captureConsole: true,
mocha: {
timeout: 7000
}
},
browserConsoleLogOptions: {
terminal: true,
level: ''
}
})
// Fix the timezone
process.env.TZ = 'Europe/Amsterdam'
}

View File

@@ -1,203 +0,0 @@
// Karma configuration
'use strict'
const path = require('path')
const VueLoaderPlugin = require('vue-loader/lib/plugin')
function resolve (dir) {
return path.join(__dirname, dir)
}
module.exports = function (config) {
config.set({
// base path that will be used to resolve all patterns (eg. files, exclude)
basePath: '',
// frameworks to use
// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
frameworks: ['mocha', 'sinon-chai'],
// list of files / patterns to load in the browser
files: [
'./karma.files.js',
{
pattern: 'node_modules/sql.js/dist/sql-wasm.wasm',
watched: false,
included: false,
served: true,
nocache: false
}
],
// list of files / patterns to exclude
exclude: [],
// preprocess matching files before serving them to the browser
// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
preprocessors: {
'./karma.files.js': ['webpack']
},
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
reporters: ['spec', 'coverage'],
coverageReporter: {
dir: 'coverage',
reporters: [{ type: 'lcov', subdir: '.' }, { type: 'text-summary' }]
},
// !!DONOT delete this reporter, or vue-cli-addon-ui-karma doesnot work
jsonResultReporter: {
outputFile: 'report/karma-result.json',
isSynchronous: true
},
junitReporter: {
outputDir: 'report', // results will be saved as $outputDir/$browserName.xml
// if included, results will be saved as $outputDir/$browserName/$outputFile
outputFile: undefined,
suite: '', // suite will become the package name attribute in xml testsuite element
useBrowserName: true, // add browser name to report and classes names
// function (browser, result) to customize the name attribute in xml testcase element
nameFormatter: undefined,
// function (browser, result) to customize the classname attribute in xml testcase element
classNameFormatter: undefined,
properties: {} // key value pairs add to the <properties> section of the report
},
// web server port
port: 9876,
// enable / disable colors in the output (reporters and logs)
colors: true,
// level of logging
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN ||
// config.LOG_INFO || config.LOG_DEBUG
logLevel: config.LOG_INFO,
// enable / disable watching file and executing tests whenever any file changes
autoWatch: false,
customLaunchers: {
FirefoxHeadlessTouch: {
base: 'FirefoxHeadless',
prefs: {
'dom.w3c_touch_events.enabled': 1,
'dom.events.asyncClipboard.clipboardItem': true
}
}
},
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
browsers: ['ChromiumHeadless', 'FirefoxHeadlessTouch'],
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: true,
// Concurrency level
// how many browser should be started simultaneous
concurrency: 2,
client: {
captureConsole: true,
mocha: {
timeout: 7000
}
},
browserConsoleLogOptions: {
terminal: true,
level: ''
},
webpack: {
mode: 'development',
entry: './src/main.js',
resolve: {
extensions: ['.js', '.vue', '.json'],
alias: {
vue$: 'vue/dist/vue.esm.js',
'@': resolve('src')
}
},
module: {
rules: [
{
test: /\.js$/,
exclude: /(node_modules|bower_components)/,
use: [
{
loader: 'babel-loader'
}
]
},
{
test: /\.js$/,
include: /src/,
exclude: /(node_modules|bower_components|\.spec\.js$)/,
use: [
{
loader: 'istanbul-instrumenter-loader',
options: {
esModules: true
}
}
]
},
{
test: /worker\.js$/,
loader: 'worker-loader'
},
{
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
loader: 'url-loader'
},
{
test: /\.vue$/,
loader: 'vue-loader',
options: {
loaders: {
js: 'babel-loader'
},
postLoaders: {
js: 'istanbul-instrumenter-loader?esModules=true'
}
}
},
{
test: /\.css$/,
use: ['vue-style-loader', 'css-loader']
},
{
test: /\.scss$/,
use: ['vue-style-loader', 'css-loader', 'sass-loader']
},
{
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
loader: 'url-loader',
options: {
limit: 10000,
name: resolve('fonts/[name].[hash:7].[ext]')
}
}
]
},
plugins: [new VueLoaderPlugin()],
node: {
fs: 'empty'
}
},
webpackMiddleware: {
watchOptions: {
ignored: /node_modules/
}
},
proxies: {
'/_karma_webpack_/sql-wasm.wasm': '/base/node_modules/sql.js/dist/sql-wasm.wasm',
'/base/sql-wasm.wasm': '/base/node_modules/sql.js/dist/sql-wasm.wasm'
}
})
// Fix the timezone
process.env.TZ = 'Europe/Amsterdam'
}

View File

@@ -1,21 +0,0 @@
import Vue from 'vue'
import { VuePlugin } from 'vuera'
import VModal from 'vue-js-modal'
Vue.use(VuePlugin)
Vue.use(VModal)
Vue.config.productionTip = false
// require all test files (files that ends with .spec.js)
const testsContext = require.context('./tests', true, /\.spec.js$/)
// Read more about why we need to call testContext:
// https://www.npmjs.com/package/require-context#context-api
testsContext.keys().forEach(testsContext)
// require all src files except main.js and router/index.js for coverage.
// you can also change this to match only the subset of files that
// you want coverage for.
// We don't include router/index.js to avoid installing VueRouter globally in tests
const srcContext = require.context('./src', true, /^\.\/(?!(main|(router(\/)?(index)?))(\.js)?$)/)
srcContext.keys().forEach(srcContext)

View File

@@ -5,7 +5,7 @@ a custom version of [sql.js][1]. It allows sqliteviz to have more recent
version of SQLite build with a number of useful extensions. version of SQLite build with a number of useful extensions.
`Makefile` from [sql.js][1] is rewritten as more comprehensible `configure.py` `Makefile` from [sql.js][1] is rewritten as more comprehensible `configure.py`
and `build.py` Python scripts that run in `emscripten/emsdk` Docker container. and `build.py` Python scripts that run in `emscripten/emsdk` Docker container.
## Extension ## Extension
@@ -45,6 +45,8 @@ SQLite 3rd party extensions included:
1. [pivot_vtab][5] -- a pivot virtual table 1. [pivot_vtab][5] -- a pivot virtual table
2. `pearson` correlation coefficient function extension from [sqlean][21] 2. `pearson` correlation coefficient function extension from [sqlean][21]
(which is part of [squib][20]) (which is part of [squib][20])
3. [sqlitelua][22] -- a virtual table `luafunctions` which allows to define custom scalar,
aggregate and table-valued functions in Lua
To ease the step to have working clone locally, the build is committed into To ease the step to have working clone locally, the build is committed into
the repository. the repository.
@@ -82,15 +84,15 @@ described in [this message from SQLite Forum][12]:
> amalgamation code and the extensions would thereafter be automatically > amalgamation code and the extensions would thereafter be automatically
> initialized on each connection. > initialized on each connection.
[1]: https://github.com/sql-js/sql.js [1]: https://github.com/sql-js/sql.js
[2]: https://sqlite.org/amalgamation.html [2]: https://sqlite.org/amalgamation.html
[3]: https://sqlite.org/src/dir?ci=trunk&name=ext/misc [3]: https://sqlite.org/src/dir?ci=trunk&name=ext/misc
[4]: https://sqlite.org/fts5.html [4]: https://sqlite.org/fts5.html
[5]: https://github.com/jakethaw/pivot_vtab [5]: https://github.com/jakethaw/pivot_vtab
[6]: https://sqlite.org/series.html [6]: https://sqlite.org/series.html
[7]: https://sqlite.org/src/file/ext/misc/series.c [7]: https://sqlite.org/src/file/ext/misc/series.c
[8]: https://sqlite.org/src/file/ext/misc/closure.c [8]: https://sqlite.org/src/file/ext/misc/closure.c
[9]: https://sqlite.org/src/file/ext/misc/uuid.c [9]: https://sqlite.org/src/file/ext/misc/uuid.c
[10]: https://sqlite.org/src/file/ext/misc/regexp.c [10]: https://sqlite.org/src/file/ext/misc/regexp.c
[11]: https://charlesleifer.com/blog/querying-tree-structures-in-sqlite-using-python-and-the-transitive-closure-extension/ [11]: https://charlesleifer.com/blog/querying-tree-structures-in-sqlite-using-python-and-the-transitive-closure-extension/
[12]: https://sqlite.org/forum/forumpost/6ad7d4f4bebe5e06?raw [12]: https://sqlite.org/forum/forumpost/6ad7d4f4bebe5e06?raw
@@ -103,3 +105,4 @@ described in [this message from SQLite Forum][12]:
[19]: https://github.com/lana-k/sqliteviz/blob/master/tests/lib/database/sqliteExtensions.spec.js [19]: https://github.com/lana-k/sqliteviz/blob/master/tests/lib/database/sqliteExtensions.spec.js
[20]: https://github.com/mrwilson/squib/blob/master/pearson.c [20]: https://github.com/mrwilson/squib/blob/master/pearson.c
[21]: https://github.com/nalgeon/sqlean/blob/incubator/src/pearson.c [21]: https://github.com/nalgeon/sqlean/blob/incubator/src/pearson.c
[22]: https://github.com/kev82/sqlitelua

View File

@@ -1,10 +1,8 @@
FROM node:14-bullseye FROM node:20.14-bookworm
RUN set -ex; \ RUN set -ex; \
echo 'deb http://deb.debian.org/debian unstable main' \
> /etc/apt/sources.list.d/unstable.list; \
apt-get update; \ apt-get update; \
apt-get install -y -t unstable firefox; \ apt-get install -y firefox-esr; \
apt-get install -y chromium apt-get install -y chromium
WORKDIR /tmp/build WORKDIR /tmp/build

View File

@@ -1,12 +1,15 @@
module.exports = function (config) { module.exports = function (config) {
const timeout = 15 * 60 * 1000 const timeout = 15 * 60 * 1000
config.set({ config.set({
frameworks: ['mocha'], frameworks: ['mocha'],
files: [ files: [
'suite.js', 'suite.js',
{ pattern: 'node_modules/sql.js/dist/sql-wasm.wasm', served: true, included: false }, {
pattern: 'node_modules/sql.js/dist/sql-wasm.wasm',
served: true,
included: false
},
{ pattern: 'sample.csv', served: true, included: false } { pattern: 'sample.csv', served: true, included: false }
], ],
@@ -15,7 +18,10 @@ module.exports = function (config) {
singleRun: true, singleRun: true,
customLaunchers: { customLaunchers: {
ChromiumHeadlessNoSandbox: { base: 'ChromiumHeadless', flags: ['--no-sandbox'] } ChromiumHeadlessNoSandbox: {
base: 'ChromiumHeadless',
flags: ['--no-sandbox']
}
}, },
browsers: ['ChromiumHeadlessNoSandbox', 'FirefoxHeadless'], browsers: ['ChromiumHeadlessNoSandbox', 'FirefoxHeadless'],
concurrency: 1, concurrency: 1,
@@ -33,11 +39,11 @@ module.exports = function (config) {
logLevel: config.LOG_INFO, logLevel: config.LOG_INFO,
browserConsoleLogOptions: { terminal: true, level: config.LOG_INFO }, browserConsoleLogOptions: { terminal: true, level: config.LOG_INFO },
preprocessors: { 'suite.js': [ 'webpack' ] }, preprocessors: { 'suite.js': ['webpack'] },
webpack: { webpack: {
mode: 'development', mode: 'development',
module: { module: {
noParse: [ __dirname + '/node_modules/benchmark/benchmark.js' ] noParse: [__dirname + '/node_modules/benchmark/benchmark.js']
}, },
node: { fs: 'empty' } node: { fs: 'empty' }
}, },
@@ -47,6 +53,5 @@ module.exports = function (config) {
}, },
jsonToFileReporter: { outputPath: '.', fileName: 'suite-result.json' } jsonToFileReporter: { outputPath: '.', fileName: 'suite-result.json' }
}) })
} }

View File

@@ -2,7 +2,7 @@
"name": "sqlite-webassembly-microbenchmark", "name": "sqlite-webassembly-microbenchmark",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@babel/core" : "^7.14.8", "@babel/core": "^7.14.8",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"benchmark": "^2.1.4", "benchmark": "^2.1.4",
"lodash": "^4.17.4", "lodash": "^4.17.4",
@@ -11,7 +11,7 @@
"karma": "^6.3.4", "karma": "^6.3.4",
"karma-chrome-launcher": "^3.1.0", "karma-chrome-launcher": "^3.1.0",
"karma-firefox-launcher": "^2.1.1", "karma-firefox-launcher": "^2.1.1",
"karma-json-to-file-reporter" : "^1.0.1", "karma-json-to-file-reporter": "^1.0.1",
"karma-mocha": "^2.0.1", "karma-mocha": "^2.0.1",
"karma-webpack": "^4.0.2", "karma-webpack": "^4.0.2",
"webpack": "^4.46.0", "webpack": "^4.46.0",

View File

@@ -69,6 +69,19 @@
], ],
"metadata": {} "metadata": {}
}, },
{
"cell_type": "code",
"source": [
"!du -b lib | head -n 2"
],
"outputs": [],
"execution_count": null,
"metadata": {
"collapsed": false,
"outputHidden": false,
"inputHidden": true
}
},
{ {
"cell_type": "code", "cell_type": "code",
"source": [ "source": [
@@ -176,7 +189,7 @@
}, },
"language_info": { "language_info": {
"name": "python", "name": "python",
"version": "3.10.7", "version": "3.10.14",
"mimetype": "text/x-python", "mimetype": "text/x-python",
"codemirror_mode": { "codemirror_mode": {
"name": "ipython", "name": "ipython",

View File

@@ -4,7 +4,6 @@ import lodash from 'lodash'
import Papa from 'papaparse' import Papa from 'papaparse'
import useragent from 'ua-parser-js' import useragent from 'ua-parser-js'
describe('SQLite build benchmark', function () { describe('SQLite build benchmark', function () {
let parsedCsv let parsedCsv
let sqlModule let sqlModule
@@ -18,7 +17,7 @@ describe('SQLite build benchmark', function () {
importToTable(selectDb, parsedCsv) importToTable(selectDb, parsedCsv)
}) })
function benchmarkImport () { function benchmarkImport() {
const db = new sqlModule.Database() const db = new sqlModule.Database()
try { try {
importToTable(db, parsedCsv) importToTable(db, parsedCsv)
@@ -27,7 +26,7 @@ describe('SQLite build benchmark', function () {
} }
} }
function benchmarkSelect () { function benchmarkSelect() {
const result = selectDb.exec(` const result = selectDb.exec(`
SELECT county, AVG(avg_depth) avg_depth_c SELECT county, AVG(avg_depth) avg_depth_c
FROM ( FROM (
@@ -50,11 +49,9 @@ describe('SQLite build benchmark', function () {
suite.add('select', { initCount: 3, minSamples: 50, fn: benchmarkSelect }) suite.add('select', { initCount: 3, minSamples: 50, fn: benchmarkSelect })
await run(suite) await run(suite)
}) })
}) })
function importToTable(db, parsedCsv, chunkSize = 1024) {
function importToTable (db, parsedCsv, chunkSize = 1024) {
const columnListString = parsedCsv.meta.fields.join(', ') const columnListString = parsedCsv.meta.fields.join(', ')
db.exec(`CREATE TABLE csv_import(${columnListString})`) db.exec(`CREATE TABLE csv_import(${columnListString})`)
@@ -67,7 +64,6 @@ function importToTable (db, parsedCsv, chunkSize = 1024) {
}) })
} }
class PromiseWrapper { class PromiseWrapper {
constructor() { constructor() {
this.promise = new Promise((resolve, reject) => { this.promise = new Promise((resolve, reject) => {
@@ -89,11 +85,11 @@ function parseCsv(url) {
}) })
} }
function chunkArray (arr, size) { function chunkArray(arr, size) {
return arr.reduce(function (result, value, index) { return arr.reduce(function (result, value, index) {
const chunkIndex = Math.floor(index / size) const chunkIndex = Math.floor(index / size)
if(!(chunkIndex in result)) { if (!(chunkIndex in result)) {
result[chunkIndex] = [] result[chunkIndex] = []
} }
result[chunkIndex].push(value) result[chunkIndex].push(value)
@@ -102,8 +98,7 @@ function chunkArray (arr, size) {
}, []) }, [])
} }
function createSuite() {
function createSuite () {
// Combined workaround from: // Combined workaround from:
// - https://github.com/bestiejs/benchmark.js/issues/106 // - https://github.com/bestiejs/benchmark.js/issues/106
// - https://github.com/bestiejs/benchmark.js/issues/237 // - https://github.com/bestiejs/benchmark.js/issues/237
@@ -117,24 +112,26 @@ function createSuite () {
return new bm.Suite() return new bm.Suite()
} }
function run (suite) { function run(suite) {
const suiteResult = new PromiseWrapper() const suiteResult = new PromiseWrapper()
suite suite
.on('cycle', function (event) { .on('cycle', function (event) {
console.info(String(event.target)) console.info(String(event.target))
}) })
.on('complete', function () { .on('complete', function () {
console.log(JSON.stringify({ console.log(
browser: useragent(navigator.userAgent).browser, JSON.stringify({
result: this.filter('successful') browser: useragent(navigator.userAgent).browser,
})) result: this.filter('successful')
})
)
suiteResult.resolve() suiteResult.resolve()
}) })
.on('error', function (event) { .on('error', function (event) {
console.error('Benchmark failed', String(event.target)) console.error('Benchmark failed', String(event.target))
suiteResult.reject() suiteResult.reject()
}) })
.run({async: true}) .run({ async: true })
return suiteResult.promise return suiteResult.promise
} }

View File

@@ -24,6 +24,7 @@ cflags = (
# Compile-time optimisation # Compile-time optimisation
'-Os', # reduces the code size about in half comparing to -O2 '-Os', # reduces the code size about in half comparing to -O2
'-flto', '-flto',
'-Isrc', '-Isrc/lua',
) )
emflags = ( emflags = (
# Base # Base
@@ -61,6 +62,15 @@ def build(src: Path, dst: Path):
'-c', src / 'extension-functions.c', '-c', src / 'extension-functions.c',
'-o', out / 'extension-functions.o', '-o', out / 'extension-functions.o',
]) ])
logging.info('Building LLVM bitcode for SQLite Lua extension')
subprocess.check_call([
'emcc',
*cflags,
'-shared',
*(src / 'lua').glob('*.c'),
*(src / 'sqlitelua').glob('*.c'),
'-o', out / 'sqlitelua.o',
])
logging.info('Building WASM from bitcode') logging.info('Building WASM from bitcode')
subprocess.check_call([ subprocess.check_call([
@@ -68,6 +78,7 @@ def build(src: Path, dst: Path):
*emflags, *emflags,
out / 'sqlite3.o', out / 'sqlite3.o',
out / 'extension-functions.o', out / 'extension-functions.o',
out / 'sqlitelua.o',
'-o', out / 'sql-wasm.js', '-o', out / 'sql-wasm.js',
]) ])

View File

@@ -1,14 +1,16 @@
import logging import logging
import re
import shutil import shutil
import subprocess import subprocess
import sys import sys
import tarfile
import zipfile import zipfile
from io import BytesIO from io import BytesIO
from pathlib import Path from pathlib import Path
from urllib import request from urllib import request
amalgamation_url = 'https://sqlite.org/2023/sqlite-amalgamation-3410000.zip' amalgamation_url = 'https://sqlite.org/2025/sqlite-amalgamation-3500300.zip'
# Extension-functions # Extension-functions
# =================== # ===================
@@ -20,18 +22,24 @@ contrib_functions_url = 'https://sqlite.org/contrib/download/extension-functions
extension_urls = ( extension_urls = (
# Miscellaneous extensions # Miscellaneous extensions
# ======================== # ========================
('https://sqlite.org/src/raw/8d79354f?at=series.c', 'sqlite3_series_init'), ('https://sqlite.org/src/raw/e212edb2?at=series.c', 'sqlite3_series_init'),
('https://sqlite.org/src/raw/dbfd8543?at=closure.c', 'sqlite3_closure_init'), ('https://sqlite.org/src/raw/5559daf1?at=closure.c', 'sqlite3_closure_init'),
('https://sqlite.org/src/raw/5bb2264c?at=uuid.c', 'sqlite3_uuid_init'), ('https://sqlite.org/src/raw/5bb2264c?at=uuid.c', 'sqlite3_uuid_init'),
('https://sqlite.org/src/raw/5853b0e5?at=regexp.c', 'sqlite3_regexp_init'), ('https://sqlite.org/src/raw/388e7f23?at=regexp.c', 'sqlite3_regexp_init'),
('https://sqlite.org/src/raw/b9086e22?at=percentile.c', 'sqlite3_percentile_init'), ('https://sqlite.org/src/raw/72e05a21?at=percentile.c', 'sqlite3_percentile_init'),
('https://sqlite.org/src/raw/09f967dc?at=decimal.c', 'sqlite3_decimal_init'), ('https://sqlite.org/src/raw/228d47e9?at=decimal.c', 'sqlite3_decimal_init'),
# Third-party extension # Third-party extension
# ===================== # =====================
('https://github.com/jakethaw/pivot_vtab/raw/9323ef93/pivot_vtab.c', 'sqlite3_pivotvtab_init'), ('https://github.com/jakethaw/pivot_vtab/raw/e7705f34/pivot_vtab.c', 'sqlite3_pivotvtab_init'),
('https://github.com/nalgeon/sqlean/raw/95e8d21a/src/pearson.c', 'sqlite3_pearson_init'), ('https://github.com/nalgeon/sqlean/raw/95e8d21a/src/pearson.c', 'sqlite3_pearson_init'),
# Third-party extension with own dependencies
# ===========================================
('https://github.com/kev82/sqlitelua/raw/db479510/src/main.c', 'sqlite3_luafunctions_init'),
) )
lua_url = 'http://www.lua.org/ftp/lua-5.3.5.tar.gz'
sqlitelua_url = 'https://github.com/kev82/sqlitelua/archive/db479510.zip'
sqljs_url = 'https://github.com/sql-js/sql.js/archive/refs/tags/v1.7.0.zip' sqljs_url = 'https://github.com/sql-js/sql.js/archive/refs/tags/v1.7.0.zip'
@@ -59,6 +67,38 @@ def _get_amalgamation(tgt: Path):
shutil.copyfileobj(fr, fw) shutil.copyfileobj(fr, fw)
def _get_lua(tgt: Path):
# Library definitions from lua/Makefile
lib_str = '''
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
ltm.o lundump.o lvm.o lzio.o
LIB_O= lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o
LUA_O= lua.o
'''
header_only_files = {'lprefix', 'luaconf', 'llimits', 'lualib'}
lib_names = set(re.findall(r'(\w+)\.o', lib_str)) | header_only_files
logging.info('Downloading and extracting Lua %s', lua_url)
archive = tarfile.open(fileobj=BytesIO(request.urlopen(lua_url).read()))
(tgt / 'lua').mkdir()
for tarinfo in archive:
tarpath = Path(tarinfo.name)
if tarpath.match('src/*') and tarpath.stem in lib_names:
with (tgt / 'lua' / tarpath.name).open('wb') as fw:
shutil.copyfileobj(archive.extractfile(tarinfo), fw)
logging.info('Downloading and extracting SQLite Lua extension %s', sqlitelua_url)
archive = zipfile.ZipFile(BytesIO(request.urlopen(sqlitelua_url).read()))
archive_root_dir = zipfile.Path(archive, archive.namelist()[0])
(tgt / 'sqlitelua').mkdir()
for zpath in (archive_root_dir / 'src').iterdir():
if zpath.name != 'main.c':
with zpath.open() as fr, (tgt / 'sqlitelua' / zpath.name).open('wb') as fw:
shutil.copyfileobj(fr, fw)
def _get_contrib_functions(tgt: Path): def _get_contrib_functions(tgt: Path):
request.urlretrieve(contrib_functions_url, tgt / 'extension-functions.c') request.urlretrieve(contrib_functions_url, tgt / 'extension-functions.c')
@@ -70,6 +110,7 @@ def _get_extensions(tgt: Path):
for url, init_fn in extension_urls: for url, init_fn in extension_urls:
logging.info('Downloading and appending to amalgamation %s', url) logging.info('Downloading and appending to amalgamation %s', url)
with request.urlopen(url) as resp: with request.urlopen(url) as resp:
f.write(b'\n')
shutil.copyfileobj(resp, f) shutil.copyfileobj(resp, f)
init_functions.append(init_fn) init_functions.append(init_fn)
@@ -90,6 +131,7 @@ def _get_sqljs(tgt: Path):
def configure(tgt: Path): def configure(tgt: Path):
_get_amalgamation(tgt) _get_amalgamation(tgt)
_get_contrib_functions(tgt) _get_contrib_functions(tgt)
_get_lua(tgt)
_get_extensions(tgt) _get_extensions(tgt)
_get_sqljs(tgt) _get_sqljs(tgt)

File diff suppressed because one or more lines are too long

Binary file not shown.

46056
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,63 +1,79 @@
{ {
"name": "sqliteviz", "name": "sqliteviz",
"version": "0.23.0", "version": "0.27.1",
"license": "Apache-2.0", "license": "Apache-2.0",
"private": true, "private": true,
"type": "module",
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "dev": "vite",
"build": "NODE_OPTIONS=--max_old_space_size=4096 vue-cli-service build", "build": "vite build",
"test": "vue-cli-service karma", "serve": "vite preview",
"lint": "vue-cli-service lint" "test": "karma start karma.conf.cjs",
"lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
"format": "prettier . --write"
}, },
"dependencies": { "dependencies": {
"codemirror": "^5.57.0", "buffer": "^6.0.3",
"codemirror": "^5.65.18",
"codemirror-editor-vue3": "^2.8.0",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"dataurl-to-blob": "^0.0.1", "dataurl-to-blob": "^0.0.1",
"html2canvas": "^1.1.4", "html2canvas": "^1.1.4",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"nanoid": "^3.1.12", "nanoid": "^3.1.12",
"papaparse": "^5.3.1", "papaparse": "^5.4.1",
"pivottable": "^2.23.0", "pivottable": "^2.23.0",
"plotly.js": "^1.58.4", "plotly.js": "^2.35.2",
"promise-worker": "^2.0.1", "promise-worker": "^2.0.1",
"react": "^16.13.1", "react": "^16.14.0",
"react-chart-editor": "^0.45.0", "react-chart-editor": "^0.46.1",
"react-dom": "^16.13.1", "react-dom": "^16.14.0",
"sql.js": "file:./lib/sql-js", "sql.js": "file:./lib/sql-js",
"vue": "^2.6.11", "tiny-emitter": "^2.1.0",
"vue-codemirror": "^4.0.6", "veaury": "^2.5.1",
"vue-js-modal": "^2.0.0-rc.6", "vue": "^3.5.11",
"vue-multiselect": "^2.1.6", "vue-final-modal": "^4.5.5",
"vue-router": "^3.2.0", "vue-multiselect": "^3.0.0-beta.3",
"vue2-teleport": "^1.0.1", "vue-router": "^4.4.5",
"vuejs-paginate": "^2.1.0", "vuejs-paginate-next": "^1.0.2",
"vuera": "^0.2.7", "vuex": "^4.1.0"
"vuex": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "^4.4.0", "@babel/core": "^7.25.7",
"@vue/cli-plugin-eslint": "^4.4.0", "@vitejs/plugin-vue": "^5.2.1",
"@vue/cli-plugin-router": "^4.4.0", "@vue/eslint-config-standard": "^8.0.1",
"@vue/cli-plugin-vuex": "^4.4.0", "@vue/test-utils": "^2.4.6",
"@vue/cli-service": "^4.4.0",
"@vue/eslint-config-standard": "^5.1.2",
"@vue/test-utils": "^1.1.2",
"babel-eslint": "^10.1.0",
"chai": "^4.1.2", "chai": "^4.1.2",
"chai-as-promised": "^7.1.1", "chai-as-promised": "^8.0.1",
"eslint": "^6.7.2", "eslint": "^8.57.1",
"eslint-config-prettier": "^10.1.1",
"eslint-plugin-import": "^2.20.2", "eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1", "eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0", "eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^9.28.0",
"flush-promises": "^1.0.2", "flush-promises": "^1.0.2",
"karma": "^3.1.4", "karma": "^6.4.4",
"karma-firefox-launcher": "^2.1.0", "karma-coverage": "^2.2.1",
"karma-webpack": "^4.0.2", "karma-coverage-istanbul-reporter": "^3.0.3",
"vue-cli-plugin-ui-karma": "^0.2.5", "karma-firefox-launcher": "^2.1.3",
"vue-template-compiler": "^2.6.11", "karma-mocha": "^1.3.0",
"workbox-webpack-plugin": "^6.1.5", "karma-spec-reporter": "^0.0.36",
"worker-loader": "^3.0.8" "karma-vite": "^1.0.5",
"mocha": "^5.2.0",
"prettier": "3.5.3",
"process": "^0.11.10",
"url-loader": "^4.1.1",
"vite": "^5.4.14",
"vite-plugin-istanbul": "^5.0.0",
"vite-plugin-node-polyfills": "^0.23.0",
"vite-plugin-pwa": "^0.21.1",
"vite-plugin-static-copy": "^2.2.0",
"vue-cli-plugin-ui-karma": "^0.2.5"
},
"overrides": {
"karma-vite": {
"vite-plugin-istanbul": "$vite-plugin-istanbul"
}
} }
} }

View File

@@ -1 +1 @@
[] []

View File

@@ -1,6 +1,6 @@
{ {
"background_color": "white", "background_color": "white",
"description": "Sqliteviz is a single-page application for fully client-side visualisation of SQLite databases or CSV.", "description": "Sqliteviz is a single-page application for fully client-side visualisation of SQLite databases, CSV, JSON or NDJSON.",
"display": "fullscreen", "display": "fullscreen",
"icons": [ "icons": [
{ {
@@ -27,4 +27,4 @@
"name": "sqliteviz", "name": "sqliteviz",
"short_name": "sqliteviz", "short_name": "sqliteviz",
"start_url": "index.html" "start_url": "index.html"
} }

View File

@@ -1,58 +1,87 @@
<template> <template>
<div id="app"> <div id="app">
<router-view/> <router-view />
</div> </div>
</template> </template>
<script>
import storedInquiries from '@/lib/storedInquiries'
export default {
computed: {
inquiries() {
return this.$store.state.inquiries
}
},
watch: {
inquiries: {
deep: true,
handler() {
storedInquiries.updateStorage(this.inquiries)
}
}
},
created() {
this.$store.commit('setInquiries', storedInquiries.getStoredInquiries())
addEventListener('storage', event => {
if (event.key === storedInquiries.myInquiriesKey) {
this.$store.commit('setInquiries', storedInquiries.getStoredInquiries())
}
})
}
}
</script>
<style> <style>
@font-face { @font-face {
font-family: "Open Sans"; font-family: 'Open Sans';
src: url("~@/assets/fonts/OpenSans-Regular.woff2"); src: url('@/assets/fonts/OpenSans-Regular.woff2');
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Open Sans"; font-family: 'Open Sans';
src: url("~@/assets/fonts/OpenSans-SemiBold.woff2"); src: url('@/assets/fonts/OpenSans-SemiBold.woff2');
font-weight: 600; font-weight: 600;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Open Sans"; font-family: 'Open Sans';
src: url("~@/assets/fonts/OpenSans-Bold.woff2"); src: url('@/assets/fonts/OpenSans-Bold.woff2');
font-weight: 700; font-weight: 700;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "Open Sans"; font-family: 'Open Sans';
src: url("~@/assets/fonts/OpenSans-Italic.woff2"); src: url('@/assets/fonts/OpenSans-Italic.woff2');
font-weight: 400; font-weight: 400;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Open Sans"; font-family: 'Open Sans';
src: url("~@/assets/fonts/OpenSans-SemiBoldItalic.woff2"); src: url('@/assets/fonts/OpenSans-SemiBoldItalic.woff2');
font-weight: 600; font-weight: 600;
font-style: italic; font-style: italic;
} }
@font-face { @font-face {
font-family: "Open Sans"; font-family: 'Open Sans';
src: url("~@/assets/fonts/OpenSans-BoldItalic.woff2"); src: url('@/assets/fonts/OpenSans-BoldItalic.woff2');
font-weight: 700; font-weight: 700;
font-style: italic; font-style: italic;
} }
#app, #app,
.dialog,
input, input,
label, label,
button, button,
.plotly_editor * { .plotly_editor * {
font-family: "Open Sans", Helvetica, Arial, sans-serif; font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }

View File

@@ -59,5 +59,3 @@ button.secondary:disabled {
text-shadow: none; text-shadow: none;
cursor: default; cursor: default;
} }

View File

@@ -1,6 +1,13 @@
.dialog { .dialog {
display: flex;
justify-content: center;
align-items: center;
}
.dialog .vfm__content {
border-radius: var(--border-radius-big); border-radius: var(--border-radius-big);
box-shadow: 0px 2px 9px rgba(80, 103, 132, 0.8); box-shadow: 0px 2px 9px rgba(80, 103, 132, 0.8);
background-color: white;
overflow: hidden;
} }
.dialog-header { .dialog-header {
@@ -16,7 +23,7 @@
} }
.dialog-body { .dialog-body {
min-height: 60px; min-height: 56px;
background-color: var(--color-bg-light); background-color: var(--color-bg-light);
padding: 24px; padding: 24px;
border-top: 1px solid var(--color-border-light); border-top: 1px solid var(--color-border-light);
@@ -35,6 +42,6 @@
margin-left: 16px; margin-left: 16px;
} }
.vm--overlay { .vfm__overlay.vfm--overlay {
background-color: rgba(162, 177, 198, 0.5); background-color: rgba(162, 177, 198, 0.5);
} }

View File

@@ -3,4 +3,4 @@
color: var(--color-text-base); color: var(--color-text-base);
font-size: 13px; font-size: 13px;
padding: 0 24px; padding: 0 24px;
} }

View File

@@ -62,14 +62,14 @@
margin: 2px; margin: 2px;
} }
.sqliteviz-select .multiselect__tag-icon:after { .sqliteviz-select .multiselect__tag-icon:after {
content: url('~@/assets/images/delete-tag.svg'); content: url('@/assets/images/delete-tag.svg');
height: 14px; height: 14px;
width: 14px; width: 14px;
} }
.sqliteviz-select .multiselect__tag-icon:focus:after, .sqliteviz-select .multiselect__tag-icon:focus:after,
.sqliteviz-select .multiselect__tag-icon:hover:after { .sqliteviz-select .multiselect__tag-icon:hover:after {
content: url('~@/assets/images/delete-tag-hover.svg'); content: url('@/assets/images/delete-tag-hover.svg');
} }
.sqliteviz-select .multiselect__tag-icon:focus, .sqliteviz-select .multiselect__tag-icon:focus,
@@ -102,7 +102,7 @@
} }
.sqliteviz-select .multiselect__select:before { .sqliteviz-select .multiselect__select:before {
content: url('~@/assets/images/arrow.svg'); content: url('@/assets/images/arrow.svg');
border: none; border: none;
top: 0; top: 0;
} }
@@ -116,14 +116,14 @@
} }
.sqliteviz-select .multiselect__select:hover:before { .sqliteviz-select .multiselect__select:hover:before {
content: url('~@/assets/images/arrow-hover.svg'); content: url('@/assets/images/arrow-hover.svg');
} }
.sqliteviz-select.multiselect--active .multiselect__tags { .sqliteviz-select.multiselect--active .multiselect__tags {
border-radius: var(--border-radius-medium-2); border-radius: var(--border-radius-medium-2);
} }
.sqliteviz-select .multiselect__option .no-results { .sqliteviz-select .multiselect__option .no-results {
color: var(--color-text-light-2); color: var(--color-text-light-2);
} }
@@ -133,4 +133,4 @@
.sqliteviz-select.multiselect--disabled .multiselect__select { .sqliteviz-select.multiselect--disabled .multiselect__select {
background: unset; background: unset;
} }

View File

@@ -3,13 +3,13 @@
width: 5px; width: 5px;
height: 5px; height: 5px;
} }
/* Track */ /* Track */
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background: transparent; background: transparent;
border-radius: 5px; border-radius: 5px;
} }
/* Handle */ /* Handle */
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background: var(--color-accent); background: var(--color-accent);

View File

@@ -37,7 +37,7 @@
height: calc(100% - 27px); height: calc(100% - 27px);
} }
@supports (-moz-appearance:none) { @supports (-moz-appearance: none) {
.header-container { .header-container {
top: 0; top: 0;
padding-left: 6px; padding-left: 6px;
@@ -59,7 +59,8 @@ table.sqliteviz-table {
margin-top: -35px; margin-top: -35px;
border-collapse: collapse; border-collapse: collapse;
} }
.sqliteviz-table thead th, .fixed-header { .sqliteviz-table thead th,
.fixed-header {
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
box-sizing: border-box; box-sizing: border-box;
@@ -71,7 +72,7 @@ table.sqliteviz-table {
} }
.sqliteviz-table tbody td { .sqliteviz-table tbody td {
font-size: 13px; font-size: 13px;
background-color:white; background-color: white;
color: var(--color-text-base); color: var(--color-text-base);
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid var(--color-border-light); border-bottom: 1px solid var(--color-border-light);
@@ -107,3 +108,9 @@ table.sqliteviz-table {
font-size: 11px; font-size: 11px;
color: var(--color-text-base); color: var(--color-text-base);
} }
.sqliteviz-table tbody td[data-isNull='true'],
.sqliteviz-table tbody td[data-isBlob='true'] {
color: var(--color-text-light-2);
font-style: italic;
}

View File

@@ -4,10 +4,10 @@
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
padding: 0 6px; padding: 0 6px;
line-height: 19px;; line-height: 19px;
position: fixed; position: fixed;
height: 19px; height: 19px;
border-radius: var(--border-radius-medium); border-radius: var(--border-radius-medium);
white-space: nowrap; white-space: nowrap;
z-index: 999; z-index: 999;
} }

View File

@@ -1,21 +1,19 @@
:root { :root {
--color-white: #ffffff; --color-white: #ffffff;
--color-gray-light: #F3F6FA; --color-gray-light: #f3f6fa;
--color-gray-light-2: #DFE8F3; --color-gray-light-2: #dfe8f3;
--color-gray-light-3: #C8D4E3; --color-gray-light-3: #c8d4e3;
--color-gray-light-4:#EBF0F8; --color-gray-light-4: #ebf0f8;
--color-gray-light-5:#f8f8f9; --color-gray-light-5: #f8f8f9;
--color-gray-medium: #A2B1C6; --color-gray-medium: #a2b1c6;
--color-gray-dark: #506784; --color-gray-dark: #506784;
--color-blue-medium: #119DFF; --color-blue-medium: #119dff;
--color-blue-dark: #0D76BF; --color-blue-dark: #0d76bf;
--color-blue-dark-2: #2A3F5F; --color-blue-dark-2: #2a3f5f;
--color-red: #EF553B; --color-red: #ef553b;
--color-red-2: #DE350B; --color-red-2: #de350b;
--color-red-light: #FFBDAD; --color-red-light: #ffbdad;
--color-yellow: #FBEFCB; --color-yellow: #fbefcb;
--color-bg-light: var(--color-gray-light); --color-bg-light: var(--color-gray-light);
--color-bg-light-2: var(--color-gray-light-2); --color-bg-light-2: var(--color-gray-light-2);
@@ -48,6 +46,3 @@
.plotly-editor--theme-provider { .plotly-editor--theme-provider {
--sidebar-width: 112px; --sidebar-width: 112px;
} }

View File

@@ -1,18 +1,27 @@
<template> <template>
<div <div
:class="['checkbox-container', { 'checked': checked }, {'disabled': disabled}]" :class="[
'checkbox-container',
{ checked: checked },
{ disabled: disabled }
]"
@click.stop="onClick" @click.stop="onClick"
> >
<div v-show="!checked" class="unchecked" /> <div v-show="!checked" class="unchecked" />
<img <img
v-show="checked && !disabled" v-show="checked && !disabled && theme === 'light'"
:src="theme === 'light' class="checked-light"
? require('@/assets/images/checkbox_checked_light.svg') src="~@/assets/images/checkbox_checked_light.svg"
: require('@/assets/images/checkbox_checked.svg')" />
<img
v-show="checked && !disabled && theme !== 'light'"
class="checked"
src="~@/assets/images/checkbox_checked.svg"
/> />
<img <img
v-show="checked && disabled" v-show="checked && disabled"
:src="require('@/assets/images/checkbox_checked_disabled.svg')" class="checked-disabled"
src="~@/assets/images/checkbox_checked_disabled.svg"
/> />
<span v-if="label" class="label">{{ label }}</span> <span v-if="label" class="label">{{ label }}</span>
</div> </div>
@@ -26,7 +35,7 @@ export default {
type: String, type: String,
required: false, required: false,
default: 'accent', default: 'accent',
validator: (value) => { validator: value => {
return ['accent', 'light'].includes(value) return ['accent', 'light'].includes(value)
} }
}, },
@@ -46,13 +55,14 @@ export default {
default: false default: false
} }
}, },
data () { emits: ['click'],
data() {
return { return {
checked: this.init checked: this.init
} }
}, },
methods: { methods: {
onClick () { onClick() {
if (!this.disabled) { if (!this.disabled) {
this.checked = !this.checked this.checked = !this.checked
this.$emit('click', this.checked) this.$emit('click', this.checked)
@@ -80,7 +90,7 @@ export default {
} }
img { img {
display: block; display: block;
} }
.label { .label {
margin-left: 6px; margin-left: 6px;
@@ -100,6 +110,6 @@ img {
.disabled .unchecked, .disabled .unchecked,
.disabled .unchecked:hover { .disabled .unchecked:hover {
background-color: var(--color-bg-light-2); background-color: var(--color-bg-light-2);
} }
</style> </style>

View File

@@ -1,387 +0,0 @@
<template>
<modal
:name="dialogName"
classes="dialog"
height="auto"
width="80%"
scrollable
:clickToClose="false"
>
<div class="dialog-header">
CSV import
<close-icon @click="cancelCsvImport" :disabled="disableDialog"/>
</div>
<div class="dialog-body">
<text-field
label="Table name"
v-model="tableName"
width="484px"
:disabled="disableDialog"
:error-msg="tableNameError"
id="csv-table-name"
/>
<div class="chars">
<delimiter-selector
v-model="delimiter"
width="210px"
class="char-input"
@input="previewCsv"
:disabled="disableDialog"
/>
<text-field
label="Quote char"
hint="The character used to quote fields."
v-model="quoteChar"
width="93px"
:disabled="disableDialog"
class="char-input"
id="quote-char"
/>
<text-field
label="Escape char"
hint='
The character used to escape the quote character within a field
(e.g. "column with ""quotes"" in text").
'
max-hint-width="242px"
v-model="escapeChar"
width="93px"
:disabled="disableDialog"
class="char-input"
id="escape-char"
/>
</div>
<check-box
@click="header = $event"
:init="true"
label="Use first row as column headers"
:disabled="disableDialog"
/>
<sql-table
v-if="previewData
&& (previewData.rowCount > 0 || Object.keys(previewData).length > 0)
"
:data-set="previewData"
class="preview-table"
:preview="true"
/>
<div v-else class="no-data">No data</div>
<logs
class="import-csv-errors"
:messages="importCsvMessages"
/>
</div>
<div class="dialog-buttons-container">
<button
class="secondary"
:disabled="disableDialog"
@click="cancelCsvImport"
id="csv-cancel"
>
Cancel
</button>
<button
v-show="!importCsvCompleted"
class="primary"
:disabled="disableDialog"
@click="loadFromCsv(file)"
id="csv-import"
>
Import
</button>
<button
v-show="importCsvCompleted"
class="primary"
:disabled="disableDialog"
@click="finish"
id="csv-finish"
>
Finish
</button>
</div>
</modal>
</template>
<script>
import csv from '@/lib/csv'
import CloseIcon from '@/components/svg/close'
import TextField from '@/components/TextField'
import DelimiterSelector from './DelimiterSelector'
import CheckBox from '@/components/CheckBox'
import SqlTable from '@/components/SqlTable'
import Logs from '@/components/Logs'
import time from '@/lib/utils/time'
import fIo from '@/lib/utils/fileIo'
import events from '@/lib/utils/events'
export default {
name: 'CsvImport',
components: {
CloseIcon,
TextField,
DelimiterSelector,
CheckBox,
SqlTable,
Logs
},
props: ['file', 'db', 'dialogName'],
data () {
return {
disableDialog: false,
tableName: '',
delimiter: '',
quoteChar: '"',
escapeChar: '"',
header: true,
importCsvCompleted: false,
importCsvMessages: [],
previewData: null,
addedTable: null,
tableNameError: ''
}
},
watch: {
quoteChar () {
this.previewCsv()
},
escapeChar () {
this.previewCsv()
},
header () {
this.previewCsv()
},
tableName: time.debounce(function () {
this.tableNameError = ''
if (!this.tableName) {
return
}
this.db.validateTableName(this.tableName)
.catch(err => {
this.tableNameError = err.message + '. Try another table name.'
})
}, 400)
},
methods: {
cancelCsvImport () {
if (!this.disableDialog) {
if (this.addedTable) {
this.db.execute(`DROP TABLE "${this.addedTable}"`)
this.db.refreshSchema()
}
this.$modal.hide(this.dialogName)
this.$emit('cancel')
}
},
reset () {
this.header = true
this.quoteChar = '"'
this.escapeChar = '"'
this.delimiter = ''
this.tableName = ''
this.disableDialog = false
this.importCsvCompleted = false
this.importCsvMessages = []
this.previewData = null
this.addedTable = null
this.tableNameError = ''
},
open () {
this.tableName = this.db.sanitizeTableName(fIo.getFileName(this.file))
this.$modal.show(this.dialogName)
},
async previewCsv () {
this.importCsvCompleted = false
const config = {
preview: 3,
quoteChar: this.quoteChar || '"',
escapeChar: this.escapeChar,
header: this.header,
delimiter: this.delimiter
}
try {
const start = new Date()
const parseResult = await csv.parse(this.file, config)
const end = new Date()
this.previewData = parseResult.data
this.delimiter = parseResult.delimiter
// In parseResult.messages we can get parse errors
this.importCsvMessages = parseResult.messages || []
if (!parseResult.hasErrors) {
this.importCsvMessages.push({
message: `Preview parsing is completed in ${time.getPeriod(start, end)}.`,
type: 'success'
})
}
} catch (err) {
this.importCsvMessages = [{
message: err,
type: 'error'
}]
}
},
async loadFromCsv (file) {
if (!this.tableName) {
this.tableNameError = "Table name can't be empty"
return
}
this.disableDialog = true
const config = {
quoteChar: this.quoteChar || '"',
escapeChar: this.escapeChar,
header: this.header,
delimiter: this.delimiter
}
const parseCsvMsg = {
message: 'Parsing CSV...',
type: 'info'
}
this.importCsvMessages.push(parseCsvMsg)
const parseCsvLoadingIndicator = setTimeout(() => { parseCsvMsg.type = 'loading' }, 1000)
const importMsg = {
message: 'Importing CSV into a SQLite database...',
type: 'info'
}
let importLoadingIndicator = null
const updateProgress = progress => {
this.$set(importMsg, 'progress', progress)
}
const progressCounterId = this.db.createProgressCounter(updateProgress)
try {
let start = new Date()
const parseResult = await csv.parse(this.file, config)
let end = new Date()
if (!parseResult.hasErrors) {
const rowCount = parseResult.rowCount
let period = time.getPeriod(start, end)
parseCsvMsg.type = 'success'
if (parseResult.messages.length > 0) {
this.importCsvMessages = this.importCsvMessages.concat(parseResult.messages)
parseCsvMsg.message = `${rowCount} rows are parsed in ${period}.`
} else {
// Inform about csv parsing success
parseCsvMsg.message = `${rowCount} rows are parsed successfully in ${period}.`
}
// Loading indicator for csv parsing is not needed anymore
clearTimeout(parseCsvLoadingIndicator)
// Add info about import start
this.importCsvMessages.push(importMsg)
// Show import progress after 1 second
importLoadingIndicator = setTimeout(() => {
importMsg.type = 'loading'
}, 1000)
// Add table
start = new Date()
await this.db.addTableFromCsv(this.tableName, parseResult.data, progressCounterId)
end = new Date()
this.addedTable = this.tableName
// Inform about import success
period = time.getPeriod(start, end)
importMsg.message = `Importing CSV into a SQLite database is completed in ${period}.`
importMsg.type = 'success'
// Loading indicator for import is not needed anymore
clearTimeout(importLoadingIndicator)
this.importCsvCompleted = true
} else {
parseCsvMsg.message = 'Parsing ended with errors.'
parseCsvMsg.type = 'info'
this.importCsvMessages = this.importCsvMessages.concat(parseResult.messages)
}
} catch (err) {
if (parseCsvMsg.type === 'loading') {
parseCsvMsg.type = 'info'
}
if (importMsg.type === 'loading') {
importMsg.type = 'info'
}
this.importCsvMessages.push({
message: err,
type: 'error'
})
}
clearTimeout(parseCsvLoadingIndicator)
clearTimeout(importLoadingIndicator)
this.db.deleteProgressCounter(progressCounterId)
this.disableDialog = false
},
async finish () {
this.$modal.hide(this.dialogName)
const stmt = [
'/*',
` * Your CSV file has been imported into ${this.addedTable} table.`,
' * You can run this SQL query to make all CSV records available for charting.',
' */',
`SELECT * FROM "${this.addedTable}"`
].join('\n')
const tabId = await this.$store.dispatch('addTab', { query: stmt })
this.$store.commit('setCurrentTabId', tabId)
this.importCsvCompleted = false
this.$emit('finish')
events.send('inquiry.create', null, { auto: true })
}
}
}
</script>
<style scoped>
.dialog-body {
padding-bottom: 0;
}
.chars {
display: flex;
align-items: flex-end;
margin: 24px 0 20px;
}
.char-input {
margin-right: 44px;
}
.preview-table {
margin-top: 18px;
}
.import-csv-errors {
height: 136px;
margin-top: 8px;
}
.no-data {
margin-top: 32px;
background-color: white;
border-radius: 5px;
position: relative;
border: 1px solid var(--color-border-light);
box-sizing: border-box;
height: 147px;
font-size: 13px;
color: var(--color-text-base);
display: flex;
justify-content: center;
align-items: center;
}
/* https://github.com/euvl/vue-js-modal/issues/623 */
>>> .vm--modal {
max-width: 1152px;
margin: auto;
left: 0 !important;
}
</style>

View File

@@ -1,5 +1,5 @@
<template> <template>
<div :class="{ 'disabled': disabled }"> <div :class="{ disabled: disabled }">
<div class="text-field-label">Delimiter</div> <div class="text-field-label">Delimiter</div>
<div <div
class="delimiter-selector-container" class="delimiter-selector-container"
@@ -8,21 +8,21 @@
> >
<div class="value"> <div class="value">
<input <input
:class="{ 'filled': filled }"
ref="delimiterInput" ref="delimiterInput"
v-model="inputValue"
:class="{ filled: filled }"
type="text" type="text"
maxlength="1" maxlength="1"
v-model="inputValue"
@click.stop
:disabled="disabled" :disabled="disabled"
@click.stop
/> />
<div class="name">{{ getSymbolName(value) }}</div> <div class="name">{{ getSymbolName(modelValue) }}</div>
</div> </div>
<div class="controls" @click.stop> <div class="controls" @click.stop>
<clear-icon @click.native="clear" :disabled="disabled"/> <clear-icon :disabled="disabled" @click="clear" />
<drop-down-chevron <drop-down-chevron
:disabled="disabled" :disabled="disabled"
@click.native="!disabled && (showOptions = !showOptions)" @click="!disabled && (showOptions = !showOptions)"
/> />
</div> </div>
</div> </div>
@@ -30,10 +30,11 @@
<div <div
v-for="(option, index) in options" v-for="(option, index) in options"
:key="index" :key="index"
@click="chooseOption(option)"
class="option" class="option"
@click="chooseOption(option)"
> >
<pre>{{option}}</pre><div>{{ getSymbolName(option) }}</div> <pre>{{ option }}</pre>
<div>{{ getSymbolName(option) }}</div>
</div> </div>
</div> </div>
</div> </div>
@@ -46,9 +47,14 @@ import ClearIcon from '@/components/svg/clear'
export default { export default {
name: 'DelimiterSelector', name: 'DelimiterSelector',
props: ['value', 'width', 'disabled'],
components: { DropDownChevron, ClearIcon }, components: { DropDownChevron, ClearIcon },
data () { props: {
modelValue: String,
width: String,
disabled: Boolean
},
emits: ['update:modelValue'],
data() {
return { return {
showOptions: false, showOptions: false,
options: [',', '\t', ' ', '|', ';', '\u001F', '\u001E'], options: [',', '\t', ' ', '|', ';', '\u001F', '\u001E'],
@@ -57,36 +63,36 @@ export default {
} }
}, },
watch: { watch: {
inputValue () { inputValue() {
if (this.inputValue) { if (this.inputValue) {
this.filled = true this.filled = true
if (this.inputValue !== this.value) { if (this.inputValue !== this.modelValue) {
this.$emit('input', this.inputValue) this.$emit('update:modelValue', this.inputValue)
} }
} else { } else {
this.filled = false this.filled = false
} }
} }
}, },
created () { created() {
this.inputValue = this.value this.inputValue = this.modelValue
}, },
methods: { methods: {
getSymbolName (str) { getSymbolName(str) {
if (!str) { if (!str) {
return '' return ''
} }
return ascii[str.charCodeAt(0).toString()].name return ascii[str.charCodeAt(0).toString()].name
}, },
chooseOption (option) { chooseOption(option) {
this.inputValue = option this.inputValue = option
this.showOptions = false this.showOptions = false
}, },
onContainerClick (event) { onContainerClick() {
this.$refs.delimiterInput.focus() this.$refs.delimiterInput.focus()
}, },
clear () { clear() {
if (!this.disabled) { if (!this.disabled) {
this.inputValue = '' this.inputValue = ''
this.$refs.delimiterInput.focus() this.$refs.delimiterInput.focus()

View File

@@ -0,0 +1,518 @@
<template>
<modal
:modalId="dialogName"
class="dialog"
contentClass="import-modal"
scrollable
:clickToClose="false"
>
<div class="dialog-header">
{{ typeName }} import
<close-icon :disabled="disableDialog" @click="cancelImport" />
</div>
<div class="dialog-body">
<text-field
id="csv-json-table-name"
v-model="tableName"
label="Table name"
width="484px"
:disabled="disableDialog"
:errorMsg="tableNameError"
/>
<div v-if="!isJson && !isNdJson" class="chars">
<delimiter-selector
v-model="delimiter"
width="210px"
class="char-input"
:disabled="disableDialog"
@input="preview"
/>
<text-field
id="quote-char"
v-model="quoteChar"
label="Quote char"
hint="The character used to quote fields."
width="93px"
:disabled="disableDialog"
class="char-input"
@input="preview"
/>
<text-field
id="escape-char"
v-model="escapeChar"
label="Escape char"
hint='
The character used to escape the quote character within a field
(e.g. "column with ""quotes"" in text").
'
maxHintWidth="242px"
width="93px"
:disabled="disableDialog"
class="char-input"
@input="preview"
/>
</div>
<check-box
v-if="!isJson && !isNdJson"
:init="header"
label="Use first row as column headers"
:disabled="disableDialog"
@click="changeHeaderDisplaying"
/>
<sql-table
v-if="previewData && previewData.rowCount > 0"
:data-set="previewData"
:preview="true"
class="preview-table"
/>
<div v-else class="no-data">No data</div>
<logs class="import-errors" :messages="importMessages" />
</div>
<div class="dialog-buttons-container">
<button
id="import-cancel"
class="secondary"
:disabled="disableDialog"
@click="cancelImport"
>
Cancel
</button>
<button
v-show="!importCompleted"
id="import-start"
class="primary"
:disabled="disableDialog || disableImport"
@click="loadToDb(file)"
>
Import
</button>
<button
v-show="importCompleted"
id="import-finish"
class="primary"
:disabled="disableDialog"
@click="finish"
>
Finish
</button>
</div>
</modal>
</template>
<script>
import csv from '@/lib/csv'
import CloseIcon from '@/components/svg/close'
import TextField from '@/components/TextField'
import DelimiterSelector from './DelimiterSelector'
import CheckBox from '@/components/CheckBox'
import SqlTable from '@/components/SqlTable'
import Logs from '@/components/Logs'
import time from '@/lib/utils/time'
import fIo from '@/lib/utils/fileIo'
import events from '@/lib/utils/events'
export default {
name: 'CsvJsonImport',
components: {
CloseIcon,
TextField,
DelimiterSelector,
CheckBox,
SqlTable,
Logs
},
props: {
file: File,
db: Object,
dialogName: String
},
emits: ['cancel', 'finish'],
data() {
return {
disableDialog: false,
disableImport: false,
tableName: '',
delimiter: '',
quoteChar: '"',
escapeChar: '"',
header: true,
importCompleted: false,
importMessages: [],
previewData: null,
addedTable: null,
tableNameError: ''
}
},
computed: {
isJson() {
return fIo.isJSON(this.file)
},
isNdJson() {
return fIo.isNDJSON(this.file)
},
typeName() {
return this.isJson || this.isNdJson ? 'JSON' : 'CSV'
}
},
watch: {
isJson() {
if (this.isJson) {
this.delimiter = '\u001E'
this.header = false
}
},
isNdJson() {
if (this.isNdJson) {
this.delimiter = '\u001E'
this.header = false
}
},
tableName: time.debounce(function () {
this.tableNameError = ''
if (!this.tableName) {
return
}
this.db.validateTableName(this.tableName).catch(err => {
this.tableNameError = err.message + '. Try another table name.'
})
}, 400)
},
methods: {
changeHeaderDisplaying(e) {
this.header = e
this.preview()
},
cancelImport() {
if (!this.disableDialog) {
if (this.addedTable) {
this.db.execute(`DROP TABLE "${this.addedTable}"`)
this.db.refreshSchema()
}
this.$modal.hide(this.dialogName)
this.$emit('cancel')
}
},
reset() {
this.header = !this.isJson && !this.isNdJson
this.quoteChar = '"'
this.escapeChar = '"'
this.delimiter = !this.isJson && !this.isNdJson ? '' : '\u001E'
this.tableName = ''
this.disableDialog = false
this.disableImport = false
this.importCompleted = false
this.importMessages = []
this.previewData = null
this.addedTable = null
this.tableNameError = ''
},
open() {
this.tableName = this.db.sanitizeTableName(fIo.getFileName(this.file))
this.$modal.show(this.dialogName)
},
async preview() {
this.disableImport = false
if (!this.file) {
return
}
this.importCompleted = false
const config = {
preview: 3,
quoteChar: this.quoteChar || '"',
escapeChar: this.escapeChar,
header: this.header,
delimiter: this.delimiter,
columns: !this.isJson && !this.isNdJson ? null : ['doc']
}
try {
const start = new Date()
const parseResult = this.isJson
? await this.getJsonParseResult(this.file)
: await csv.parse(this.file, config)
const end = new Date()
this.previewData = parseResult.data
this.previewData.rowCount = parseResult.rowCount
this.delimiter = parseResult.delimiter
// In parseResult.messages we can get parse errors
this.importMessages = parseResult.messages || []
if (this.previewData.rowCount === 0) {
this.disableImport = true
this.importMessages.push({
type: 'info',
message: 'No rows to import.'
})
}
if (!parseResult.hasErrors) {
this.importMessages.push({
message: `Preview parsing is completed in ${time.getPeriod(start, end)}.`,
type: 'success'
})
}
} catch (err) {
console.error(err)
this.importMessages = [
{
message: err,
type: 'error'
}
]
}
},
async getJsonParseResult(file) {
const jsonContent = await fIo.getFileContent(file)
const isEmpty = !jsonContent.trim()
return {
data: {
columns: ['doc'],
values: { doc: !isEmpty ? [jsonContent] : [] }
},
hasErrors: false,
messages: [],
rowCount: +!isEmpty
}
},
async loadToDb(file) {
if (!this.tableName) {
this.tableNameError = "Table name can't be empty"
return
}
this.disableDialog = true
const config = {
quoteChar: this.quoteChar || '"',
escapeChar: this.escapeChar,
header: this.header,
delimiter: this.delimiter,
columns: !this.isJson && !this.isNdJson ? null : ['doc']
}
let parsingMsg = {}
this.importMessages.push({
message: `Parsing ${this.typeName}...`,
type: 'info'
})
// Get *reactive* link to parsing message for later updates
parsingMsg = this.importMessages[this.importMessages.length - 1]
const parsingLoadingIndicator = setTimeout(() => {
parsingMsg.type = 'loading'
}, 1000)
let importMsg = {}
let importLoadingIndicator = null
const updateProgress = progress => {
importMsg.progress = progress
}
const progressCounterId = this.db.createProgressCounter(updateProgress)
try {
let start = new Date()
const parseResult = this.isJson
? await this.getJsonParseResult(file)
: await csv.parse(this.file, config)
let end = new Date()
if (!parseResult.hasErrors) {
const rowCount = parseResult.rowCount
let period = time.getPeriod(start, end)
parsingMsg.type = 'success'
if (parseResult.messages.length > 0) {
this.importMessages = this.importMessages.concat(
parseResult.messages
)
parsingMsg.message = `${rowCount} rows are parsed in ${period}.`
} else {
// Inform about parsing success
parsingMsg.message = `${rowCount} rows are parsed successfully in ${period}.`
}
// Loading indicator for parsing is not needed anymore
clearTimeout(parsingLoadingIndicator)
// Add info about import start
this.importMessages.push({
message: `Importing ${this.typeName} into a SQLite database...`,
type: 'info'
})
importMsg = this.importMessages[this.importMessages.length - 1]
// Show import progress after 1 second
importLoadingIndicator = setTimeout(() => {
importMsg.type = 'loading'
}, 1000)
// Add table
start = new Date()
await this.db.addTableFromCsv(
this.tableName,
parseResult.data,
progressCounterId
)
end = new Date()
this.addedTable = this.tableName
// Inform about import success
period = time.getPeriod(start, end)
importMsg.message =
`Importing ${this.typeName} ` +
`into a SQLite database is completed in ${period}.`
importMsg.type = 'success'
// Loading indicator for import is not needed anymore
clearTimeout(importLoadingIndicator)
this.importCompleted = true
} else {
parsingMsg.message = 'Parsing ended with errors.'
parsingMsg.type = 'info'
this.importMessages = this.importMessages.concat(parseResult.messages)
}
} catch (err) {
console.error(err)
if (parsingMsg.type === 'loading') {
parsingMsg.type = 'info'
}
if (importMsg.type === 'loading') {
importMsg.type = 'info'
}
this.importMessages.push({
message: err,
type: 'error'
})
}
clearTimeout(parsingLoadingIndicator)
clearTimeout(importLoadingIndicator)
this.db.deleteProgressCounter(progressCounterId)
this.disableDialog = false
},
async finish() {
this.$modal.hide(this.dialogName)
const stmt = this.getQueryExample()
const tabId = await this.$store.dispatch('addTab', { query: stmt })
this.$store.commit('setCurrentTabId', tabId)
this.importCompleted = false
this.$emit('finish')
events.send('inquiry.create', null, { auto: true })
},
getQueryExample() {
return this.isNdJson
? this.getNdJsonQueryExample()
: this.isJson
? this.getJsonQueryExample()
: [
'/*',
` * Your CSV file has been imported into ${this.addedTable} table.`,
' * You can run this SQL query to make all CSV records available for charting.',
' */',
`SELECT * FROM "${this.addedTable}"`
].join('\n')
},
getNdJsonQueryExample() {
try {
const firstRowJson = JSON.parse(this.previewData.values.doc[0])
const firstKey = Object.keys(firstRowJson)[0]
return [
'/*',
` * Your NDJSON file has been imported into ${this.addedTable} table.`,
` * Run this SQL query to get values of property ${firstKey} ` +
'and make them available for charting.',
' */',
`SELECT doc->>'${firstKey}'`,
`FROM "${this.addedTable}"`
].join('\n')
} catch (err) {
console.error(err)
return [
'/*',
` * Your NDJSON file has been imported into ${this.addedTable} table.`,
' */',
'SELECT *',
`FROM "${this.addedTable}"`
].join('\n')
}
},
getJsonQueryExample() {
try {
const firstRowJson = JSON.parse(this.previewData.values.doc[0])
const firstKey = Object.keys(firstRowJson)[0]
return [
'/*',
` * Your JSON file has been imported into ${this.addedTable} table.`,
` * Run this SQL query to get values of property ${firstKey} ` +
'and make them available for charting.',
' */',
'SELECT *',
`FROM "${this.addedTable}"`,
`JOIN json_each(doc, '$.${firstKey}')`
].join('\n')
} catch (err) {
console.error(err)
return [
'/*',
` * Your NDJSON file has been imported into ${this.addedTable} table.`,
' */',
'SELECT *',
`FROM "${this.addedTable}"`
].join('\n')
}
}
}
}
</script>
<style>
.import-modal {
width: 80%;
max-width: 1152px;
margin: auto;
left: 0 !important;
}
</style>
<style scoped>
.dialog-body {
padding-bottom: 0;
}
#csv-json-table-name {
margin-bottom: 24px;
}
.chars {
display: flex;
align-items: flex-end;
margin: 0 0 20px;
}
.char-input {
margin-right: 44px;
}
.preview-table {
margin-top: 18px;
}
.import-errors {
height: 136px;
margin-top: 8px;
}
.no-data {
margin-top: 32px;
background-color: white;
border-radius: 5px;
position: relative;
border: 1px solid var(--color-border-light);
box-sizing: border-box;
height: 147px;
font-size: 13px;
color: var(--color-text-base);
display: flex;
justify-content: center;
align-items: center;
}
</style>

View File

@@ -1,53 +1,54 @@
<template> <template>
<div class="db-uploader-container" :style="{ width }"> <div class="db-uploader-container" :style="{ width }">
<change-db-icon v-if="type === 'small'" @click="browse"/> <change-db-icon v-if="type === 'small'" @click="browse" />
<div v-if="type === 'illustrated'" class="drop-area-container"> <div v-if="type === 'illustrated'" class="drop-area-container">
<div <div
class="drop-area" class="drop-area"
@dragover.prevent="state = 'dragover'" @dragover.prevent="state = 'dragover'"
@dragleave.prevent="state=''" @dragleave.prevent="state = ''"
@drop.prevent="drop" @drop.prevent="drop"
@click="browse" @click="browse"
> >
<div class="text"> <div class="text">
Drop the database or CSV file here or click to choose a file from your computer. Drop the database, CSV, JSON or NDJSON file here or click to choose a
file from your computer.
</div> </div>
</div> </div>
</div> </div>
<div v-if="type === 'illustrated'" id="img-container"> <div v-if="type === 'illustrated'" id="img-container">
<img id="drop-file-top-img" :src="require('@/assets/images/top.svg')" /> <img id="drop-file-top-img" src="~@/assets/images/top.svg" />
<img <img
id="left-arm-img" id="left-arm-img"
:class="{'swing': state === 'dragover'}" :class="{ swing: state === 'dragover' }"
:src="require('@/assets/images/leftArm.svg')" src="~@/assets/images/leftArm.svg"
/> />
<img <img
id="file-img" id="file-img"
ref="fileImg" ref="fileImg"
:class="{ :class="{
'swing': state === 'dragover', swing: state === 'dragover',
'fly': state === 'dropping', fly: state === 'dropping',
'hidden': state === 'dropped' hidden: state === 'dropped'
}" }"
:src="require('@/assets/images/file.png')" src="~@/assets/images/file.png"
/> />
<img id="drop-file-bottom-img" :src="require('@/assets/images/bottom.svg')" /> <img id="drop-file-bottom-img" src="~@/assets/images/bottom.svg" />
<img id="body-img" :src="require('@/assets/images/body.svg')" /> <img id="body-img" src="~@/assets/images/body.svg" />
<img <img
id="right-arm-img" id="right-arm-img"
:class="{'swing': state === 'dragover'}" :class="{ swing: state === 'dragover' }"
:src="require('@/assets/images/rightArm.svg')" src="~@/assets/images/rightArm.svg"
/> />
</div> </div>
<div id="error" class="error"></div> <div id="error" class="error"></div>
<!--Parse csv dialog --> <!--Parse csv or json dialog -->
<csv-import <csv-json-import
ref="addCsv" ref="addCsvJson"
:file="file" :file="file"
:db="newDb" :db="newDb"
dialog-name="importFromCsv" dialogName="importFromCsvJson"
@cancel="cancelCsvImport" @cancel="cancelImport"
@finish="finish" @finish="finish"
/> />
</div> </div>
@@ -57,17 +58,21 @@
import fIo from '@/lib/utils/fileIo' import fIo from '@/lib/utils/fileIo'
import ChangeDbIcon from '@/components/svg/changeDb' import ChangeDbIcon from '@/components/svg/changeDb'
import database from '@/lib/database' import database from '@/lib/database'
import CsvImport from '@/components/CsvImport' import CsvJsonImport from '@/components/CsvJsonImport'
import events from '@/lib/utils/events' import events from '@/lib/utils/events'
export default { export default {
name: 'DbUploader', name: 'DbUploader',
components: {
ChangeDbIcon,
CsvJsonImport
},
props: { props: {
type: { type: {
type: String, type: String,
required: false, required: false,
default: 'small', default: 'small',
validator: (value) => { validator: value => {
return ['illustrated', 'small'].includes(value) return ['illustrated', 'small'].includes(value)
} }
}, },
@@ -77,11 +82,8 @@ export default {
default: 'unset' default: 'unset'
} }
}, },
components: { emits: [],
ChangeDbIcon, data() {
CsvImport
},
data () {
return { return {
state: '', state: '',
animationPromise: Promise.resolve(), animationPromise: Promise.resolve(),
@@ -89,9 +91,9 @@ export default {
newDb: null newDb: null
} }
}, },
mounted () { mounted() {
if (this.type === 'illustrated') { if (this.type === 'illustrated') {
this.animationPromise = new Promise((resolve) => { this.animationPromise = new Promise(resolve => {
this.$refs.fileImg.addEventListener('animationend', event => { this.$refs.fileImg.addEventListener('animationend', event => {
if (event.animationName.startsWith('fly')) { if (event.animationName.startsWith('fly')) {
this.state = 'dropped' this.state = 'dropped'
@@ -102,51 +104,56 @@ export default {
} }
}, },
methods: { methods: {
cancelCsvImport () { cancelImport() {
if (this.newDb) { if (this.newDb) {
this.newDb.shutDown() this.newDb.shutDown()
this.newDb = null this.newDb = null
} }
}, },
async finish () { async finish() {
this.$store.commit('setDb', this.newDb) this.$store.commit('setDb', this.newDb)
if (this.$route.path !== '/workspace') { if (this.$route.path !== '/workspace') {
this.$router.push('/workspace') this.$router.push('/workspace')
} }
}, },
loadDb (file) { loadDb(file) {
return Promise.all([this.newDb.loadDb(file), this.animationPromise]) return Promise.all([this.newDb.loadDb(file), this.animationPromise]).then(
.then(this.finish) this.finish
)
}, },
async checkFile (file) { async checkFile(file) {
this.state = 'dropping' this.state = 'dropping'
this.newDb = database.getNewDatabase() this.newDb = database.getNewDatabase()
if (fIo.isDatabase(file)) { if (fIo.isDatabase(file)) {
this.loadDb(file) this.loadDb(file)
} else { } else {
const isJson = fIo.isJSON(file) || fIo.isNDJSON(file)
events.send('database.import', file.size, { events.send('database.import', file.size, {
from: 'csv', from: isJson ? 'json' : 'csv',
new_db: true new_db: true
}) })
this.file = file this.file = file
await this.$nextTick() await this.$nextTick()
const csvImport = this.$refs.addCsv const csvJsonImportModal = this.$refs.addCsvJson
csvImport.reset() csvJsonImportModal.reset()
return Promise.all([csvImport.previewCsv(), this.animationPromise]) return Promise.all([
.then(csvImport.open) csvJsonImportModal.preview(),
this.animationPromise
]).then(csvJsonImportModal.open)
} }
}, },
browse () { browse() {
fIo.getFileFromUser('.db,.sqlite,.sqlite3,.csv') fIo
.getFileFromUser('.db,.sqlite,.sqlite3,.csv,.json,.ndjson')
.then(this.checkFile) .then(this.checkFile)
}, },
drop (event) { drop(event) {
this.checkFile(event.dataTransfer.files[0]) this.checkFile(event.dataTransfer.files[0])
} }
} }
@@ -240,11 +247,15 @@ export default {
transform-origin: 0 56px; transform-origin: 0 56px;
} }
#file-img.swing { #file-img.swing {
transform-origin: -74px 139px; transform-origin: -74px 139px;
} }
@keyframes swing { @keyframes swing {
0% { transform: rotate(0deg); } 0% {
100% { transform: rotate(-7deg); } transform: rotate(0deg);
}
100% {
transform: rotate(-7deg);
}
} }
#file-img.fly { #file-img.fly {

View File

@@ -1,6 +1,7 @@
<template> <template>
<div <button
:class="['icon-btn', { active }, { disabled }]" :class="['icon-btn', { active }]"
:disabled="disabled"
@click="onClick" @click="onClick"
@mouseenter="showTooltip($event, tooltipPosition)" @mouseenter="showTooltip($event, tooltipPosition)"
@mouseleave="hideTooltip" @mouseleave="hideTooltip"
@@ -9,10 +10,15 @@
<div v-show="loading" class="icon-in-progress"> <div v-show="loading" class="icon-in-progress">
<loading-indicator /> <loading-indicator />
</div> </div>
<span v-if="tooltip" class="icon-tooltip" :style="tooltipStyle" ref="tooltip"> <span
v-if="tooltip"
ref="tooltip"
class="icon-tooltip"
:style="tooltipStyle"
>
{{ tooltip }} {{ tooltip }}
</span> </span>
</div> </button>
</template> </template>
<script> <script>
@@ -21,11 +27,18 @@ import LoadingIndicator from '@/components/LoadingIndicator'
export default { export default {
name: 'SideBarButton', name: 'SideBarButton',
props: ['active', 'disabled', 'tooltip', 'tooltipPosition', 'loading'],
components: { LoadingIndicator }, components: { LoadingIndicator },
mixins: [tooltipMixin], mixins: [tooltipMixin],
props: {
active: Boolean,
disabled: Boolean,
tooltip: String,
tooltipPosition: String,
loading: Boolean
},
emits: ['click'],
methods: { methods: {
onClick () { onClick() {
this.hideTooltip() this.hideTooltip()
this.$emit('click') this.$emit('click')
} }
@@ -38,35 +51,36 @@ export default {
box-sizing: border-box; box-sizing: border-box;
width: 26px; width: 26px;
height: 26px; height: 26px;
cursor: pointer;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: relative; position: relative;
background-color: transparent;
border: none;
} }
.icon-btn:hover { .icon-btn:hover {
border: 1px solid var(--color-border); border: 1px solid var(--color-border);
border-radius: var(--border-radius-medium-2); border-radius: var(--border-radius-medium-2);
} }
.icon-btn:hover .icon >>> path, .icon-btn:hover .icon :deep(path),
.icon-btn.active .icon >>> path, .icon-btn.active .icon :deep(path),
.icon-btn:hover .icon >>> circle, .icon-btn:hover .icon :deep(circle),
.icon-btn.active .icon >>> circle { .icon-btn.active .icon :deep(circle) {
fill: var(--color-accent); fill: var(--color-accent);
} }
.disabled.icon-btn .icon >>> path, .icon-btn:disabled .icon :deep(path),
.disabled.icon-btn .icon >>> circle { .icon-btn:disabled .icon :deep(circle) {
fill: var(--color-border); fill: var(--color-border);
} }
.disabled.icon-btn { .icon-btn:disabled {
cursor: default; cursor: default;
pointer-events: none; pointer-events: none;
} }
.disabled.icon-btn:hover .icon >>> path { .disabled.icon-btn:hover .icon :deep(path) {
fill: var(--color-border); fill: var(--color-border);
} }

View File

@@ -1,34 +1,41 @@
<template> <template>
<modal <modal
:name="name" v-model="show"
classes="dialog" class="dialog"
height="auto"
:clickToClose="false" :clickToClose="false"
:contentTransition="{ name: 'loading-dialog' }"
:overlayTransition="{ name: 'loading-dialog' }"
@update:model-value="$emit('update:modelValue', $event)"
> >
<div class="dialog-header"> <div class="dialog-header">
{{ title }} {{ title }}
<close-icon @click="$emit('cancel')" :disabled="loading"/> <close-icon :disabled="loading" @click="cancel" />
</div> </div>
<div class="dialog-body"> <div class="dialog-body">
<div v-if="loading" class="loading-dialog-body"> <div v-if="loading" class="loading-dialog-body">
<loading-indicator :size="30" class="state-icon"/> <loading-indicator :size="30" class="state-icon" />
{{ loadingMsg }} {{ loadingMsg }}
</div> </div>
<div v-else class="loading-dialog-body"> <div v-else class="loading-dialog-body">
<img :src="require('@/assets/images/success.svg')" class="success-icon state-icon" /> <img
src="~@/assets/images/success.svg"
class="success-icon state-icon"
/>
{{ successMsg }} {{ successMsg }}
</div> </div>
</div> </div>
<div class="dialog-buttons-container"> <div class="dialog-buttons-container">
<button <button
class="secondary" class="secondary"
type="button"
:disabled="loading" :disabled="loading"
@click="$emit('cancel')" @click="cancel"
> >
Cancel Cancel
</button> </button>
<button <button
class="primary" class="primary"
type="button"
:disabled="loading" :disabled="loading"
@click="$emit('action')" @click="$emit('action')"
> >
@@ -43,31 +50,66 @@ import LoadingIndicator from '@/components/LoadingIndicator'
import CloseIcon from '@/components/svg/close' import CloseIcon from '@/components/svg/close'
export default { export default {
name: 'loadingDialog', name: 'LoadingDialog',
components: { LoadingIndicator, CloseIcon },
props: { props: {
modelValue: Boolean,
loadingMsg: String, loadingMsg: String,
successMsg: String, successMsg: String,
actionBtnName: String, actionBtnName: String,
name: String,
title: String, title: String,
loading: Boolean loading: Boolean
}, },
emits: ['cancel', 'action', 'update:modelValue'],
data() {
return {
show: this.modelValue
}
},
watch: { watch: {
loading () { modelValue() {
this.show = this.modelValue
},
loading() {
if (this.loading) { if (this.loading) {
this.$modal.show(this.name) this.$emit('update:modelValue', true)
} }
} }
}, },
components: { LoadingIndicator, CloseIcon },
methods: { methods: {
cancel () { cancel() {
this.$emit('cancel') this.$emit('cancel')
this.$emit('update:modelValue', false)
} }
} }
} }
</script> </script>
<style>
.loading-dialog-enter-active {
animation: show-modal 1s linear 0s 1;
}
.loading-dialog-leave-active {
opacity: 0;
}
@keyframes show-modal {
0% {
opacity: 0;
}
99% {
opacity: 0;
}
100% {
opacity: 1;
}
}
.loading-modal {
width: 400px;
}
</style>
<style scoped> <style scoped>
.loading-dialog-body { .loading-dialog-body {
display: flex; display: flex;

View File

@@ -1,5 +1,10 @@
<template> <template>
<svg :class="animationClass" :height="size" :width="size" :viewBox="`0 0 ${size} ${size}`"> <svg
:class="animationClass"
:height="size"
:width="size"
:viewBox="`0 0 ${size} ${size}`"
>
<circle <circle
class="loader-svg bg" class="loader-svg bg"
:style="{ strokeWidth }" :style="{ strokeWidth }"
@@ -9,7 +14,11 @@
/> />
<circle <circle
class="loader-svg front" class="loader-svg front"
:style="{ strokeDasharray: circleProgress, strokeDashoffset: offset, strokeWidth }" :style="{
strokeDasharray: circleProgress,
strokeDashoffset: offset,
strokeWidth
}"
:cx="size / 2" :cx="size / 2"
:cy="size / 2" :cy="size / 2"
:r="radius" :r="radius"
@@ -31,23 +40,26 @@ export default {
default: 20 default: 20
} }
}, },
emits: [],
computed: { computed: {
circleProgress () { circleProgress() {
const circle = this.radius * 3.14 * 2 const circle = this.radius * 3.14 * 2
const dash = this.progress ? (circle * this.progress) / 100 : circle * 1 / 3 const dash = this.progress
? (circle * this.progress) / 100
: (circle * 1) / 3
const space = circle - dash const space = circle - dash
return `${dash}px, ${space}px` return `${dash}px, ${space}px`
}, },
animationClass () { animationClass() {
return this.progress === undefined ? 'loading' : 'progress' return this.progress === undefined ? 'loading' : 'progress'
}, },
radius () { radius() {
return this.size / 2 - this.strokeWidth return this.size / 2 - this.strokeWidth
}, },
offset () { offset() {
return this.radius * 3.14 / 2 return (this.radius * 3.14) / 2
}, },
strokeWidth () { strokeWidth() {
return this.size / 10 return this.size / 10
} }
} }
@@ -57,7 +69,10 @@ export default {
<style scoped> <style scoped>
.loader-svg { .loader-svg {
position: absolute; position: absolute;
left: 0; right: 0; top: 0; bottom: 0; left: 0;
right: 0;
top: 0;
bottom: 0;
fill: none; fill: none;
stroke-linecap: round; stroke-linecap: round;
stroke: var(--color-accent); stroke: var(--color-accent);
@@ -69,7 +84,7 @@ export default {
.loading .loader-svg.front { .loading .loader-svg.front {
will-change: transform; will-change: transform;
animation: fill-animation-loading 1s cubic-bezier(1,1,1,1) 0s infinite; animation: fill-animation-loading 1s cubic-bezier(1, 1, 1, 1) 0s infinite;
transform-origin: center; transform-origin: center;
} }
@@ -96,10 +111,10 @@ export default {
} }
.progress .loader-svg.bg { .progress .loader-svg.bg {
animation: bg-animation 1.5s cubic-bezier(1,1,1,1) 0s infinite; animation: bg-animation 1.5s cubic-bezier(1, 1, 1, 1) 0s infinite;
} }
@keyframes bg-animation{ @keyframes bg-animation {
0% { 0% {
r: 8; r: 8;
} }
@@ -108,8 +123,7 @@ export default {
r: 9; r: 9;
} }
100% { 100% {
r: 8; r: 8;
} }
} }
</style> </style>

View File

@@ -1,10 +1,17 @@
<template> <template>
<div class="logs-container" ref="logsContainer"> <div ref="logsContainer" class="logs-container">
<div v-for="(msg, index) in messages" :key="index" class="msg"> <div v-for="(msg, index) in messages" :key="index" class="msg">
<img v-if="msg.type === 'error'" :src="require('@/assets/images/error.svg')"> <img v-if="msg.type === 'error'" src="~@/assets/images/error.svg" />
<img v-if="msg.type === 'info'" :src="require('@/assets/images/info.svg')" width="20px"> <img
<img v-if="msg.type === 'success'" :src="require('@/assets/images/success.svg')"> v-if="msg.type === 'info'"
<loading-indicator v-if="msg.type === 'loading'" :progress="msg.progress" /> src="~@/assets/images/info.svg"
width="20px"
/>
<img v-if="msg.type === 'success'" src="~@/assets/images/success.svg" />
<loading-indicator
v-if="msg.type === 'loading'"
:progress="msg.progress"
/>
<span class="msg-text">{{ serializeMessage(msg) }}</span> <span class="msg-text">{{ serializeMessage(msg) }}</span>
</div> </div>
</div> </div>
@@ -14,17 +21,18 @@
import LoadingIndicator from '@/components/LoadingIndicator' import LoadingIndicator from '@/components/LoadingIndicator'
export default { export default {
name: 'logs', name: 'Logs',
props: ['messages'],
components: { LoadingIndicator }, components: { LoadingIndicator },
props: { messages: Array },
emits: [],
watch: { watch: {
'messages.length': 'scrollToBottom' 'messages.length': 'scrollToBottom'
}, },
mounted () { mounted() {
this.scrollToBottom() this.scrollToBottom()
}, },
methods: { methods: {
async scrollToBottom () { async scrollToBottom() {
const container = this.$refs.logsContainer const container = this.$refs.logsContainer
if (container) { if (container) {
await this.$nextTick() await this.$nextTick()
@@ -32,7 +40,7 @@ export default {
} }
}, },
serializeMessage (msg) { serializeMessage(msg) {
let result = '' let result = ''
if (msg.row !== null && msg.row !== undefined) { if (msg.row !== null && msg.row !== undefined) {
if (msg.type === 'error') { if (msg.type === 'error') {
@@ -43,7 +51,7 @@ export default {
} }
result += msg.message result += msg.message
if (!(/(\.|!|\?)$/.test(result))) { if (!/(\.|!|\?)$/.test(result)) {
result += '.' result += '.'
} }

View File

@@ -7,10 +7,14 @@
{ 'splitpanes-dragging': dragging } { 'splitpanes-dragging': dragging }
]" ]"
> >
<div class="movable-splitter" ref="movableSplitter" :style="movableSplitterStyle" />
<div <div
class="splitpanes-pane" ref="movableSplitter"
class="movable-splitter"
:style="movableSplitterStyle"
/>
<div
ref="left" ref="left"
class="splitpanes-pane"
:size="paneBefore.size" :size="paneBefore.size"
max-size="30" max-size="30"
:style="styles.before" :style="styles.before"
@@ -27,8 +31,11 @@
:class="[ :class="[
'toggle-btns', 'toggle-btns',
{ {
'both': after.max === 100 && before.max === 100 && both:
paneAfter.size > 0 && paneBefore.size > 0 after.max === 100 &&
before.max === 100 &&
paneAfter.size > 0 &&
paneBefore.size > 0
} }
]" ]"
> >
@@ -39,9 +46,9 @@
> >
<img <img
class="direction-icon" class="direction-icon"
:src="require('@/assets/images/chevron.svg')" src="~@/assets/images/chevron.svg"
:style="directionBeforeIconStyle" :style="directionBeforeIconStyle"
> />
</div> </div>
<div <div
v-if="before.max === 100 && paneBefore.size > 0" v-if="before.max === 100 && paneBefore.size > 0"
@@ -50,18 +57,14 @@
> >
<img <img
class="direction-icon" class="direction-icon"
:src="require('@/assets/images/chevron.svg')" src="~@/assets/images/chevron.svg"
:style="directionAfterIconStyle" :style="directionAfterIconStyle"
> />
</div> </div>
</div> </div>
</div> </div>
<!-- splitter end --> <!-- splitter end -->
<div <div ref="right" class="splitpanes-pane" :style="styles.after">
class="splitpanes-pane"
ref="right"
:style="styles.after"
>
<slot name="right-pane" /> <slot name="right-pane" />
</div> </div>
</div> </div>
@@ -86,15 +89,19 @@ export default {
} }
} }
}, },
data () { emits: [],
data() {
return { return {
container: null, container: null,
paneBefore: this.before, paneBefore: this.before,
paneAfter: this.after, paneAfter: this.after,
beforeMinimising: !this.after.size || !this.before.size ? this.default : { beforeMinimising:
before: this.before.size, !this.after.size || !this.before.size
after: this.after.size ? this.default
}, : {
before: this.before.size,
after: this.after.size
},
dragging: false, dragging: false,
movableSplitter: { movableSplitter: {
top: 0, top: 0,
@@ -104,19 +111,23 @@ export default {
} }
}, },
computed: { computed: {
styles () { styles() {
return { return {
before: { [this.horizontal ? 'height' : 'width']: `${this.paneBefore.size}%` }, before: {
after: { [this.horizontal ? 'height' : 'width']: `${this.paneAfter.size}%` } [this.horizontal ? 'height' : 'width']: `${this.paneBefore.size}%`
},
after: {
[this.horizontal ? 'height' : 'width']: `${this.paneAfter.size}%`
}
} }
}, },
movableSplitterStyle () { movableSplitterStyle() {
const style = { ...this.movableSplitter } const style = { ...this.movableSplitter }
style.top += '%' style.top += '%'
style.left += '%' style.left += '%'
return style return style
}, },
directionBeforeIconStyle () { directionBeforeIconStyle() {
const expanded = this.paneBefore.size !== 0 const expanded = this.paneBefore.size !== 0
const translation = 'translate(-50%, -50%) ' const translation = 'translate(-50%, -50%) '
let rotation = '' let rotation = ''
@@ -131,7 +142,7 @@ export default {
transform: translation + rotation transform: translation + rotation
} }
}, },
directionAfterIconStyle () { directionAfterIconStyle() {
const expanded = this.paneAfter.size !== 0 const expanded = this.paneAfter.size !== 0
const translation = 'translate(-50%, -50%)' const translation = 'translate(-50%, -50%)'
let rotation = '' let rotation = ''
@@ -147,37 +158,48 @@ export default {
} }
} }
}, },
mounted() {
this.container = this.$refs.container
},
methods: { methods: {
bindEvents () { bindEvents() {
// Passive: false to prevent scrolling while touch dragging. // Passive: false to prevent scrolling while touch dragging.
document.addEventListener('mousemove', this.onMouseMove, { passive: false }) document.addEventListener('mousemove', this.onMouseMove, {
passive: false
})
document.addEventListener('mouseup', this.onMouseUp) document.addEventListener('mouseup', this.onMouseUp)
if ('ontouchstart' in window) { if ('ontouchstart' in window) {
document.addEventListener('touchmove', this.onMouseMove, { passive: false }) document.addEventListener('touchmove', this.onMouseMove, {
passive: false
})
document.addEventListener('touchend', this.onMouseUp) document.addEventListener('touchend', this.onMouseUp)
} }
}, },
unbindEvents () { unbindEvents() {
document.removeEventListener('mousemove', this.onMouseMove, { passive: false }) document.removeEventListener('mousemove', this.onMouseMove, {
passive: false
})
document.removeEventListener('mouseup', this.onMouseUp) document.removeEventListener('mouseup', this.onMouseUp)
if ('ontouchstart' in window) { if ('ontouchstart' in window) {
document.removeEventListener('touchmove', this.onMouseMove, { passive: false }) document.removeEventListener('touchmove', this.onMouseMove, {
passive: false
})
document.removeEventListener('touchend', this.onMouseUp) document.removeEventListener('touchend', this.onMouseUp)
} }
}, },
onMouseMove (event) { onMouseMove(event) {
event.preventDefault() event.preventDefault()
this.dragging = true this.dragging = true
this.movableSplitter.visibility = 'visible' this.movableSplitter.visibility = 'visible'
this.moveSplitter(event) this.moveSplitter(event)
}, },
onMouseUp () { onMouseUp() {
if (this.dragging) { if (this.dragging) {
const dragPercentage = this.horizontal const dragPercentage = this.horizontal
? this.movableSplitter.top ? this.movableSplitter.top
@@ -198,7 +220,7 @@ export default {
this.unbindEvents() this.unbindEvents()
}, },
moveSplitter (event) { moveSplitter(event) {
const splitterInfo = { const splitterInfo = {
container: this.container, container: this.container,
paneBeforeMax: this.paneBefore.max, paneBeforeMax: this.paneBefore.max,
@@ -210,21 +232,19 @@ export default {
this.movableSplitter[dir] = offset this.movableSplitter[dir] = offset
}, },
togglePane (pane) { togglePane(pane) {
if (pane.size > 0) { if (pane.size > 0) {
this.beforeMinimising.before = this.paneBefore.size this.beforeMinimising.before = this.paneBefore.size
this.beforeMinimising.after = this.paneAfter.size this.beforeMinimising.after = this.paneAfter.size
pane.size = 0 pane.size = 0
const otherPane = pane === this.paneBefore ? this.paneAfter : this.paneBefore const otherPane =
pane === this.paneBefore ? this.paneAfter : this.paneBefore
otherPane.size = 100 - pane.size otherPane.size = 100 - pane.size
} else { } else {
this.paneBefore.size = this.beforeMinimising.before this.paneBefore.size = this.beforeMinimising.before
this.paneAfter.size = this.beforeMinimising.after this.paneAfter.size = this.beforeMinimising.after
} }
} }
},
mounted () {
this.container = this.$refs.container
} }
} }
</script> </script>
@@ -236,9 +256,15 @@ export default {
position: relative; position: relative;
} }
.splitpanes-vertical {flex-direction: row;} .splitpanes-vertical {
.splitpanes-horizontal {flex-direction: column;} flex-direction: row;
.splitpanes-dragging * {user-select: none;} }
.splitpanes-horizontal {
flex-direction: column;
}
.splitpanes-dragging * {
user-select: none;
}
.splitpanes-pane { .splitpanes-pane {
width: 100%; width: 100%;
@@ -278,14 +304,14 @@ export default {
.movable-splitter { .movable-splitter {
position: absolute; position: absolute;
background-color:rgba(162, 177, 198, 0.5); background-color: rgba(162, 177, 198, 0.5);
} }
.splitpanes-vertical > .splitpanes-splitter, .splitpanes-vertical > .splitpanes-splitter,
.splitpanes-vertical > .movable-splitter { .splitpanes-vertical > .movable-splitter {
width: 8px; width: 8px;
z-index: 5; z-index: 5;
height: 100% height: 100%;
} }
.splitpanes-horizontal > .splitpanes-splitter, .splitpanes-horizontal > .splitpanes-splitter,
@@ -336,20 +362,32 @@ export default {
left: 50%; left: 50%;
} }
.splitpanes-horizontal > .splitpanes-splitter .toggle-btns.both .toggle-btn:first-child { .splitpanes-horizontal
> .splitpanes-splitter
.toggle-btns.both
.toggle-btn:first-child {
border-radius: var(--border-radius-small) 0 0 var(--border-radius-small); border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
} }
.splitpanes-horizontal > .splitpanes-splitter .toggle-btns.both .toggle-btn:last-child { .splitpanes-horizontal
> .splitpanes-splitter
.toggle-btns.both
.toggle-btn:last-child {
border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0; border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
margin-left: -1px; margin-left: -1px;
} }
.splitpanes-vertical > .splitpanes-splitter .toggle-btns.both .toggle-btn:first-child { .splitpanes-vertical
> .splitpanes-splitter
.toggle-btns.both
.toggle-btn:first-child {
border-radius: var(--border-radius-small) var(--border-radius-small) 0 0; border-radius: var(--border-radius-small) var(--border-radius-small) 0 0;
} }
.splitpanes-vertical > .splitpanes-splitter .toggle-btns.both .toggle-btn:last-child { .splitpanes-vertical
> .splitpanes-splitter
.toggle-btns.both
.toggle-btn:last-child {
border-radius: 0 0 var(--border-radius-small) var(--border-radius-small); border-radius: 0 0 var(--border-radius-small) var(--border-radius-small);
margin-top: -1px; margin-top: -1px;
} }

View File

@@ -1,10 +1,9 @@
export default { export default {
// Get the cursor position relative to the splitpane container. // Get the cursor position relative to the splitpane container.
getCurrentMouseDrag (event, container) { getCurrentMouseDrag(event, container) {
const rect = container.getBoundingClientRect() const rect = container.getBoundingClientRect()
const { clientX, clientY } = ('ontouchstart' in window && event.touches) const { clientX, clientY } =
? event.touches[0] 'ontouchstart' in window && event.touches ? event.touches[0] : event
: event
return { return {
x: clientX - rect.left, x: clientX - rect.left,
y: clientY - rect.top y: clientY - rect.top
@@ -12,23 +11,35 @@ export default {
}, },
// Returns the drag percentage of the splitter relative to the 2 panes it's inbetween. // Returns the drag percentage of the splitter relative to the 2 panes it's inbetween.
getCurrentDragPercentage (event, container, isHorisontal) { getCurrentDragPercentage(event, container, isHorisontal) {
let drag = this.getCurrentMouseDrag(event, container) let drag = this.getCurrentMouseDrag(event, container)
drag = drag[isHorisontal ? 'y' : 'x'] drag = drag[isHorisontal ? 'y' : 'x']
const containerSize = container[isHorisontal ? 'clientHeight' : 'clientWidth'] const containerSize =
return drag * 100 / containerSize container[isHorisontal ? 'clientHeight' : 'clientWidth']
return (drag * 100) / containerSize
}, },
// Returns the new position in percents. // Returns the new position in percents.
calculateOffset (event, { container, isHorisontal, paneBeforeMax, paneAfterMax }) { calculateOffset(
const dragPercentage = this.getCurrentDragPercentage(event, container, isHorisontal) event,
{ container, isHorisontal, paneBeforeMax, paneAfterMax }
) {
const dragPercentage = this.getCurrentDragPercentage(
event,
container,
isHorisontal
)
const paneBeforeMaxReached = paneBeforeMax < 100 && (dragPercentage >= paneBeforeMax) const paneBeforeMaxReached =
const paneAfterMaxReached = paneAfterMax < 100 && (dragPercentage <= 100 - paneAfterMax) paneBeforeMax < 100 && dragPercentage >= paneBeforeMax
const paneAfterMaxReached =
paneAfterMax < 100 && dragPercentage <= 100 - paneAfterMax
// Prevent dragging beyond pane max. // Prevent dragging beyond pane max.
if (paneBeforeMaxReached || paneAfterMaxReached) { if (paneBeforeMaxReached || paneAfterMaxReached) {
return paneBeforeMaxReached ? paneBeforeMax : Math.max(100 - paneAfterMax, 0) return paneBeforeMaxReached
? paneBeforeMax
: Math.max(100 - paneAfterMax, 0)
} else { } else {
return Math.min(Math.max(dragPercentage, 0), paneBeforeMax) return Math.min(Math.max(dragPercentage, 0), paneBeforeMax)
} }

View File

@@ -1,32 +1,36 @@
<template> <template>
<paginate <paginate
:page-count="pageCount"
:page-range="5"
:margin-pages="1"
:prev-text="chevron"
:next-text="chevron"
:no-li-surround="true"
container-class="paginator-continer"
page-link-class="paginator-page-link"
active-class="paginator-active-page"
break-view-link-class="paginator-break"
next-link-class="paginator-next"
prev-link-class="paginator-prev"
disabled-class="paginator-disabled"
v-model="page" v-model="page"
:pageCount="pageCount"
:pageRange="5"
:marginPages="1"
:prevText="chevron"
:nextText="chevron"
:noLiSurround="true"
containerClass="paginator-continer"
pageLinkClass="paginator-page-link"
activeClass="paginator-active-page"
breakViewLinkClass="paginator-break"
nextLinkClass="paginator-next"
prevLinkClass="paginator-prev"
disabledClass="paginator-disabled"
/> />
</template> </template>
<script> <script>
import Paginate from 'vuejs-paginate' import Paginate from 'vuejs-paginate-next'
export default { export default {
name: 'Pager', name: 'Pager',
components: { Paginate }, components: { Paginate },
props: ['pageCount', 'value'], props: {
data () { pageCount: Number,
modelValue: Number
},
emits: ['update:modelValue'],
data() {
return { return {
page: this.value, page: this.modelValue,
chevron: ` chevron: `
<svg width="9" height="9" viewBox="0 0 8 12" fill="none"> <svg width="9" height="9" viewBox="0 0 8 12" fill="none">
<path <path
@@ -38,11 +42,11 @@ export default {
} }
}, },
watch: { watch: {
page () { page() {
this.$emit('input', this.page) this.$emit('update:modelValue', this.page)
}, },
value () { modelValue() {
this.page = this.value this.page = this.modelValue
} }
} }
} }
@@ -54,48 +58,52 @@ export default {
align-items: center; align-items: center;
line-height: 10px; line-height: 10px;
} }
>>> .paginator-page-link { :deep(a) {
cursor: pointer;
}
:deep(.paginator-page-link) {
padding: 2px 3px; padding: 2px 3px;
margin: 0 5px; margin: 0 5px;
display: block; display: block;
color: var(--color-text-base); color: var(--color-text-base);
font-size: 11px; font-size: 11px;
} }
>>> .paginator-page-link:hover { :deep(.paginator-page-link:hover) {
color: var(--color-text-active); color: var(--color-text-active);
} }
>>> .paginator-page-link:active, :deep(.paginator-page-link:active),
>>> .paginator-page-link:visited, :deep(.paginator-page-link:visited),
>>> .paginator-page-link:focus, :deep(.paginator-page-link:focus),
>>> .paginator-next:active, :deep(.paginator-next:active),
>>> .paginator-next:visited, :deep(.paginator-next:visited),
>>> .paginator-next:focus, :deep(.paginator-next:focus),
>>> .paginator-prev:active, :deep(.paginator-prev:active),
>>> .paginator-prev:visited, :deep(.paginator-prev:visited),
>>> .paginator-prev:focus { :deep(.paginator-prev:focus) {
outline: none; outline: none;
} }
>>> .paginator-active-page, :deep(.paginator-active-page),
>>> .paginator-active-page:hover { :deep(.paginator-active-page:hover) {
color: var(--color-accent); color: var(--color-accent);
} }
>>> .paginator-break:hover, :deep(.paginator-break:hover),
>>> .paginator-disabled:hover { :deep(.paginator-disabled:hover) {
cursor: default; cursor: default;
} }
>>> .paginator-prev svg { :deep(.paginator-prev svg) {
transform: rotate(180deg); transform: rotate(180deg);
} }
>>> .paginator-next:hover path, :deep(.paginator-next:hover path),
>>> .paginator-prev:hover path { :deep(.paginator-prev:hover path) {
fill: var(--color-text-active); fill: var(--color-text-active);
} }
>>> .paginator-disabled path, :deep(.paginator-disabled path),
>>> .paginator-disabled:hover path { :deep(.paginator-disabled:hover path) {
fill: var(--color-text-light-2); fill: var(--color-text-light-2);
} }
</style> </style>

View File

@@ -1,92 +1,118 @@
<template> <template>
<div> <div>
<div class="rounded-bg"> <div class="rounded-bg">
<div class="header-container" ref="header-container"> <div ref="header-container" class="header-container">
<div> <div>
<div <div
v-for="(th, index) in header" v-for="(th, index) in header"
:key="index"
class="fixed-header" class="fixed-header"
:style="{ width: `${th.width}px` }" :style="{ width: `${th.width}px` }"
:key="index" :title="th.name"
> >
{{ th.name }} {{ th.name }}
</div> </div>
</div> </div>
</div> </div>
<div <div
class="table-container"
ref="table-container" ref="table-container"
class="table-container"
@scroll="onScrollTable" @scroll="onScrollTable"
> >
<table ref="table" class="sqliteviz-table"> <table
<thead> ref="table"
<tr> class="sqliteviz-table"
<th v-for="(th, index) in columns" :key="index" ref="th"> tabindex="0"
<div class="cell-data" :style="cellStyle">{{ th }}</div> @keydown="onTableKeydown"
</th> >
</tr> <thead>
</thead> <tr>
<tbody> <th v-for="(th, index) in columns" :key="index" ref="th">
<tr v-for="rowIndex in currentPageData.count" :key="rowIndex"> <div class="cell-data" :style="cellStyle">{{ th }}</div>
<td v-for="(col, colIndex) in columns" :key="colIndex"> </th>
<div class="cell-data" :style="cellStyle"> </tr>
{{ dataSet.values[col][rowIndex - 1 + currentPageData.start] }} </thead>
</div> <tbody>
</td> <tr v-for="rowIndex in currentPageData.count" :key="rowIndex">
</tr> <td
</tbody> v-for="(col, colIndex) in columns"
</table> :key="colIndex"
:data-col="colIndex"
:data-row="pageSize * (currentPage - 1) + rowIndex - 1"
:data-isNull="isNull(getCellValue(col, rowIndex))"
:data-isBlob="isBlob(getCellValue(col, rowIndex))"
:aria-selected="false"
@click="onCellClick"
>
<div class="cell-data" :style="cellStyle">
{{ getCellText(col, rowIndex) }}
</div>
</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
<div class="table-footer"> <div class="table-footer">
<div class="table-footer-count"> <div class="table-footer-count">
{{ rowCount }} {{rowCount === 1 ? 'row' : 'rows'}} retrieved {{ rowCount }} {{ rowCount === 1 ? 'row' : 'rows' }} retrieved
<span v-if="preview">for preview</span> <span v-if="preview">for preview</span>
<span v-if="time">in {{ time }}</span> <span v-if="time">in {{ time }}</span>
</div> </div>
<pager v-show="pageCount > 1" :page-count="pageCount" v-model="currentPage" /> <pager
v-show="pageCount > 1"
v-model="currentPage"
:pageCount="pageCount"
/>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Pager from './Pager' import Pager from './Pager.vue'
export default { export default {
name: 'SqlTable', name: 'SqlTable',
components: { Pager }, components: { Pager },
props: { props: {
dataSet: Object, dataSet: Object,
time: String, time: [String, Number],
pageSize: { pageSize: {
type: Number, type: Number,
default: 20 default: 20
}, },
preview: Boolean page: {
type: Number,
default: 1
},
preview: Boolean,
selectedCellCoordinates: Object
}, },
data () { emits: ['updateSelectedCell'],
data() {
return { return {
header: null, header: null,
tableWidth: null, tableWidth: null,
currentPage: 1, currentPage: this.page,
resizeObserver: null resizeObserver: null,
selectedCellElement: null
} }
}, },
computed: { computed: {
columns () { columns() {
return this.dataSet.columns return this.dataSet.columns
}, },
rowCount () { rowCount() {
return this.dataSet.values[this.columns[0]].length return this.dataSet.values[this.columns[0]].length
}, },
cellStyle () { cellStyle() {
const eq = this.tableWidth / this.columns.length const eq = this.tableWidth / this.columns.length
return { maxWidth: `${Math.max(eq, 100)}px` } return { maxWidth: `${Math.max(eq, 100)}px` }
}, },
pageCount () { pageCount() {
return Math.ceil(this.rowCount / this.pageSize) return Math.ceil(this.rowCount / this.pageSize)
}, },
currentPageData () { currentPageData() {
const start = (this.currentPage - 1) * this.pageSize const start = (this.currentPage - 1) * this.pageSize
let end = start + this.pageSize let end = start + this.pageSize
if (end > this.rowCount - 1) { if (end > this.rowCount - 1) {
@@ -99,8 +125,54 @@ export default {
} }
} }
}, },
watch: {
currentPageData() {
this.calculateHeadersWidth()
this.selectCell(null)
},
dataSet() {
this.currentPage = 1
}
},
mounted() {
this.resizeObserver = new ResizeObserver(this.calculateHeadersWidth)
this.resizeObserver.observe(this.$refs.table)
this.calculateHeadersWidth()
if (this.selectedCellCoordinates) {
const { row, col } = this.selectedCellCoordinates
const cell = this.$refs.table.querySelector(
`td[data-col="${col}"][data-row="${row}"]`
)
if (cell) {
this.selectCell(cell)
}
}
},
beforeUnmount() {
this.resizeObserver.unobserve(this.$refs.table)
},
methods: { methods: {
calculateHeadersWidth () { isBlob(value) {
return value && ArrayBuffer.isView(value)
},
isNull(value) {
return value === null
},
getCellValue(col, rowIndex) {
return this.dataSet.values[col][rowIndex - 1 + this.currentPageData.start]
},
getCellText(col, rowIndex) {
const value = this.getCellValue(col, rowIndex)
if (this.isNull(value)) {
return 'NULL'
}
if (this.isBlob(value)) {
return 'BLOB'
}
return value
},
calculateHeadersWidth() {
this.tableWidth = this.$refs['table-container'].offsetWidth this.tableWidth = this.$refs['table-container'].offsetWidth
this.$nextTick(() => { this.$nextTick(() => {
this.header = this.$refs.th.map(th => { this.header = this.$refs.th.map(th => {
@@ -108,26 +180,102 @@ export default {
}) })
}) })
}, },
onScrollTable () { onScrollTable() {
this.$refs['header-container'].scrollLeft = this.$refs['table-container'].scrollLeft this.$refs['header-container'].scrollLeft =
} this.$refs['table-container'].scrollLeft
}, },
mounted () { onTableKeydown(e) {
this.resizeObserver = new ResizeObserver(this.calculateHeadersWidth) const keyCodeMap = {
this.resizeObserver.observe(this.$refs.table) 37: 'left',
this.calculateHeadersWidth() 39: 'right',
}, 38: 'up',
beforeDestroy () { 40: 'down'
this.resizeObserver.unobserve(this.$refs.table) }
},
watch: { if (
currentPageData: 'calculateHeadersWidth', !this.selectedCellElement ||
dataSet () { !Object.keys(keyCodeMap).includes(e.keyCode.toString())
this.currentPage = 1 ) {
return
}
e.preventDefault()
this.moveFocusInTable(this.selectedCellElement, keyCodeMap[e.keyCode])
},
onCellClick(e) {
this.selectCell(e.target.closest('td'), false)
},
selectCell(cell, scrollTo = true) {
if (!cell) {
if (this.selectedCellElement) {
this.selectedCellElement.ariaSelected = 'false'
}
this.selectedCellElement = cell
} else if (!cell.ariaSelected || cell.ariaSelected === 'false') {
if (this.selectedCellElement) {
this.selectedCellElement.ariaSelected = 'false'
}
cell.ariaSelected = 'true'
this.selectedCellElement = cell
} else {
cell.ariaSelected = 'false'
this.selectedCellElement = null
}
if (this.selectedCellElement && scrollTo) {
this.selectedCellElement.scrollIntoView()
}
this.$emit('updateSelectedCell', this.selectedCellElement)
},
moveFocusInTable(initialCell, direction) {
const currentRowIndex = +initialCell.dataset.row
const currentColIndex = +initialCell.dataset.col
let newRowIndex, newColIndex
if (direction === 'right') {
if (currentColIndex === this.columns.length - 1) {
newRowIndex = currentRowIndex + 1
newColIndex = 0
} else {
newRowIndex = currentRowIndex
newColIndex = currentColIndex + 1
}
} else if (direction === 'left') {
if (currentColIndex === 0) {
newRowIndex = currentRowIndex - 1
newColIndex = this.columns.length - 1
} else {
newRowIndex = currentRowIndex
newColIndex = currentColIndex - 1
}
} else if (direction === 'up') {
newRowIndex = currentRowIndex - 1
newColIndex = currentColIndex
} else if (direction === 'down') {
newRowIndex = currentRowIndex + 1
newColIndex = currentColIndex
}
const newCell = this.$refs.table.querySelector(
`td[data-col="${newColIndex}"][data-row="${newRowIndex}"]`
)
if (newCell) {
this.selectCell(newCell)
}
} }
} }
} }
</script> </script>
<style scoped> <style scoped>
table.sqliteviz-table:focus {
outline: none;
}
.sqliteviz-table tbody td:hover {
background-color: var(--color-bg-light-3);
}
.sqliteviz-table tbody td[aria-selected='true'] {
box-shadow: inset 0 0 0 1px var(--color-accent);
}
</style> </style>

View File

@@ -1,17 +1,25 @@
<template> <template>
<div> <div>
<div v-if="label" :class="['text-field-label', { error: errorMsg }, {'disabled': disabled}]"> <div
v-if="label"
:class="['text-field-label', { error: errorMsg }, { disabled: disabled }]"
>
{{ label }} {{ label }}
<hint-icon class="hint" v-if="hint" :hint="hint" :max-width="maxHintWidth || '149px'"/> <hint-icon
v-if="hint"
class="hint"
:hint="hint"
:maxWidth="maxHintWidth || '149px'"
/>
</div> </div>
<input <input
type="text" type="text"
:placeholder="placeholder" :placeholder="placeholder"
:class="{ error: errorMsg }" :class="{ error: errorMsg }"
:style="{ width: width }" :style="{ width: width }"
:value="value" :value="modelValue"
:disabled="disabled" :disabled="disabled"
@input="$emit('input', $event.target.value)" @input="$emit('update:modelValue', $event.target.value)"
/> />
<div v-show="errorMsg" class="text-field-error">{{ errorMsg }}</div> <div v-show="errorMsg" class="text-field-error">{{ errorMsg }}</div>
</div> </div>
@@ -20,9 +28,19 @@
<script> <script>
import HintIcon from '@/components/svg/hint' import HintIcon from '@/components/svg/hint'
export default { export default {
name: 'textField', name: 'TextField',
props: ['placeholder', 'label', 'errorMsg', 'value', 'width', 'hint', 'maxHintWidth', 'disabled'], components: { HintIcon },
components: { HintIcon } props: {
placeholder: String,
label: String,
errorMsg: String,
modelValue: String,
width: String,
hint: String,
maxHintWidth: String,
disabled: Boolean
},
emits: ['update:modelValue']
} }
</script> </script>
@@ -66,7 +84,7 @@ input.error {
position: relative; position: relative;
} }
.text-field-label .hint{ .text-field-label .hint {
position: absolute; position: absolute;
top: -2px; top: -2px;
right: -22px; right: -22px;

View File

@@ -29,12 +29,12 @@
</g> </g>
<defs> <defs>
<clipPath id="clip0"> <clipPath id="clip0">
<rect width="18" height="18" fill="white"/> <rect width="18" height="18" fill="white" />
</clipPath> </clipPath>
</defs> </defs>
</svg> </svg>
<span class="icon-tooltip" :style="tooltipStyle" ref="tooltip"> <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
Add new table from CSV Add new table from CSV, JSON or NDJSON
</span> </span>
</span> </span>
</template> </template>
@@ -45,9 +45,10 @@ import tooltipMixin from '@/tooltipMixin'
export default { export default {
name: 'AddTableIcon', name: 'AddTableIcon',
mixins: [tooltipMixin], mixins: [tooltipMixin],
props: ['tooltip'], props: { tooltip: String },
emits: ['click'],
methods: { methods: {
onClick () { onClick() {
this.hideTooltip() this.hideTooltip()
this.$emit('click') this.$emit('click')
} }

View File

@@ -0,0 +1,19 @@
<template>
<svg
width="28"
height="27"
viewBox="0 0 28 27"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M17.9475 8.33625L12.7838 13.5L17.9475 18.6638L16.35 20.25L9.60001
13.5L16.35 6.75L17.9475 8.33625Z"
fill="#506784"
/>
</svg>
</template>
<script>
export default {}
</script>

View File

@@ -1,40 +1,41 @@
<template> <template>
<div> <div>
<svg <svg
class="db-edit-icon" class="db-edit-icon"
width="18" width="18"
height="18" height="18"
viewBox="0 0 18 18" viewBox="0 0 18 18"
fill="none" fill="none"
@click.stop="onClick" @click.stop="onClick"
@mouseenter="showTooltip" @mouseenter="showTooltip"
@mouseleave="hideTooltip" @mouseleave="hideTooltip"
> >
<path <path
d="M3 10.5V12.75C3 14.25 5.2875 15.54 8.25 15.75V13.5825L8.3475 13.5C5.34 13.32 3 12.045 3 d="M3 10.5V12.75C3 14.25 5.2875 15.54 8.25 15.75V13.5825L8.3475 13.5C5.34 13.32 3 12.045 3
10.5ZM9 9.75C5.685 9.75 3 8.4075 3 6.75V9C3 10.6575 5.685 12 9 12C9.2925 12 9.5775 12 10.5ZM9 9.75C5.685 9.75 3 8.4075 3 6.75V9C3 10.6575 5.685 12 9 12C9.2925 12 9.5775 12
9.87 12L12.75 9.09C11.55 9.54 10.2825 9.75 9 9.75ZM9 2.25C5.685 2.25 3 3.5925 3 5.25C3 9.87 12L12.75 9.09C11.55 9.54 10.2825 9.75 9 9.75ZM9 2.25C5.685 2.25 3 3.5925 3 5.25C3
6.9075 5.685 8.25 9 8.25C12.315 8.25 15 6.9075 15 5.25C15 3.5925 12.315 2.25 9 2.25ZM15.75 6.9075 5.685 8.25 9 8.25C12.315 8.25 15 6.9075 15 5.25C15 3.5925 12.315 2.25 9 2.25ZM15.75
8.3475C15.6375 8.3475 15.5325 8.3925 15.4575 8.475L14.7075 9.225L16.245 10.725L16.995 8.3475C15.6375 8.3475 15.5325 8.3925 15.4575 8.475L14.7075 9.225L16.245 10.725L16.995
9.975C17.1525 9.825 17.16 9.57 16.995 9.3975L16.065 8.475C15.99 8.3925 15.885 8.3475 15.78 9.975C17.1525 9.825 17.16 9.57 16.995 9.3975L16.065 8.475C15.99 8.3925 15.885 8.3475 15.78
8.3475H15.75ZM14.28 9.66L9.75 14.205V15.75H11.295L15.84 11.1975L14.28 9.66Z" 8.3475H15.75ZM14.28 9.66L9.75 14.205V15.75H11.295L15.84 11.1975L14.28 9.66Z"
fill="#A2B1C6" fill="#A2B1C6"
/> />
</svg> </svg>
<span class="icon-tooltip" :style="tooltipStyle" ref="tooltip"> <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
Load another database or CSV Load another database, CSV, JSON or NDJSON
</span> </span>
</div> </div>
</template> </template>
<script> <script>
import tooltipMixin from '@/tooltipMixin' import tooltipMixin from '@/tooltipMixin'
export default { export default {
name: 'changeDbIcon', name: 'ChangeDbIcon',
mixins: [tooltipMixin], mixins: [tooltipMixin],
emits: ['click'],
methods: { methods: {
onClick () { onClick() {
this.hideTooltip() this.hideTooltip()
this.$emit('click') this.$emit('click')
} }

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="18" height="18" viewBox="0 0 18 18" fill="none">
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
>
<path <path
fill-rule="evenodd" fill-rule="evenodd"
clip-rule="evenodd" clip-rule="evenodd"
@@ -46,7 +41,6 @@
</template> </template>
<script> <script>
export default { export default {
name: 'ChartIcon' name: 'ChartIcon'
} }

View File

@@ -1,6 +1,6 @@
<template> <template>
<svg <svg
:class="['clear-icon', {'disabled': disabled}]" :class="['clear-icon', { disabled: disabled }]"
width="20" width="20"
height="20" height="20"
viewBox="0 0 20 20" viewBox="0 0 20 20"
@@ -21,10 +21,9 @@
</template> </template>
<script> <script>
export default { export default {
name: 'ClearIcon', name: 'ClearIcon',
props: ['disabled'] props: { disabled: Boolean }
} }
</script> </script>
@@ -42,6 +41,6 @@ export default {
} }
.disabled.clear-icon:hover path { .disabled.clear-icon:hover path {
fill: #C8D4E3; fill: #c8d4e3;
} }
</style> </style>

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="18" height="18" viewBox="0 0 18 18" fill="none">
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
>
<path <path
d="M14.1917 1.3851H12.4806V0.703125C12.4806 0.314758 12.1658 0 11.7775 0H6.246C5.85764 0 d="M14.1917 1.3851H12.4806V0.703125C12.4806 0.314758 12.1658 0 11.7775 0H6.246C5.85764 0
5.54288 0.314758 5.54288 0.703125V1.3851H3.83203C2.86276 1.3851 2.07422 2.17365 2.07422 5.54288 0.314758 5.54288 0.703125V1.3851H3.83203C2.86276 1.3851 2.07422 2.17365 2.07422
@@ -26,7 +21,6 @@
</template> </template>
<script> <script>
export default { export default {
name: 'ClipboardIcon' name: 'ClipboardIcon'
} }

View File

@@ -1,12 +1,12 @@
<template> <template>
<svg <svg
@click.stop="$emit('click')" :class="['icon', { disabled: disabled }]"
:class="['icon', {'disabled': disabled }]"
:width="size" :width="size"
:height="size" :height="size"
viewBox="0 0 14 14" viewBox="0 0 14 14"
fill="none" fill="none"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
@click.stop="$emit('click')"
> >
<path <path
d="M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14 d="M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14
@@ -30,7 +30,8 @@ export default {
required: false, required: false,
default: false default: false
} }
} },
emits: ['click']
} }
</script> </script>

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="18" height="18" viewBox="0 0 18 18" fill="none">
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
>
<path <path
fill-rule="evenodd" fill-rule="evenodd"
clip-rule="evenodd" clip-rule="evenodd"
@@ -17,7 +12,7 @@
6.91686 13.5552 6.91522Z" 6.91686 13.5552 6.91522Z"
fill="#A2B1C6" fill="#A2B1C6"
/> />
<circle cx="5.50049" cy="6.00339" r="1.5" fill="#A2B1C6"/> <circle cx="5.50049" cy="6.00339" r="1.5" fill="#A2B1C6" />
<path <path
fill-rule="evenodd" fill-rule="evenodd"
clip-rule="evenodd" clip-rule="evenodd"
@@ -27,11 +22,10 @@
1.21788ZM16.0374 2.71788L1.96424 2.713L1.96289 15.2773L16.036 15.2821L16.0374 2.71788Z" 1.21788ZM16.0374 2.71788L1.96424 2.713L1.96289 15.2773L16.036 15.2821L16.0374 2.71788Z"
fill="#A2B1C6" fill="#A2B1C6"
/> />
</svg> </svg>
</template> </template>
<script> <script>
export default { export default {
name: 'DataViewIcon' name: 'DataViewIcon'
} }

View File

@@ -1,6 +1,6 @@
<template> <template>
<svg <svg
:class="['chevron-icon', {'disabled': disabled}]" :class="['chevron-icon', { disabled: disabled }]"
width="20" width="20"
height="20" height="20"
viewBox="0 0 20 20" viewBox="0 0 20 20"
@@ -15,10 +15,9 @@
</template> </template>
<script> <script>
export default { export default {
name: 'DropDownChevron', name: 'DropDownChevron',
props: ['disabled'] props: { disabled: Boolean }
} }
</script> </script>
@@ -36,6 +35,6 @@ export default {
} }
.disabled.chevron-icon:hover path { .disabled.chevron-icon:hover path {
fill: #C8D4E3; fill: #c8d4e3;
} }
</style> </style>

View File

@@ -0,0 +1,25 @@
<template>
<svg
width="27"
height="27"
viewBox="0 0 27 27"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M17.3474 8.33625L12.1837 13.5L17.3474 18.6638L15.7499 20.25L8.99991
13.5L15.7499 6.75L17.3474 8.33625Z"
fill="#506784"
/>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M7.19995 19.8L7.19995 7.20001H9.19995V19.8H7.19995Z"
fill="#506784"
/>
</svg>
</template>
<script>
export default {}
</script>

View File

@@ -17,7 +17,7 @@
fill="#A2B1C6" fill="#A2B1C6"
/> />
</svg> </svg>
<span class="icon-tooltip" :style="tooltipStyle" ref="tooltip"> <span ref="tooltip" class="icon-tooltip" :style="tooltipStyle">
{{ tooltip }} {{ tooltip }}
</span> </span>
</span> </span>
@@ -29,9 +29,13 @@ import tooltipMixin from '@/tooltipMixin'
export default { export default {
name: 'ExportIcon', name: 'ExportIcon',
mixins: [tooltipMixin], mixins: [tooltipMixin],
props: ['tooltip', 'tooltipPosition'], props: {
tooltip: String,
tooltipPosition: String
},
emits: ['click'],
methods: { methods: {
onClick () { onClick() {
this.hideTooltip() this.hideTooltip()
this.$emit('click') this.$emit('click')
} }

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="19" height="18" viewBox="0 0 19 18" fill="none">
width="19"
height="18"
viewBox="0 0 19 18"
fill="none"
>
<path <path
d="M6.07959 13.5756C6.05908 14.0209 5.93896 14.415 5.71924 14.7578C5.49951 15.0976 5.19043 d="M6.07959 13.5756C6.05908 14.0209 5.93896 14.415 5.71924 14.7578C5.49951 15.0976 5.19043
15.3613 4.79199 15.5488C4.39648 15.7363 3.94385 15.83 3.43408 15.83C2.59326 15.83 15.3613 4.79199 15.5488C4.39648 15.7363 3.94385 15.83 3.43408 15.83C2.59326 15.83
@@ -34,7 +29,7 @@
14.6699C9.53809 14.6699 9.73877 14.6157 9.88525 14.5073C10.0347 14.3959 10.1094 14.2407 14.6699C9.53809 14.6699 9.73877 14.6157 9.88525 14.5073C10.0347 14.3959 10.1094 14.2407
10.1094 14.0414ZM14.9258 14.0019L16.2002 9.34369H17.9229L15.7695 15.7421H14.082L11.9463 10.1094 14.0414ZM14.9258 14.0019L16.2002 9.34369H17.9229L15.7695 15.7421H14.082L11.9463
9.34369H13.6558L14.9258 14.0019Z" 9.34369H13.6558L14.9258 14.0019Z"
fill="#A2B1C6" fill="#A2B1C6"
/> />
<path <path
d="M3.03345 0.991333H4.89869V2.49133H3.03345V7.93074H1.53345V2.49133C1.53345 1.66633 d="M3.03345 0.991333H4.89869V2.49133H3.03345V7.93074H1.53345V2.49133C1.53345 1.66633
@@ -55,7 +50,6 @@
</template> </template>
<script> <script>
export default { export default {
name: 'ExportToCsvIcon' name: 'ExportToCsvIcon'
} }

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="19" height="18" viewBox="0 0 19 18" fill="none">
width="19"
height="18"
viewBox="0 0 19 18"
fill="none"
>
<path <path
d="M4.28369 13.9966C4.28369 13.7711 4.20312 13.5953 4.04199 13.4693C3.88379 13.3433 3.604 d="M4.28369 13.9966C4.28369 13.7711 4.20312 13.5953 4.04199 13.4693C3.88379 13.3433 3.604
13.213 3.20264 13.0782C2.80127 12.9434 2.47314 12.813 2.21826 12.6871C1.38916 12.2798 13.213 3.20264 13.0782C2.80127 12.9434 2.47314 12.813 2.21826 12.6871C1.38916 12.2798
@@ -54,7 +49,6 @@
</template> </template>
<script> <script>
export default { export default {
name: 'ExportToSvgIcon' name: 'ExportToSvgIcon'
} }

View File

@@ -33,7 +33,11 @@
fill="#A2B1C6" fill="#A2B1C6"
/> />
</svg> </svg>
<span class="icon-tooltip" :style="{...tooltipStyle, maxWidth: maxWidth }" ref="tooltip"> <span
ref="tooltip"
class="icon-tooltip"
:style="{ ...tooltipStyle, maxWidth: maxWidth }"
>
{{ hint }} {{ hint }}
</span> </span>
</div> </div>
@@ -44,10 +48,14 @@ import tooltipMixin from '@/tooltipMixin'
export default { export default {
name: 'HintIcon', name: 'HintIcon',
props: ['hint', 'maxWidth'],
mixins: [tooltipMixin], mixins: [tooltipMixin],
props: {
hint: String,
maxWidth: String
},
emits: ['click'],
methods: { methods: {
onClick () { onClick() {
this.hideTooltip() this.hideTooltip()
this.$emit('click') this.$emit('click')
} }

View File

@@ -11,8 +11,8 @@
7.89917V9.2439L5.1626 10.0745ZM8.99023 13.3H7.93994L10.124 6.35229H11.1787L8.99023 7.89917V9.2439L5.1626 10.0745ZM8.99023 13.3H7.93994L10.124 6.35229H11.1787L8.99023
13.3ZM14.1099 10.0613L11.7192 9.24829V7.90356L15.582 9.4856V10.6545L11.7192 13.3ZM14.1099 10.0613L11.7192 9.24829V7.90356L15.582 9.4856V10.6545L11.7192
12.2366V10.8918L14.1099 10.0613Z" 12.2366V10.8918L14.1099 10.0613Z"
fill="#A2B1C6" fill="#A2B1C6"
/> />
<path <path
d="M2.17041 0.0637207H16.2185V1.56372H2.17041V9.30354H0.67041V1.56372C0.67041 0.73872 d="M2.17041 0.0637207H16.2185V1.56372H2.17041V9.30354H0.67041V1.56372C0.67041 0.73872
1.34541 0.0637207 2.17041 0.0637207Z" 1.34541 0.0637207 2.17041 0.0637207Z"

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="18" height="18" viewBox="0 0 18 18" fill="none">
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
>
<path <path
fill-rule="evenodd" fill-rule="evenodd"
clip-rule="evenodd" clip-rule="evenodd"
@@ -14,14 +9,13 @@
14.1914C14.8372 13.965 15.0161 13.5645 15.0161 12.8467V9.43008H13.1914L15.7661 5.13901Z" 14.1914C14.8372 13.965 15.0161 13.5645 15.0161 12.8467V9.43008H13.1914L15.7661 5.13901Z"
fill="#A2B1C6" fill="#A2B1C6"
/> />
<path d="M6.41943 0H18.4194V4H6.41943V0Z" fill="#A2B1C6"/> <path d="M6.41943 0H18.4194V4H6.41943V0Z" fill="#A2B1C6" />
<path d="M0.419434 6H4.41943V18H0.419434V6Z" fill="#A2B1C6"/> <path d="M0.419434 6H4.41943V18H0.419434V6Z" fill="#A2B1C6" />
<path d="M0.419434 0H4.41943V4H0.419434V0Z" fill="#A2B1C6"/> <path d="M0.419434 0H4.41943V4H0.419434V0Z" fill="#A2B1C6" />
</svg> </svg>
</template> </template>
<script> <script>
export default { export default {
name: 'PivotIcon' name: 'PivotIcon'
} }

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="18" height="18" viewBox="0 0 18 18" fill="none">
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
>
<path <path
d="M9 5.51953C6.57686 5.51953 4.60547 7.49092 4.60547 9.91406C4.60547 12.3372 6.57686 d="M9 5.51953C6.57686 5.51953 4.60547 7.49092 4.60547 9.91406C4.60547 12.3372 6.57686
14.3086 9 14.3086C11.4231 14.3086 13.3945 12.3372 13.3945 9.91406C13.3945 7.49092 11.4231 14.3086 9 14.3086C11.4231 14.3086 13.3945 12.3372 13.3945 9.91406C13.3945 7.49092 11.4231
@@ -30,7 +25,10 @@
5.5195V15.0117Z" 5.5195V15.0117Z"
fill="#A2B1C6" fill="#A2B1C6"
/> />
<path d="M15.1875 6.22266H13.7812V7.62891H15.1875V6.22266Z" fill="#A2B1C6"/> <path
d="M15.1875 6.22266H13.7812V7.62891H15.1875V6.22266Z"
fill="#A2B1C6"
/>
</svg> </svg>
</template> </template>

View File

@@ -0,0 +1,47 @@
<template>
<svg width="19" height="19" viewBox="0 0 19 19" fill="none">
<g clip-path="url(#clip0_2130_5292)">
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M1.85303 11.3794L1.85303 7.80371L5.86304 7.80371L5.86304
11.3794L1.85303 11.3794ZM7.36304 11.3794L7.36304 7.80371L11.3428
7.80371L11.3428 11.3794L7.36304 11.3794ZM12.8428 11.3794L16.853
11.3794L16.853 7.80371L12.8428 7.80371L12.8428 11.3794ZM15.353
6.30371L16.853 6.30371C17.6815 6.30371 18.353 6.97528 18.353
7.80371L18.353 11.3794C18.353 12.2078 17.6815 12.8794 16.853
12.8794L15.353 12.8794L15.353 14.3111C15.353 15.0153 14.7603 15.5916
14.0358 15.5916L4.67027 15.5916C3.94579 15.5916 3.35303 15.0153 3.35303
14.3111L3.35303 12.8794L1.85303 12.8794C1.0246 12.8794 0.353027 12.2078
0.353027 11.3794L0.353027 7.80371C0.353027 6.97528 1.0246 6.30371
1.85303 6.30371L3.35303 6.30371L3.35303 4.87201C3.35303 4.16349 3.94139
3.59155 4.67027 3.59155L14.0358 3.59155C14.7604 3.59155 15.353 4.16117
15.353 4.87201L15.353 6.30371ZM14.0315 6.30371L14.0315 4.87086L11.887
4.87086L11.887 6.30371L12.8428 6.30371L14.0315 6.30371ZM10.387
6.30371L10.387 4.87086L8.26685 4.87086L8.26685 6.30371L10.387
6.30371ZM6.76685 6.30371L6.76685 4.87086L4.67027 4.87086L4.67027
6.30371L6.76685 6.30371ZM4.67027 12.8794L4.67027 14.3121L6.76685
14.3121L6.76685 12.8794L4.67027 12.8794ZM8.26685 12.8794L8.26685
14.3121L10.387 14.3121L10.387 12.8794L8.26685 12.8794ZM11.887
12.8794L11.887 14.3121L14.0315 14.3121L14.0315 12.8794L11.887 12.8794Z"
fill="#A2B1C6"
/>
</g>
<defs>
<clipPath id="clip0_2130_5292">
<rect
width="18"
height="18"
fill="white"
transform="translate(0.353027 18.5916) rotate(-90)"
/>
</clipPath>
</defs>
</svg>
</template>
<script>
export default {
name: 'RowIcon'
}
</script>

View File

@@ -1,16 +1,13 @@
<template> <template>
<svg <svg width="12" height="13" viewBox="0 0 12 13" fill="none">
width="12" <path
height="13" d="M11.1624 6.94358L0.770043 12.9436L0.770043 0.943573L11.1624 6.94358Z"
viewBox="0 0 12 13" fill="#A2B1C6"
fill="none" />
>
<path d="M11.1624 6.94358L0.770043 12.9436L0.770043 0.943573L11.1624 6.94358Z" fill="#A2B1C6"/>
</svg> </svg>
</template> </template>
<script> <script>
export default { export default {
name: 'RunIcon' name: 'RunIcon'
} }

View File

@@ -24,7 +24,6 @@
</template> </template>
<script> <script>
export default { export default {
name: 'SortIcon', name: 'SortIcon',
props: { props: {

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="18" height="19" viewBox="0 0 18 19" fill="none">
width="18"
height="19"
viewBox="0 0 18 19"
fill="none"
>
<g clip-path="url(#clip0)"> <g clip-path="url(#clip0)">
<path <path
d="M4.5 1.51343H10.5L15 6.01343V8.45284H13.5V6.76343H9.75V3.01343H4.5V8.45284H3V3.01343C3 d="M4.5 1.51343H10.5L15 6.01343V8.45284H13.5V6.76343H9.75V3.01343H4.5V8.45284H3V3.01343C3
@@ -47,14 +42,18 @@
</g> </g>
<defs> <defs>
<clipPath id="clip0"> <clipPath id="clip0">
<rect width="18" height="18" fill="white" transform="translate(0 0.0134277)"/> <rect
width="18"
height="18"
fill="white"
transform="translate(0 0.0134277)"
/>
</clipPath> </clipPath>
</defs> </defs>
</svg> </svg>
</template> </template>
<script> <script>
export default { export default {
name: 'SqlEditorIcon' name: 'SqlEditorIcon'
} }

View File

@@ -1,10 +1,5 @@
<template> <template>
<svg <svg width="18" height="18" viewBox="0 0 18 18" fill="none">
width="18"
height="18"
viewBox="0 0 18 18"
fill="none"
>
<path <path
fill-rule="evenodd" fill-rule="evenodd"
clip-rule="evenodd" clip-rule="evenodd"
@@ -41,7 +36,6 @@
</template> </template>
<script> <script>
export default { export default {
name: 'TableIcon' name: 'TableIcon'
} }

View File

@@ -17,9 +17,8 @@
</template> </template>
<script> <script>
export default { export default {
name: 'treeChevron', name: 'TreeChevron',
props: { props: {
expanded: { expanded: {
type: Boolean, type: Boolean,
@@ -31,7 +30,7 @@ export default {
<style scoped> <style scoped>
.chevron-icon { .chevron-icon {
-webkit-transition: transform .15s ease-in-out; -webkit-transition: transform 0.15s ease-in-out;
transition: transform .15s ease-in-out; transition: transform 0.15s ease-in-out;
} }
</style> </style>

View File

@@ -0,0 +1,44 @@
<template>
<svg width="19" height="19" viewBox="0 0 19 19" fill="none">
<g clip-path="url(#clip0_2131_6054)">
<path
d="M3.53784 11.5846L3.53784 3.14734L11.9751 3.14734V7.676C12.4655 7.51991
12.9771 7.47439 13.4751 7.53264V3.14734C13.4751 2.31891 12.8035 1.64734
11.9751 1.64734L3.53784 1.64734C2.70941 1.64734 2.03784 2.31891 2.03784
3.14734L2.03784 11.5846C2.03784 12.413 2.70942 13.0846 3.53784
13.0846H10.0831C9.771 12.6184 9.58279 12.1055 9.51083
11.5846H3.53784Z"
fill="#A2B1C6"
/>
<path
fill-rule="evenodd"
clip-rule="evenodd"
d="M14.7887 9.9291C15.4307 10.8837 15.1773 12.1779 14.2228
12.8199C13.2682 13.4618 11.974 13.2084 11.332 12.2539C10.69 11.2993
10.9434 10.0051 11.898 9.3631C12.8525 8.72113 14.1468 8.97454 14.7887
9.9291ZM14.4606 14.3901L16.6181 17.5982C16.8492 17.9419 17.3153 18.0331
17.659 17.802C18.0027 17.5708 18.0939 17.1048 17.8628 16.7611L15.6884
13.5279C16.7949 12.3365 16.9801 10.4996 16.0334 9.092C14.9292 7.45002
12.7029 7.01412 11.0609 8.1184C9.41891 9.22268 8.98302 11.449 10.0873
13.0909C11.062 14.5403 12.9109 15.05 14.4606 14.3901Z"
fill="#A2B1C6"
/>
</g>
<defs>
<clipPath id="clip0_2131_6054">
<rect
width="18"
height="18"
fill="white"
transform="translate(0.5 18.5916) rotate(-90)"
/>
</clipPath>
</defs>
</svg>
</template>
<script>
export default {
name: 'ViewCellValueIcon'
}
</script>

View File

@@ -0,0 +1,65 @@
import ReactPlotlyEditor from 'react-chart-editor'
import React, { createRef } from 'react'
import EditorControls from 'react-chart-editor/lib/EditorControls'
/**
* This extended ReactPlotlyEditor has a reference to PlotComponent.
* The reference makes it possible to call updatePlotly method of PlotComponent.
* updatePlotly method allows smoothly resize the plot
* when resize chart editor container.
*/
export default class ReactPlotlyEditorWithPlotRef extends ReactPlotlyEditor {
constructor(props) {
super(props)
this.plotComponentRef = createRef()
}
render() {
return (
<div className="plotly_editor">
{!this.props.hideControls && (
<EditorControls
graphDiv={this.state.graphDiv}
dataSources={this.props.dataSources}
dataSourceOptions={this.props.dataSourceOptions}
plotly={this.props.plotly}
onUpdate={this.props.onUpdate}
advancedTraceTypeSelector={this.props.advancedTraceTypeSelector}
locale={this.props.locale}
traceTypesConfig={this.props.traceTypesConfig}
dictionaries={this.props.dictionaries}
showFieldTooltips={this.props.showFieldTooltips}
srcConverters={this.props.srcConverters}
makeDefaultTrace={this.props.makeDefaultTrace}
glByDefault={this.props.glByDefault}
mapBoxAccess={Boolean(
this.props.config && this.props.config.mapboxAccessToken
)}
fontOptions={this.props.fontOptions}
chartHelp={this.props.chartHelp}
customConfig={this.props.customConfig}
>
{this.props.children}
</EditorControls>
)}
<div
className="plotly_editor_plot"
style={{ width: '100%', height: '100%' }}
>
<this.PlotComponent
ref={this.plotComponentRef}
data={this.props.data}
layout={this.props.layout}
frames={this.props.frames}
config={this.props.config}
useResizeHandler={this.props.useResizeHandler}
debug={this.props.debug}
onInitialized={this.handleRender}
onUpdate={this.handleRender}
style={{ width: '100%', height: '100%' }}
divId={this.props.divId}
/>
</div>
</div>
)
}
}

View File

@@ -1,8 +1,8 @@
import dereference from 'react-chart-editor/lib/lib/dereference' import * as dereference from 'react-chart-editor/lib/lib/dereference'
import plotly from 'plotly.js' import plotly from 'plotly.js'
import { nanoid } from 'nanoid' import { nanoid } from 'nanoid'
export function getOptionsFromDataSources (dataSources) { export function getOptionsFromDataSources(dataSources) {
if (!dataSources) { if (!dataSources) {
return [] return []
} }
@@ -13,7 +13,7 @@ export function getOptionsFromDataSources (dataSources) {
})) }))
} }
export function getOptionsForSave (state, dataSources) { export function getOptionsForSave(state, dataSources) {
// we don't need to save the data, only settings // we don't need to save the data, only settings
// so we modify state.data using dereference // so we modify state.data using dereference
const stateCopy = JSON.parse(JSON.stringify(state)) const stateCopy = JSON.parse(JSON.stringify(state))
@@ -21,11 +21,11 @@ export function getOptionsForSave (state, dataSources) {
for (const key in dataSources) { for (const key in dataSources) {
emptySources[key] = [] emptySources[key] = []
} }
dereference(stateCopy.data, emptySources) dereference.default(stateCopy.data, emptySources)
return stateCopy return stateCopy
} }
export async function getImageDataUrl (element, type) { export async function getImageDataUrl(element, type) {
const chartElement = element.querySelector('.js-plotly-plot') const chartElement = element.querySelector('.js-plotly-plot')
return await plotly.toImage(chartElement, { return await plotly.toImage(chartElement, {
format: type, format: type,
@@ -34,7 +34,7 @@ export async function getImageDataUrl (element, type) {
}) })
} }
export function getChartData (element) { export function getChartData(element) {
const chartElement = element.querySelector('.js-plotly-plot') const chartElement = element.querySelector('.js-plotly-plot')
return { return {
data: chartElement.data, data: chartElement.data,
@@ -42,7 +42,7 @@ export function getChartData (element) {
} }
} }
export function getHtml (options) { export function getHtml(options) {
const chartId = nanoid() const chartId = nanoid()
return ` return `
<script src="https://cdn.plot.ly/plotly-latest.js" charset="UTF-8"></script> <script src="https://cdn.plot.ly/plotly-latest.js" charset="UTF-8"></script>

View File

@@ -7,9 +7,9 @@ const hintsByCode = {
} }
export default { export default {
getResult (source) { getResult(source, columns) {
const result = { const result = {
columns: [] columns: columns || []
} }
const values = {} const values = {}
if (source.meta.fields) { if (source.meta.fields) {
@@ -24,8 +24,18 @@ export default {
return value return value
}) })
}) })
} else if (columns) {
columns.forEach((col, i) => {
values[col] = source.data.map(row => {
let value = row[i]
if (value instanceof Date) {
value = value.toISOString()
}
return value
})
})
} else { } else {
for (let i = 0; i <= source.data[0].length - 1; i++) { for (let i = 0; source.data[0] && i <= source.data[0].length - 1; i++) {
const colName = `col${i + 1}` const colName = `col${i + 1}`
result.columns.push(colName) result.columns.push(colName)
values[colName] = source.data.map(row => { values[colName] = source.data.map(row => {
@@ -42,7 +52,7 @@ export default {
return result return result
}, },
prepareForExport (resultSet) { prepareForExport(resultSet) {
const columns = resultSet.columns const columns = resultSet.columns
const rowCount = resultSet.values[columns[0]].length const rowCount = resultSet.values[columns[0]].length
const result = { const result = {
@@ -51,13 +61,15 @@ export default {
} }
for (let rowNumber = 0; rowNumber < rowCount; rowNumber++) { for (let rowNumber = 0; rowNumber < rowCount; rowNumber++) {
result.data.push(columns.map(column => resultSet.values[column][rowNumber])) result.data.push(
columns.map(column => resultSet.values[column][rowNumber])
)
} }
return result return result
}, },
parse (file, config = {}) { parse(file, config = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const defaultConfig = { const defaultConfig = {
delimiter: '', // auto-detect delimiter: '', // auto-detect
@@ -73,21 +85,26 @@ export default {
comments: false, comments: false,
step: undefined, step: undefined,
complete: results => { complete: results => {
const res = { let res
data: this.getResult(results), try {
delimiter: results.meta.delimiter, res = {
hasErrors: false, data: this.getResult(results, config.columns),
rowCount: results.data.length delimiter: results.meta.delimiter,
hasErrors: false,
rowCount: results.data.length
}
res.messages = results.errors.map(msg => {
msg.type = msg.code === 'UndetectableDelimiter' ? 'info' : 'error'
if (msg.type === 'error') res.hasErrors = true
msg.hint = hintsByCode[msg.code]
return msg
})
} catch (error) {
reject(error)
} }
res.messages = results.errors.map(msg => {
msg.type = msg.code === 'UndetectableDelimiter' ? 'info' : 'error'
if (msg.type === 'error') res.hasErrors = true
msg.hint = hintsByCode[msg.code]
return msg
})
resolve(res) resolve(res)
}, },
error: (error, file) => { error: error => {
reject(error) reject(error)
}, },
download: false, download: false,
@@ -107,7 +124,7 @@ export default {
}) })
}, },
serialize (resultSet) { serialize(resultSet) {
return Papa.unparse(this.prepareForExport(resultSet), { delimiter: '\t' }) return Papa.unparse(this.prepareForExport(resultSet), { delimiter: '\t' })
} }
} }

View File

@@ -1,46 +1,50 @@
import initSqlJs from 'sql.js/dist/sql-wasm.js' import initSqlJs from 'sql.js'
import dbUtils from './_statements' import dbUtils from './_statements'
import wasmUrl from 'sql.js/dist/sql-wasm.wasm?url'
let SQL = null let SQL = null
const sqlModuleReady = initSqlJs().then(sqlModule => { SQL = sqlModule }) const sqlModuleReady = initSqlJs({
locateFile: () => wasmUrl
}).then(sqlModule => {
SQL = sqlModule
})
function _getDataSourcesFromSqlResult (sqlResult) { function _getDataSourcesFromSqlResult(sqlResult) {
if (!sqlResult) { if (!sqlResult) {
return {} return {}
} }
const dataSorces = {} const dataSources = {}
sqlResult.columns.forEach((column, index) => { sqlResult.columns.forEach((column, index) => {
dataSorces[column] = sqlResult.values.map(row => row[index]) dataSources[column] = sqlResult.values.map(row => row[index])
}) })
return dataSorces return dataSources
} }
export default class Sql { export default class Sql {
constructor () { constructor() {
this.db = null this.db = null
} }
static build () { static build() {
return sqlModuleReady return sqlModuleReady.then(() => {
.then(() => { return new Sql()
return new Sql() })
})
} }
createDb (buffer) { createDb(buffer) {
if (this.db != null) this.db.close() if (this.db != null) this.db.close()
this.db = new SQL.Database(buffer) this.db = new SQL.Database(buffer)
return this.db return this.db
} }
open (buffer) { open(buffer) {
this.createDb(buffer && new Uint8Array(buffer)) this.createDb(buffer && new Uint8Array(buffer))
return { return {
ready: true ready: true
} }
} }
exec (sql, params) { exec(sql, params) {
if (this.db === null) { if (this.db === null) {
this.createDb() this.createDb()
} }
@@ -56,7 +60,7 @@ export default class Sql {
}) })
} }
import (tabName, data, progressCounterId, progressCallback, chunkSize = 1500) { import(tabName, data, progressCounterId, progressCallback, chunkSize = 1500) {
if (this.db === null) { if (this.db === null) {
this.createDb() this.createDb()
} }
@@ -77,7 +81,10 @@ export default class Sql {
} }
this.db.exec('COMMIT') this.db.exec('COMMIT')
count++ count++
progressCallback({ progress: 100 * (count / chunksAmount), id: progressCounterId }) progressCallback({
progress: 100 * (count / chunksAmount),
id: progressCounterId
})
} }
return { return {
@@ -85,11 +92,11 @@ export default class Sql {
} }
} }
export () { export() {
return this.db.export() return this.db.export()
} }
close () { close() {
if (this.db) { if (this.db) {
this.db.close() this.db.close()
} }

View File

@@ -1,8 +1,10 @@
export default { export default {
* generateChunks (data, size) { *generateChunks(data, size) {
const matrix = Object.keys(data).map(col => data[col]) const matrix = Object.keys(data).map(col => data[col])
const [row] = matrix const [row] = matrix
const transposedMatrix = row.map((value, column) => matrix.map(row => row[column])) const transposedMatrix = row.map((value, column) =>
matrix.map(row => row[column])
)
const count = Math.ceil(transposedMatrix.length / size) const count = Math.ceil(transposedMatrix.length / size)
@@ -13,13 +15,13 @@ export default {
} }
}, },
getInsertStmt (tabName, columns) { getInsertStmt(tabName, columns) {
const colList = `"${columns.join('", "')}"` const colList = `"${columns.join('", "')}"`
const params = columns.map(() => '?').join(', ') const params = columns.map(() => '?').join(', ')
return `INSERT INTO "${tabName}" (${colList}) VALUES (${params});` return `INSERT INTO "${tabName}" (${colList}) VALUES (${params});`
}, },
getCreateStatement (tabName, data) { getCreateStatement(tabName, data) {
let result = `CREATE table "${tabName}"(` let result = `CREATE table "${tabName}"(`
for (const col in data) { for (const col in data) {
// Get the first row of values to determine types // Get the first row of values to determine types
@@ -38,7 +40,8 @@ export default {
type = 'TEXT' type = 'TEXT'
break break
} }
default: type = 'TEXT' default:
type = 'TEXT'
} }
result += `"${col}" ${type}, ` result += `"${col}" ${type}, `
} }

View File

@@ -3,7 +3,7 @@ import Sql from './_sql'
const sqlReady = Sql.build() const sqlReady = Sql.build()
function processMsg (sql) { function processMsg(sql) {
const data = this const data = this
switch (data && data.action) { switch (data && data.action) {
case 'open': case 'open':
@@ -28,14 +28,12 @@ function processMsg (sql) {
} }
} }
function onError (error) { function onError(error) {
return { return {
error: error.message error: error.message
} }
} }
registerPromiseWorker(data => { registerPromiseWorker(data => {
return sqlReady return sqlReady.then(processMsg.bind(data)).catch(onError)
.then(processMsg.bind(data))
.catch(onError)
}) })

View File

@@ -1,7 +1,4 @@
import fu from '@/lib/utils/fileIo' import fu from '@/lib/utils/fileIo'
// We can import workers like so because of worker-loader:
// https://webpack.js.org/loaders/worker-loader/
import Worker from './_worker.js'
// Use promise-worker in order to turn worker into the promise based one: // Use promise-worker in order to turn worker into the promise based one:
// https://github.com/nolanlawson/promise-worker // https://github.com/nolanlawson/promise-worker
@@ -9,8 +6,10 @@ import PromiseWorker from 'promise-worker'
import events from '@/lib/utils/events' import events from '@/lib/utils/events'
function getNewDatabase () { function getNewDatabase() {
const worker = new Worker() const worker = new Worker(new URL('./_worker.js', import.meta.url), {
type: 'module'
})
return new Database(worker) return new Database(worker)
} }
@@ -20,7 +19,7 @@ export default {
let progressCounterIds = 0 let progressCounterIds = 0
class Database { class Database {
constructor (worker) { constructor(worker) {
this.dbName = null this.dbName = null
this.schema = null this.schema = null
this.worker = worker this.worker = worker
@@ -31,29 +30,33 @@ class Database {
const progress = e.data.progress const progress = e.data.progress
if (progress !== undefined) { if (progress !== undefined) {
const id = e.data.id const id = e.data.id
this.importProgresses[id].dispatchEvent(new CustomEvent('progress', { this.importProgresses[id].dispatchEvent(
detail: progress new CustomEvent('progress', {
})) detail: progress
})
)
} }
}) })
} }
shutDown () { shutDown() {
this.worker.terminate() this.worker.terminate()
} }
createProgressCounter (callback) { createProgressCounter(callback) {
const id = progressCounterIds++ const id = progressCounterIds++
this.importProgresses[id] = new EventTarget() this.importProgresses[id] = new EventTarget()
this.importProgresses[id].addEventListener('progress', e => { callback(e.detail) }) this.importProgresses[id].addEventListener('progress', e => {
callback(e.detail)
})
return id return id
} }
deleteProgressCounter (id) { deleteProgressCounter(id) {
delete this.importProgresses[id] delete this.importProgresses[id]
} }
async addTableFromCsv (tabName, data, progressCounterId) { async addTableFromCsv(tabName, data, progressCounterId) {
const result = await this.pw.postMessage({ const result = await this.pw.postMessage({
action: 'import', action: 'import',
data, data,
@@ -68,9 +71,12 @@ class Database {
this.refreshSchema() this.refreshSchema()
} }
async loadDb (file) { async loadDb(file) {
const fileContent = file ? await fu.readAsArrayBuffer(file) : null const fileContent = file ? await fu.readAsArrayBuffer(file) : null
const res = await this.pw.postMessage({ action: 'open', buffer: fileContent }) const res = await this.pw.postMessage({
action: 'open',
buffer: fileContent
})
if (res.error) { if (res.error) {
throw new Error(res.error) throw new Error(res.error)
@@ -85,7 +91,7 @@ class Database {
}) })
} }
async refreshSchema () { async refreshSchema() {
const getSchemaSql = ` const getSchemaSql = `
WITH columns as ( WITH columns as (
SELECT SELECT
@@ -103,7 +109,7 @@ class Database {
this.schema = JSON.parse(result.values.objects[0]) this.schema = JSON.parse(result.values.objects[0])
} }
async execute (commands) { async execute(commands) {
await this.pw.postMessage({ action: 'reopen' }) await this.pw.postMessage({ action: 'reopen' })
const results = await this.pw.postMessage({ action: 'exec', sql: commands }) const results = await this.pw.postMessage({ action: 'exec', sql: commands })
@@ -114,7 +120,7 @@ class Database {
return results[results.length - 1] return results[results.length - 1]
} }
async export (fileName) { async export(fileName) {
const data = await this.pw.postMessage({ action: 'export' }) const data = await this.pw.postMessage({ action: 'export' })
if (data.error) { if (data.error) {
@@ -124,13 +130,15 @@ class Database {
events.send('database.export', data.byteLength, { to: 'sqlite' }) events.send('database.export', data.byteLength, { to: 'sqlite' })
} }
async validateTableName (name) { async validateTableName(name) {
if (name.startsWith('sqlite_')) { if (name.startsWith('sqlite_')) {
throw new Error("Table name can't start with sqlite_") throw new Error("Table name can't start with sqlite_")
} }
if (/[^\w]/.test(name)) { if (/[^\w]/.test(name)) {
throw new Error('Table name can contain only letters, digits and underscores') throw new Error(
'Table name can contain only letters, digits and underscores'
)
} }
if (/^(\d)/.test(name)) { if (/^(\d)/.test(name)) {
@@ -140,7 +148,7 @@ class Database {
await this.execute(`BEGIN; CREATE TABLE "${name}"(id); ROLLBACK;`) await this.execute(`BEGIN; CREATE TABLE "${name}"(id); ROLLBACK;`)
} }
sanitizeTableName (tabName) { sanitizeTableName(tabName) {
return tabName return tabName
.replace(/[^\w]/g, '_') // replace everything that is not letter, digit or _ with _ .replace(/[^\w]/g, '_') // replace everything that is not letter, digit or _ with _
.replace(/^(\d)/, '_$1') // add _ at beginning if starts with digit .replace(/^(\d)/, '_$1') // add _ at beginning if starts with digit

8
src/lib/eventBus.js Normal file
View File

@@ -0,0 +1,8 @@
import emitter from 'tiny-emitter/instance'
export default {
$on: (...args) => emitter.on(...args),
$once: (...args) => emitter.once(...args),
$off: (...args) => emitter.off(...args),
$emit: (...args) => emitter.emit(...args)
}

View File

@@ -1,5 +1,5 @@
export default { export default {
_migrate (installedVersion, inquiries) { _migrate(installedVersion, inquiries) {
if (installedVersion === 1) { if (installedVersion === 1) {
inquiries.forEach(inquire => { inquiries.forEach(inquire => {
inquire.viewType = 'chart' inquire.viewType = 'chart'

View File

@@ -4,11 +4,13 @@ import events from '@/lib/utils/events'
import migration from './_migrations' import migration from './_migrations'
const migrate = migration._migrate const migrate = migration._migrate
const myInquiriesKey = 'myInquiries'
export default { export default {
version: 2, version: 2,
getStoredInquiries () { myInquiriesKey,
let myInquiries = JSON.parse(localStorage.getItem('myInquiries')) getStoredInquiries() {
let myInquiries = JSON.parse(localStorage.getItem(myInquiriesKey))
if (!myInquiries) { if (!myInquiries) {
const oldInquiries = localStorage.getItem('myQueries') const oldInquiries = localStorage.getItem('myQueries')
if (oldInquiries) { if (oldInquiries) {
@@ -22,63 +24,39 @@ export default {
return (myInquiries && myInquiries.inquiries) || [] return (myInquiries && myInquiries.inquiries) || []
}, },
duplicateInquiry (baseInquiry) { duplicateInquiry(baseInquiry) {
const newInquiry = JSON.parse(JSON.stringify(baseInquiry)) const newInquiry = JSON.parse(JSON.stringify(baseInquiry))
newInquiry.name = newInquiry.name + ' Copy' newInquiry.name = newInquiry.name + ' Copy'
newInquiry.id = nanoid() newInquiry.id = nanoid()
newInquiry.createdAt = new Date() newInquiry.createdAt = new Date().toJSON()
newInquiry.updatedAt = new Date().toJSON()
delete newInquiry.isPredefined delete newInquiry.isPredefined
return newInquiry return newInquiry
}, },
isTabNeedName (inquiryTab) { isTabNeedName(inquiryTab) {
return inquiryTab.isPredefined || !inquiryTab.name return inquiryTab.isPredefined || !inquiryTab.name
}, },
save (inquiryTab, newName) { updateStorage(inquiries) {
const value = { localStorage.setItem(
id: inquiryTab.isPredefined ? nanoid() : inquiryTab.id, myInquiriesKey,
query: inquiryTab.query, JSON.stringify({ version: this.version, inquiries })
viewType: inquiryTab.dataView.mode, )
viewOptions: inquiryTab.dataView.getOptionsForSave(),
name: newName || inquiryTab.name
}
// Get inquiries from local storage
const myInquiries = this.getStoredInquiries()
// Set createdAt
if (newName) {
value.createdAt = new Date()
} else {
var inquiryIndex = myInquiries.findIndex(oldInquiry => oldInquiry.id === inquiryTab.id)
value.createdAt = myInquiries[inquiryIndex].createdAt
}
// Insert in inquiries list
if (newName) {
myInquiries.push(value)
} else {
myInquiries[inquiryIndex] = value
}
// Save to local storage
this.updateStorage(myInquiries)
return value
}, },
updateStorage (inquiries) { serialiseInquiries(inquiryList) {
localStorage.setItem('myInquiries', JSON.stringify({ version: this.version, inquiries }))
},
serialiseInquiries (inquiryList) {
const preparedData = JSON.parse(JSON.stringify(inquiryList)) const preparedData = JSON.parse(JSON.stringify(inquiryList))
preparedData.forEach(inquiry => delete inquiry.isPredefined) preparedData.forEach(inquiry => delete inquiry.isPredefined)
return JSON.stringify({ version: this.version, inquiries: preparedData }, null, 4) return JSON.stringify(
{ version: this.version, inquiries: preparedData },
null,
4
)
}, },
deserialiseInquiries (str) { deserialiseInquiries(str) {
const inquiries = JSON.parse(str) const inquiries = JSON.parse(str)
let inquiryList = [] let inquiryList = []
if (!inquiries.version) { if (!inquiries.version) {
@@ -91,7 +69,9 @@ export default {
// Generate new ids if they are the same as existing inquiries // Generate new ids if they are the same as existing inquiries
inquiryList.forEach(inquiry => { inquiryList.forEach(inquiry => {
const allInquiriesIds = this.getStoredInquiries().map(inquiry => inquiry.id) const allInquiriesIds = this.getStoredInquiries().map(
inquiry => inquiry.id
)
if (allInquiriesIds.includes(inquiry.id)) { if (allInquiriesIds.includes(inquiry.id)) {
inquiry.id = nanoid() inquiry.id = nanoid()
} }
@@ -100,24 +80,23 @@ export default {
return inquiryList return inquiryList
}, },
importInquiries () { importInquiries() {
return fu.importFile() return fu.importFile().then(str => {
.then(str => { const inquires = this.deserialiseInquiries(str)
const inquires = this.deserialiseInquiries(str)
events.send('inquiry.import', inquires.length) events.send('inquiry.import', inquires.length)
return inquires return inquires
}) })
}, },
export (inquiryList, fileName) { export(inquiryList, fileName) {
const jsonStr = this.serialiseInquiries(inquiryList) const jsonStr = this.serialiseInquiries(inquiryList)
fu.exportToFile(jsonStr, fileName) fu.exportToFile(jsonStr, fileName)
events.send('inquiry.export', inquiryList.length) events.send('inquiry.export', inquiryList.length)
}, },
async readPredefinedInquiries () { async readPredefinedInquiries() {
const res = await fu.readFile('./inquiries.json') const res = await fu.readFile('./inquiries.json')
const data = await res.json() const data = await res.json()

View File

@@ -3,12 +3,14 @@ import time from '@/lib/utils/time'
import events from '@/lib/utils/events' import events from '@/lib/utils/events'
export default class Tab { export default class Tab {
constructor (state, inquiry = {}) { constructor(state, inquiry = {}) {
this.id = inquiry.id || nanoid() this.id = inquiry.id || nanoid()
this.name = inquiry.id ? inquiry.name : null this.name = inquiry.id ? inquiry.name : null
this.tempName = inquiry.name || (state.untitledLastIndex this.tempName =
? `Untitled ${state.untitledLastIndex}` inquiry.name ||
: 'Untitled') (state.untitledLastIndex
? `Untitled ${state.untitledLastIndex}`
: 'Untitled')
this.query = inquiry.query this.query = inquiry.query
this.viewOptions = inquiry.viewOptions || undefined this.viewOptions = inquiry.viewOptions || undefined
this.isPredefined = inquiry.isPredefined this.isPredefined = inquiry.isPredefined
@@ -26,9 +28,10 @@ export default class Tab {
this.isSaved = !!inquiry.id this.isSaved = !!inquiry.id
this.state = state this.state = state
this.updatedAt = inquiry.updatedAt
} }
async execute () { async execute() {
this.isGettingResults = true this.isGettingResults = true
this.result = null this.result = null
this.error = null this.error = null
@@ -39,7 +42,8 @@ export default class Tab {
this.time = time.getPeriod(start, new Date()) this.time = time.getPeriod(start, new Date())
if (this.result && this.result.values) { if (this.result && this.result.values) {
events.send('resultset.create', events.send(
'resultset.create',
this.result.values[this.result.columns[0]].length this.result.values[this.result.columns[0]].length
) )
} }

View File

@@ -2,12 +2,14 @@ import Lib from 'plotly.js/src/lib'
import dataUrlToBlob from 'dataurl-to-blob' import dataUrlToBlob from 'dataurl-to-blob'
export default { export default {
async copyCsv (str) { async copyText(str, notifyMessage) {
await navigator.clipboard.writeText(str) await navigator.clipboard.writeText(str)
Lib.notifier('CSV copied to clipboard successfully', 'long') if (notifyMessage) {
Lib.notifier(notifyMessage, 'long')
}
}, },
async copyImage (source) { async copyImage(source) {
if (source instanceof HTMLCanvasElement) { if (source instanceof HTMLCanvasElement) {
return this._copyCanvas(source) return this._copyCanvas(source)
} else { } else {
@@ -15,24 +17,29 @@ export default {
} }
}, },
async _copyBlob (blob) { async _copyBlob(blob) {
await navigator.clipboard.write([ await navigator.clipboard.write([
new ClipboardItem({ // eslint-disable-line no-undef new ClipboardItem({
// eslint-disable-line no-undef
[blob.type]: blob [blob.type]: blob
}) })
]) ])
}, },
async _copyFromDataUrl (url) { async _copyFromDataUrl(url) {
const blob = dataUrlToBlob(url) const blob = dataUrlToBlob(url)
await this._copyBlob(blob) await this._copyBlob(blob)
Lib.notifier('Image copied to clipboard successfully', 'long') Lib.notifier('Image copied to clipboard successfully', 'long')
}, },
async _copyCanvas (canvas) { async _copyCanvas(canvas) {
canvas.toBlob(async (blob) => { canvas.toBlob(
await this._copyBlob(blob) async blob => {
Lib.notifier('Image copied to clipboard successfully', 'long') await this._copyBlob(blob)
}, 'image/png', 1) Lib.notifier('Image copied to clipboard successfully', 'long')
},
'image/png',
1
)
} }
} }

View File

@@ -1,5 +1,5 @@
export default { export default {
send (name, value, labels) { send(name, value, labels) {
const event = new CustomEvent('sqliteviz-app-event', { const event = new CustomEvent('sqliteviz-app-event', {
detail: { detail: {
name, name,

View File

@@ -1,16 +1,22 @@
export default { export default {
isDatabase (file) { isJSON(file) {
return file && file.type === 'application/json'
},
isNDJSON(file) {
return file && file.name.endsWith('.ndjson')
},
isDatabase(file) {
const dbTypes = ['application/vnd.sqlite3', 'application/x-sqlite3'] const dbTypes = ['application/vnd.sqlite3', 'application/x-sqlite3']
return file.type return file.type
? dbTypes.includes(file.type) ? dbTypes.includes(file.type)
: /\.(db|sqlite(3)?)+$/.test(file.name) : /\.(db|sqlite(3)?)+$/.test(file.name)
}, },
getFileName (file) { getFileName(file) {
return file.name.replace(/\.[^.]+$/, '') return file.name.replace(/\.[^.]+$/, '')
}, },
downloadFromUrl (url, fileName) { downloadFromUrl(url, fileName) {
// Create downloader // Create downloader
const downloader = document.createElement('a') const downloader = document.createElement('a')
downloader.href = url downloader.href = url
@@ -23,7 +29,7 @@ export default {
URL.revokeObjectURL(url) URL.revokeObjectURL(url)
}, },
async exportToFile (str, fileName, type = 'octet/stream') { async exportToFile(str, fileName, type = 'octet/stream') {
const blob = new Blob([str], { type }) const blob = new Blob([str], { type })
const url = URL.createObjectURL(blob) const url = URL.createObjectURL(blob)
this.downloadFromUrl(url, fileName) this.downloadFromUrl(url, fileName)
@@ -34,7 +40,7 @@ export default {
* it will be an unsettled promise. But it's grabbed by * it will be an unsettled promise. But it's grabbed by
* the garbage collector (tested with FinalizationRegistry). * the garbage collector (tested with FinalizationRegistry).
*/ */
getFileFromUser (type) { getFileFromUser(type) {
return new Promise(resolve => { return new Promise(resolve => {
const uploader = document.createElement('input') const uploader = document.createElement('input')
@@ -50,25 +56,25 @@ export default {
}) })
}, },
importFile () { importFile() {
const reader = new FileReader() return this.getFileFromUser('.json').then(file => {
return this.getFileContent(file)
return this.getFileFromUser('.json') })
.then(file => {
return new Promise((resolve, reject) => {
reader.onload = e => {
resolve(e.target.result)
}
reader.readAsText(file)
})
})
}, },
readFile (path) { getFileContent(file) {
const reader = new FileReader()
return new Promise(resolve => {
reader.onload = e => resolve(e.target.result)
reader.readAsText(file)
})
},
readFile(path) {
return fetch(path) return fetch(path)
}, },
readAsArrayBuffer (file) { readAsArrayBuffer(file) {
const fileReader = new FileReader() const fileReader = new FileReader()
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View File

@@ -1,11 +1,11 @@
export default { export default {
getPeriod (start, end) { getPeriod(start, end) {
const diff = end.getTime() - start.getTime() const diff = end.getTime() - start.getTime()
const seconds = diff / 1000 const seconds = diff / 1000
return seconds.toFixed(3) + 's' return seconds.toFixed(3) + 's'
}, },
debounce (func, ms) { debounce(func, ms) {
let timeout let timeout
return function () { return function () {
clearTimeout(timeout) clearTimeout(timeout)
@@ -13,9 +13,11 @@ export default {
} }
}, },
sleep (ms) { sleep(ms) {
return new Promise(resolve => { return new Promise(resolve => {
setTimeout(() => { resolve() }, ms) setTimeout(() => {
resolve()
}, ms)
}) })
} }
} }

View File

@@ -1,9 +1,8 @@
import Vue from 'vue' import { createApp } from 'vue'
import App from '@/App.vue' import App from '@/App.vue'
import router from '@/router' import router from '@/router'
import store from '@/store' import store from '@/store'
import { VuePlugin } from 'vuera' import { createVfm, VueFinalModal, useVfm } from 'vue-final-modal'
import VModal from 'vue-js-modal'
import '@/assets/styles/variables.css' import '@/assets/styles/variables.css'
import '@/assets/styles/buttons.css' import '@/assets/styles/buttons.css'
@@ -11,20 +10,23 @@ import '@/assets/styles/tables.css'
import '@/assets/styles/dialogs.css' import '@/assets/styles/dialogs.css'
import '@/assets/styles/tooltips.css' import '@/assets/styles/tooltips.css'
import '@/assets/styles/messages.css' import '@/assets/styles/messages.css'
import 'vue-multiselect/dist/vue-multiselect.min.css' import 'vue-multiselect/dist/vue-multiselect.css'
import '@/assets/styles/multiselect.css' import '@/assets/styles/multiselect.css'
import 'vue-final-modal/style.css'
if (!['localhost', '127.0.0.1'].includes(location.hostname)) { if (!['localhost', '127.0.0.1'].includes(location.hostname)) {
import('./registerServiceWorker') // eslint-disable-line no-unused-expressions import('./registerServiceWorker') // eslint-disable-line no-unused-expressions
} }
Vue.use(VuePlugin) const app = createApp(App)
Vue.use(VModal) .use(router)
.use(store)
.use(createVfm())
.component('modal', VueFinalModal)
Vue.config.productionTip = false const vfm = useVfm()
app.config.globalProperties.$modal = {
new Vue({ show: modalId => vfm.open(modalId),
router, hide: modalId => vfm.close(modalId)
store, }
render: h => h(App) app.mount('#app')
}).$mount('#app')

View File

@@ -1,7 +1,7 @@
import events from '@/lib/utils/events' import events from '@/lib/utils/events'
let refresh = false let refresh = false
function invokeServiceWorkerUpdateFlow (registration) { function invokeServiceWorkerUpdateFlow(registration) {
const agree = confirm('New version of the app is available. Refresh now?') const agree = confirm('New version of the app is available. Refresh now?')
if (agree) { if (agree) {
if (registration.waiting) { if (registration.waiting) {
@@ -14,7 +14,8 @@ function invokeServiceWorkerUpdateFlow (registration) {
if ('serviceWorker' in navigator) { if ('serviceWorker' in navigator) {
window.addEventListener('load', async () => { window.addEventListener('load', async () => {
const registration = await navigator.serviceWorker.register('service-worker.js') const registration =
await navigator.serviceWorker.register('service-worker.js')
// ensure the case when the updatefound event was missed is also handled // ensure the case when the updatefound event was missed is also handled
// by re-invoking the prompt when there's a waiting Service Worker // by re-invoking the prompt when there's a waiting Service Worker
if (registration.waiting) { if (registration.waiting) {

View File

@@ -1,16 +1,13 @@
import Vue from 'vue' import { createRouter, createWebHashHistory } from 'vue-router'
import VueRouter from 'vue-router' import Workspace from '@/views/MainView/Workspace'
import Workspace from '@/views/Main/Workspace' import Inquiries from '@/views/MainView/Inquiries'
import Inquiries from '@/views/Main/Inquiries'
import Welcome from '@/views/Welcome' import Welcome from '@/views/Welcome'
import Main from '@/views/Main' import MainView from '@/views/MainView'
import LoadView from '@/views/LoadView' import LoadView from '@/views/LoadView'
import store from '@/store' import store from '@/store'
import database from '@/lib/database' import database from '@/lib/database'
Vue.use(VueRouter) export const routes = [
const routes = [
{ {
path: '/', path: '/',
name: 'Welcome', name: 'Welcome',
@@ -18,8 +15,8 @@ const routes = [
}, },
{ {
path: '/', path: '/',
name: 'Main', name: 'MainView',
component: Main, component: MainView,
children: [ children: [
{ {
path: '/workspace', path: '/workspace',
@@ -40,7 +37,8 @@ const routes = [
} }
] ]
const router = new VueRouter({ const router = createRouter({
history: createWebHashHistory(),
routes routes
}) })

View File

@@ -1,7 +1,8 @@
import Tab from '@/lib/tab' import Tab from '@/lib/tab'
import { nanoid } from 'nanoid'
export default { export default {
async addTab ({ state }, inquiry = {}) { async addTab({ state }, inquiry = {}) {
// add new tab only if it was not already opened // add new tab only if it was not already opened
if (!state.tabs.some(openedTab => openedTab.id === inquiry.id)) { if (!state.tabs.some(openedTab => openedTab.id === inquiry.id)) {
const tab = new Tab(state, JSON.parse(JSON.stringify(inquiry))) const tab = new Tab(state, JSON.parse(JSON.stringify(inquiry)))
@@ -13,5 +14,77 @@ export default {
} }
return inquiry.id return inquiry.id
},
async saveInquiry({ state }, { inquiryTab, newName }) {
const value = {
id: inquiryTab.isPredefined || newName ? nanoid() : inquiryTab.id,
query: inquiryTab.query,
viewType: inquiryTab.dataView.mode,
viewOptions: inquiryTab.dataView.getOptionsForSave(),
name: newName || inquiryTab.name,
updatedAt: new Date().toJSON()
}
// Get inquiries from local storage
const myInquiries = state.inquiries
let inquiryIndex
// Set createdAt
if (newName) {
value.createdAt = new Date().toJSON()
} else {
inquiryIndex = myInquiries.findIndex(
oldInquiry => oldInquiry.id === inquiryTab.id
)
value.createdAt =
inquiryIndex !== -1
? myInquiries[inquiryIndex].createdAt
: new Date().toJSON()
}
// Insert in inquiries list
if (newName || inquiryIndex === -1) {
myInquiries.push(value)
} else {
myInquiries.splice(inquiryIndex, 1, value)
}
return value
},
addInquiry({ state }, newInquiry) {
state.inquiries.push(newInquiry)
},
deleteInquiries({ state, commit }, inquiryIdSet) {
state.inquiries = state.inquiries.filter(
inquiry => !inquiryIdSet.has(inquiry.id)
)
// Close deleted inquiries if it was opened
const tabs = state.tabs
let i = tabs.length - 1
while (i > -1) {
if (inquiryIdSet.has(tabs[i].id)) {
commit('deleteTab', tabs[i])
}
i--
}
},
renameInquiry({ state, commit }, { inquiryId, newName }) {
const renamingInquiry = state.inquiries.find(
inquiry => inquiry.id === inquiryId
)
renamingInquiry.name = newName
// update tab, if renamed inquiry is opened
const tab = state.tabs.find(tab => tab.id === renamingInquiry.id)
if (tab) {
commit('updateTab', {
tab,
newValues: {
name: newName
}
})
}
} }
} }

View File

@@ -1,12 +1,9 @@
import Vue from 'vue' import { createStore } from 'vuex'
import Vuex from 'vuex'
import state from '@/store/state' import state from '@/store/state'
import mutations from '@/store/mutations' import mutations from '@/store/mutations'
import actions from '@/store/actions' import actions from '@/store/actions'
Vue.use(Vuex) export default createStore({
export default new Vuex.Store({
state, state,
mutations, mutations,
actions actions

View File

@@ -1,32 +1,48 @@
export default { export default {
setDb (state, db) { setDb(state, db) {
if (state.db) { if (state.db) {
state.db.shutDown() state.db.shutDown()
} }
state.db = db state.db = db
}, },
updateTab (state, { tab, newValues }) { updateTab(state, { tab, newValues }) {
const { name, id, query, viewType, viewOptions, isSaved } = newValues const { name, id, query, viewType, viewOptions, isSaved, updatedAt } =
newValues
const oldId = tab.id const oldId = tab.id
if (id && state.currentTabId === oldId) { if (id && state.currentTabId === oldId) {
state.currentTabId = id state.currentTabId = id
} }
if (id) { tab.id = id } if (id) {
if (name) { tab.name = name } tab.id = id
if (query) { tab.query = query } }
if (viewType) { tab.viewType = viewType } if (name) {
if (viewOptions) { tab.viewOptions = viewOptions } tab.name = name
if (isSaved !== undefined) { tab.isSaved = isSaved } }
if (query) {
tab.query = query
}
if (viewType) {
tab.viewType = viewType
}
if (viewOptions) {
tab.viewOptions = viewOptions
}
if (isSaved !== undefined) {
tab.isSaved = isSaved
}
if (isSaved) { if (isSaved) {
// Saved inquiry is not predefined // Saved inquiry is not predefined
delete tab.isPredefined delete tab.isPredefined
} }
if (updatedAt) {
tab.updatedAt = updatedAt
}
}, },
deleteTab (state, tab) { deleteTab(state, tab) {
const index = state.tabs.indexOf(tab) const index = state.tabs.indexOf(tab)
// If closing tab is the current opened // If closing tab is the current opened
if (tab.id === state.currentTabId) { if (tab.id === state.currentTabId) {
@@ -36,27 +52,37 @@ export default {
state.currentTabId = state.tabs[index - 1].id state.currentTabId = state.tabs[index - 1].id
} else { } else {
state.currentTabId = null state.currentTabId = null
state.currentTab = null
state.untitledLastIndex = 0 state.untitledLastIndex = 0
} }
state.currentTab = state.currentTabId
? state.tabs.find(tab => tab.id === state.currentTabId)
: null
} }
state.tabs.splice(index, 1) state.tabs.splice(index, 1)
}, },
setCurrentTabId (state, id) { setCurrentTabId(state, id) {
try { try {
state.currentTabId = id state.currentTabId = id
state.currentTab = state.tabs.find(tab => tab.id === id) state.currentTab = state.tabs.find(tab => tab.id === id)
} catch (e) { } catch (e) {
console.error('Can\'t open a tab id:' + id) console.error("Can't open a tab id:" + id)
} }
}, },
updatePredefinedInquiries (state, inquiries) { updatePredefinedInquiries(state, inquiries) {
state.predefinedInquiries = Array.isArray(inquiries) ? inquiries : [inquiries] state.predefinedInquiries = Array.isArray(inquiries)
? inquiries
: [inquiries]
}, },
setLoadingPredefinedInquiries (state, value) { setLoadingPredefinedInquiries(state, value) {
state.loadingPredefinedInquiries = value state.loadingPredefinedInquiries = value
}, },
setPredefinedInquiriesLoaded (state, value) { setPredefinedInquiriesLoaded(state, value) {
state.predefinedInquiriesLoaded = value state.predefinedInquiriesLoaded = value
},
setInquiries(state, value) {
state.inquiries = value
},
setIsWorkspaceVisible(state, value) {
state.isWorkspaceVisible = value
} }
} }

View File

@@ -3,8 +3,10 @@ export default {
currentTab: null, currentTab: null,
currentTabId: null, currentTabId: null,
untitledLastIndex: 0, untitledLastIndex: 0,
inquiries: [],
predefinedInquiries: [], predefinedInquiries: [],
loadingPredefinedInquiries: false, loadingPredefinedInquiries: false,
predefinedInquiriesLoaded: false, predefinedInquiriesLoaded: false,
db: null db: null,
isWorkspaceVisible: false
} }

View File

@@ -1,5 +1,5 @@
export default { export default {
data () { data() {
return { return {
tooltipStyle: { tooltipStyle: {
visibility: 'hidden' visibility: 'hidden'
@@ -7,13 +7,15 @@ export default {
} }
}, },
computed: { computed: {
tooltipElement () { tooltipElement() {
return this.$refs.tooltip return this.$refs.tooltip
} }
}, },
methods: { methods: {
showTooltip (e, tooltipPosition) { showTooltip(e, tooltipPosition) {
const position = tooltipPosition ? tooltipPosition.split('-') : ['top', 'right'] const position = tooltipPosition
? tooltipPosition.split('-')
: ['top', 'right']
const offset = 12 const offset = 12
if (position[0] === 'top') { if (position[0] === 'top') {
@@ -25,12 +27,13 @@ export default {
if (position[1] === 'right') { if (position[1] === 'right') {
this.tooltipStyle.left = e.clientX + offset + 'px' this.tooltipStyle.left = e.clientX + offset + 'px'
} else { } else {
this.tooltipStyle.left = e.clientX - offset - this.tooltipElement.offsetWidth + 'px' this.tooltipStyle.left =
e.clientX - offset - this.tooltipElement.offsetWidth + 'px'
} }
this.tooltipStyle.visibility = 'visible' this.tooltipStyle.visibility = 'visible'
}, },
hideTooltip () { hideTooltip() {
this.tooltipStyle.visibility = 'hidden' this.tooltipStyle.visibility = 'hidden'
} }
} }

Some files were not shown because too many files have changed in this diff Show More