From 9cf8b3d888e13aa6cb4fef1208acd980f50bdfe2 Mon Sep 17 00:00:00 2001 From: Alireza Haghshenas Date: Tue, 10 Jan 2023 16:08:07 -0800 Subject: [PATCH] Token names are being shown --- taqueria-vscode-extension/package.json | 2 +- .../src/lib/gui/DataModels.ts | 2 +- .../src/lib/gui/SandboxesDataProvider.ts | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/taqueria-vscode-extension/package.json b/taqueria-vscode-extension/package.json index 8314a3723..c5905a39c 100644 --- a/taqueria-vscode-extension/package.json +++ b/taqueria-vscode-extension/package.json @@ -750,7 +750,7 @@ }, "scripts": { "vscode:prepublish": "npm run compile:base -- --minify", - "compile:base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node", + "compile:base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --external:pg-native --format=cjs --platform=node", "compile": "npx tsc -noEmit && npm run compile:base -- --sourcemap", "compile:watch": "npm run compile:base -- --sourcemap --watch", "compile:test": "tsc -p tsconfig.test.json", diff --git a/taqueria-vscode-extension/src/lib/gui/DataModels.ts b/taqueria-vscode-extension/src/lib/gui/DataModels.ts index 1700f05b3..0111166e4 100644 --- a/taqueria-vscode-extension/src/lib/gui/DataModels.ts +++ b/taqueria-vscode-extension/src/lib/gui/DataModels.ts @@ -21,7 +21,7 @@ export type TokenInfo_Dipdup = { id: bigint; token_id: bigint; link: string | undefined | null; - metadata: string | undefined | null; + metadata: TokenMetadata | undefined | null; image_processed: boolean | undefined | null; }; diff --git a/taqueria-vscode-extension/src/lib/gui/SandboxesDataProvider.ts b/taqueria-vscode-extension/src/lib/gui/SandboxesDataProvider.ts index 05c079630..6debe920e 100644 --- a/taqueria-vscode-extension/src/lib/gui/SandboxesDataProvider.ts +++ b/taqueria-vscode-extension/src/lib/gui/SandboxesDataProvider.ts @@ -403,8 +403,15 @@ export class SandboxesDataProvider extends TaqueriaDataProviderBase } async getTokens(element: SmartContractChildrenTreeItem): Promise { - const data = await this.getTokensFromTzKt(element); - return data.map(item => new TokenTreeItem(item.tokenId, item.metadata?.name)); + const [dataFromTzKt, dataFromDipdup] = await Promise.all([ + this.getTokensFromTzKt(element), + this.getTokensFromDipdup(element), + ]); + const data = dataFromTzKt.map(tzKtItem => ({ + tzKtItem, + dipDupItem: dataFromDipdup.find(dipDupItem => dipDupItem.token_id.toString() === tzKtItem.tokenId), + })); + return data.map(item => new TokenTreeItem(item.tzKtItem.tokenId, item.dipDupItem?.metadata?.name)); } private async getTokensFromTzKt(element: SmartContractChildrenTreeItem): Promise { @@ -428,12 +435,11 @@ export class SandboxesDataProvider extends TaqueriaDataProviderBase const pool = this.pools.getPool(connectionString); const contractAddress = element.parent.address; const tokens = await pool.query(`select * from token_metadata where contract='${contractAddress}'`); - this.helper.logHelper.showOutput(JSON.stringify(tokens.rows)); return tokens.rows.map(row => ({ id: row.id, token_id: row.token_id, link: row.link, - metadata: JSON.parse(row.metadata), + metadata: row.metadata, image_processed: row.image_processed, })); }