From 4c830c91b336b2b545b1201ddeb87348e3bd8dcd Mon Sep 17 00:00:00 2001 From: Emmy Leke Date: Sat, 16 Dec 2023 21:48:25 +0100 Subject: [PATCH] Add interpolation to block titles, tab titles, iframe url, content block body, metric transformation function and automation button labels --- .../components/PageBlocks/Configurator.vue | 1 + .../src/components/PageBlocks/ContentBase.vue | 27 ++++++++++++++++++- .../src/components/PageBlocks/IFrameBase.vue | 11 +++++++- .../PageBlocks/MetricConfigurator/index.vue | 22 +++++++++++++++ .../PageBlocks/Shared/AutomationButtons.vue | 14 ++++++++-- .../src/components/PageBlocks/TabsBase.vue | 13 +++++++-- .../src/components/PageBlocks/Wrap/Card.vue | 4 +-- .../src/components/PageBlocks/Wrap/Plain.vue | 2 +- .../src/components/PageBlocks/Wrap/base.vue | 10 +++++++ locale/en/corteza-webapp-compose/block.yaml | 3 ++- 10 files changed, 97 insertions(+), 10 deletions(-) diff --git a/client/web/compose/src/components/PageBlocks/Configurator.vue b/client/web/compose/src/components/PageBlocks/Configurator.vue index 7bde5bdb7..63745bd49 100644 --- a/client/web/compose/src/components/PageBlocks/Configurator.vue +++ b/client/web/compose/src/components/PageBlocks/Configurator.vue @@ -25,6 +25,7 @@ v-model="block.title" :placeholder="$t('general.titlePlaceholder')" /> +

diff --git a/client/web/compose/src/components/PageBlocks/IFrameBase.vue b/client/web/compose/src/components/PageBlocks/IFrameBase.vue index 5d2030727..11810f045 100644 --- a/client/web/compose/src/components/PageBlocks/IFrameBase.vue +++ b/client/web/compose/src/components/PageBlocks/IFrameBase.vue @@ -14,6 +14,8 @@ diff --git a/client/web/compose/src/components/PageBlocks/Shared/AutomationButtons.vue b/client/web/compose/src/components/PageBlocks/Shared/AutomationButtons.vue index 8c6ca421c..b6f35023e 100644 --- a/client/web/compose/src/components/PageBlocks/Shared/AutomationButtons.vue +++ b/client/web/compose/src/components/PageBlocks/Shared/AutomationButtons.vue @@ -8,12 +8,13 @@ :class="buttonClass" @click.prevent="handle(b)" > - {{ b.label || '-' }} + {{ handleButtonLabel(b.label) || '-' }} diff --git a/client/web/compose/src/components/PageBlocks/TabsBase.vue b/client/web/compose/src/components/PageBlocks/TabsBase.vue index 9a4337166..d7283aebb 100644 --- a/client/web/compose/src/components/PageBlocks/TabsBase.vue +++ b/client/web/compose/src/components/PageBlocks/TabsBase.vue @@ -129,8 +129,9 @@ diff --git a/locale/en/corteza-webapp-compose/block.yaml b/locale/en/corteza-webapp-compose/block.yaml index 81b0a9084..bf245a08a 100644 --- a/locale/en/corteza-webapp-compose/block.yaml +++ b/locale/en/corteza-webapp-compose/block.yaml @@ -198,8 +198,9 @@ metric: dimensionFieldLabel: Field dimensionFieldPlaceholder: Dimension field dimensionLabel: Dimension - filterFootnote: Simplified SQL condition (WHERE ...) syntax is supported. Variables like {{0}}, {{1}}, {{2}} and {{3}} are evaluated (when available) filterLabel: Filter + filterFootnote: Simplified SQL condition (WHERE ...) syntax is supported. Variables like {{0}}, {{1}}, {{2}} and {{3}} are evaluated (when available) + transformFootnote: Variables like {{0}}, {{1}}, {{2}} and {{3}} are evaluated (when available) labelLabel: Label labelPlaceholder: Label metricFieldLabel: Field