Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<template>
<div>
<span>server status</span>
<a class="d-inline-block" href="#" data-bs-toggle="tooltip" :title="serverStatusText">
<a class="d-inline-block" href="#" :title="serverStatusText">
<svg id="status-icon" class="ms-2">
<circle cx="1em" cy="1em" r="1em" stroke="transparent" stroke-width="0" fill="transparent" :class="isUp" />
</svg>
Expand Down
1 change: 0 additions & 1 deletion jena-fuseki2/jena-fuseki-ui/src/components/Toast.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
@click="removeMessage(message.id)"
type="button"
class="me-2 mb-1 btn-close btn-close-white"
data-bs-dismiss="toast"
aria-label="Close"
>
</button>
Expand Down
2 changes: 1 addition & 1 deletion jena-fuseki2/jena-fuseki-ui/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import { createApp } from 'vue'
import App from './App.vue'
import router from './router'
import 'bootstrap/dist/js/bootstrap.bundle.min'
import 'bootstrap/js/dist/collapse'
import { FusekiServicePlugin, ToastPlugin } from '@/plugins/index'

const app = createApp(App)
Expand Down
1 change: 0 additions & 1 deletion jena-fuseki2/jena-fuseki-ui/src/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* limitations under the License.
*/

@import '/node_modules/bootstrap/dist/css/bootstrap.min';
@import '/node_modules/bootstrap/scss/bootstrap.scss';
@import 'upload.scss';

Expand Down
2 changes: 1 addition & 1 deletion jena-fuseki2/jena-fuseki-ui/src/views/dataset/Info.vue
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ import Menu from '@/components/dataset/Menu.vue'
import { displayError } from '@/utils'
import currentDatasetMixin from '@/mixins/current-dataset'
import currentDatasetMixinNavigationGuards from '@/mixins/current-dataset-navigation-guards'
import { Popover } from 'bootstrap'
import Popover from 'bootstrap/js/dist/popover'
import JenaTable from '@/components/dataset/JenaTable.vue'
import TableListing from "@/components/dataset/TableListing.vue";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ import TableListing from '@/components/dataset/TableListing.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
import { faTimesCircle, faDownload, faTachometerAlt } from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
import { Popover } from 'bootstrap'
import Popover from 'bootstrap/js/dist/popover'
import { displayNotification } from '@/utils'

library.add(faTimesCircle, faDownload, faTachometerAlt)
Expand Down
58 changes: 58 additions & 0 deletions jena-fuseki2/jena-fuseki-ui/tests/e2e/specs/menu.cy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* Tests the navigation menu.
*
* The menu uses Bootstrap's collapse plugin, which is the only Bootstrap
* plugin loaded in main.js. Other specs run at 1440x1024, where the menu
* is expanded and the toggler is hidden, so they never exercise it.
*/
describe('menu', () => {
describe('on a small screen', () => {
beforeEach(() => {
// Below Bootstrap's md breakpoint (768px), so navbar-expand-md collapses the menu.
cy.viewport(375, 667)
})
it('Opens and closes the collapsed menu with the toggler', () => {
cy.visit('/')
cy
.get('#navbarNav')
.should('not.be.visible')
cy
.get('.navbar-toggler')
.should('be.visible')
.and('have.attr', 'aria-expanded', 'false')
.click()
cy
.get('#navbarNav')
.should('have.class', 'show')
.contains('manage')
.should('be.visible')
cy
.get('.navbar-toggler')
.should('have.attr', 'aria-expanded', 'true')
.click()
cy
.get('#navbarNav')
.should('not.be.visible')
cy
.get('.navbar-toggler')
.should('have.attr', 'aria-expanded', 'false')
})
})
})
6 changes: 3 additions & 3 deletions jena-fuseki2/jena-fuseki-ui/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ export default defineConfig({
},
},
build: {
// Our largest chunk: target/webapp/static/Query-CakHSd_3.js 1,172.48 kB │ gzip: 350.95 kB
chunkSizeWarningLimit: 1250,
// Our largest chunk: target/webapp/static/Query-*.js ~1,333 kB │ gzip: ~388 kB │ map: ~3,607 kB (only fetched when devtools are open)
chunkSizeWarningLimit: 1350,
// Change build paths to make them Maven compatible.
outDir: 'target/webapp',
assetsDir: 'static',
sourcemap: 'inline'
sourcemap: true
},
test: {
globals: true,
Expand Down
Loading