RavenDB-22501 Exception in studio on delete all items in collection

ml054 · Jun 25, 2024 · f1e84e8 · f1e84e8
1 parent 8b6b545
commit f1e84e8
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 24 deletions.
diff --git a/src/Raven.Studio/typescript/common/notifications/models/groupedVirtualNotification.ts b/src/Raven.Studio/typescript/common/notifications/models/groupedVirtualNotification.ts
@@ -0,0 +1,8 @@
+import virtualNotification from "common/notifications/models/virtualNotification";
+
+
+abstract class groupedVirtualNotification<T extends { id: string }> extends virtualNotification {
+    operations = ko.observableArray<T>([]);
+}
+
+export = groupedVirtualNotification;
diff --git a/src/Raven.Studio/typescript/common/notifications/models/virtualBulkInsert.ts b/src/Raven.Studio/typescript/common/notifications/models/virtualBulkInsert.ts
@@ -1,15 +1,13 @@
 /// <reference path="../../../../typings/tsd.d.ts" />
-import virtualNotification = require("common/notifications/models/virtualNotification");
 import database = require("models/resources/database");
 import pluralizeHelpers = require("common/helpers/text/pluralizeHelpers");
 import moment = require("moment");
+import groupedVirtualNotification from "common/notifications/models/groupedVirtualNotification";
 
-class virtualBulkInsert extends virtualNotification {
+class virtualBulkInsert extends groupedVirtualNotification<virtualBulkOperationItem> {
 
     static readonly Id = "virtual$$bulkInsert";
 
-    operations = ko.observableArray<virtualBulkOperationItem>([]);
-
     constructor(db: database) {
         super(db, {
             Id: virtualBulkInsert.Id,

diff --git a/src/Raven.Studio/typescript/common/notifications/models/virtualBulkInsertFailures.ts b/src/Raven.Studio/typescript/common/notifications/models/virtualBulkInsertFailures.ts
@@ -1,15 +1,13 @@
 /// <reference path="../../../../typings/tsd.d.ts" />
-import virtualNotification = require("common/notifications/models/virtualNotification");
 import database = require("models/resources/database");
 import pluralizeHelpers = require("common/helpers/text/pluralizeHelpers");
 import moment = require("moment");
+import groupedVirtualNotification from "common/notifications/models/groupedVirtualNotification";
 
-class virtualBulkInsertFailures extends virtualNotification {
+class virtualBulkInsertFailures extends groupedVirtualNotification<virtualBulkOperationFailureItem> {
 
     static readonly Id = "virtual$$bulkInsertFailures";
 
-    operations = ko.observableArray<virtualBulkOperationFailureItem>([]);
-
     constructor(db: database) {
         super(db, {
             Id: virtualBulkInsertFailures.Id,

diff --git a/src/Raven.Studio/typescript/common/notifications/models/virtualDeleteByQuery.ts b/src/Raven.Studio/typescript/common/notifications/models/virtualDeleteByQuery.ts
@@ -1,15 +1,13 @@
 /// <reference path="../../../../typings/tsd.d.ts" />
-import virtualNotification = require("common/notifications/models/virtualNotification");
 import database = require("models/resources/database");
 import pluralizeHelpers = require("common/helpers/text/pluralizeHelpers");
 import moment = require("moment");
+import groupedVirtualNotification from "common/notifications/models/groupedVirtualNotification";
 
-class virtualDeleteByQuery extends virtualNotification {
+class virtualDeleteByQuery extends groupedVirtualNotification<queryBasedVirtualBulkOperationItem> {
 
     static readonly Id = "virtual$$deleteByQuery";
 
-    operations = ko.observableArray<queryBasedVirtualBulkOperationItem>([]);
-
     constructor(db: database) {
         super(db, {
             Id: virtualDeleteByQuery.Id,

diff --git a/src/Raven.Studio/typescript/common/notifications/models/virtualDeleteByQueryFailures.ts b/src/Raven.Studio/typescript/common/notifications/models/virtualDeleteByQueryFailures.ts
@@ -1,15 +1,13 @@
 /// <reference path="../../../../typings/tsd.d.ts" />
-import virtualNotification = require("common/notifications/models/virtualNotification");
 import database = require("models/resources/database");
 import pluralizeHelpers = require("common/helpers/text/pluralizeHelpers");
 import moment = require("moment");
+import groupedVirtualNotification from "common/notifications/models/groupedVirtualNotification";
 
-class virtualDeleteByQueryFailures extends virtualNotification {
+class virtualDeleteByQueryFailures extends groupedVirtualNotification<queryBasedVirtualBulkOperationFailureItem> {
 
     static readonly Id = "virtual$$deleteByQueryFailures";
 
-    operations = ko.observableArray<queryBasedVirtualBulkOperationFailureItem>([]);
-
     constructor(db: database) {
         super(db, {
             Id: virtualDeleteByQueryFailures.Id,

diff --git a/src/Raven.Studio/typescript/common/notifications/models/virtualUpdateByQuery.ts b/src/Raven.Studio/typescript/common/notifications/models/virtualUpdateByQuery.ts
@@ -3,13 +3,12 @@ import virtualNotification = require("common/notifications/models/virtualNotific
 import database = require("models/resources/database");
 import moment = require("moment");
 import pluralizeHelpers = require("common/helpers/text/pluralizeHelpers");
+import groupedVirtualNotification from "common/notifications/models/groupedVirtualNotification";
 
-class virtualUpdateByQuery extends virtualNotification {
+class virtualUpdateByQuery extends groupedVirtualNotification<queryBasedVirtualBulkOperationItem> {
 
     static readonly Id = "virtual$$updateByQuery";
 
-    operations = ko.observableArray<queryBasedVirtualBulkOperationItem>([]);
-
     constructor(db: database) {
         super(db, {
             Id: virtualUpdateByQuery.Id,

diff --git a/src/Raven.Studio/typescript/common/notifications/models/virtualUpdateByQueryFailures.ts b/src/Raven.Studio/typescript/common/notifications/models/virtualUpdateByQueryFailures.ts
@@ -1,15 +1,13 @@
 /// <reference path="../../../../typings/tsd.d.ts" />
-import virtualNotification = require("common/notifications/models/virtualNotification");
 import database = require("models/resources/database");
 import pluralizeHelpers = require("common/helpers/text/pluralizeHelpers");
 import moment = require("moment");
+import groupedVirtualNotification from "common/notifications/models/groupedVirtualNotification";
 
-class virtualUpdateByQueryFailures extends virtualNotification {
+class virtualUpdateByQueryFailures extends groupedVirtualNotification<queryBasedVirtualBulkOperationFailureItem> {
 
     static readonly Id = "virtual$$updateByQueryFailures";
 
-    operations = ko.observableArray<queryBasedVirtualBulkOperationFailureItem>([]);
-
     constructor(db: database) {
         super(db, {
             Id: virtualUpdateByQueryFailures.Id,

diff --git a/src/Raven.Studio/typescript/common/notifications/notificationCenter.ts b/src/Raven.Studio/typescript/common/notifications/notificationCenter.ts
@@ -68,6 +68,7 @@ import complexFieldsAlertDetails
     from "viewmodels/common/notificationCenter/detailViewer/alerts/complexFieldsAlertDetails";
 import cpuCreditsBalanceDetails
     from "viewmodels/common/notificationCenter/detailViewer/alerts/cpuCreditsBalanceDetails";
+import groupedVirtualNotification from "common/notifications/models/groupedVirtualNotification";
 interface detailsProvider {
     supportsDetailsFor(notification: abstractNotification): boolean;
     showDetailsFor(notification: abstractNotification, notificationCenter: notificationCenter): JQueryPromise<void> | void;
@@ -515,7 +516,22 @@ class notificationCenter {
 
     private getOperationById(db: database, operationId: number) {
         const notificationsArray = db ? this.databaseNotifications() : this.globalNotifications();
-        return notificationsArray.find(x => x instanceof operation && x.operationId() === operationId);
+        const topLevelNotification = notificationsArray.find(x => x instanceof operation && x.operationId() === operationId);
+        if (topLevelNotification) {
+            return topLevelNotification;
+        }
+
+        // merge operation was merged into other virtual operation?
+        for (const array of notificationsArray) {
+            if (array instanceof groupedVirtualNotification) {
+                const match = array.operations().find(x => x.id === operationId);
+                if (match) {
+                    return match;
+                }
+            }
+        }
+
+        throw new Error("Unable to find operation with id = " + operationId);
     }
 
     openDetails(notification: abstractNotification) {