Fix remove and add submitters

OpenSlides · Oct 5, 2023 · f4b44ca · f4b44ca
1 parent d2a51bf
commit f4b44ca
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/client/src/app/gateways/actions/action.ts b/client/src/app/gateways/actions/action.ts
@@ -4,6 +4,10 @@ export class Action<T = void> {
     private _actions: ActionRequest[];
     private _sendActionFn: (requests: ActionRequest[]) => Promise<T[]>;
 
+    public setSendActionFn(sendActionFn: (requests: ActionRequest[]) => Promise<T[]>): void {
+        this._sendActionFn = sendActionFn;
+    }
+
     public constructor(sendActionFn: (requests: ActionRequest[]) => Promise<T[]>, actions: ActionRequest[] = []) {
         this._actions = actions.filter(action => !!action?.data?.length);
         this._sendActionFn = sendActionFn;

diff --git a/client/src/app/gateways/repositories/base-repository.ts b/client/src/app/gateways/repositories/base-repository.ts
@@ -479,11 +479,15 @@ export abstract class BaseRepository<V extends BaseViewModel, M extends BaseMode
 
     protected tapViewModels(_viewModels: V[]): void {}
 
-    protected createAction<T = void>(name: string, payload: unknown | unknown[]): Action<T> {
+    protected createAction<T = void>(
+        name: string,
+        payload: unknown | unknown[],
+        handle_separately?: boolean
+    ): Action<T> {
         if (!Array.isArray(payload)) {
             payload = [payload];
         }
-        return this.actions.create({ action: name, data: payload as unknown[] });
+        return this.actions.createFromArray([{ action: name, data: payload as unknown[] }], handle_separately ?? false);
     }
 
     /**

diff --git a/...tories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts b/...tories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts
@@ -39,11 +39,11 @@ export class MotionSubmitterRepositoryService extends BaseMeetingRelatedReposito
         return this.createAction(MotionSubmitterAction.DELETE, payload);
     }
 
-    public async sort(submitters: Identifiable[], motion: Identifiable): Promise<void> {
+    public sort(submitters: Identifiable[], motion: Identifiable): Action<void> {
         const payload = {
             motion_submitter_ids: submitters.map(submitter => submitter.id),
             motion_id: motion.id
         };
-        await this.sendActionToBackend(MotionSubmitterAction.SORT, payload);
+        return this.createAction(MotionSubmitterAction.SORT, payload);
     }
 }
diff --git a/...tters/services/motion-submitter-controller.service/motion-submitter-controller.service.ts b/...tters/services/motion-submitter-controller.service/motion-submitter-controller.service.ts
@@ -34,7 +34,7 @@ export class MotionSubmitterControllerService extends BaseMeetingControllerServi
         return this.repo.delete(...submitters);
     }
 
-    public sort(submitters: Identifiable[], motion: Identifiable): Promise<void> {
+    public sort(submitters: Identifiable[], motion: Identifiable): Action<void> {
         return this.repo.sort(submitters, motion);
     }
 }
diff --git a/...s/motion-detail/components/motion-manage-submitters/motion-manage-submitters.component.ts b/...s/motion-detail/components/motion-manage-submitters/motion-manage-submitters.component.ts
@@ -3,7 +3,7 @@ import { BehaviorSubject, filter, firstValueFrom, map, Observable } from 'rxjs';
 import { Fqid, Id } from 'src/app/domain/definitions/key-types';
 import { Identifiable } from 'src/app/domain/interfaces';
 import { Selectable } from 'src/app/domain/interfaces/selectable';
-import { Action } from 'src/app/gateways/actions';
+import { Action, ActionService } from 'src/app/gateways/actions';
 import { UserSelectionData } from 'src/app/site/pages/meetings/modules/participant-search-selector';
 import { ViewMotion, ViewMotionSubmitter } from 'src/app/site/pages/meetings/pages/motions';
 import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service';
@@ -77,7 +77,8 @@ export class MotionManageSubmittersComponent extends BaseUiComponent implements
         private userRepository: ParticipantControllerService,
         private motionSubmitterRepository: MotionSubmitterControllerService,
         public perms: MotionPermissionService,
-        private motionController: MotionControllerService
+        private motionController: MotionControllerService,
+        private actionService: ActionService
     ) {
         super();
 
@@ -111,21 +112,29 @@ export class MotionManageSubmittersComponent extends BaseUiComponent implements
                     ...Array.from(this._addSubmittersSet).map(id => ({ id }))
                 )
             );
+
+            if (Object.values(this._removeSubmittersMap).length > 0) {
+                actions[0].setSendActionFn(r => this.actionService.sendRequests(r, true));
+            }
         }
-        await Action.from(...actions).resolve();
-        const submitters = await Promise.all(
-            this.editSubmitterSubject.value.map(async val =>
+
+        const submittersPromise = Promise.all(
+            this.editSubmitterSubject.value.map(val =>
                 val.user_id
                     ? val
-                    : await firstValueFrom(
+                    : firstValueFrom(
                           this.motionController.getViewModelObservable(this.motion.id).pipe(
                               map(motion => motion.submitters.find(sub => sub.user_id === val.id)),
                               filter(sub => !!sub)
                           )
                       )
             )
         );
-        this.motionSubmitterRepository.sort(submitters, this.motion);
+
+        await Action.from(...actions).resolve();
+
+        const submitters = await submittersPromise;
+        this.motionSubmitterRepository.sort(submitters, this.motion).resolve();
         this.isEditMode = false;
     }