feat(analytics): improved UI of filtered aggregated column (#270)

* feat(analytics): improved UI of filtered aggregated column

* ci(ci-cd): add tests

* test(analytics-table): update tests on conditions

Co-authored-by: Aurelien Arino <aurelien.arino@gmail.com>

.github/workflows/ci-cd.yml

@@ -20,6 +20,9 @@ jobs:
       - name: Lint code
         run: npm run lint
         timeout-minutes: 5
+      - name: Test code
+        run: npm run test
+        timeout-minutes: 1
       - name: Create a release
         if: github.event_name == 'push'
         run: npm run release

src/models/analytics/analytics-tables.ts

@@ -850,7 +850,6 @@ function getColumnPlaceholder(
   userLocale: keyof Translations,
 ): string {
   const tl = t[userLocale];
-  const conditionMarker = 'condition' in column ? '*' : '';
 
   const parseField = (field: string): {
     tableName: TableKeys,
@@ -902,18 +901,18 @@ function getColumnPlaceholder(
     onTimeGroupColumn: (timeGroupColumn) => {
       const aggregateText = getTranslationString(tl.granularities[timeGroupColumn.granularity]);
       const placeholder = placeholderFromField(timeGroupColumn.field);
-      return `${aggregateText}${conditionMarker}(${placeholder})`;
+      return `${aggregateText}(${placeholder})`;
     },
     onAggregatedColumnWithField: (aggregatedColumn, field) => {
       const aggregateText = getTranslationString(tl.aggregations[aggregatedColumn.type]);
       const placeholder = typeof field === 'string'
         ? placeholderFromField(field)
         : field.expression;
-      return `${aggregateText}${conditionMarker}(${placeholder})`;
+      return `${aggregateText}(${placeholder})`;
     },
     onAggregatedColumnWithoutField: (aggregatedColumn) => {
       const aggregateText = getTranslationString(tl.aggregations[aggregatedColumn.type]);
-      return `${aggregateText}${conditionMarker}`;
+      return `${aggregateText}`;
     },
   });
 }

test/analytics/analytics-tables.test.ts

@@ -179,8 +179,8 @@ describe('analytics-tables placeholders', () => {
           },
         },
         expected: {
-          nl: 'Min*(Meting:waarde)',
-          en: 'Min*(Measurement:value)',
+          nl: 'Min(Meting:waarde)',
+          en: 'Min(Measurement:value)',
         },
       },
     ])('then it returns me the placeholder ($name)', ({