Skip to content

fix: auto completion not working when either stretchgoal or targetgoa… #1624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MasterEvarior merged 1 commit into from
Aug 20, 2025
Merged

fix: auto completion not working when either stretchgoal or targetgoa… #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frontend/src/app/components/key-result-type/key-result-type.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,9 @@ describe('KeyResultTypeComponent', () => {
KeyResultMetricField.STRETCH_GOAL]])('Should call calculateValueForField with the correct enum', (values: MetricValue, changed: KeyResultMetricField, result: KeyResultMetricField) => {
const spyInstance = jest.spyOn(component, 'calculateValueForField');

component.calculateValueAfterChanged(values, changed);
component.calculateValueAfterChanged(values, changed, component.keyResultForm);
expect(spyInstance)
.toHaveBeenCalledWith(values, result);
.toHaveBeenCalledWith(values, result, component.keyResultForm);
});

it.each([
Expand Down Expand Up @@ -341,7 +341,7 @@ describe('KeyResultTypeComponent', () => {
{ stretchGoal: 5,
commitValue: -2 }]
])('calculateValueForField should calculate correct', (values: MetricValue, targetField: KeyResultMetricField, result: any) => {
expect(component.calculateValueForField(values, targetField))
expect(component.calculateValueForField(values, targetField, component.keyResultForm))
.toEqual(result);
});

Expand Down
23 changes: 17 additions & 6 deletions frontend/src/app/components/key-result-type/key-result-type.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,16 @@ export class KeyResultTypeComponent implements AfterContentInit {
updateMetricValue(changed: KeyResultMetricField, value: any) {
const formGroupMetric = this.keyResultForm.get('metric');
formGroupMetric?.updateValueAndValidity();
const formGroupValue = this.getMetricValue(formGroupMetric?.value, value);
const newMetricValue = this.calculateValueAfterChanged(formGroupValue, changed, formGroupMetric);

const hasUndefinedValue = Object.values(value)
.some((v) => v === undefined);
if (hasUndefinedValue || formGroupMetric?.invalid) {
return;
}

const formGroupValue = this.getMetricValue(formGroupMetric?.value, value);
const newMetricValue = this.calculateValueAfterChanged(formGroupValue, changed);

formGroupMetric?.patchValue(newMetricValue, { emitEvent: false });
}

Expand All @@ -102,14 +103,14 @@ export class KeyResultTypeComponent implements AfterContentInit {
stretchGoal: +formGroupValue.stretchGoal } as MetricValue;
}

calculateValueAfterChanged(values: MetricValue, changed: KeyResultMetricField) {
calculateValueAfterChanged(values: MetricValue, changed: KeyResultMetricField, formGroupMetric: any) {
switch (changed) {
case KeyResultMetricField.STRETCH_GOAL:
case KeyResultMetricField.BASELINE: {
return this.calculateValueForField(values, KeyResultMetricField.TARGET_VALUE);
return this.calculateValueForField(values, KeyResultMetricField.TARGET_VALUE, formGroupMetric);
}
case KeyResultMetricField.TARGET_VALUE: {
return this.calculateValueForField(values, KeyResultMetricField.STRETCH_GOAL);
return this.calculateValueForField(values, KeyResultMetricField.STRETCH_GOAL, formGroupMetric);
}

case KeyResultMetricField.NONE: {
Expand All @@ -118,22 +119,25 @@ export class KeyResultTypeComponent implements AfterContentInit {
}
}

calculateValueForField(values: MetricValue, field: KeyResultMetricField) {
calculateValueForField(values: MetricValue, field: KeyResultMetricField, formGroupMetric: any) {
const roundToTwoDecimals = (num: number) => parseFloat(num.toFixed(2));

switch (field) {
case KeyResultMetricField.BASELINE: {
this.setFormControlValueToZero(formGroupMetric, 'baseline');
const baseline = roundToTwoDecimals((values.targetValue - values.stretchGoal * 0.7) / 0.3);
return { baseline: baseline,
commitValue: roundToTwoDecimals((values.stretchGoal - baseline) * 0.3 + baseline) };
}

case KeyResultMetricField.TARGET_VALUE: {
this.setFormControlValueToZero(formGroupMetric, 'targetGoal');
return { targetValue: roundToTwoDecimals((values.stretchGoal - values.baseline) * 0.7 + values.baseline),
commitValue: roundToTwoDecimals((values.stretchGoal - values.baseline) * 0.3 + values.baseline) };
}

case KeyResultMetricField.STRETCH_GOAL: {
this.setFormControlValueToZero(formGroupMetric, 'stretchGoal');
const stretchGoal = roundToTwoDecimals((values.targetValue - values.baseline) / 0.7 + values.baseline);
return { stretchGoal: stretchGoal,
commitValue: roundToTwoDecimals((stretchGoal - values.baseline) * 0.3 + values.baseline) };
Expand All @@ -145,6 +149,13 @@ export class KeyResultTypeComponent implements AfterContentInit {
}
}

setFormControlValueToZero(formGroupMetric: any, formControl: string) {
if (formGroupMetric.get(formControl) && !formGroupMetric.get(formControl).value) {
formGroupMetric.get(formControl)
.setValue(0, { emitEvent: false });
}
}

protected readonly getFullNameOfUser = getFullNameOfUser;


Expand Down
Loading