diff --git a/less/documentDB.less b/less/documentDB.less index dc59733fe..dce940328 100644 --- a/less/documentDB.less +++ b/less/documentDB.less @@ -2869,6 +2869,7 @@ a:link { z-index: 1000; overflow-y: auto; overflow-x: clip; + min-height: fit-content; } .uniqueIndexesContainer { diff --git a/src/Common/dataAccess/deleteDocument.ts b/src/Common/dataAccess/deleteDocument.ts index 1f551ee0e..9d4b8a396 100644 --- a/src/Common/dataAccess/deleteDocument.ts +++ b/src/Common/dataAccess/deleteDocument.ts @@ -42,6 +42,7 @@ export interface IBulkDeleteResult { export const deleteDocuments = async ( collection: CollectionBase, documentIds: DocumentId[], + abortSignal: AbortSignal, ): Promise => { const clearMessage = logConsoleProgress(`Deleting ${documentIds.length} ${getEntityName(true)}`); try { @@ -65,12 +66,16 @@ export const deleteDocuments = async ( operationType: BulkOperationType.Delete, })); - const promise = v2Container.items.bulk(operations).then((bulkResults) => { - return bulkResults.map((bulkResult, index) => { - const documentId = documentIdsChunk[index]; - return { ...bulkResult, documentId }; + const promise = v2Container.items + .bulk(operations, undefined, { + abortSignal, + }) + .then((bulkResults) => { + return bulkResults.map((bulkResult, index) => { + const documentId = documentIdsChunk[index]; + return { ...bulkResult, documentId }; + }); }); - }); promiseArray.push(promise); } diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx index 47a866b27..c84fcb945 100644 --- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx +++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx @@ -679,6 +679,7 @@ export const DocumentsTabComponent: React.FunctionComponent(undefined); const [bulkDeleteMode, setBulkDeleteMode] = useState<"inProgress" | "completed" | "aborting" | "aborted">(undefined); + const [abortController, setAbortController] = useState(undefined); const setKeyboardActions = useKeyboardActionGroup(KeyboardActionGroup.ACTIVE_TAB); @@ -706,13 +707,19 @@ export const DocumentsTabComponent: React.FunctionComponent { - deleteNoSqlDocuments(bulkDeleteOperation.collection, [...newPendingIds]) + deleteNoSqlDocuments(bulkDeleteOperation.collection, [...newPendingIds], ac.signal) .then((deleteResult) => { let retryAfterMilliseconds = 0; const newSuccessful: DocumentId[] = [];