CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-08-08 14:48:13 +12:00
Code Issues Projects Releases Wiki Activity

dont hide chart errors

Browse source
This commit is contained in:
Gerard Burns 2024-04-18 08:23:19 +01:00
parent b75d054cdd
commit f5345fd4f3
2 changed files with 5 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/client/src/components/Component.svelte
View file

@ -296,9 +296,6 @@
return false
}
if (sectionDependsOnValue == null && sectionRealDependentValue == null) {
return false
}
if (sectionDependsOnValue != null && sectionDependsOnValue !== sectionRealDependentValue) {
return false
}

64
packages/client/src/components/app/charts/ApexChart.svelte
View file

@ -11,75 +11,27 @@
// Apex charts directly modifies the options object with default properties and internal variables. These being present could unintentionally cause issues to the provider of this prop as the changes are reflected in that component as well. To prevent any issues we clone this here to provide a buffer.
$: optionsCopy = cloneDeep(options);
/*
export let invalid = false
const parseValue = (value) => {
// A value like [10, 11, 12] actually would be output by parseInt as `10`, but this behaviour is odd and not something a
// reasonable user would expect.
if (Array.isArray(value)) {
return null;
}
const parsedValue = parseInt(value, 10);
if (Number.isNaN(parsedValue)) {
return null;
}
return parsedValue
}
const parseOptions = (optionsCopy) => {
const parsedOptions = { series: [], ...cloneDeep(optionsCopy)}
// Object form of series, used by most charts
if (parsedOptions.series.some(entry => Array.isArray(entry?.data))) {
parsedOptions.series = parsedOptions.series.map(entry => ({ ...entry, data: parseValue})parseValue);
} else {
// Scalar form of series, used by non-axis charts like pie and donut
parsedOptions.series = parsedOptions.series.map(parseValue);
}
return parsedOptions;
}
$: parsedOptions = parseOptions(optionsCopy);
*/
let chartElement;
let chart;
const updateChart = async (newOptions) => {
try {
await chart?.updateOptions(newOptions)
} catch(e) {
//console.log(e)
}
await chart?.updateOptions(newOptions)
}
const renderChart = async (newChartElement) => {
try {
await chart?.destroy()
chart = new ApexCharts(newChartElement, optionsCopy)
await chart.render()
} catch(e) {
//console.log(e)
}
}
const isSeriesValid = (series) => {
return true
await chart?.destroy()
chart = new ApexCharts(newChartElement, optionsCopy)
await chart.render()
}
$: noData = optionsCopy == null || optionsCopy?.series?.length === 0
$: hide = noData || !seriesValid
$: hide = noData
// Call render chart upon changes to hide, as apex charts has issues with rendering upon changes automatically
// if the chart is hidden.
$: renderChart(chartElement, hide)
$: updateChart(optionsCopy)
$: seriesValid = isSeriesValid(optionsCopy?.series || [])
</script>
{#key optionsCopy?.customColor}
@ -89,13 +41,7 @@
<Icon name="Alert" color="var(--spectrum-global-color-static-red-600)" />
Add rows to your data source to start using your component
</div>
{:else if $builderStore.inBuilder && !seriesValid}
<div class="component-placeholder" use:styleable={{ ...$component.styles, normal: {}, custom: null, empty: true }}>
<Icon name="Alert" color="var(--spectrum-global-color-static-red-600)" />
Your selected data cannot be displayed in this chart
</div>
{/if}
{/key}
<style>