archive/bramw_baserow
1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-04 13:15:24 +00:00
Code Issues Projects Releases Wiki Activity

Ensure propertySelectorAvailable() doesn't throw an error when Data Source isn't selected

Browse source
This commit is contained in:
Tsering Paljor 2024-09-23 05:07:53 +00:00
parent 144ededd4e
commit bcaec1c2de
2 changed files with 12 additions and 6 deletions
changelog/entries/unreleased/bug
3033_builder_safely_check_if_property_selector_is_available.json
web-frontend/modules/builder/mixins
collectionElementForm.js

7
changelog/entries/unreleased/bug/3033_builder_safely_check_if_property_selector_is_available.json Normal file
View file

@ -0,0 +1,7 @@
{
"type": "bug",
"message": "[Builder] Safely check if property selector is available.",
"issue_number": 3033,
"bullet_points": [],
"created_at": "2024-09-20"
}

11
web-frontend/modules/builder/mixins/collectionElementForm.js
View file

@ -49,7 +49,7 @@ export default {
* @returns {boolean} - Whether the paging options are available.
*/
pagingOptionsAvailable() {
return this.selectedDataSourceType?.returnsList
return this.selectedDataSourceReturnsList
},
/**
* In collection element forms, the ability to choose a data source
@ -76,10 +76,7 @@ export default {
if (!this.hasCollectionAncestor) {
// If we don't have a data source, or
// We do, and it returns a list, then the schema selector isn't available.
if (
!this.selectedDataSource ||
this.selectedDataSourceType.returnsList
) {
if (!this.selectedDataSource || this.selectedDataSourceReturnsList) {
return false
}
}
@ -90,7 +87,9 @@ export default {
* @returns {Array} - The data sources the page designer can choose from.
*/
dataSources() {
return this.$store.getters['dataSource/getPageDataSources'](this.page)
return this.$store.getters['dataSource/getPageDataSources'](
this.page
).filter((dataSource) => dataSource.type)
},
selectedDataSource() {
if (!this.values.data_source_id) {