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

Add check for database query

Browse Source
This commit is contained in:
nthouliss 2022-04-04 11:30:50 +10:00
parent 1414080db6
commit 88c165d5ab
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/modals/ImportExportModal.tsx
View File

@ -68,7 +68,7 @@ function ImportExportModal({
addToast(`${message} ${tokenText}`); addToast(`${message} ${tokenText}`);
} }
} }
function addWarningToast( function addWarningToast(
message: string, message: string,
items: string[], items: string[],
@ -86,7 +86,7 @@ function ImportExportModal({
} }
} }
const toastMessage = <span>{message} <b>{text}</b></span> const toastMessage = <span>{message} <b>{text}</b></span>
addToast(toastMessage, {appearance: "warning", autoDismiss: true }); addToast(toastMessage, { appearance: "warning", autoDismiss: true });
} }
function openFileDialog() { function openFileDialog() {
@ -123,7 +123,7 @@ function ImportExportModal({
} catch (e) { } catch (e) {
setIsLoading(false); setIsLoading(false);
backgroundTaskRunningRef.current = false; backgroundTaskRunningRef.current = false;
if (e instanceof(Error)) { if (e instanceof (Error)) {
if (e.message.startsWith("Max buffer length exceeded")) { if (e.message.startsWith("Max buffer length exceeded")) {
setError( setError(
new Error( new Error(
@ -201,35 +201,38 @@ function ImportExportModal({
let newTokens: Token[] = []; let newTokens: Token[] = [];
if (checkedTokens.length > 0) { if (checkedTokens.length > 0) {
const tokenIds = checkedTokens.map((token) => token.id); const tokenIds = checkedTokens.map((token) => token.id);
const tokensToAdd: Token[] = await importDB.table<Token>("tokens").bulkGet(tokenIds); const tokensToAdd: Token[] | undefined = await importDB.table<Token>("tokens").bulkGet(tokenIds);
for (let token of tokensToAdd) {
if (token) {
// Generate new ids
const newId = uuid();
newTokenIds[token.id] = newId;
if (token.type === "default") {
if (userId) {
newTokens.push({ ...token, id: newId, owner: userId });
}
} else {
const newFileId = uuid();
const newThumbnailId = uuid();
newAssetIds[token.file] = newFileId;
newAssetIds[token.thumbnail] = newThumbnailId;
oldAssetIds[token.file] = { itemName: token.name, item: "token", assetType: "file" }; if (tokensToAdd) {
oldAssetIds[token.thumbnail] = { itemName: token.name, item: "token", assetType: "thumbnail" }; for (let token of tokensToAdd) {
if (token) {
// Generate new ids
const newId = uuid();
newTokenIds[token.id] = newId;
// Change ids and owner if (token.type === "default") {
if (userId) { if (userId) {
newTokens.push({ newTokens.push({ ...token, id: newId, owner: userId });
...token, }
id: newId, } else {
owner: userId, const newFileId = uuid();
file: newFileId, const newThumbnailId = uuid();
thumbnail: newThumbnailId, newAssetIds[token.file] = newFileId;
}); newAssetIds[token.thumbnail] = newThumbnailId;
oldAssetIds[token.file] = { itemName: token.name, item: "token", assetType: "file" };
oldAssetIds[token.thumbnail] = { itemName: token.name, item: "token", assetType: "thumbnail" };
// Change ids and owner
if (userId) {
newTokens.push({
...token,
id: newId,
owner: userId,
file: newFileId,
thumbnail: newThumbnailId,
});
}
} }
} }
} }
@ -456,7 +459,7 @@ function ImportExportModal({
saveAs(blob, `${shortid.generate()}.owlbear`); saveAs(blob, `${shortid.generate()}.owlbear`);
addSuccessToast("Exported", checkedMaps.length, checkedTokens.length); addSuccessToast("Exported", checkedMaps.length, checkedTokens.length);
} catch (e: unknown) { } catch (e: unknown) {
if (e instanceof(Error)) { if (e instanceof (Error)) {
console.error(e); console.error(e);
setError(e); setError(e);
} }