From 9b1f43203307b1dd2f1a2a2e6b836ba252af87ec Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Nov 2024 02:28:57 -0300 Subject: [PATCH 1/8] Fix Drop from Compass without Image --- packages/drops/src/domain/Drop.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/drops/src/domain/Drop.ts b/packages/drops/src/domain/Drop.ts index d2572ef..55e134b 100644 --- a/packages/drops/src/domain/Drop.ts +++ b/packages/drops/src/domain/Drop.ts @@ -69,8 +69,12 @@ export class Drop { original: response.image_url, }; + if (!response.drop_image) { + return defaultImage; + } + return ( - response.drop_image?.gateways.reduce( + response.drop_image?.gateways?.reduce( (images, gateway) => ({ ...images, [gateway.type.toLowerCase()]: gateway.url, From 3f5119cc4feda8da4466b6f3cd846765a0dbbd4e Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Nov 2024 10:26:14 -0300 Subject: [PATCH 2/8] Add drop image type --- packages/drops/src/domain/Drop.ts | 8 +++----- packages/drops/src/domain/DropImage.ts | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 packages/drops/src/domain/DropImage.ts diff --git a/packages/drops/src/domain/Drop.ts b/packages/drops/src/domain/Drop.ts index 55e134b..cc9fd1a 100644 --- a/packages/drops/src/domain/Drop.ts +++ b/packages/drops/src/domain/Drop.ts @@ -1,5 +1,6 @@ import { DropResponse as ProviderDropResponse } from '@poap-xyz/providers'; import { DropResponse } from '../types/DropResponse'; +import { DropImage } from './DropImage'; export class Drop { id: number; @@ -60,11 +61,8 @@ export class Drop { }); } - private static getDropImageFromCompass(response: DropResponse): { - crop: string; - original: string; - } { - const defaultImage = { + private static getDropImageFromCompass(response: DropResponse): DropImage { + const defaultImage: DropImage = { crop: response.image_url, original: response.image_url, }; diff --git a/packages/drops/src/domain/DropImage.ts b/packages/drops/src/domain/DropImage.ts new file mode 100644 index 0000000..ae26b65 --- /dev/null +++ b/packages/drops/src/domain/DropImage.ts @@ -0,0 +1,4 @@ +export interface DropImage { + crop: string; + original: string; +} From 662a06b6c72078fba7a2d3d97fcb875767eee140 Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Nov 2024 10:26:27 -0300 Subject: [PATCH 3/8] Use ?? instead of || --- packages/drops/src/domain/Drop.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/drops/src/domain/Drop.ts b/packages/drops/src/domain/Drop.ts index cc9fd1a..5e9f994 100644 --- a/packages/drops/src/domain/Drop.ts +++ b/packages/drops/src/domain/Drop.ts @@ -72,13 +72,13 @@ export class Drop { } return ( - response.drop_image?.gateways?.reduce( + response.drop_image?.gateways.reduce( (images, gateway) => ({ ...images, [gateway.type.toLowerCase()]: gateway.url, }), defaultImage, - ) || defaultImage + ) ?? defaultImage ); } From 820e8c85295f0f751fc0ad992a32f361c82348d6 Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Nov 2024 10:27:02 -0300 Subject: [PATCH 4/8] Remove optional chaining as is validated before --- packages/drops/src/domain/Drop.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/drops/src/domain/Drop.ts b/packages/drops/src/domain/Drop.ts index 5e9f994..14dde1d 100644 --- a/packages/drops/src/domain/Drop.ts +++ b/packages/drops/src/domain/Drop.ts @@ -72,7 +72,7 @@ export class Drop { } return ( - response.drop_image?.gateways.reduce( + response.drop_image.gateways.reduce( (images, gateway) => ({ ...images, [gateway.type.toLowerCase()]: gateway.url, From dd681e846beaa8ce7158cf3eece54e4fb9476845 Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Nov 2024 10:28:35 -0300 Subject: [PATCH 5/8] Remove completly ?? as is not needed anymore --- packages/drops/src/domain/Drop.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/drops/src/domain/Drop.ts b/packages/drops/src/domain/Drop.ts index 14dde1d..20eade2 100644 --- a/packages/drops/src/domain/Drop.ts +++ b/packages/drops/src/domain/Drop.ts @@ -78,7 +78,7 @@ export class Drop { [gateway.type.toLowerCase()]: gateway.url, }), defaultImage, - ) ?? defaultImage + ) ); } From 97f759adc6f1118189374a3ce00ea42e572cee69 Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Nov 2024 23:51:33 -0300 Subject: [PATCH 6/8] CS --- packages/drops/src/domain/Drop.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/drops/src/domain/Drop.ts b/packages/drops/src/domain/Drop.ts index 20eade2..ab0827c 100644 --- a/packages/drops/src/domain/Drop.ts +++ b/packages/drops/src/domain/Drop.ts @@ -71,14 +71,12 @@ export class Drop { return defaultImage; } - return ( - response.drop_image.gateways.reduce( - (images, gateway) => ({ - ...images, - [gateway.type.toLowerCase()]: gateway.url, - }), - defaultImage, - ) + return response.drop_image.gateways.reduce( + (images, gateway) => ({ + ...images, + [gateway.type.toLowerCase()]: gateway.url, + }), + defaultImage, ); } From d73a5602ca49d012f0d1e0b8681acdbf0c9dc5aa Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Nov 2024 23:53:08 -0300 Subject: [PATCH 7/8] Version 0.7.3 --- packages/drops/package.json | 2 +- packages/moments/package.json | 2 +- packages/poaps/package.json | 2 +- packages/providers/package.json | 2 +- packages/utils/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/drops/package.json b/packages/drops/package.json index a5f1d6e..2a774ff 100644 --- a/packages/drops/package.json +++ b/packages/drops/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/drops", - "version": "0.5.6", + "version": "0.7.3", "description": "Drops module for the poap.js library", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", diff --git a/packages/moments/package.json b/packages/moments/package.json index 098079a..aeee329 100644 --- a/packages/moments/package.json +++ b/packages/moments/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/moments", - "version": "0.7.0", + "version": "0.7.3", "description": "Moments module for the poap.js library", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", diff --git a/packages/poaps/package.json b/packages/poaps/package.json index c4d74e0..7755e37 100644 --- a/packages/poaps/package.json +++ b/packages/poaps/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/poaps", - "version": "0.5.5", + "version": "0.7.3", "description": "Poaps module for the poap.js library", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", diff --git a/packages/providers/package.json b/packages/providers/package.json index d51b1c3..7db454c 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/providers", - "version": "0.7.0", + "version": "0.7.3", "description": "Providers module for the poap.js library", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", diff --git a/packages/utils/package.json b/packages/utils/package.json index a86f962..accc7c7 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@poap-xyz/utils", - "version": "0.5.5", + "version": "0.7.3", "description": "Utils module for the poap.js library", "main": "dist/cjs/index.cjs", "module": "dist/esm/index.mjs", From 3673fba9d4d9f01bb5f5593985ffb57cec5f34cd Mon Sep 17 00:00:00 2001 From: Juan Date: Mon, 18 Nov 2024 23:57:39 -0300 Subject: [PATCH 8/8] Use 0.7.3 --- packages/drops/package.json | 4 ++-- packages/moments/package.json | 4 ++-- packages/poaps/package.json | 4 ++-- packages/providers/package.json | 2 +- yarn.lock | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/drops/package.json b/packages/drops/package.json index df3acf6..0b3a5f9 100644 --- a/packages/drops/package.json +++ b/packages/drops/package.json @@ -29,7 +29,7 @@ "node": ">=18" }, "dependencies": { - "@poap-xyz/providers": "0.7.2", - "@poap-xyz/utils": "0.7.2" + "@poap-xyz/providers": "0.7.3", + "@poap-xyz/utils": "0.7.3" } } diff --git a/packages/moments/package.json b/packages/moments/package.json index 9b62568..837c02e 100644 --- a/packages/moments/package.json +++ b/packages/moments/package.json @@ -26,8 +26,8 @@ "build": "rollup -c --bundleConfigAsCjs" }, "dependencies": { - "@poap-xyz/providers": "0.7.2", - "@poap-xyz/utils": "0.7.2", + "@poap-xyz/providers": "0.7.3", + "@poap-xyz/utils": "0.7.3", "uuid": "^9.0.0" }, "engines": { diff --git a/packages/poaps/package.json b/packages/poaps/package.json index badbb72..3021512 100644 --- a/packages/poaps/package.json +++ b/packages/poaps/package.json @@ -26,8 +26,8 @@ "build": "rollup -c --bundleConfigAsCjs" }, "dependencies": { - "@poap-xyz/providers": "0.7.2", - "@poap-xyz/utils": "0.7.2" + "@poap-xyz/providers": "0.7.3", + "@poap-xyz/utils": "0.7.3" }, "engines": { "node": ">=18" diff --git a/packages/providers/package.json b/packages/providers/package.json index 25ee658..6855d0f 100644 --- a/packages/providers/package.json +++ b/packages/providers/package.json @@ -26,7 +26,7 @@ "build": "rollup -c --bundleConfigAsCjs" }, "dependencies": { - "@poap-xyz/utils": "0.7.2", + "@poap-xyz/utils": "0.7.3", "axios": "^1.6.8", "lodash.chunk": "^4.2.0" }, diff --git a/yarn.lock b/yarn.lock index 4e385c1..5cd71a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -884,8 +884,8 @@ __metadata: version: 0.0.0-use.local resolution: "@poap-xyz/drops@workspace:packages/drops" dependencies: - "@poap-xyz/providers": 0.7.2 - "@poap-xyz/utils": 0.7.2 + "@poap-xyz/providers": 0.7.3 + "@poap-xyz/utils": 0.7.3 languageName: unknown linkType: soft @@ -901,8 +901,8 @@ __metadata: version: 0.0.0-use.local resolution: "@poap-xyz/moments@workspace:packages/moments" dependencies: - "@poap-xyz/providers": 0.7.2 - "@poap-xyz/utils": 0.7.2 + "@poap-xyz/providers": 0.7.3 + "@poap-xyz/utils": 0.7.3 "@types/uuid": ^9.0.2 uuid: ^9.0.0 languageName: unknown @@ -912,16 +912,16 @@ __metadata: version: 0.0.0-use.local resolution: "@poap-xyz/poaps@workspace:packages/poaps" dependencies: - "@poap-xyz/providers": 0.7.2 - "@poap-xyz/utils": 0.7.2 + "@poap-xyz/providers": 0.7.3 + "@poap-xyz/utils": 0.7.3 languageName: unknown linkType: soft -"@poap-xyz/providers@0.7.2, @poap-xyz/providers@workspace:packages/providers": +"@poap-xyz/providers@0.7.3, @poap-xyz/providers@workspace:packages/providers": version: 0.0.0-use.local resolution: "@poap-xyz/providers@workspace:packages/providers" dependencies: - "@poap-xyz/utils": 0.7.2 + "@poap-xyz/utils": 0.7.3 axios: ^1.6.8 axios-mock-adapter: ^1.21.4 jest-fetch-mock: ^3.0.3 @@ -929,7 +929,7 @@ __metadata: languageName: unknown linkType: soft -"@poap-xyz/utils@0.7.2, @poap-xyz/utils@workspace:packages/utils": +"@poap-xyz/utils@0.7.3, @poap-xyz/utils@workspace:packages/utils": version: 0.0.0-use.local resolution: "@poap-xyz/utils@workspace:packages/utils" languageName: unknown