Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DPA-1384]: fix(chain): override apollo ID matching for chain #97

Merged
merged 1 commit into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/eighty-apricots-rest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@smartcontractkit/operator-ui': patch
---

fix: override unique handling logic of apollo client for chains
24 changes: 23 additions & 1 deletion src/apollo.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { ApolloClient, InMemoryCache, HttpLink } from '@apollo/client'
import {
ApolloClient,
defaultDataIdFromObject,
HttpLink,
InMemoryCache,
} from '@apollo/client'
import generatedIntrospection from 'src/types/generated/possibleTypes'

const baseURL = process.env.CHAINLINK_BASEURL ?? location.origin
Expand All @@ -11,6 +16,23 @@ const httpLink = new HttpLink({
export const client = new ApolloClient({
cache: new InMemoryCache({
possibleTypes: generatedIntrospection.possibleTypes,
// we need to explicitly handle the uniqueness of chain object because
// ID is not unique across as different network can have the same ID
// which confuses the caching of apollo client.
// the code below is to override the handling of uniqueness for Chain type.
dataIdFromObject(responseObject) {
switch (responseObject.__typename) {
case 'Chain':
if (!responseObject.network) {
throw new Error(
'Due to Chain ID not being unique across chain, ensure network is fetched too',
)
}
return `Chain:${responseObject.network}:${responseObject.id}`
default:
archseer marked this conversation as resolved.
Show resolved Hide resolved
return defaultDataIdFromObject(responseObject)
}
},
}),
link: httpLink,
})
2 changes: 2 additions & 0 deletions src/components/Form/ChainConfigurationForm.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('ChainConfigurationForm', () => {
address: '0x1111',
chain: {
id: '1111',
network: 'evm',
},
createdAt: '2021-10-06T00:00:00Z',
isDisabled: false,
Expand Down Expand Up @@ -428,6 +429,7 @@ function renderChainConfigurationForm(
address: '0x1111',
chain: {
id: '1111',
network: 'evm',
},
createdAt: '2021-10-06T00:00:00Z',
isDisabled: false,
Expand Down
1 change: 1 addition & 0 deletions src/hooks/queries/useEVMAccountsQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export const ETH_KEYS_PAYLOAD__RESULTS_FIELDS = gql`
address
chain {
id
network
}
createdAt
ethBalance
Expand Down
1 change: 1 addition & 0 deletions src/screens/Dashboard/AccountBalanceCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const ACCOUNT_BALANCES_PAYLOAD__RESULTS_FIELDS = gql`
address
chain {
id
network
}
ethBalance
isDisabled
Expand Down
1 change: 1 addition & 0 deletions src/screens/Node/NodeView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const NODE_PAYLOAD_FIELDS = gql`
name
chain {
id
network
}
httpURL
wsURL
Expand Down
1 change: 1 addition & 0 deletions src/screens/Nodes/NodesView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const NODES_PAYLOAD__RESULTS_FIELDS = gql`
id
chain {
id
network
}
name
state
Expand Down
1 change: 1 addition & 0 deletions src/screens/Transaction/TransactionView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const ETH_TRANSACTION_PAYLOAD_FIELDS = gql`
fragment EthTransactionPayloadFields on EthTransaction {
chain {
id
network
}
data
from
Expand Down
1 change: 1 addition & 0 deletions src/screens/Transactions/TransactionsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const ETH_TRANSACTIONS_PAYLOAD__RESULTS_FIELDS = gql`
fragment EthTransactionsPayload_ResultsFields on EthTransaction {
chain {
id
network
}
from
hash
Expand Down
1 change: 1 addition & 0 deletions support/factories/gql/fetchAccountBalances.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export function buildETHKey(
chain: {
__typename: 'Chain',
id: '42',
network: 'evm',
},
ethBalance: '0.100000000000000000',
isDisabled: false,
Expand Down
1 change: 1 addition & 0 deletions support/factories/gql/fetchETHKeys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export function buildETHKey(
address: '0x0000000000000000000000000000000000000001',
chain: {
id: '42',
network: 'evm',
},
createdAt: minuteAgo,
ethBalance: '0.100000000000000000',
Expand Down
1 change: 1 addition & 0 deletions support/factories/gql/fetchEthTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export function buildEthTx(
__typename: 'EthTransaction',
chain: {
id: '42',
network: 'evm',
},
data: '0x',
from: '0x0000000000000000000000000000000000000001',
Expand Down
1 change: 1 addition & 0 deletions support/factories/gql/fetchEthTransactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export function buildEthTx(
__typename: 'EthTransaction',
chain: {
id: '42',
network: 'evm',
},
from: '0x0000000000000000000000000000000000000001',
hash: '0x1111111111111111',
Expand Down
1 change: 1 addition & 0 deletions support/factories/gql/fetchNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export function buildNodePayloadFields(
wsURL: 'wss://node1.com',
chain: {
id: '42',
network: 'evm',
},
state: '',
sendOnly: false,
Expand Down
3 changes: 3 additions & 0 deletions support/factories/gql/fetchNodes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export function buildNode(
name: 'node1',
chain: {
id: '42',
network: 'evm',
},
state: '',
sendOnly: false,
Expand All @@ -23,6 +24,7 @@ export function buildNodes(): ReadonlyArray<NodesPayload_ResultsFields> {
name: 'node1',
chain: {
id: '42',
network: 'evm',
},
order: 32,
}),
Expand All @@ -31,6 +33,7 @@ export function buildNodes(): ReadonlyArray<NodesPayload_ResultsFields> {
name: 'node2',
chain: {
id: '5',
network: 'evm',
},
}),
]
Expand Down
Loading