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
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Fix requiring of relations and updating
Oliver Güntherb2f552099836
diff --git a/frontend/src/app/core/apiv3/cache/state-cache.service.ts b/frontend/src/app/core/apiv3/cache/state-cache.service.tsindex fcff31736e6..87b9c48a323 100644--- a/frontend/src/app/core/apiv3/cache/state-cache.service.ts+++ b/frontend/src/app/core/apiv3/cache/state-cache.service.ts@@ -27,6 +27,7 @@//++import {+ InputState,MultiInputState,State,} from '@openproject/reactivestates';@@ -152,6 +153,10 @@ export class StateCacheService<T> {);}+ observeChanges():Observable<[string, T|undefined, InputState<T>]> {+ return this.multiState.observeChange();+ }+observeSome(ids:string[]):Observable<T[]> {return combineLatest(ids.map(diff --git a/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-relations.directive.ts b/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-relations.directive.tsindex 086c18ad3a1..45ec80484fc 100644--- a/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-relations.directive.ts+++ b/frontend/src/app/features/work-packages/components/wp-table/timeline/global-elements/wp-timeline-relations.directive.ts@@ -34,7 +34,9 @@ import { State } from '@openproject/reactivestates';import { combineLatest } from 'rxjs';import { filter, map, take } from 'rxjs/operators';import { States } from 'core-app/core/states/states.service';-import { WorkPackageViewTimelineService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-timeline.service';+import {+ WorkPackageViewTimelineService,+} from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-timeline.service';import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';import { RelationsStateValue, WorkPackageRelationsService } from '../../../wp-relations/wp-relations.service';@@ -48,13 +50,13 @@ const DEBUG_DRAW_RELATION_LINES_WITH_COLOR = false;export const timelineGlobalElementCssClassname = 'relation-line';function newSegment(vp:TimelineViewParameters,- classNames:string[],- yPosition:number,- top:number,- left:number,- width:number,- height:number,- color?:string):HTMLElement {+ classNames:string[],+ yPosition:number,+ top:number,+ left:number,+ width:number,+ height:number,+ color?:string):HTMLElement {const segment = document.createElement('div');segment.classList.add(timelineElementCssClass,@@ -85,14 +87,14 @@ export class WorkPackageTableTimelineRelations extends UntilDestroyedMixin impleprivate container:JQuery;- private workPackagesWithRelations:{ [workPackageId:string]:State<RelationsStateValue> } = {};+ private workPackagesWithRelations:{ [workPackageId:string]:RelationsStateValue } = {};constructor(public readonly injector:Injector,- public elementRef:ElementRef,- public states:States,- public workPackageTimelineTableController:WorkPackageTimelineTableController,- public wpTableTimeline:WorkPackageViewTimelineService,- public wpRelations:WorkPackageRelationsService) {+ public elementRef:ElementRef,+ public states:States,+ public workPackageTimelineTableController:WorkPackageTimelineTableController,+ public wpTableTimeline:WorkPackageViewTimelineService,+ public wpRelations:WorkPackageRelationsService) {super();}@@ -120,34 +122,32 @@ export class WorkPackageTableTimelineRelations extends UntilDestroyedMixin imple// for all visible WorkPackage rows...combineLatest([this.querySpace.renderedWorkPackages.values$(),- this.wpRelations.observeAll(),this.wpTableTimeline.live$(),]).pipe(- filter(([_render, _relations, timeline]) => timeline.visible),+ filter(([_render, timeline]) => timeline.visible),this.untilDestroyed(),map(([rendered, _]) => rendered),).subscribe((list) => {// ... make sure that the corresponding relations are loaded ...const wps = _.compact(list.map((row) => row.workPackageId) as string[]);- this.wpRelations.requireAll(wps);-- wps.forEach((wpId) => {- const relationsForWorkPackage = this.wpRelations.state(wpId);- this.workPackagesWithRelations[wpId] = relationsForWorkPackage;-- // ... once they are loaded, display them.- relationsForWorkPackage.values$()- .pipe(- take(1),- )- .subscribe(() => {- this.renderWorkPackagesRelations([wpId]);- });- });+ void this.wpRelations.requireAll(wps);});+ // When the relations are updated, redraw them+ this+ .wpRelations+ .observeChanges()+ .pipe(+ this.untilDestroyed(),+ filter(([_, state]) => !!state),+ ).subscribe(([wpId, state]) => {+ this.workPackagesWithRelations[wpId] = state!;+ this.renderWorkPackagesRelations([wpId]);+ });++// When a WorkPackage changes, redraw the corresponding relationsthis.states.workPackages.observeChange().pipe(@@ -167,7 +167,7 @@ export class WorkPackageTableTimelineRelations extends UntilDestroyedMixin imple}this.removeRelationElementsForWorkPackage(workPackageId);- const relations = _.values(workPackageWithRelation.value);+ const relations = _.values(workPackageWithRelation);const relationsList = _.values(relations);relationsList.forEach((relation) => {if (!(relation.type === 'precedes'@@ -229,11 +229,11 @@ export class WorkPackageTableTimelineRelations extends UntilDestroyedMixin imple}private renderRelation(vp:TimelineViewParameters,- e:TimelineRelationElement,- idxFrom:number,- idxTo:number,- startCell:WorkPackageTimelineCell,- endCell:WorkPackageTimelineCell) {+ e:TimelineRelationElement,+ idxFrom:number,+ idxTo:number,+ startCell:WorkPackageTimelineCell,+ endCell:WorkPackageTimelineCell) {const rowFrom = this.workPackageIdOrder[idxFrom];const rowTo = this.workPackageIdOrder[idxTo];