mirror of https://github.com/Fabio286/antares.git
Compare commits
12 Commits
6d954a94ab
...
df532a8168
Author | SHA1 | Date |
---|---|---|
Bagus Indrayana | df532a8168 | |
Fabio Di Stasio | 1875e895ae | |
Fabio Di Stasio | 2064294119 | |
Fabio Di Stasio | 62e3115860 | |
Fabio Di Stasio | 9aef287a98 | |
Fabio Di Stasio | 65ec4c5da6 | |
Fabio Di Stasio | e19118982b | |
Fabio Di Stasio | 11f130d91c | |
Yaskur | 0bb5cedda6 | |
Fabio Di Stasio | de9dac3e8a | |
Fabio Di Stasio | dd5b41716a | |
Fabio Di Stasio | 86acb390ac |
|
@ -0,0 +1 @@
|
||||||
|
npx --no -- commitlint --edit $1
|
|
@ -0,0 +1 @@
|
||||||
|
npm run lint
|
|
@ -5,14 +5,14 @@
|
||||||
],
|
],
|
||||||
"fix": true,
|
"fix": true,
|
||||||
"formatter": "verbose",
|
"formatter": "verbose",
|
||||||
|
"customSyntax": "postcss-html",
|
||||||
"plugins": [
|
"plugins": [
|
||||||
"stylelint-scss"
|
"stylelint-scss"
|
||||||
],
|
],
|
||||||
"rules": {
|
"rules": {
|
||||||
"at-rule-no-unknown": null,
|
"at-rule-no-unknown": null,
|
||||||
"no-descending-specificity": null,
|
"no-descending-specificity": null,
|
||||||
"font-family-no-missing-generic-family-keyword": null,
|
"font-family-no-missing-generic-family-keyword": null
|
||||||
"declaration-colon-newline-after": "always-multi-line"
|
|
||||||
},
|
},
|
||||||
"syntax": "scss"
|
"syntax": "scss"
|
||||||
}
|
}
|
23
CHANGELOG.md
23
CHANGELOG.md
|
@ -2,6 +2,29 @@
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||||
|
|
||||||
|
### [0.7.23-beta.1](https://github.com/antares-sql/antares/compare/v0.7.23-beta.0...v0.7.23-beta.1) (2024-04-02)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* add the page reference in the export file name, closes [#772](https://github.com/antares-sql/antares/issues/772) ([2064294](https://github.com/antares-sql/antares/commit/2064294119ed9dfab2a9968dfb5b35d52e2ae03b))
|
||||||
|
* move connections out of folder from context menu, related to [#773](https://github.com/antares-sql/antares/issues/773) ([62e3115](https://github.com/antares-sql/antares/commit/62e311586073ae7ee4896305198c7168f637c1af))
|
||||||
|
* move connections to folders from context menu, related to [#773](https://github.com/antares-sql/antares/issues/773) ([9aef287](https://github.com/antares-sql/antares/commit/9aef287a983754158cdbdc9b2a72db9ab82f76c8))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* bad format of timestamp fields on CSV export, fixes 776 ([65ec4c5](https://github.com/antares-sql/antares/commit/65ec4c5da6187a7ab2dfff59326cd12bfa788c3b))
|
||||||
|
|
||||||
|
### [0.7.23-beta.0](https://github.com/antares-sql/antares/compare/v0.7.22...v0.7.23-beta.0) (2024-03-21)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* CSV export does not escape strings when needed, fixes [#770](https://github.com/antares-sql/antares/issues/770) ([dd5b417](https://github.com/antares-sql/antares/commit/dd5b41716a10cf9500f2c611b232f5b5b0756a68))
|
||||||
|
* query result sort not working with aliased tables, fixes [#765](https://github.com/antares-sql/antares/issues/765) ([de9dac3](https://github.com/antares-sql/antares/commit/de9dac3e8abf3b3261f8c54c88cf2386a5be2207))
|
||||||
|
* shortcut not working on mac os ([0bb5ced](https://github.com/antares-sql/antares/commit/0bb5cedda6a67ccbeea8c127b799f533395101a2))
|
||||||
|
|
||||||
### [0.7.22](https://github.com/antares-sql/antares/compare/v0.7.22-beta.2...v0.7.22) (2024-02-26)
|
### [0.7.22](https://github.com/antares-sql/antares/compare/v0.7.22-beta.2...v0.7.22) (2024-02-26)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
module.exports = {
|
||||||
|
extends: ['@commitlint/config-conventional'],
|
||||||
|
rules: {
|
||||||
|
// TODO Add Scope Enum Here
|
||||||
|
// 'scope-enum': [2, 'always', ['yourscope', 'yourscope']],
|
||||||
|
'type-enum': [
|
||||||
|
2,
|
||||||
|
'always',
|
||||||
|
[
|
||||||
|
'feat',
|
||||||
|
'fix',
|
||||||
|
'docs',
|
||||||
|
'chore',
|
||||||
|
'style',
|
||||||
|
'refactor',
|
||||||
|
'build',
|
||||||
|
'ci',
|
||||||
|
'test',
|
||||||
|
'revert',
|
||||||
|
'perf'
|
||||||
|
]
|
||||||
|
],
|
||||||
|
'subject-case': [
|
||||||
|
2,
|
||||||
|
'never',
|
||||||
|
[
|
||||||
|
'upper-case',
|
||||||
|
'pascal-case',
|
||||||
|
'start-case'
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
};
|
File diff suppressed because it is too large
Load Diff
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "antares",
|
"name": "antares",
|
||||||
"productName": "Antares",
|
"productName": "Antares",
|
||||||
"version": "0.7.22",
|
"version": "0.7.23-beta.1",
|
||||||
"description": "A modern, fast and productivity driven SQL client with a focus in UX.",
|
"description": "A modern, fast and productivity driven SQL client with a focus in UX.",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"repository": "https://github.com/antares-sql/antares.git",
|
"repository": "https://github.com/antares-sql/antares.git",
|
||||||
|
@ -25,7 +25,8 @@
|
||||||
"lint": "eslint . --ext .js,.ts,.vue && stylelint \"./src/**/*.{css,scss,sass,vue}\"",
|
"lint": "eslint . --ext .js,.ts,.vue && stylelint \"./src/**/*.{css,scss,sass,vue}\"",
|
||||||
"lint:fix": "eslint . --ext .js,.ts,.vue --fix && stylelint \"./src/**/*.{css,scss,sass,vue}\" --fix",
|
"lint:fix": "eslint . --ext .js,.ts,.vue --fix && stylelint \"./src/**/*.{css,scss,sass,vue}\" --fix",
|
||||||
"contributors:add": "all-contributors add",
|
"contributors:add": "all-contributors add",
|
||||||
"contributors:generate": "all-contributors generate"
|
"contributors:generate": "all-contributors generate",
|
||||||
|
"prepare": "husky"
|
||||||
},
|
},
|
||||||
"author": "Fabio Di Stasio <info@fabiodistasio.it>",
|
"author": "Fabio Di Stasio <info@fabiodistasio.it>",
|
||||||
"main": "./dist/main.js",
|
"main": "./dist/main.js",
|
||||||
|
@ -179,6 +180,8 @@
|
||||||
"@babel/eslint-parser": "~7.15.7",
|
"@babel/eslint-parser": "~7.15.7",
|
||||||
"@babel/preset-env": "~7.15.8",
|
"@babel/preset-env": "~7.15.8",
|
||||||
"@babel/preset-typescript": "~7.16.7",
|
"@babel/preset-typescript": "~7.16.7",
|
||||||
|
"@commitlint/cli": "~19.0.3",
|
||||||
|
"@commitlint/config-conventional": "~19.0.3",
|
||||||
"@playwright/test": "~1.28.1",
|
"@playwright/test": "~1.28.1",
|
||||||
"@types/better-sqlite3": "~7.5.0",
|
"@types/better-sqlite3": "~7.5.0",
|
||||||
"@types/leaflet": "~1.7.9",
|
"@types/leaflet": "~1.7.9",
|
||||||
|
@ -198,6 +201,7 @@
|
||||||
"eslint-plugin-promise": "~5.2.0",
|
"eslint-plugin-promise": "~5.2.0",
|
||||||
"eslint-plugin-simple-import-sort": "~10.0.0",
|
"eslint-plugin-simple-import-sort": "~10.0.0",
|
||||||
"eslint-plugin-vue": "~8.0.3",
|
"eslint-plugin-vue": "~8.0.3",
|
||||||
|
"husky": "~9.0.11",
|
||||||
"playwright": "~1.28.1",
|
"playwright": "~1.28.1",
|
||||||
"playwright-core": "~1.28.1",
|
"playwright-core": "~1.28.1",
|
||||||
"standard-version": "~9.3.1",
|
"standard-version": "~9.3.1",
|
||||||
|
|
|
@ -70,23 +70,21 @@ export class ShortcutRegister {
|
||||||
}
|
}
|
||||||
|
|
||||||
private setLocalShortcuts () {
|
private setLocalShortcuts () {
|
||||||
|
const isMenuVisible = process.platform === 'darwin';
|
||||||
|
const submenu = [];
|
||||||
for (const shortcut of this.shortcuts) {
|
for (const shortcut of this.shortcuts) {
|
||||||
if (shortcut.os.includes(process.platform)) {
|
if (shortcut.os.includes(process.platform)) {
|
||||||
for (const key of shortcut.keys) {
|
for (const key of shortcut.keys) {
|
||||||
try {
|
try {
|
||||||
this._menu.append(new MenuItem({
|
submenu.push({
|
||||||
label: '.',
|
label: String(shortcut.event),
|
||||||
visible: false,
|
accelerator: key,
|
||||||
submenu: [{
|
visible: isMenuVisible,
|
||||||
label: String(key),
|
click: () => {
|
||||||
accelerator: key,
|
this._mainWindow.webContents.send(shortcut.event);
|
||||||
visible: false,
|
if (isDevelopment) console.log('LOCAL EVENT:', shortcut);
|
||||||
click: () => {
|
}
|
||||||
this._mainWindow.webContents.send(shortcut.event);
|
});
|
||||||
if (isDevelopment) console.log('LOCAL EVENT:', shortcut);
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
if (isDevelopment) console.log(error);
|
if (isDevelopment) console.log(error);
|
||||||
|
@ -96,6 +94,11 @@ export class ShortcutRegister {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
this._menu.append(new MenuItem({
|
||||||
|
label: 'Shortcut',
|
||||||
|
visible: isMenuVisible,
|
||||||
|
submenu
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
private setGlobalShortcuts () {
|
private setGlobalShortcuts () {
|
||||||
|
|
|
@ -127,8 +127,8 @@ app.on('ready', async () => {
|
||||||
if (isWindows)
|
if (isWindows)
|
||||||
mainWindow.show();
|
mainWindow.show();
|
||||||
|
|
||||||
// if (isDevelopment)
|
if (isDevelopment && !isWindows)// Because on Windows you can open devtools from title-bar
|
||||||
// mainWindow.webContents.openDevTools();
|
mainWindow.webContents.openDevTools();
|
||||||
|
|
||||||
process.on('uncaughtException', error => {
|
process.on('uncaughtException', error => {
|
||||||
mainWindow.webContents.send('unhandled-exception', error);
|
mainWindow.webContents.send('unhandled-exception', error);
|
||||||
|
|
|
@ -15,6 +15,56 @@
|
||||||
:size="18"
|
:size="18"
|
||||||
/> {{ t('connection.disconnect') }}</span>
|
/> {{ t('connection.disconnect') }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="!contextConnection.isFolder" class="context-element">
|
||||||
|
<span class="d-flex">
|
||||||
|
<BaseIcon
|
||||||
|
class="text-light mt-1 mr-1"
|
||||||
|
icon-name="mdiFolderMove"
|
||||||
|
:size="18"
|
||||||
|
/> {{ t('general.moveTo') }}</span>
|
||||||
|
<BaseIcon
|
||||||
|
class="text-light ml-1"
|
||||||
|
icon-name="mdiChevronRight"
|
||||||
|
:size="18"
|
||||||
|
/>
|
||||||
|
<div class="context-submenu">
|
||||||
|
<div class="context-element" @click.stop="moveToFolder(null)">
|
||||||
|
<span class="d-flex">
|
||||||
|
<BaseIcon
|
||||||
|
class="text-light mt-1 mr-1"
|
||||||
|
icon-name="mdiFolderPlus"
|
||||||
|
:size="18"
|
||||||
|
/> {{ t('application.newFolder') }}</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-for="folder in filteredFolders"
|
||||||
|
:key="folder.uid"
|
||||||
|
class="context-element"
|
||||||
|
@click.stop="moveToFolder(folder.uid)"
|
||||||
|
>
|
||||||
|
<span class="d-flex">
|
||||||
|
<BaseIcon
|
||||||
|
class="text-light mt-1 mr-1"
|
||||||
|
icon-name="mdiFolder"
|
||||||
|
:size="18"
|
||||||
|
:style="`color: ${folder.color}!important`"
|
||||||
|
/> {{ folder.name || t('general.folder') }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="isInFolder"
|
||||||
|
class="context-element"
|
||||||
|
@click="outOfFolder"
|
||||||
|
>
|
||||||
|
<span class="d-flex">
|
||||||
|
<BaseIcon
|
||||||
|
class="text-light mt-1 mr-1"
|
||||||
|
icon-name="mdiFolderOff"
|
||||||
|
:size="18"
|
||||||
|
/> {{ t('application.outOfFolder') }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="context-element" @click.stop="showAppearanceModal">
|
<div class="context-element" @click.stop="showAppearanceModal">
|
||||||
<span class="d-flex">
|
<span class="d-flex">
|
||||||
<BaseIcon
|
<BaseIcon
|
||||||
|
@ -79,6 +129,7 @@
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { uidGen } from 'common/libs/uidGen';
|
import { uidGen } from 'common/libs/uidGen';
|
||||||
|
import { storeToRefs } from 'pinia';
|
||||||
import { computed, Prop, ref } from 'vue';
|
import { computed, Prop, ref } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
@ -98,9 +149,14 @@ const {
|
||||||
getConnectionByUid,
|
getConnectionByUid,
|
||||||
getConnectionName,
|
getConnectionName,
|
||||||
addConnection,
|
addConnection,
|
||||||
deleteConnection
|
deleteConnection,
|
||||||
|
addFolder,
|
||||||
|
addToFolder,
|
||||||
|
removeFromFolders
|
||||||
} = connectionsStore;
|
} = connectionsStore;
|
||||||
|
|
||||||
|
const { getFolders: folders } = storeToRefs(connectionsStore);
|
||||||
|
|
||||||
const workspacesStore = useWorkspacesStore();
|
const workspacesStore = useWorkspacesStore();
|
||||||
|
|
||||||
const {
|
const {
|
||||||
|
@ -121,6 +177,8 @@ const isConnectionEdit = ref(false);
|
||||||
|
|
||||||
const connectionName = computed(() => props.contextConnection.name || getConnectionName(props.contextConnection.uid) || t('general.folder', 1));
|
const connectionName = computed(() => props.contextConnection.name || getConnectionName(props.contextConnection.uid) || t('general.folder', 1));
|
||||||
const isConnected = computed(() => getWorkspace(props.contextConnection.uid)?.connectionStatus === 'connected');
|
const isConnected = computed(() => getWorkspace(props.contextConnection.uid)?.connectionStatus === 'connected');
|
||||||
|
const filteredFolders = computed(() => folders.value.filter(f => !f.connections.includes(props.contextConnection.uid)));
|
||||||
|
const isInFolder = computed(() => folders.value.some(f => f.connections.includes(props.contextConnection.uid)));
|
||||||
|
|
||||||
const confirmDeleteConnection = () => {
|
const confirmDeleteConnection = () => {
|
||||||
if (isConnected.value)
|
if (isConnected.value)
|
||||||
|
@ -129,6 +187,27 @@ const confirmDeleteConnection = () => {
|
||||||
closeContext();
|
closeContext();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const moveToFolder = (folderUid?: string) => {
|
||||||
|
if (!folderUid) {
|
||||||
|
addFolder({
|
||||||
|
connections: [props.contextConnection.uid]
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
addToFolder({
|
||||||
|
folder: folderUid,
|
||||||
|
connection: props.contextConnection.uid
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
closeContext();
|
||||||
|
};
|
||||||
|
|
||||||
|
const outOfFolder = () => {
|
||||||
|
removeFromFolders(props.contextConnection.uid);
|
||||||
|
closeContext();
|
||||||
|
};
|
||||||
|
|
||||||
const duplicateConnection = () => {
|
const duplicateConnection = () => {
|
||||||
let connectionCopy = getConnectionByUid(props.contextConnection.uid);
|
let connectionCopy = getConnectionByUid(props.contextConnection.uid);
|
||||||
connectionCopy = {
|
connectionCopy = {
|
||||||
|
|
|
@ -101,7 +101,13 @@ const props = defineProps({
|
||||||
selectedField: Object
|
selectedField: Object
|
||||||
});
|
});
|
||||||
|
|
||||||
const emit = defineEmits(['close-context', 'duplicate-selected', 'delete-selected', 'add-new-index', 'add-to-index']);
|
const emit = defineEmits([
|
||||||
|
'close-context',
|
||||||
|
'duplicate-selected',
|
||||||
|
'delete-selected',
|
||||||
|
'add-new-index',
|
||||||
|
'add-to-index'
|
||||||
|
]);
|
||||||
|
|
||||||
const hasPrimary = computed(() => props.indexes.some(index => index.type === 'PRIMARY'));
|
const hasPrimary = computed(() => props.indexes.some(index => index.type === 'PRIMARY'));
|
||||||
|
|
||||||
|
|
|
@ -150,7 +150,13 @@ const props = defineProps({
|
||||||
mode: String
|
mode: String
|
||||||
});
|
});
|
||||||
|
|
||||||
const emit = defineEmits(['add-new-index', 'add-to-index', 'rename-field', 'duplicate-field', 'remove-field']);
|
const emit = defineEmits([
|
||||||
|
'add-new-index',
|
||||||
|
'add-to-index',
|
||||||
|
'rename-field',
|
||||||
|
'duplicate-field',
|
||||||
|
'remove-field'
|
||||||
|
]);
|
||||||
|
|
||||||
const workspacesStore = useWorkspacesStore();
|
const workspacesStore = useWorkspacesStore();
|
||||||
const consoleStore = useConsoleStore();
|
const consoleStore = useConsoleStore();
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
:class="{ 'active': resultsetIndex === index }"
|
:class="{ 'active': resultsetIndex === index }"
|
||||||
@click="selectResultset(index)"
|
@click="selectResultset(index)"
|
||||||
>
|
>
|
||||||
<a>{{ result.fields ? result.fields[0]?.table : '' }} ({{ result.rows.length }})</a>
|
<a>{{ result.fields ? result.fields[0]?.tableAlias ?? result.fields[0]?.table : `${t('general.results')} #${index}` }} ({{ result.rows.length }})</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div ref="table" class="table table-hover">
|
<div ref="table" class="table table-hover">
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
:title="`${field.type} ${fieldLength(field) ? `(${fieldLength(field)})` : ''}`"
|
:title="`${field.type} ${fieldLength(field) ? `(${fieldLength(field)})` : ''}`"
|
||||||
>
|
>
|
||||||
<div ref="columnResize" class="column-resizable">
|
<div ref="columnResize" class="column-resizable">
|
||||||
<div class="table-column-title" @click="sort(field.name)">
|
<div class="table-column-title" @click="sort(field)">
|
||||||
<div v-if="field.key" :title="keyName(field.key)">
|
<div v-if="field.key" :title="keyName(field.key)">
|
||||||
<BaseIcon
|
<BaseIcon
|
||||||
icon-name="mdiKey"
|
icon-name="mdiKey"
|
||||||
|
@ -56,8 +56,8 @@
|
||||||
</div>
|
</div>
|
||||||
<span>{{ field.alias || field.name }}</span>
|
<span>{{ field.alias || field.name }}</span>
|
||||||
<BaseIcon
|
<BaseIcon
|
||||||
v-if="isSortable && currentSort === field.name || currentSort === `${field.table}.${field.name}`"
|
v-if="isSortable && currentSort[resultsetIndex]?.field === field.name || currentSort[resultsetIndex]?.field === `${field.tableAlias || field.table}.${field.name}`"
|
||||||
:icon-name="currentSortDir === 'asc' ? 'mdiSortAscending' : 'mdiSortDescending'"
|
:icon-name="currentSort[resultsetIndex].dir === 'asc' ? 'mdiSortAscending' : 'mdiSortDescending'"
|
||||||
:size="18"
|
:size="18"
|
||||||
class="sort-icon ml-1"
|
class="sort-icon ml-1"
|
||||||
/>
|
/>
|
||||||
|
@ -292,6 +292,10 @@ const props = defineProps({
|
||||||
results: Array as Prop<QueryResult[]>,
|
results: Array as Prop<QueryResult[]>,
|
||||||
connUid: String,
|
connUid: String,
|
||||||
mode: String as Prop<'table' | 'query'>,
|
mode: String as Prop<'table' | 'query'>,
|
||||||
|
page: {
|
||||||
|
type: Number,
|
||||||
|
required: false
|
||||||
|
},
|
||||||
isSelected: Boolean,
|
isSelected: Boolean,
|
||||||
elementType: { type: String, default: 'table' }
|
elementType: { type: String, default: 'table' }
|
||||||
});
|
});
|
||||||
|
@ -314,8 +318,7 @@ const hasFocus = ref(false);
|
||||||
const contextEvent = ref(null);
|
const contextEvent = ref(null);
|
||||||
const selectedCell = ref(null);
|
const selectedCell = ref(null);
|
||||||
const selectedRows = ref([]);
|
const selectedRows = ref([]);
|
||||||
const currentSort = ref('');
|
const currentSort: Ref<{field: string; dir: 'asc' | 'desc'}[]> = ref([]);
|
||||||
const currentSortDir = ref('asc');
|
|
||||||
const resultsetIndex = ref(0);
|
const resultsetIndex = ref(0);
|
||||||
const scrollElement = ref(null);
|
const scrollElement = ref(null);
|
||||||
const rowHeight = ref(23);
|
const rowHeight = ref(23);
|
||||||
|
@ -358,14 +361,16 @@ const isHardSort = computed(() => {
|
||||||
});
|
});
|
||||||
|
|
||||||
const sortedResults = computed(() => {
|
const sortedResults = computed(() => {
|
||||||
if (currentSort.value && !isHardSort.value) {
|
if (currentSort.value[resultsetIndex.value] && !isHardSort.value) {
|
||||||
|
const sortObj = currentSort.value[resultsetIndex.value];
|
||||||
|
|
||||||
return [...localResults.value].sort((a: any, b: any) => {
|
return [...localResults.value].sort((a: any, b: any) => {
|
||||||
let modifier = 1;
|
let modifier = 1;
|
||||||
let valA = typeof a[currentSort.value] === 'string' ? a[currentSort.value].toLowerCase() : a[currentSort.value];
|
let valA = typeof a[sortObj.field] === 'string' ? a[sortObj.field].toLowerCase() : a[sortObj.field];
|
||||||
if (!isNaN(valA)) valA = Number(valA);
|
if (!isNaN(valA)) valA = Number(valA);
|
||||||
let valB = typeof b[currentSort.value] === 'string' ? b[currentSort.value].toLowerCase() : b[currentSort.value];
|
let valB = typeof b[sortObj.field] === 'string' ? b[sortObj.field].toLowerCase() : b[sortObj.field];
|
||||||
if (!isNaN(valB)) valB = Number(valB);
|
if (!isNaN(valB)) valB = Number(valB);
|
||||||
if (currentSortDir.value === 'desc') modifier = -1;
|
if (sortObj.dir === 'desc') modifier = -1;
|
||||||
if (valA < valB) return -1 * modifier;
|
if (valA < valB) return -1 * modifier;
|
||||||
if (valA > valB) return 1 * modifier;
|
if (valA > valB) return 1 * modifier;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -784,32 +789,42 @@ const contextMenu = (event: MouseEvent, cell: any) => {
|
||||||
isContext.value = true;
|
isContext.value = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
const sort = (field: string) => {
|
const sort = (field: TableField) => {
|
||||||
if (!isSortable.value) return;
|
if (!isSortable.value) return;
|
||||||
|
|
||||||
selectedRows.value = [];
|
selectedRows.value = [];
|
||||||
|
let fieldName = field.name;
|
||||||
|
const hasTableInFieldname = Object.keys(localResults.value[0]).find(k => k !== '_antares_id').includes('.');
|
||||||
|
|
||||||
if (props.mode === 'query')
|
if (props.mode === 'query' && hasTableInFieldname)
|
||||||
field = `${getTable(resultsetIndex.value)}.${field}`;
|
fieldName = `${field.tableAlias || field.table}.${field.name}`;
|
||||||
|
|
||||||
if (field === currentSort.value) {
|
if (fieldName === currentSort.value[resultsetIndex.value]?.field) {
|
||||||
if (currentSortDir.value === 'asc')
|
if (currentSort.value[resultsetIndex.value].dir === 'asc')
|
||||||
currentSortDir.value = 'desc';
|
currentSort.value[resultsetIndex.value].dir = 'desc';
|
||||||
else
|
else
|
||||||
resetSort();
|
resetSort();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
currentSortDir.value = 'asc';
|
currentSort.value[resultsetIndex.value] = {
|
||||||
currentSort.value = field;
|
field: fieldName,
|
||||||
|
dir: 'asc'
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isHardSort.value)
|
if (isHardSort.value) {
|
||||||
emit('hard-sort', { field: currentSort.value, dir: currentSortDir.value });
|
emit('hard-sort', {
|
||||||
|
field: currentSort.value[resultsetIndex.value].field,
|
||||||
|
dir: currentSort.value[resultsetIndex.value].dir
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const resetSort = () => {
|
const resetSort = () => {
|
||||||
currentSort.value = '';
|
currentSort.value[resultsetIndex.value] = {
|
||||||
currentSortDir.value = 'asc';
|
field: null,
|
||||||
|
dir: 'asc'
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const selectResultset = (index: number) => {
|
const selectResultset = (index: number) => {
|
||||||
|
@ -857,6 +872,7 @@ const downloadTable = (format: 'csv' | 'json' | 'sql' | 'php', table: string, po
|
||||||
},
|
},
|
||||||
client: workspaceClient.value,
|
client: workspaceClient.value,
|
||||||
table,
|
table,
|
||||||
|
page: props.page,
|
||||||
sqlOptions: popup ? { ...sqlExportOptions.value } : null,
|
sqlOptions: popup ? { ...sqlExportOptions.value } : null,
|
||||||
csvOptions: popup ? { ...csvExportOptions.value } : null
|
csvOptions: popup ? { ...csvExportOptions.value } : null
|
||||||
});
|
});
|
||||||
|
|
|
@ -202,6 +202,7 @@
|
||||||
v-if="results"
|
v-if="results"
|
||||||
ref="queryTable"
|
ref="queryTable"
|
||||||
:results="results"
|
:results="results"
|
||||||
|
:page="page"
|
||||||
:tab-uid="tabUid"
|
:tab-uid="tabUid"
|
||||||
:conn-uid="connection.uid"
|
:conn-uid="connection.uid"
|
||||||
:is-selected="isSelected"
|
:is-selected="isSelected"
|
||||||
|
|
|
@ -79,7 +79,8 @@ export const enUS = {
|
||||||
search: 'Search',
|
search: 'Search',
|
||||||
title: 'Title',
|
title: 'Title',
|
||||||
archive: 'Archive', // verb
|
archive: 'Archive', // verb
|
||||||
undo: 'Undo'
|
undo: 'Undo',
|
||||||
|
moveTo: 'Move to'
|
||||||
},
|
},
|
||||||
connection: { // Database connection
|
connection: { // Database connection
|
||||||
connection: 'Connection',
|
connection: 'Connection',
|
||||||
|
@ -332,7 +333,7 @@ export const enUS = {
|
||||||
wrapLongLines: 'Wrap long lines',
|
wrapLongLines: 'Wrap long lines',
|
||||||
markdownSupported: 'Markdown supported',
|
markdownSupported: 'Markdown supported',
|
||||||
plantATree: 'Plant a Tree',
|
plantATree: 'Plant a Tree',
|
||||||
dataTabPageSize: 'DATA tab page size',
|
dataTabPageSize: 'Results per page',
|
||||||
noOpenTabs: 'There are no open tabs, navigate on the left bar or:',
|
noOpenTabs: 'There are no open tabs, navigate on the left bar or:',
|
||||||
restorePreviousSession: 'Restore previous session',
|
restorePreviousSession: 'Restore previous session',
|
||||||
closeTab: 'Close tab',
|
closeTab: 'Close tab',
|
||||||
|
@ -363,6 +364,8 @@ export const enUS = {
|
||||||
editFolder: 'Edit folder',
|
editFolder: 'Edit folder',
|
||||||
folderName: 'Folder name',
|
folderName: 'Folder name',
|
||||||
deleteFolder: 'Delete folder',
|
deleteFolder: 'Delete folder',
|
||||||
|
newFolder: 'New folder',
|
||||||
|
outOfFolder: 'Out of folder',
|
||||||
editConnectionAppearance: 'Edit connection appearance',
|
editConnectionAppearance: 'Edit connection appearance',
|
||||||
defaultCopyType: 'Default copy type',
|
defaultCopyType: 'Default copy type',
|
||||||
showTableSize: 'Show table size in sidebar',
|
showTableSize: 'Show table size in sidebar',
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
import { ClientCode } from 'common/interfaces/antares';
|
import { ClientCode } from 'common/interfaces/antares';
|
||||||
import { jsonToSqlInsert } from 'common/libs/sqlUtils';
|
import { jsonToSqlInsert } from 'common/libs/sqlUtils';
|
||||||
import * as json2php from 'json2php';
|
import * as json2php from 'json2php';
|
||||||
|
import * as moment from 'moment';
|
||||||
|
|
||||||
export const exportRows = (args: {
|
export const exportRows = (args: {
|
||||||
type: 'csv' | 'json'| 'sql' | 'php';
|
type: 'csv' | 'json'| 'sql' | 'php';
|
||||||
content: object[];
|
content: object[];
|
||||||
table: string;
|
table: string;
|
||||||
|
page?: number;
|
||||||
client?: ClientCode;
|
client?: ClientCode;
|
||||||
fields?: {
|
fields?: {
|
||||||
[key: string]: {type: string; datePrecision: number};
|
[key: string]: {type: string; datePrecision: number};
|
||||||
|
@ -31,7 +33,7 @@ export const exportRows = (args: {
|
||||||
const csv = [];
|
const csv = [];
|
||||||
const sd = args.csvOptions.stringDelimiter === 'single'
|
const sd = args.csvOptions.stringDelimiter === 'single'
|
||||||
? '\''
|
? '\''
|
||||||
: args.csvOptions.stringDelimiter === 'single'
|
: args.csvOptions.stringDelimiter === 'double'
|
||||||
? '"'
|
? '"'
|
||||||
: '';
|
: '';
|
||||||
|
|
||||||
|
@ -41,6 +43,7 @@ export const exportRows = (args: {
|
||||||
for (const row of args.content) {
|
for (const row of args.content) {
|
||||||
csv.push(Object.values(row).map(col => {
|
csv.push(Object.values(row).map(col => {
|
||||||
if (typeof col === 'string') return `${sd}${col}${sd}`;
|
if (typeof col === 'string') return `${sd}${col}${sd}`;
|
||||||
|
if (col instanceof Date) return `${sd}${moment(col).format('YYYY-MM-DD HH:mm:ss')}${sd}`;
|
||||||
if (col instanceof Buffer) return col.toString('base64');
|
if (col instanceof Buffer) return col.toString('base64');
|
||||||
if (col instanceof Uint8Array) return Buffer.from(col).toString('base64');
|
if (col instanceof Uint8Array) return Buffer.from(col).toString('base64');
|
||||||
return col;
|
return col;
|
||||||
|
@ -81,7 +84,7 @@ export const exportRows = (args: {
|
||||||
|
|
||||||
const file = new Blob([content], { type: mime });
|
const file = new Blob([content], { type: mime });
|
||||||
const downloadLink = document.createElement('a');
|
const downloadLink = document.createElement('a');
|
||||||
downloadLink.download = `${args.sqlOptions?.targetTable || args.table}.${args.type}`;
|
downloadLink.download = `${args.sqlOptions?.targetTable || args.table}${args.page ? `-${args.page}` : ''}.${args.type}`;
|
||||||
downloadLink.href = window.URL.createObjectURL(file);
|
downloadLink.href = window.URL.createObjectURL(file);
|
||||||
downloadLink.style.display = 'none';
|
downloadLink.style.display = 'none';
|
||||||
document.body.appendChild(downloadLink);
|
document.body.appendChild(downloadLink);
|
||||||
|
|
|
@ -415,8 +415,7 @@
|
||||||
box-shadow: 0 0 1px 0 #000;
|
box-shadow: 0 0 1px 0 #000;
|
||||||
|
|
||||||
.settingbar-top-elements {
|
.settingbar-top-elements {
|
||||||
overflow-x: hidden;
|
overflow: hidden overlay;
|
||||||
overflow-y: overlay;
|
|
||||||
max-height: calc((100vh - 3.5rem) - #{$excluding-size});
|
max-height: calc((100vh - 3.5rem) - #{$excluding-size});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -164,8 +164,7 @@
|
||||||
box-shadow: 0 0 1px 0 #000;
|
box-shadow: 0 0 1px 0 #000;
|
||||||
|
|
||||||
.settingbar-top-elements {
|
.settingbar-top-elements {
|
||||||
overflow-x: hidden;
|
overflow: hidden overlay;
|
||||||
overflow-y: overlay;
|
|
||||||
max-height: calc((100vh - 3.5rem) - #{$excluding-size});
|
max-height: calc((100vh - 3.5rem) - #{$excluding-size});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -90,8 +90,12 @@ export const useConnectionsStore = defineStore('connections', {
|
||||||
});
|
});
|
||||||
persistentStore.set('connectionsOrder', this.connectionsOrder);
|
persistentStore.set('connectionsOrder', this.connectionsOrder);
|
||||||
},
|
},
|
||||||
addFolder (params: {after: string; connections: [string, string]}) {
|
addFolder (params: {after?: string; connections: [string, string?]}) {
|
||||||
const index = this.connectionsOrder.findIndex((conn: SidebarElement) => conn.uid === params.after);
|
const index = params.after
|
||||||
|
? this.connectionsOrder.findIndex((conn: SidebarElement) => conn.uid === params.after)
|
||||||
|
: this.connectionsOrder.length;
|
||||||
|
|
||||||
|
this.removeFromFolders(...params.connections);
|
||||||
|
|
||||||
this.connectionsOrder.splice(index, 0, {
|
this.connectionsOrder.splice(index, 0, {
|
||||||
isFolder: true,
|
isFolder: true,
|
||||||
|
@ -102,7 +106,18 @@ export const useConnectionsStore = defineStore('connections', {
|
||||||
});
|
});
|
||||||
persistentStore.set('connectionsOrder', this.connectionsOrder);
|
persistentStore.set('connectionsOrder', this.connectionsOrder);
|
||||||
},
|
},
|
||||||
|
removeFromFolders (...connections: string[]) { // Removes connections from folders
|
||||||
|
this.connectionsOrder = (this.connectionsOrder as SidebarElement[]).map(el => {
|
||||||
|
if (el.isFolder)
|
||||||
|
el.connections = el.connections.filter(uid => !connections.includes(uid));
|
||||||
|
return el;
|
||||||
|
});
|
||||||
|
|
||||||
|
this.clearEmptyFolders();
|
||||||
|
},
|
||||||
addToFolder (params: {folder: string; connection: string}) {
|
addToFolder (params: {folder: string; connection: string}) {
|
||||||
|
this.removeFromFolders(params.connection);
|
||||||
|
|
||||||
this.connectionsOrder = this.connectionsOrder.map((conn: SidebarElement) => {
|
this.connectionsOrder = this.connectionsOrder.map((conn: SidebarElement) => {
|
||||||
if (conn.uid === params.folder)
|
if (conn.uid === params.folder)
|
||||||
conn.connections.push(params.connection);
|
conn.connections.push(params.connection);
|
||||||
|
@ -113,11 +128,7 @@ export const useConnectionsStore = defineStore('connections', {
|
||||||
this.clearEmptyFolders();
|
this.clearEmptyFolders();
|
||||||
},
|
},
|
||||||
deleteConnection (connection: SidebarElement | ConnectionParams) {
|
deleteConnection (connection: SidebarElement | ConnectionParams) {
|
||||||
this.connectionsOrder = (this.connectionsOrder as SidebarElement[]).map(el => { // Removes connection from folders
|
this.removeFromFolders(connection.uid);
|
||||||
if (el.isFolder && el.connections.includes(connection.uid))
|
|
||||||
el.connections = el.connections.filter(uid => uid !== connection.uid);
|
|
||||||
return el;
|
|
||||||
});
|
|
||||||
this.connectionsOrder = (this.connectionsOrder as SidebarElement[]).filter(el => el.uid !== connection.uid);
|
this.connectionsOrder = (this.connectionsOrder as SidebarElement[]).filter(el => el.uid !== connection.uid);
|
||||||
this.lastConnections = (this.lastConnections as SidebarElement[]).filter(el => el.uid !== connection.uid);
|
this.lastConnections = (this.lastConnections as SidebarElement[]).filter(el => el.uid !== connection.uid);
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ export interface Workspace {
|
||||||
uid: string;
|
uid: string;
|
||||||
client?: ClientCode;
|
client?: ClientCode;
|
||||||
database?: string;
|
database?: string;
|
||||||
connectionStatus: 'connected' | 'disconnected' | 'failed';
|
connectionStatus: 'connected' | 'connecting' | 'disconnected' | 'failed';
|
||||||
selectedTab: string;
|
selectedTab: string;
|
||||||
searchTerm: string;
|
searchTerm: string;
|
||||||
tabs: WorkspaceTab[];
|
tabs: WorkspaceTab[];
|
||||||
|
|
Loading…
Reference in New Issue