1
0
Fork 0
mirror of https://gitlab.com/bramw/baserow.git synced 2025-04-09 23:27:51 +00:00

Improve messaging for series in charts

This commit is contained in:
Przemyslaw Kukulski 2025-03-13 09:10:04 +00:00
parent b1b1ece162
commit 85207346a5
3 changed files with 22 additions and 3 deletions
docker-compose.yml
enterprise/web-frontend/modules/baserow_enterprise
dashboard/components/data_source
module.js

View file

@ -201,6 +201,7 @@ x-backend-variables: &backend-variables
BASEROW_ENTERPRISE_MAX_PERIODIC_DATA_SYNC_CONSECUTIVE_ERRORS: BASEROW_ENTERPRISE_MAX_PERIODIC_DATA_SYNC_CONSECUTIVE_ERRORS:
BASEROW_USE_LOCAL_CACHE: BASEROW_USE_LOCAL_CACHE:
BASEROW_WEBHOOKS_BATCH_LIMIT: BASEROW_WEBHOOKS_BATCH_LIMIT:
BASEROW_ENTERPRISE_GROUPED_AGGREGATE_SERVICE_MAX_SERIES:
services: services:
# A caddy reverse proxy sitting in-front of all the services. Responsible for routing # A caddy reverse proxy sitting in-front of all the services. Responsible for routing
@ -271,6 +272,7 @@ services:
BASEROW_BUILDER_DOMAINS: BASEROW_BUILDER_DOMAINS:
BASEROW_FRONTEND_SAME_SITE_COOKIE: BASEROW_FRONTEND_SAME_SITE_COOKIE:
SENTRY_DSN: SENTRY_DSN:
BASEROW_ENTERPRISE_GROUPED_AGGREGATE_SERVICE_MAX_SERIES:
depends_on: depends_on:
- backend - backend
networks: networks:

View file

@ -76,9 +76,15 @@
class="margin-bottom-2" class="margin-bottom-2"
> >
<template #title-slot> <template #title-slot>
<ButtonText icon="iconoir-plus" type="secondary" @click="addSeries">{{ <ButtonText
$t('groupedAggregateRowsDataSourceForm.addSeries') icon="iconoir-plus"
}}</ButtonText> type="secondary"
:disabled="!canAddSeries"
tooltip-position="bottom-left"
@click="addSeries"
>
{{ $t('groupedAggregateRowsDataSourceForm.addSeries') }}
</ButtonText>
</template> </template>
<div class="margin-bottom-2"></div> <div class="margin-bottom-2"></div>
<AggregationSeriesForm <AggregationSeriesForm
@ -260,6 +266,12 @@ export default {
) )
return seriesSortReferences.concat(groupBySortReferences) return seriesSortReferences.concat(groupBySortReferences)
}, },
canAddSeries() {
return (
this.values.aggregation_series.length <
this.$config.BASEROW_ENTERPRISE_GROUPED_AGGREGATE_SERVICE_MAX_SERIES
)
},
}, },
watch: { watch: {
dataSource: { dataSource: {

View file

@ -19,6 +19,11 @@ export default function () {
// Register new alias to the web-frontend directory. // Register new alias to the web-frontend directory.
this.options.alias['@baserow_enterprise'] = path.resolve(__dirname, './') this.options.alias['@baserow_enterprise'] = path.resolve(__dirname, './')
if (this.options.publicRuntimeConfig) {
this.options.publicRuntimeConfig.BASEROW_ENTERPRISE_GROUPED_AGGREGATE_SERVICE_MAX_SERIES =
process.env.BASEROW_ENTERPRISE_GROUPED_AGGREGATE_SERVICE_MAX_SERIES || 3
}
// Remove the existing index route and add our own routes. // Remove the existing index route and add our own routes.
this.extendRoutes((configRoutes) => { this.extendRoutes((configRoutes) => {
const settingsRoute = configRoutes.find( const settingsRoute = configRoutes.find(