Skip to content

Commit 57d5fdf

Browse files
committed
Vuetify it #338
1 parent 995b1d3 commit 57d5fdf

5 files changed

Lines changed: 17 additions & 13 deletions

File tree

src/main/malewicz/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"vue-resource": "^1.5.1",
8686
"vue-template-compiler": "^2.5.2",
8787
"webpack": "^3.6.0",
88-
"webpack-bundle-analyzer": "^2.9.0",
88+
"webpack-bundle-analyzer": ">=3.3.2",
8989
"webpack-dev-server": "^2.9.1",
9090
"webpack-merge": "^4.1.0"
9191
},

src/main/malewicz/src/main.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,35 @@ import router from './router'
77
import VueResource from 'vue-resource'
88
import VueTreeNavigation from 'vue-tree-navigation'
99

10-
import ECharts from 'vue-echarts' // refers to components/ECharts.vue in webpack
11-
// import ECharts modules manually to reduce bundle size
12-
import 'echarts/lib/chart/bar'
13-
import 'echarts/lib/component/tooltip'
14-
1510
import Notifications from 'vue-notification'
1611
import JsonExcel from 'vue-json-excel'
1712

1813
import VueSSE from 'vue-sse'
1914

15+
import Vuetify from 'vuetify'
16+
17+
import VueHighlightJS from 'vue-highlightjs'
18+
19+
20+
import 'vuetify/dist/vuetify.min.css' // Ensure you are using css-loader
21+
2022

2123
Vue.use(VueResource)
2224
Vue.use(Vuex)
2325
Vue.use(VueTreeNavigation)
24-
Vue.component('v-chart', ECharts)
2526
Vue.use(Notifications)
2627
Vue.component('downloadExcel', JsonExcel)
27-
2828
Vue.use(VueSSE)
29+
Vue.use(Vuetify)
30+
Vue.use(VueHighlightJS)
31+
2932

3033
Vue.config.productionTip = false
3134

3235
const store = new Vuex.Store({
3336
state: {
3437
host: '',
38+
// host: 'http://localhost:8007/',
3539
connections: '',
3640
type: 'table',
3741
path: [''],

src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/MetadataTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal class MetadataTest {
2121

2222
@Test
2323
fun toJson() = assertEquals(
24-
"""{"name":"name","description":"{ \"key_1\": \"value_1\" }","properties":{"key_1":"value_1","key":"name"}}""",
24+
"""{"name":"name","description":"{ \"key_1\": \"value_1\" }","value":"name","text":"name","properties":{"key_1":"value_1","key":"name"}}""",
2525
metadata().toJson().toString())
2626

2727
private fun metadata() = Metadata("@name", "String", """{ "key_1": "value_1" }""")

src/test/kotlin/com/github/mgramin/sqlboot/model/resourcetype/wrappers/ResourceTypeWrapperTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class ResourceTypeWrapperTest {
165165
Metadata("@table", "String", "Table name"),
166166
Metadata("@index", "String", "Index name"),
167167
Metadata("size", "Number", "Table size"),
168-
Metadata("database", "String", "Database name")).sorted(),
168+
Metadata("endpoint", "String", "Endpoint name")).sorted(),
169169
w.metaData(FakeUri()).sorted())
170170
}
171171
}

src/test/kotlin/com/github/mgramin/sqlboot/rest/controllers/ApiControllerITCase.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ class ApiControllerITCase {
5353

5454
@ParameterizedTest
5555
@CsvSource(
56-
"204#/api/h2/table/foo",
56+
"200#/api/h2/table/foo",
5757
"200#/api/h2/table/BOOKINGS",
5858
"200#/api/h2/table",
5959
"200#/api/h2/table/BOOKINGS.AIRCRAFTS",
60-
"204#/api/h2/table/not_exist_schema",
60+
"200#/api/h2/table/not_exist_schema",
6161
"200#/api/h2/table",
62-
"204#/api/h2/not_exist_type",
62+
"200#/api/h2/not_exist_type",
6363
"200#/api/h2/table/BOOKINGS.AIRPORTS?select=remarks",
6464
delimiter = '#')
6565
fun testHeaders(code: Int, uri: String) {

0 commit comments

Comments
 (0)