Browse Source

UI: Fixed entity-aggregation-component.component.ts

pull/14253/head
Vladyslav_Prykhodko 10 months ago
parent
commit
7d48aca10d
  1. 2
      ui-ngx/src/app/modules/home/components/calculated-fields/components/entity-aggregation-configuration/entity-aggregation-component.component.ts
  2. 2
      ui-ngx/src/app/shared/models/calculated-field.models.ts
  3. 1
      ui-ngx/src/assets/locale/locale.constant-en_US.json

2
ui-ngx/src/app/modules/home/components/calculated-fields/components/entity-aggregation-configuration/entity-aggregation-component.component.ts

@ -176,7 +176,7 @@ export class EntityAggregationComponentComponent implements ControlValueAccessor
if (!value.interval.allowOffsetSec) { if (!value.interval.allowOffsetSec) {
delete value.interval.offsetSec; delete value.interval.offsetSec;
} }
delete value.interval.offsetSec; delete value.interval.allowOffsetSec;
if (!value.allowWatermark) { if (!value.allowWatermark) {
delete value.watermark; delete value.watermark;
} }

2
ui-ngx/src/app/shared/models/calculated-field.models.ts

@ -294,6 +294,7 @@ export enum AggIntervalType {
WEEK = 'WEEK', WEEK = 'WEEK',
WEEK_SUN_SAT = 'WEEK_SUN_SAT', WEEK_SUN_SAT = 'WEEK_SUN_SAT',
MONTH = 'MONTH', MONTH = 'MONTH',
QUARTER = 'QUARTER',
YEAR = 'YEAR', YEAR = 'YEAR',
CUSTOM = 'CUSTOM' CUSTOM = 'CUSTOM'
} }
@ -305,6 +306,7 @@ export const AggIntervalTypeTranslations = new Map<AggIntervalType, string>(
[AggIntervalType.WEEK, 'calculated-fields.aggregate-period.week'], [AggIntervalType.WEEK, 'calculated-fields.aggregate-period.week'],
[AggIntervalType.WEEK_SUN_SAT, 'calculated-fields.aggregate-period.week-sun-sat'], [AggIntervalType.WEEK_SUN_SAT, 'calculated-fields.aggregate-period.week-sun-sat'],
[AggIntervalType.MONTH, 'calculated-fields.aggregate-period.month'], [AggIntervalType.MONTH, 'calculated-fields.aggregate-period.month'],
[AggIntervalType.QUARTER, 'calculated-fields.aggregate-period.quarter'],
[AggIntervalType.YEAR, 'calculated-fields.aggregate-period.year'], [AggIntervalType.YEAR, 'calculated-fields.aggregate-period.year'],
[AggIntervalType.CUSTOM, 'calculated-fields.aggregate-period.custom'] [AggIntervalType.CUSTOM, 'calculated-fields.aggregate-period.custom']
] ]

1
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -1203,6 +1203,7 @@
"week": "Week (Mon - Sun)", "week": "Week (Mon - Sun)",
"week-sun-sat": "Week (Sun - Sat)", "week-sun-sat": "Week (Sun - Sat)",
"month": "Month", "month": "Month",
"quarter": "Quarter",
"year": "Year", "year": "Year",
"custom": "Custom" "custom": "Custom"
}, },

Loading…
Cancel
Save