Prevent unneccessary presenter call (#3671)

OpenSlides · May 15, 2024 · 51703fe · 51703fe
1 parent b025d67
commit 51703fe
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/...onents/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.ts b/...onents/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.ts
@@ -69,6 +69,8 @@ export class MotionManageMotionMeetingUsersComponent<V extends BaseHasMeetingUse
     public secondSelectorLabel: string;
 
     @Input()
+    public loadSecondSelectorValues: () => Promise<Selectable[]>;
+
     public secondSelectorValues: Selectable[];
 
     public secondSelectorFormControl: UntypedFormControl;
@@ -98,6 +100,11 @@ export class MotionManageMotionMeetingUsersComponent<V extends BaseHasMeetingUse
         this._editMode = value;
         this._addUsersSet.clear();
         this._removeUsersMap = {};
+        if (value && this.loadSecondSelectorValues) {
+            this.loadSecondSelectorValues().then(items => {
+                this.secondSelectorValues = items;
+            });
+        }
     }
 
     public get isEditMode(): boolean {
@@ -235,7 +242,7 @@ export class MotionManageMotionMeetingUsersComponent<V extends BaseHasMeetingUse
         }
     }
 
-    public getDisabledFn(): (Selectable) => boolean {
+    public getDisabledFn(): (v: Selectable) => boolean {
         return (value: Selectable) => this.secondSelectorDisabledIds.includes(value.id);
     }
 
@@ -246,7 +253,7 @@ export class MotionManageMotionMeetingUsersComponent<V extends BaseHasMeetingUse
     }
 
     public get isSecondSelectorValuesFilled(): boolean {
-        return this.secondSelectorValues.length > 0;
+        return this.secondSelectorValues && this.secondSelectorValues.length > 0;
     }
 
     private updateData(models: V[]): void {

diff --git a/...s/motions/pages/motion-detail/components/motion-meta-data/motion-meta-data.component.html b/...s/motions/pages/motion-detail/components/motion-meta-data/motion-meta-data.component.html
@@ -11,7 +11,7 @@
             additionalInputLabel="{{ 'Extension' | translate }}"
             [additionalInputValue]="motion?.additional_submitter"
             secondSelectorLabel="{{ 'Committees' | translate }}"
-            [secondSelectorValues]="forwardingCommittees"
+            [loadSecondSelectorValues]="loadForwardingCommittees"
         ></os-motion-manage-motion-meeting-users>
     </div>
 </div>

diff --git a/...ges/motions/pages/motion-detail/components/motion-meta-data/motion-meta-data.component.ts b/...ges/motions/pages/motion-detail/components/motion-meta-data/motion-meta-data.component.ts
@@ -112,18 +112,14 @@ export class MotionMetaDataComponent extends BaseMotionDetailChildComponent impl
         return this._referencedMotions;
     }
 
-    public get forwardingCommittees(): Selectable[] {
-        return this._forwardingCommittees;
-    }
+    public loadForwardingCommittees: () => Promise<Selectable[]>;
 
     private _referencingMotions: ViewMotion[];
 
     private _referencedMotions: ViewMotion[];
 
     private _forwardingAvailable = false;
 
-    private _forwardingCommittees: (Selectable & { name: string; toString: any })[] = [];
-
     public get supportersObservable(): Observable<ViewUser[]> {
         return this._supportersSubject;
     }
@@ -152,6 +148,9 @@ export class MotionMetaDataComponent extends BaseMotionDetailChildComponent impl
         if (operator.hasPerms(Permission.motionCanManage)) {
             this.motionForwardingService.forwardingMeetingsAvailable().then(forwardingAvailable => {
                 this._forwardingAvailable = forwardingAvailable;
+                this.loadForwardingCommittees = async (): Promise<Selectable[]> => {
+                    return (await this.checkPresenter()) as Selectable[];
+                };
             });
         } else {
             this._forwardingAvailable = false;
@@ -164,7 +163,6 @@ export class MotionMetaDataComponent extends BaseMotionDetailChildComponent impl
         this.subscriptions.push(
             this.participantSort.getSortedViewModelListObservable().subscribe(() => this.updateSupportersSubject())
         );
-        this.checkPresenter();
     }
 
     public override ngOnDestroy(): void {
@@ -388,21 +386,23 @@ export class MotionMetaDataComponent extends BaseMotionDetailChildComponent impl
         }
     }
 
-    private async checkPresenter(): Promise<void> {
+    private async checkPresenter(): Promise<(Selectable & { name: string; toString: any })[]> {
         const meetingId = this.activeMeetingService.meetingId;
         const committees =
             this.operator.hasPerms(Permission.motionCanManage) && !!meetingId
                 ? await this.presenter.call({ meeting_id: meetingId })
                 : [];
-        this._forwardingCommittees = [];
+        const forwardingCommittees: (Selectable & { name: string; toString: any })[] = [];
         for (let n = 0; n < committees.length; n++) {
-            this._forwardingCommittees.push({
+            forwardingCommittees.push({
                 id: n + 1,
                 name: committees[n],
                 getTitle: () => committees[n],
                 getListTitle: () => ``,
                 toString: () => committees[n]
             });
         }
+
+        return forwardingCommittees;
     }
 }