Cleanup motion content component

Change detection for amendments and crs not working yet
OpenSlides · Aug 16, 2024 · 385b402 · 385b402
1 parent 2579251
commit 385b402
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 357 deletions.
diff --git a/client/src/app/gateways/repositories/base-repository.ts b/client/src/app/gateways/repositories/base-repository.ts
@@ -721,6 +721,10 @@ export abstract class BaseRepository<V extends BaseViewModel, M extends BaseMode
                     result = this.relationManager.handleRelation(_model, relation);
                 }
                 return result;
+            },
+            set: (obj, ...args): any => {
+                obj.viewModelUpdateTimestamp = Date.now();
+                return Reflect.set(obj, ...args);
             }
         });
         this._createViewModelPipes.forEach(fn => fn(viewModel));

diff --git a/client/src/app/site/base/base-view-model.ts b/client/src/app/site/base/base-view-model.ts
@@ -23,6 +23,8 @@ export interface ViewModelConstructor<T extends BaseViewModel> {
  * Base class for view models.
  */
 export abstract class BaseViewModel<M extends BaseModel = any> implements DetailNavigable {
+    public viewModelUpdateTimestamp = Date.now();
+
     public get fqid(): Fqid {
         return this.getModel().fqid;
     }

diff --git a/...ange-recommendation-controller.service/motion-change-recommendation-controller.service.ts b/...ange-recommendation-controller.service/motion-change-recommendation-controller.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { map, Observable } from 'rxjs';
+import { distinctUntilChanged, map, Observable } from 'rxjs';
 import { Id } from 'src/app/domain/definitions/key-types';
 import { Identifiable } from 'src/app/domain/interfaces';
 import { MotionChangeRecommendation } from 'src/app/domain/models/motions/motion-change-recommendation';
@@ -47,7 +47,13 @@ export class MotionChangeRecommendationControllerService extends BaseMeetingCont
      */
     public getChangeRecosOfMotionObservable(motionId: Id): Observable<ViewMotionChangeRecommendation[]> {
         return this.getViewModelListObservable().pipe(
-            map((recos: ViewMotionChangeRecommendation[]) => recos.filter(reco => reco.motion_id === motionId))
+            map((recos: ViewMotionChangeRecommendation[]) => recos.filter(reco => reco.motion_id === motionId)),
+            distinctUntilChanged(
+                (prev, curr) =>
+                    prev?.length === curr?.length &&
+                    Math.max(...prev.map(e => e.viewModelUpdateTimestamp)) ===
+                        Math.max(...curr.map(e => e.viewModelUpdateTimestamp))
+            )
         );
     }
 

diff --git a/...ges/meetings/pages/motions/pages/motion-detail/base/base-motion-detail-child.component.ts b/...ges/meetings/pages/motions/pages/motion-detail/base/base-motion-detail-child.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Directive, inject, Input } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { filter, Subscription } from 'rxjs';
+import { filter, Observable, Subscription } from 'rxjs';
 import { ChangeRecoMode, LineNumberingMode } from 'src/app/domain/models/motions/motions.constants';
 import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component';
 import { ViewMotion, ViewMotionChangeRecommendation } from 'src/app/site/pages/meetings/pages/motions';
@@ -62,10 +62,18 @@ export abstract class BaseMotionDetailChildComponent extends BaseMeetingComponen
         return this.viewService.currentLineNumberingMode;
     }
 
+    public get lineNumberingMode$(): Observable<LineNumberingMode> {
+        return this.viewService.lineNumberingModeSubject;
+    }
+
     public get changeRecoMode(): ChangeRecoMode {
         return this.viewService.currentChangeRecommendationMode;
     }
 
+    public get changeRecoMode$(): Observable<ChangeRecoMode> {
+        return this.viewService.changeRecommendationModeSubject;
+    }
+
     public get hasChangingObjects(): boolean {
         if (this.sortedChangingObjects !== null) {
             return this.sortedChangingObjects.length > 0;
@@ -88,6 +96,10 @@ export abstract class BaseMotionDetailChildComponent extends BaseMeetingComponen
         return this.viewService.currentShowAllAmendmentsState;
     }
 
+    public get showAllAmendments$(): Observable<boolean> {
+        return this.viewService.showAllAmendmentsStateSubject;
+    }
+
     ///////////////////////////////////////////////
     /////// Getter to repos & services
     ///////////////////////////////////////////////
@@ -156,12 +168,19 @@ export abstract class BaseMotionDetailChildComponent extends BaseMeetingComponen
      * All change recommendations to this motion
      */
     public changeRecommendations: ViewUnifiedChange[] = [];
+    public get changeRecommendations$(): Observable<ViewUnifiedChange[]> {
+        return this.changeRecoRepo.getChangeRecosOfMotionObservable(this.motion.id).pipe(filter(value => !!value));
+    }
+
     /**
      * Value for os-motion-detail-diff: when this is set, that component scrolls to the given change
      */
     public scrollToChange: ViewUnifiedChange | null = null;
 
     protected amendments: ViewMotion[] = [];
+    protected get amendments$(): Observable<ViewMotion[]> {
+        return this.amendmentRepo.getViewModelListObservableFor(this.motion).pipe(filter(value => !!value));
+    }
 
     private _isEditing = false;
     private _motion: ViewMotion | null = null;
@@ -233,21 +252,17 @@ export abstract class BaseMotionDetailChildComponent extends BaseMeetingComponen
 
     private getSharedSubscriptionsToRepositories(): Subscription[] {
         return [
-            this.changeRecoRepo
-                .getChangeRecosOfMotionObservable(this.motion.id)
-                .pipe(filter(value => !!value))
-                .subscribe(changeRecos => {
-                    this.changeRecommendations = changeRecos;
-                    this.sortedChangingObjects = null;
-                }),
-            this.amendmentRepo
-                .getViewModelListObservableFor(this.motion)
-                .pipe(filter(value => !!value))
-                .subscribe((amendments: ViewMotion[]): void => {
-                    this.amendments = amendments;
-                    this.motionLineNumbering.resetAmendmentChangeRecoListeners(amendments);
-                    this.sortedChangingObjects = null;
-                })
+            this.changeRecommendations$.subscribe(changeRecos => {
+                console.log(`crs updated`);
+                this.changeRecommendations = changeRecos;
+                this.sortedChangingObjects = null;
+            }),
+            this.amendments$.subscribe((amendments: ViewMotion[]): void => {
+                console.log(`amendments updated`);
+                this.amendments = amendments;
+                this.motionLineNumbering.resetAmendmentChangeRecoListeners(amendments);
+                this.sortedChangingObjects = null;
+            })
         ];
     }
 

diff --git a/...pages/motions/pages/motion-detail/components/motion-content/motion-content.component.html b/...pages/motions/pages/motion-detail/components/motion-content/motion-content.component.html
@@ -1,12 +1,16 @@
 <!-- Regular motions or traditional amendments -->
-@if (!motion.isParagraphBasedAmendment()) {
-    <!-- Text (hide preamble, if diff mode. The preample is included in the motion-detail-diff component) -->
-    @if (showPreamble && changeRecoMode !== ChangeRecoMode.Diff) {
-        <span class="text-prefix-label">
-            {{ preamble }}
-        </span>
-    }
-    @if (changeRecoMode !== ChangeRecoMode.Diff && !isFinalEdit) {
+@if (!isParagraphBasedAmendment) {
+    @let changeRecoMode = changeRecoMode$ | async;
+    @let lineNumberingMode = lineNumberingMode$ | async;
+
+    @if (changeRecoMode !== ChangeRecoMode.Diff) {
+        <!-- Text (hide preamble, if diff mode. The preample is included in the motion-detail-diff component) -->
+        @if (showPreamble) {
+            <span class="text-prefix-label">
+                {{ preamble }}
+            </span>
+        }
+
         <div
             class="motion-text underlined-links"
             [class.line-numbers-inline]="lineNumberingMode === LineNumberingMode.Inside"
@@ -21,16 +25,14 @@
                     (createChangeRecommendation)="createChangeRecommendation($event)"
                     (gotoChangeRecommendation)="gotoChangeRecommendation($event)"
                 ></os-motion-detail-original-change-recommendations>
-            }
-            @if (lineNumberingMode !== LineNumberingMode.Outside || changeRecoMode !== ChangeRecoMode.Original) {
+            } @else {
                 <os-motion-final-version
                     [formattedText]="getFormattedTextPlain()"
                     [motion]="motion"
                 ></os-motion-final-version>
             }
         </div>
-    }
-    @if (changeRecoMode === ChangeRecoMode.Diff) {
+    } @else {
         <os-motion-detail-diff
             [changes]="getChangesForDiffMode()"
             [highlightedLine]="highlightedLine"
@@ -41,16 +43,13 @@
             (createChangeRecommendation)="createChangeRecommendation($event)"
         ></os-motion-detail-diff>
     }
-} @else if (isParagraphBasedAmendment) {
+} @else {
     <!-- Paragraph-based amendments -->
     <os-paragraph-based-amendment
         [changesForDiffMode]="getChangesForDiffMode()"
         [highlightedLine]="highlightedLine"
-        [isFinalEdit]="isFinalEdit"
         [motion]="motion"
         (createChangeRecommendation)="createChangeRecommendation($event)"
-        (formChanged)="paragraphBasedAmendmentContent = $event"
-        (validStateChanged)="canSaveParagraphBasedAmendment = $event"
     ></os-paragraph-based-amendment>
 }