Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Fix wp-baseline type errors

Alexander Brandon Coles7c52e9ddc5cc
diff --git a/frontend/src/app/features/work-packages/components/wp-baseline/baseline-helpers.ts b/frontend/src/app/features/work-packages/components/wp-baseline/baseline-helpers.ts
index 00c52ac43a2..3ca7307167c 100644
--- a/frontend/src/app/features/work-packages/components/wp-baseline/baseline-helpers.ts
+++ b/frontend/src/app/features/work-packages/components/wp-baseline/baseline-helpers.ts
@@ -6,6 +6,7 @@ import { WorkPackageResource } from 'core-app/features/hal/resources/work-packag
import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
export type BaselineOption = 'oneDayAgo'|'lastWorkingDay'|'oneWeekAgo'|'oneMonthAgo'|'aSpecificDate'|'betweenTwoSpecificDates';
+export type BaselineMode = 'added'|'updated'|'removed'|null;
export interface BaselineTimestamp {
date:string;
@@ -60,8 +61,8 @@ export function attributeChanged(base:IWorkPackageTimestamp, schema:ISchemaProxy
});
}
-export function getBaselineState(workPackage:WorkPackageResource, schemaService:SchemaCacheService):string {
- let state = '';
+export function getBaselineState(workPackage:WorkPackageResource, schemaService:SchemaCacheService):BaselineMode {
+ let state:BaselineMode = null;
const schema = schemaService.of(workPackage);
const timestamps = workPackage.attributesByTimestamp || [];
if (timestamps.length > 1) {
@@ -74,8 +75,6 @@ export function getBaselineState(workPackage:WorkPackageResource, schemaService:
} else if (attributeChanged(base, schema)) {
state = 'updated';
}
- } else {
- state = '';
}
return state;
}
diff --git a/frontend/src/app/features/work-packages/components/wp-baseline/baseline-legends/baseline-legends.component.ts b/frontend/src/app/features/work-packages/components/wp-baseline/baseline-legends/baseline-legends.component.ts
index 789e00adc4a..ce265bc3dfb 100644
--- a/frontend/src/app/features/work-packages/components/wp-baseline/baseline-legends/baseline-legends.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-baseline/baseline-legends/baseline-legends.component.ts
@@ -44,6 +44,7 @@ import {
getPartsFromTimestamp,
getBaselineState,
offsetToUtcString,
+ BaselineMode,
} from 'core-app/features/work-packages/components/wp-baseline/baseline-helpers';
import { TimezoneService } from 'core-app/core/datetime/timezone.service';
import moment, { Moment } from 'moment-timezone';
@@ -200,7 +201,7 @@ export class OpBaselineLegendsComponent extends UntilDestroyedMixin implements O
this.numAdded = 0;
this.numRemoved = 0;
this.numUpdated = 0;
- let state = '';
+ let state:BaselineMode;
const baselineIsActive= this.wpTableBaseline.isActive();
const results = this.querySpace.results.value;
if (baselineIsActive && results && results.elements.length > 0) {
diff --git a/frontend/src/app/features/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.html b/frontend/src/app/features/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.html
index 8edbc920b80..f8a8d2f903c 100644
--- a/frontend/src/app/features/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.html
+++ b/frontend/src/app/features/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.html
@@ -134,7 +134,7 @@
>
</wp-status-button>
<span
- *ngIf="baselineIcon(workPackage) !== ''"
+ *ngIf="baselineIcon(workPackage) !== null"
class="spot-icon spot-icon_1 spot-icon_flex op-wp-single-card--content-baseline"
[ngClass]="baselineMode==='added' ? 'spot-icon_flex spot-icon_arrow-in op-table-baseline--icon-added' : (baselineMode==='removed' ? 'spot-icon_arrow-out op-table-baseline--icon-removed' : 'spot-icon_delta-triangle op-table-baseline--icon-changed')"
title="{{ baselineMode==='added' ? text.baseLineIconAdded : (baselineMode==='removed' ? text.baseLineIconRemoved : text.baseLineIconChanged) }}"
diff --git a/frontend/src/app/features/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.ts b/frontend/src/app/features/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.ts
index 3f4d39a3b4a..54482f1c882 100644
--- a/frontend/src/app/features/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-card-view/wp-single-card/wp-single-card.component.ts
@@ -39,7 +39,7 @@ import { combineLatest } from 'rxjs';
import { map } from 'rxjs/operators';
import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
import SpotDropAlignmentOption from 'core-app/spot/drop-alignment-options';
-import { getBaselineState } from 'core-app/features/work-packages/components/wp-baseline/baseline-helpers';
+import { BaselineMode, getBaselineState } from 'core-app/features/work-packages/components/wp-baseline/baseline-helpers';
import {
CombinedDateDisplayField,
} from 'core-app/shared/components/fields/display/field-types/combined-date-display.field';
@@ -96,7 +96,7 @@ export class WorkPackageSingleCardComponent extends UntilDestroyedMixin implemen
public selected = false;
- public baselineMode = ''||'added'||'updated'||'removed';
+ public baselineMode:BaselineMode;
public text = {
removeCard: this.I18n.t('js.card.remove_from_list'),