feat: PictureAcceptReplace via gRPC

autowp · Sep 1, 2024 · bcc5780 · bcc5780
1 parent 4013933
commit bcc5780
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 20 deletions.
diff --git a/src/app/moder/pictures/item/item.component.html b/src/app/moder/pictures/item/item.component.html
@@ -382,7 +382,7 @@ <h3 i18n>Replacement</h3>
                 >
               </p>
               @if (picture.rights.accept) {
-                <button class="btn btn-success" (click)="acceptReplace(picture.id)">
+                <button class="btn btn-success" (click)="acceptReplace(picture.id + '')">
                   <i class="bi bi-arrow-left-right" aria-hidden="true"></i>
                   <ng-container i18n>Accept and remove double</ng-container>
                 </button>

diff --git a/src/app/moder/pictures/item/item.component.ts b/src/app/moder/pictures/item/item.component.ts
@@ -498,28 +498,40 @@ export class ModerPicturesItemComponent {
   protected cancelReplace(id: string) {
     this.replaceLoading = true;
 
-    this.picturesClient.clearReplacePicture(new PictureIDRequest({id})).subscribe({
-      error: () => {
-        this.replaceLoading = false;
-      },
-      next: () => {
-        this.change$.next();
-        this.replaceLoading = false;
-      },
-    });
+    this.picturesClient
+      .clearReplacePicture(new PictureIDRequest({id}))
+      .pipe(
+        catchError((error: unknown) => {
+          this.replaceLoading = false;
+          this.toastService.handleError(error);
+          return EMPTY;
+        }),
+      )
+      .subscribe({
+        next: () => {
+          this.change$.next();
+          this.replaceLoading = false;
+        },
+      });
   }
 
-  protected acceptReplace(id: number) {
+  protected acceptReplace(id: string) {
     this.replaceLoading = true;
-    this.api.request<void>('PUT', 'picture/' + id + '/accept-replace', {body: {}}).subscribe({
-      error: () => {
-        this.replaceLoading = false;
-      },
-      next: () => {
-        this.change$.next();
-        this.replaceLoading = false;
-      },
-    });
+    this.picturesClient
+      .acceptReplacePicture(new PictureIDRequest({id}))
+      .pipe(
+        catchError((error: unknown) => {
+          this.replaceLoading = false;
+          this.toastService.handleError(error);
+          return EMPTY;
+        }),
+      )
+      .subscribe({
+        next: () => {
+          this.change$.next();
+          this.replaceLoading = false;
+        },
+      });
   }
 
   protected removeFromBlacklist(ip: string) {

diff --git a/src/grpc/spec.pbsc.ts b/src/grpc/spec.pbsc.ts
@@ -3929,6 +3929,27 @@ export class PicturesClient {
         responseClass: googleProtobuf001.Empty
       });
     },
+    /**
+     * Unary call: /goautowp.Pictures/AcceptReplacePicture
+     *
+     * @param requestMessage Request message
+     * @param requestMetadata Request metadata
+     * @returns Observable<GrpcEvent<googleProtobuf001.Empty>>
+     */
+    acceptReplacePicture: (
+      requestData: thisProto.PictureIDRequest,
+      requestMetadata = new GrpcMetadata()
+    ): Observable<GrpcEvent<googleProtobuf001.Empty>> => {
+      return this.handler.handle({
+        type: GrpcCallType.unary,
+        client: this.client,
+        path: '/goautowp.Pictures/AcceptReplacePicture',
+        requestData,
+        requestMetadata,
+        requestClass: thisProto.PictureIDRequest,
+        responseClass: googleProtobuf001.Empty
+      });
+    },
     /**
      * Unary call: /goautowp.Pictures/SetPicturePoint
      *
@@ -4327,6 +4348,22 @@ export class PicturesClient {
       .pipe(throwStatusErrors(), takeMessages());
   }
 
+  /**
+   * Unary call @/goautowp.Pictures/AcceptReplacePicture
+   *
+   * @param requestMessage Request message
+   * @param requestMetadata Request metadata
+   * @returns Observable<googleProtobuf001.Empty>
+   */
+  acceptReplacePicture(
+    requestData: thisProto.PictureIDRequest,
+    requestMetadata = new GrpcMetadata()
+  ): Observable<googleProtobuf001.Empty> {
+    return this.$raw
+      .acceptReplacePicture(requestData, requestMetadata)
+      .pipe(throwStatusErrors(), takeMessages());
+  }
+
   /**
    * Unary call @/goautowp.Pictures/SetPicturePoint
    *