From f7977cb59ac44cd57be336d7e02f6393d3a686e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hornych?= <lukashornych@proton.me>
Date: Wed, 16 Oct 2024 23:38:51 +0200
Subject: [PATCH] feat(#171): updated access to fileId during backup upload

---
 .../components/BackupCatalogDialog.vue        | 11 +++-
 .../driver/grpc/EvitaDBDriverGrpc.ts          | 13 ++--
 .../gen/GrpcEvitaManagementAPI_connect.ts     |  4 +-
 .../grpc/gen/GrpcEvitaManagementAPI_pb.ts     | 61 ++++++++++++++++++-
 .../driver/grpc/gen/GrpcEvitaSessionAPI_pb.ts | 17 ++++++
 5 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/src/modules/backup-viewer/components/BackupCatalogDialog.vue b/src/modules/backup-viewer/components/BackupCatalogDialog.vue
index 89f6f27f..c499a44e 100644
--- a/src/modules/backup-viewer/components/BackupCatalogDialog.vue
+++ b/src/modules/backup-viewer/components/BackupCatalogDialog.vue
@@ -25,6 +25,15 @@ const emit = defineEmits<{
     (e: 'backup'): void
 }>()
 
+watch(
+    () => props.modelValue,
+    (newValue) => {
+        if (newValue) {
+            loadAvailableCatalogs().then()
+        }
+    }
+)
+
 const availableCatalogs = ref<string[]>([])
 const availableCatalogsLoaded = ref<boolean>(false)
 const minimalDate = ref<string | undefined>()
@@ -133,8 +142,6 @@ async function backup(): Promise<boolean> {
         return false
     }
 }
-
-loadAvailableCatalogs().then()
 </script>
 
 <template>
diff --git a/src/modules/connection/driver/grpc/EvitaDBDriverGrpc.ts b/src/modules/connection/driver/grpc/EvitaDBDriverGrpc.ts
index 3f025393..f683ddf5 100644
--- a/src/modules/connection/driver/grpc/EvitaDBDriverGrpc.ts
+++ b/src/modules/connection/driver/grpc/EvitaDBDriverGrpc.ts
@@ -39,7 +39,7 @@ import {
     GrpcDeleteFileToFetchResponse,
     GrpcEvitaServerStatusResponse,
     GrpcReservedKeywordsResponse,
-    GrpcRestoreCatalogResponse, GrpcRestoreCatalogUnaryRequest
+    GrpcRestoreCatalogUnaryRequest, GrpcRestoreCatalogUnaryResponse
 } from '@/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_pb'
 import { ReservedKeywordsConverter } from '@/modules/connection/driver/grpc/service/ReservedKeywordsConverter'
 import { splitStringWithCaseIntoWords } from '@/utils/string'
@@ -59,7 +59,7 @@ import { GrpcFile, GrpcTaskStatus } from '@/modules/connection/driver/grpc/gen/G
 /**
  * Chunk size for upload local backup files
  */
-const chunkSize: number = 64 * 1024; // 64 KB chunks
+const chunkSize: number = 2 * 1024 * 1024; // 2 MB chunks
 /**
  * Timeout in milliseconds in which a file chunks needs to be uploaded to server
  */
@@ -622,7 +622,7 @@ export class EvitaDBDriverGrpc implements EvitaDBDriver {
                 totalSizeInBytes: BigInt(file.size)
             });
 
-            const chunkResponse: GrpcRestoreCatalogResponse = await this.clientProvider
+            const chunkResponse: GrpcRestoreCatalogUnaryResponse = await this.clientProvider
                 .getEvitaManagementClient(connection)
                 .restoreCatalogUnary(
                     chunkRequest,
@@ -630,9 +630,10 @@ export class EvitaDBDriverGrpc implements EvitaDBDriver {
                 )
             lastTaskStatus = chunkResponse.task
             if (uploadedFileId == undefined) {
-                uploadedFileId = this.evitaValueConverter.convertUUID(
-                    (chunkResponse.task?.result.value as GrpcFile).fileId!
-                )
+                if (chunkResponse.fileId == undefined) {
+                    throw new UnexpectedError('No fileId was returned for uploaded chunk. Aborting...')
+                }
+                uploadedFileId = this.evitaValueConverter.convertUUID(chunkResponse.fileId)
             }
         }
 
diff --git a/src/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_connect.ts b/src/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_connect.ts
index c7edbda0..b9d73b28 100644
--- a/src/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_connect.ts
+++ b/src/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_connect.ts
@@ -4,7 +4,7 @@
 // @ts-nocheck
 
 import { Empty, MethodKind } from "@bufbuild/protobuf";
-import { GrpcCancelTaskRequest, GrpcCancelTaskResponse, GrpcDeleteFileToFetchRequest, GrpcDeleteFileToFetchResponse, GrpcEvitaCatalogStatisticsResponse, GrpcEvitaConfigurationResponse, GrpcEvitaServerStatusResponse, GrpcFetchFileRequest, GrpcFetchFileResponse, GrpcFilesToFetchRequest, GrpcFilesToFetchResponse, GrpcFileToFetchRequest, GrpcFileToFetchResponse, GrpcReservedKeywordsResponse, GrpcRestoreCatalogFromServerFileRequest, GrpcRestoreCatalogRequest, GrpcRestoreCatalogResponse, GrpcRestoreCatalogUnaryRequest, GrpcSpecifiedTaskStatusesRequest, GrpcSpecifiedTaskStatusesResponse, GrpcTaskStatusesRequest, GrpcTaskStatusesResponse, GrpcTaskStatusRequest, GrpcTaskStatusResponse } from "./GrpcEvitaManagementAPI_pb.js";
+import { GrpcCancelTaskRequest, GrpcCancelTaskResponse, GrpcDeleteFileToFetchRequest, GrpcDeleteFileToFetchResponse, GrpcEvitaCatalogStatisticsResponse, GrpcEvitaConfigurationResponse, GrpcEvitaServerStatusResponse, GrpcFetchFileRequest, GrpcFetchFileResponse, GrpcFilesToFetchRequest, GrpcFilesToFetchResponse, GrpcFileToFetchRequest, GrpcFileToFetchResponse, GrpcReservedKeywordsResponse, GrpcRestoreCatalogFromServerFileRequest, GrpcRestoreCatalogRequest, GrpcRestoreCatalogResponse, GrpcRestoreCatalogUnaryRequest, GrpcRestoreCatalogUnaryResponse, GrpcSpecifiedTaskStatusesRequest, GrpcSpecifiedTaskStatusesResponse, GrpcTaskStatusesRequest, GrpcTaskStatusesResponse, GrpcTaskStatusRequest, GrpcTaskStatusResponse } from "./GrpcEvitaManagementAPI_pb.js";
 
 /**
  * This service contains RPCs that could be called by gRPC clients on evitaDB. Main purpose of this service is to provide
@@ -67,7 +67,7 @@ export const EvitaManagementService = {
     restoreCatalogUnary: {
       name: "RestoreCatalogUnary",
       I: GrpcRestoreCatalogUnaryRequest,
-      O: GrpcRestoreCatalogResponse,
+      O: GrpcRestoreCatalogUnaryResponse,
       kind: MethodKind.Unary,
     },
     /**
diff --git a/src/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_pb.ts b/src/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_pb.ts
index 8ead703b..e13d1b08 100644
--- a/src/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_pb.ts
+++ b/src/modules/connection/driver/grpc/gen/GrpcEvitaManagementAPI_pb.ts
@@ -500,7 +500,7 @@ export class GrpcRestoreCatalogResponse extends Message<GrpcRestoreCatalogRespon
   /**
    * the task that is used to restore the catalog and getting its progress
    *
-   * @generated from field: io.evitadb.externalApi.grpc.generated.GrpcTaskStatus task = 2;
+   * @generated from field: io.evitadb.externalApi.grpc.generated.GrpcTaskStatus task = 3;
    */
   task?: GrpcTaskStatus;
 
@@ -513,7 +513,7 @@ export class GrpcRestoreCatalogResponse extends Message<GrpcRestoreCatalogRespon
   static readonly typeName = "io.evitadb.externalApi.grpc.generated.GrpcRestoreCatalogResponse";
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "read", kind: "scalar", T: 3 /* ScalarType.INT64 */ },
-    { no: 2, name: "task", kind: "message", T: GrpcTaskStatus },
+    { no: 3, name: "task", kind: "message", T: GrpcTaskStatus },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): GrpcRestoreCatalogResponse {
@@ -533,6 +533,63 @@ export class GrpcRestoreCatalogResponse extends Message<GrpcRestoreCatalogRespon
   }
 }
 
+/**
+ * Response to a catalog restore request.
+ *
+ * @generated from message io.evitadb.externalApi.grpc.generated.GrpcRestoreCatalogUnaryResponse
+ */
+export class GrpcRestoreCatalogUnaryResponse extends Message<GrpcRestoreCatalogUnaryResponse> {
+  /**
+   * returns the number of bytes read from the backup file
+   *
+   * @generated from field: int64 read = 1;
+   */
+  read = protoInt64.zero;
+
+  /**
+   * The identification of the file on the server that should be restored
+   *
+   * @generated from field: io.evitadb.externalApi.grpc.generated.GrpcUuid fileId = 2;
+   */
+  fileId?: GrpcUuid;
+
+  /**
+   * the task that is used to restore the catalog and getting its progress
+   *
+   * @generated from field: io.evitadb.externalApi.grpc.generated.GrpcTaskStatus task = 3;
+   */
+  task?: GrpcTaskStatus;
+
+  constructor(data?: PartialMessage<GrpcRestoreCatalogUnaryResponse>) {
+    super();
+    proto3.util.initPartial(data, this);
+  }
+
+  static readonly runtime: typeof proto3 = proto3;
+  static readonly typeName = "io.evitadb.externalApi.grpc.generated.GrpcRestoreCatalogUnaryResponse";
+  static readonly fields: FieldList = proto3.util.newFieldList(() => [
+    { no: 1, name: "read", kind: "scalar", T: 3 /* ScalarType.INT64 */ },
+    { no: 2, name: "fileId", kind: "message", T: GrpcUuid },
+    { no: 3, name: "task", kind: "message", T: GrpcTaskStatus },
+  ]);
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): GrpcRestoreCatalogUnaryResponse {
+    return new GrpcRestoreCatalogUnaryResponse().fromBinary(bytes, options);
+  }
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): GrpcRestoreCatalogUnaryResponse {
+    return new GrpcRestoreCatalogUnaryResponse().fromJson(jsonValue, options);
+  }
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): GrpcRestoreCatalogUnaryResponse {
+    return new GrpcRestoreCatalogUnaryResponse().fromJsonString(jsonString, options);
+  }
+
+  static equals(a: GrpcRestoreCatalogUnaryResponse | PlainMessage<GrpcRestoreCatalogUnaryResponse> | undefined, b: GrpcRestoreCatalogUnaryResponse | PlainMessage<GrpcRestoreCatalogUnaryResponse> | undefined): boolean {
+    return proto3.util.equals(GrpcRestoreCatalogUnaryResponse, a, b);
+  }
+}
+
 /**
  * Request to list task statuses in paginated form.
  *
diff --git a/src/modules/connection/driver/grpc/gen/GrpcEvitaSessionAPI_pb.ts b/src/modules/connection/driver/grpc/gen/GrpcEvitaSessionAPI_pb.ts
index 7d227ce9..140283b2 100644
--- a/src/modules/connection/driver/grpc/gen/GrpcEvitaSessionAPI_pb.ts
+++ b/src/modules/connection/driver/grpc/gen/GrpcEvitaSessionAPI_pb.ts
@@ -1011,6 +1011,13 @@ export class GrpcPaginatedList extends Message<GrpcPaginatedList> {
    */
   pageNumber = 0;
 
+  /**
+   * The number of the last page.
+   *
+   * @generated from field: int32 lastPageNumber = 3;
+   */
+  lastPageNumber = 0;
+
   constructor(data?: PartialMessage<GrpcPaginatedList>) {
     super();
     proto3.util.initPartial(data, this);
@@ -1021,6 +1028,7 @@ export class GrpcPaginatedList extends Message<GrpcPaginatedList> {
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "pageSize", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
     { no: 2, name: "pageNumber", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
+    { no: 3, name: "lastPageNumber", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): GrpcPaginatedList {
@@ -2748,6 +2756,14 @@ export class GrpcQueryParam extends Message<GrpcQueryParam> {
      */
     value: GrpcManagedReferencesBehaviour;
     case: "managedReferencesBehaviour";
+  } | {
+    /**
+     * The expression
+     *
+     * @generated from field: string expressionValue = 23;
+     */
+    value: string;
+    case: "expressionValue";
   } | {
     /**
      * The string array value.
@@ -2946,6 +2962,7 @@ export class GrpcQueryParam extends Message<GrpcQueryParam> {
     { no: 20, name: "statisticsType", kind: "enum", T: proto3.getEnumType(GrpcStatisticsType), oneof: "queryParam" },
     { no: 21, name: "histogramBehavior", kind: "enum", T: proto3.getEnumType(GrpcHistogramBehavior), oneof: "queryParam" },
     { no: 22, name: "managedReferencesBehaviour", kind: "enum", T: proto3.getEnumType(GrpcManagedReferencesBehaviour), oneof: "queryParam" },
+    { no: 23, name: "expressionValue", kind: "scalar", T: 9 /* ScalarType.STRING */, oneof: "queryParam" },
     { no: 101, name: "stringArrayValue", kind: "message", T: GrpcStringArray, oneof: "queryParam" },
     { no: 102, name: "integerArrayValue", kind: "message", T: GrpcIntegerArray, oneof: "queryParam" },
     { no: 103, name: "longArrayValue", kind: "message", T: GrpcLongArray, oneof: "queryParam" },