Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

style: run linter through studio/vue files to cleanup git's whining i… #1725

Merged
merged 1 commit into from
Oct 6, 2023
Merged

style: run linter through studio/vue files to cleanup git's whining i… #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions apps/studio/src/components/TabQueryEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,21 @@
</x-menuitem>
<x-menuitem @click.prevent="submitQueryToFile">
<x-label>{{ hasSelectedText ? 'Run Selection to File' : 'Run to File' }}</x-label>
<i v-if="$config.isCommunity" class="material-icons menu-icon">stars</i>
<i
v-if="$config.isCommunity"
class="material-icons menu-icon"
>
stars
</i>
</x-menuitem>
<x-menuitem @click.prevent="submitCurrentQueryToFile">
<x-label>Run Current to File</x-label>
<i v-if="$config.isCommunity" class="material-icons menu-icon ">stars</i>
<i
v-if="$config.isCommunity"
class="material-icons menu-icon "
>
stars
</i>
</x-menuitem>
</x-menu>
</x-button>
Expand Down Expand Up @@ -312,7 +322,7 @@
import pluralize from 'pluralize'

import platformInfo from '@/common/platform_info'
import { splitQueries, extractParams } from '../lib/db/sql_tools'
import { splitQueries } from '../lib/db/sql_tools'
import ProgressBar from './editor/ProgressBar.vue'
import ResultTable from './editor/ResultTable.vue'
import ShortcutHints from './editor/ShortcutHints.vue'
Expand Down
17 changes: 12 additions & 5 deletions apps/studio/src/components/common/ToggleFormArea.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,21 @@
</span>
<h4 class="advanced-heading flex">
<span class="expand">{{ this.title }}</span>
<slot name="header"></slot>
<slot name="header" />
</h4>
</div>
<transition @before-enter="beforeEnter" @enter="enter" @before-leave="beforeLeave" @leave="leave">
<div class="advanced-body" v-if="toggleContent">
<slot></slot>
<transition
@before-enter="beforeEnter"
@enter="enter"
@before-leave="beforeLeave"
@leave="leave"
>
<div
class="advanced-body"
v-if="toggleContent"
>
<slot />
</div>

</transition>
</div>
</template>
Expand Down
8 changes: 6 additions & 2 deletions apps/studio/src/components/common/UpgradeRequiredModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
</span>
<div class="checkbox-wrapper">
<!-- <p class="text-muted">This feature is not included in the Community Edition. Please upgrade the app to continue.</p> -->
<p class="text-muted"><strong v-if="message">{{ message }}.</strong> Upgrade to get exclusive featuers:</p>
<p class="text-muted">
<strong v-if="message">{{ message }}.</strong> Upgrade to get exclusive featuers:
</p>
<div class="row">
<div class="col s6">
<ul class="check-list">
Expand All @@ -31,7 +33,9 @@
</div>
<div class="col s6">
<ul class="check-list">
<li title="Oracle, Cassandra, BigQuery, and more">More database engines</li>
<li title="Oracle, Cassandra, BigQuery, and more">
More database engines
</li>
<li>Cloud sync</li>
<li>Read-only mode</li>
<li>SQLite Extensions</li>
Expand Down
14 changes: 10 additions & 4 deletions apps/studio/src/components/editor/QueryEditorStatusBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
<template>
<statusbar :class="{ 'empty': results.length === 0, 'query-meta': true }">
<template v-if="results.length > 0">
<div class="truncate statusbar-info" v-hotkey="keymap">
<div
class="truncate statusbar-info"
v-hotkey="keymap"
>
<span
v-show="results.length > 1"
class="statusbar-item result-selector"
Expand Down Expand Up @@ -84,15 +87,18 @@
</x-menuitem>
<span
v-tooltip="{
content: downloadFullTooltip
}"
content: downloadFullTooltip
}"
>
<x-menuitem
@click.prevent="$event => submitCurrentQueryToFile()"
:disabled="!result?.truncated"
>
<x-label>Download Full Resultset</x-label>
<i v-if="$config.isCommunity" class="material-icons menu-icon">stars</i>
<i
v-if="$config.isCommunity"
class="material-icons menu-icon"
>stars</i>
</x-menuitem>
</span>
<hr>
Expand Down
14 changes: 7 additions & 7 deletions apps/studio/src/components/export/ExportModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@
</div>
<div class="vue-dialog-buttons">
<button
class="btn btn-flat btn-icon"
type="button"
@click.prevent="upgradeModal"
>
<i class="material-icons">tab</i>
Export multiple tables
</button>
class="btn btn-flat btn-icon"
type="button"
@click.prevent="upgradeModal"
>
<i class="material-icons">tab</i>
Export multiple tables
</button>
<button
class="btn btn-primary"
type="submit"
Expand Down
110 changes: 89 additions & 21 deletions apps/studio/src/components/sidebar/core/table_list/TableListItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,106 @@
<template>
<div class="list-item" @contextmenu="$emit('contextmenu', $event)">
<a class="list-item-btn" role="button" :class="{ 'active': active, 'selected': selected, 'open': showColumns }">
<span @contextmenu.prevent.stop="" class="btn-fab open-close" @mousedown.prevent="toggleColumns">
<div
class="list-item"
@contextmenu="$emit('contextmenu', $event)"
>
<a
class="list-item-btn"
role="button"
:class="{ 'active': active, 'selected': selected, 'open': showColumns }"
>
<span
@contextmenu.prevent.stop=""
class="btn-fab open-close"
@mousedown.prevent="toggleColumns"
>
<i class="dropdown-icon material-icons">keyboard_arrow_right</i>
</span>
<span class="item-wrapper flex flex-middle expand" @dblclick.prevent="openTable" @mousedown="selectItem">
<span :title="draggable ? 'drag me!' : ''" class="table-item-wrapper"
:class="{ 'draggable': draggable, 'drag-handle': draggable }">
<table-icon :table="table" class="table-icon" />
<i class="material-icons item-icon dh" v-if="draggable">menu</i>
<span
class="item-wrapper flex flex-middle expand"
@dblclick.prevent="openTable"
@mousedown="selectItem"
>
<span
:title="draggable ? 'drag me!' : ''"
class="table-item-wrapper"
:class="{ 'draggable': draggable, 'drag-handle': draggable }"
>
<table-icon
:table="table"
class="table-icon"
/>
<i
class="material-icons item-icon dh"
v-if="draggable"
>menu</i>
</span>
<span class="table-name truncate" :title="table.name">{{ table.name }}</span>
<span
class="table-name truncate"
:title="table.name"
>{{ table.name }}</span>
</span>
<span class="actions" :class="{ 'pinned': pinned }">
<span v-if="!pinned" @mousedown.prevent.stop="pin" class="btn-fab pin" :title="'Pin'"><i class="bk-pin" /></span>
<span v-if="pinned" @mousedown.prevent.stop="unpin" class="btn-fab unpin" :title="'Unpin'"><i
class="material-icons">clear</i></span>
<span v-if="pinned" @mousedown.prevent.stop="unpin" class="btn-fab pinned">
<i class="bk-pin" :title="'Unpin'" />
<span
class="actions"
:class="{ 'pinned': pinned }"
>
<span
v-if="!pinned"
@mousedown.prevent.stop="pin"
class="btn-fab pin"
:title="'Pin'"
><i class="bk-pin" /></span>
<span
v-if="pinned"
@mousedown.prevent.stop="unpin"
class="btn-fab unpin"
:title="'Unpin'"
><i
class="material-icons"
>clear</i></span>
<span
v-if="pinned"
@mousedown.prevent.stop="unpin"
class="btn-fab pinned"
>
<i
class="bk-pin"
:title="'Unpin'"
/>
<i class="material-icons">clear</i>
</span>
</span>
</a>
<div v-if="showColumns" class="sub-items">
<span class="sub-item" v-if="!columnsLoading && table.columns.length === 0">
<div
v-if="showColumns"
class="sub-items"
>
<span
class="sub-item"
v-if="!columnsLoading && table.columns.length === 0"
>
No Columns
</span>
<template v-else-if="table.columns.length > 0">
<span :key="c.columnName" v-for="(c, i) in table.columns" class="sub-item">
<span class="title truncate" ref="title" @click="selectColumn(i)">{{ c.columnName }}</span>
<span class="badge" :class="c.dataType"><span>{{ c.dataType }}</span></span>
<span
:key="c.columnName"
v-for="(c, i) in table.columns"
class="sub-item"
>
<span
class="title truncate"
ref="title"
@click="selectColumn(i)"
>{{ c.columnName }}</span>
<span
class="badge"
:class="c.dataType"
><span>{{ c.dataType }}</span></span>
</span>
</template>
<span class="sub-item" v-else>
<span
class="sub-item"
v-else
>
{{ columnsLoading }}
</span>
</div>
Expand Down