Atlas48/grungnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed observable addon from loading on import db

Browse Source
This commit is contained in:
Mitchell McCaffrey 2021-03-18 12:57:41 +11:00
parent c316f21020
commit 83d80fbbbd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modals/ImportExportModal.js
View File

@ -117,7 +117,7 @@ function ImportExportModal({ isOpen, onRequestClose }) {
}
async function handleImportSelectorClose() {
const importDB = getDatabase({}, importDBName);
const importDB = getDatabase({ addons: [] }, importDBName);
await importDB.delete();
importDB.close();
setShowImportSelector(false);
@ -129,7 +129,7 @@ function ImportExportModal({ isOpen, onRequestClose }) {
setShowImportSelector(false);
loadingProgressRef.current = 0;
const importDB = getDatabase({}, importDBName);
const importDB = getDatabase({ addons: [] }, importDBName);
const db = getDatabase({});
try {
// Keep track of a mapping of old token ids to new ones to apply them to the map states

2
src/modals/SelectDataModal.js
View File

@ -28,7 +28,7 @@ function SelectDataModal({
async function loadData() {
if (isOpen && databaseName) {
setIsLoading(true);
const db = getDatabase({}, databaseName);
const db = getDatabase({ addons: [] }, databaseName);
let loadedMaps = {};
let loadedTokensByMap = {};
let loadedTokens = {};

8
src/workers/DatabaseWorker.js
View File

@ -124,12 +124,16 @@ let service = {
}
// Ensure import DB is cleared before importing new data
let importDB = getDatabase({}, databaseName, 0);
let importDB = getDatabase({ addons: [] }, databaseName, 0);
await importDB.delete();
importDB.close();
// Load import database up to it's desired version
importDB = getDatabase({}, databaseName, importMeta.data.databaseVersion);
importDB = getDatabase(
{ addons: [] },
databaseName,
importMeta.data.databaseVersion
);
await importInto(importDB, data, {
progressCallback,
acceptNameDiff: true,