From 4ff950dc457446ba600e6dceee3f0ce76eed653f Mon Sep 17 00:00:00 2001 From: Mateusz Jasiuk Date: Thu, 22 Aug 2024 09:22:26 +0200 Subject: [PATCH] refactor: use new api client --- apps/namadillo/package.json | 2 +- apps/namadillo/src/atoms/api.ts | 6 ++-- .../src/atoms/proposals/functions.ts | 11 ++++--- apps/namadillo/src/atoms/settings/services.ts | 5 +-- yarn.lock | 33 +++++++++++++++---- 5 files changed, 41 insertions(+), 16 deletions(-) diff --git a/apps/namadillo/package.json b/apps/namadillo/package.json index 39f6905f6..321a2c2de 100644 --- a/apps/namadillo/package.json +++ b/apps/namadillo/package.json @@ -7,7 +7,7 @@ "license": "MIT", "private": true, "dependencies": { - "@anomaorg/namada-indexer-client": "0.0.21", + "@anomaorg/namada-indexer-client": "../../../namada-indexer-client", "@cosmjs/encoding": "^0.32.3", "@tailwindcss/container-queries": "^0.1.1", "@tanstack/react-query": "^5.40.0", diff --git a/apps/namadillo/src/atoms/api.ts b/apps/namadillo/src/atoms/api.ts index 0c158192b..24257cbad 100644 --- a/apps/namadillo/src/atoms/api.ts +++ b/apps/namadillo/src/atoms/api.ts @@ -1,4 +1,4 @@ -import { DefaultApi } from "@anomaorg/namada-indexer-client"; +import { Configuration, DefaultApi } from "@anomaorg/namada-indexer-client"; import { Atom, atom, getDefaultStore } from "jotai"; import { indexerUrlAtom } from "./settings"; @@ -14,5 +14,7 @@ export const getIndexerApi = (): DefaultApi => { // Helper function to use outside of hooks const getApi = (get: (atom: Atom) => Value): DefaultApi => { const indexerUrl = get(indexerUrlAtom); - return new DefaultApi({ basePath: indexerUrl }); + const configuration = new Configuration({ basePath: indexerUrl }); + + return new DefaultApi(configuration); }; diff --git a/apps/namadillo/src/atoms/proposals/functions.ts b/apps/namadillo/src/atoms/proposals/functions.ts index 435c2e55c..cc4bbc1a6 100644 --- a/apps/namadillo/src/atoms/proposals/functions.ts +++ b/apps/namadillo/src/atoms/proposals/functions.ts @@ -1,4 +1,5 @@ import { + ApiV1GovProposalGetStatusEnum as ApiIndexerProposalStatusEnum, DefaultApi, Proposal as IndexerProposal, ProposalStatusEnum as IndexerProposalStatusEnum, @@ -257,16 +258,16 @@ const fromIndexerStatus = ( const toIndexerStatus = ( proposalStatus: ProposalStatus -): IndexerProposalStatusEnum => { +): ApiIndexerProposalStatusEnum => { switch (proposalStatus) { case "pending": - return IndexerProposalStatusEnum.Pending; + return ApiIndexerProposalStatusEnum.Pending; case "ongoing": - return IndexerProposalStatusEnum.Voting; + return ApiIndexerProposalStatusEnum.VotingPeriod; case "passed": - return IndexerProposalStatusEnum.Passed; + return ApiIndexerProposalStatusEnum.Passed; case "rejected": - return IndexerProposalStatusEnum.Rejected; + return ApiIndexerProposalStatusEnum.Rejected; default: return assertNever(proposalStatus); } diff --git a/apps/namadillo/src/atoms/settings/services.ts b/apps/namadillo/src/atoms/settings/services.ts index 2dbbff95b..3ac430f7a 100644 --- a/apps/namadillo/src/atoms/settings/services.ts +++ b/apps/namadillo/src/atoms/settings/services.ts @@ -1,4 +1,4 @@ -import { DefaultApi } from "@anomaorg/namada-indexer-client"; +import { Configuration, DefaultApi } from "@anomaorg/namada-indexer-client"; import { isUrlValid } from "@namada/utils"; import toml from "toml"; import { SettingsTomlOptions } from "types"; @@ -8,7 +8,8 @@ export const isIndexerAlive = async (url: string): Promise => { return false; } try { - const api = new DefaultApi({ basePath: url }); + const configuration = new Configuration({ basePath: url }); + const api = new DefaultApi(configuration); const response = await api.healthGet(); return response.status === 200; } catch { diff --git a/yarn.lock b/yarn.lock index 3bd7bed2b..186cd0d61 100644 --- a/yarn.lock +++ b/yarn.lock @@ -45,12 +45,12 @@ __metadata: languageName: node linkType: hard -"@anomaorg/namada-indexer-client@npm:0.0.21": - version: 0.0.21 - resolution: "@anomaorg/namada-indexer-client@npm:0.0.21" +"@anomaorg/namada-indexer-client@file:../../../namada-indexer-client::locator=%40namada%2Fnamadillo%40workspace%3Aapps%2Fnamadillo": + version: 0.0.22 + resolution: "@anomaorg/namada-indexer-client@file:../../../namada-indexer-client#../../../namada-indexer-client::hash=3a5fbb&locator=%40namada%2Fnamadillo%40workspace%3Aapps%2Fnamadillo" dependencies: - axios: "npm:^0.21.1" - checksum: 4b9632145eee1d20672ad65eef447ed90e3abfc2fee09a5c3e40fc5fd9321ff83aff03acf4be75abe1c74c83fc635216f46f5c58155c11a291656bb822f05465 + axios: "npm:^1.6.1" + checksum: 812376e1e7591f5f8f6a4a28c237797bf58aa7cf956f2a4cc373ad2bc4d270da5ec3c80b617a20d5e9c40a949a2d5f73873a08f410607caa426666d6418b3682 languageName: node linkType: hard @@ -8448,7 +8448,7 @@ __metadata: version: 0.0.0-use.local resolution: "@namada/namadillo@workspace:apps/namadillo" dependencies: - "@anomaorg/namada-indexer-client": "npm:0.0.21" + "@anomaorg/namada-indexer-client": ../../../namada-indexer-client "@cosmjs/encoding": "npm:^0.32.3" "@playwright/test": "npm:^1.24.1" "@release-it/keep-a-changelog": "npm:^5.0.0" @@ -12954,6 +12954,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.6.1": + version: 1.7.4 + resolution: "axios@npm:1.7.4" + dependencies: + follow-redirects: "npm:^1.15.6" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 5ea1a93140ca1d49db25ef8e1bd8cfc59da6f9220159a944168860ad15a2743ea21c5df2967795acb15cbe81362f5b157fdebbea39d53117ca27658bab9f7f17 + languageName: node + linkType: hard + "axobject-query@npm:^2.2.0": version: 2.2.0 resolution: "axobject-query@npm:2.2.0" @@ -19364,6 +19375,16 @@ __metadata: languageName: node linkType: hard +"follow-redirects@npm:^1.15.6": + version: 1.15.6 + resolution: "follow-redirects@npm:1.15.6" + peerDependenciesMeta: + debug: + optional: true + checksum: 9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071 + languageName: node + linkType: hard + "for-each@npm:^0.3.3": version: 0.3.3 resolution: "for-each@npm:0.3.3"