Commit 10a6e36b authored by Sascha Herzinger's avatar Sascha Herzinger
Browse files

Improved cross browser support

parent 61503f40
......@@ -35,16 +35,19 @@ export default {
* @param context The action context.
*/
updateData: context => {
context.getters.requestManager.getAllDataStates().then(response => {
const data = response.data.data_states
context.commit(types.SET_DATA, data)
}).catch(error => {
console.error(error) // TODO: Notify user about this
}).then(() => { // finally
setTimeout(() => {
context.dispatch('updateData')
}, 2000)
})
const _updateData = () => {
context.getters.requestManager.getAllDataStates().then(response => {
const data = response.data.data_states
context.commit(types.SET_DATA, data)
}).catch(error => {
console.error(error) // TODO: Notify user about this
}).then(() => { // finally
setTimeout(() => {
_updateData()
}, 2000)
})
}
_updateData()
},
/**
* Commits a filter mutation that will replace the specified filter with a new value.
......@@ -77,7 +80,7 @@ export default {
/**
* Commits a control panel vm for keeping track of all such instances.
* @param context The context of the action.
* @param vm The vm of the control panel
* @param vm The vm of the contr
*/
addControlPanel: (context, vm) => {
context.commit(types.ADD_CONTROL_PANEL, {vm})
......
......@@ -392,7 +392,7 @@
.fjs-control-panel
hr
width: 100%
margin: 10% 0 10% 0
margin: 20px 0 20px 0
.fjs-vis-container
flex: 1
display: flex
......
......@@ -505,7 +505,7 @@
.fjs-control-panel
hr
width: 100%
margin: 10% 0 10% 0
margin: 20px 0 20px 0
.fjs-correlation-method
white-space: nowrap
border: solid 1px #fff
......
......@@ -246,7 +246,7 @@
.fjs-control-panel
hr
width: 100%
margin: 10% 0 10% 0
margin: 20px 0 20px 0
.fjs-vis-container
flex: 1
......
......@@ -108,13 +108,13 @@
flex-direction: column
justify-content: flex-start
top: 0
padding: 1%
padding: 20px
height: 100%
min-width: 15vw
hr
width: 100%
margin: 10% 0 10% 0
margin: 20px 0 20px 0
.fjs-lock-btn
margin-bottom: 10%
margin-bottom: 5vh
cursor: pointer
</style>
......@@ -13,8 +13,8 @@
<div class="fjs-data-entry-body" :data-state="item.etl_state" :data-id="item.task_id">
<div class="fjs-action-btns">
<button class="fjs-reload-btn" @click="reloadData(item.task_id)">&#8635;</button>
<button class="fjs-delete-btn" @click="deleteData(item.task_id)">&#215;</button><br/>
<span class="fjs-reload-btn" @click="reloadData(item.task_id)">&#8635;</span>
<span class="fjs-delete-btn" @click="deleteData(item.task_id)">&#215;</span>
</div>
{{ item.etl_message }}
</div>
......@@ -69,6 +69,8 @@
handler: function (newItems) {
const existingIDs = newItems.map(d => d.task_id)
// this removes selected IDs when they expired in the back end
console.log(existingIDs)
console.log(this.selectedIDs.filter(id => existingIDs.indexOf(id) !== -1))
this.selectedIDs = this.selectedIDs.filter(id => existingIDs.indexOf(id) !== -1)
}
}
......@@ -103,7 +105,7 @@
flex-direction: column
width: 100%
text-align: start
margin: 2%
margin: 10px 0 10px 0
> label
font-size: 1rem
.fjs-data-window
......@@ -112,7 +114,7 @@
border-radius: 8px
font-size: 0.875rem
overflow-y: scroll
padding: 1%
padding: 8px
.fjs-data-entry-container
display: flex
flex-direction: column
......@@ -120,8 +122,8 @@
display: flex
justify-content: space-between
cursor: pointer
padding: 1.5%
margin: 0.5%
padding: 4px
margin: 2px 0 2px 0
.fjs-selected
background-color: rgb(16, 95, 190)
.fjs-data-entry-body
......@@ -130,9 +132,13 @@
&[data-state="FAILURE"]
background-color: #ffcbcb
.fjs-action-btns
text-align: center
button
height: 1.5rem
font-size: 0.75rem
font-weight: bold
display: flex
flex-direction: row
justify-content: space-around
span
padding: 10px
cursor: pointer
font-size: 1.4rem
&:hover
background-color: rgb(16, 95, 190)
</style>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment