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.

Sign up for GitHub

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

Make operators by searchable by sponsorships and vice versa #1714

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Make operators by searchable by sponsorships and vice versa #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 5 additions & 29 deletions src/generated/gql/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4430,21 +4430,11 @@ export type GetAllOperatorsQueryVariables = Exact<{

export type GetAllOperatorsQuery = { __typename?: 'Query', operators: Array<{ __typename?: 'Operator', id: string, delegatorCount: number, valueWithoutEarnings: any, totalStakeInSponsorshipsWei: any, dataTokenBalanceWei: any, operatorTokenTotalSupplyWei: any, exchangeRate: any, metadataJsonString: string, owner: string, nodes: Array<string>, cumulativeProfitsWei: any, cumulativeOperatorsCutWei: any, operatorsCutFraction: any, stakes: Array<{ __typename?: 'Stake', amountWei: any, earningsWei: any, joinTimestamp: number, operator: { __typename?: 'Operator', id: string }, sponsorship: { __typename?: 'Sponsorship', id: string, metadata?: string | null, isRunning: boolean, totalPayoutWeiPerSec: any, operatorCount: number, maxOperators?: number | null, totalStakedWei: any, remainingWei: any, projectedInsolvency?: any | null, cumulativeSponsoring: any, minimumStakingPeriodSeconds: any, creator: string, spotAPY: any, stream?: { __typename?: 'Stream', id: string, metadata: string } | null, stakes: Array<{ __typename?: 'Stake', amountWei: any, earningsWei: any, joinTimestamp: number, operator: { __typename?: 'Operator', id: string, metadataJsonString: string } }> } }>, delegations: Array<{ __typename?: 'Delegation', valueDataWei: any, operatorTokenBalanceWei: any, id: string, delegator: { __typename?: 'Delegator', id: string } }>, slashingEvents: Array<{ __typename?: 'SlashingEvent', amount: any, date: any, sponsorship: { __typename?: 'Sponsorship', id: string, stream?: { __typename?: 'Stream', id: string } | null } }>, queueEntries: Array<{ __typename?: 'QueueEntry', amount: any, date: any, id: string, delegator: { __typename?: 'Delegator', id: string } }> }> };

export type SearchOperatorsByIdQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
skip?: InputMaybe<Scalars['Int']['input']>;
operatorId?: InputMaybe<Scalars['ID']['input']>;
orderBy?: InputMaybe<Operator_OrderBy>;
orderDirection?: InputMaybe<OrderDirection>;
}>;


export type SearchOperatorsByIdQuery = { __typename?: 'Query', operators: Array<{ __typename?: 'Operator', id: string, delegatorCount: number, valueWithoutEarnings: any, totalStakeInSponsorshipsWei: any, dataTokenBalanceWei: any, operatorTokenTotalSupplyWei: any, exchangeRate: any, metadataJsonString: string, owner: string, nodes: Array<string>, cumulativeProfitsWei: any, cumulativeOperatorsCutWei: any, operatorsCutFraction: any, stakes: Array<{ __typename?: 'Stake', amountWei: any, earningsWei: any, joinTimestamp: number, operator: { __typename?: 'Operator', id: string }, sponsorship: { __typename?: 'Sponsorship', id: string, metadata?: string | null, isRunning: boolean, totalPayoutWeiPerSec: any, operatorCount: number, maxOperators?: number | null, totalStakedWei: any, remainingWei: any, projectedInsolvency?: any | null, cumulativeSponsoring: any, minimumStakingPeriodSeconds: any, creator: string, spotAPY: any, stream?: { __typename?: 'Stream', id: string, metadata: string } | null, stakes: Array<{ __typename?: 'Stake', amountWei: any, earningsWei: any, joinTimestamp: number, operator: { __typename?: 'Operator', id: string, metadataJsonString: string } }> } }>, delegations: Array<{ __typename?: 'Delegation', valueDataWei: any, operatorTokenBalanceWei: any, id: string, delegator: { __typename?: 'Delegator', id: string } }>, slashingEvents: Array<{ __typename?: 'SlashingEvent', amount: any, date: any, sponsorship: { __typename?: 'Sponsorship', id: string, stream?: { __typename?: 'Stream', id: string } | null } }>, queueEntries: Array<{ __typename?: 'QueueEntry', amount: any, date: any, id: string, delegator: { __typename?: 'Delegator', id: string } }> }> };

export type SearchOperatorsByMetadataQueryVariables = Exact<{
first?: InputMaybe<Scalars['Int']['input']>;
skip?: InputMaybe<Scalars['Int']['input']>;
searchQuery?: InputMaybe<Scalars['String']['input']>;
id: Scalars['ID']['input'];
orderBy?: InputMaybe<Operator_OrderBy>;
orderDirection?: InputMaybe<OrderDirection>;
}>;
Expand Down Expand Up @@ -4841,26 +4831,12 @@ export const GetAllOperatorsDocument = gql`
}
${OperatorFieldsFragmentDoc}`;
export type GetAllOperatorsQueryResult = Apollo.QueryResult<GetAllOperatorsQuery, GetAllOperatorsQueryVariables>;
export const SearchOperatorsByIdDocument = gql`
query searchOperatorsById($first: Int, $skip: Int, $operatorId: ID, $orderBy: Operator_orderBy, $orderDirection: OrderDirection) {
operators(
first: $first
skip: $skip
where: {id: $operatorId}
orderBy: $orderBy
orderDirection: $orderDirection
) {
...OperatorFields
}
}
${OperatorFieldsFragmentDoc}`;
export type SearchOperatorsByIdQueryResult = Apollo.QueryResult<SearchOperatorsByIdQuery, SearchOperatorsByIdQueryVariables>;
export const SearchOperatorsByMetadataDocument = gql`
query searchOperatorsByMetadata($first: Int, $skip: Int, $searchQuery: String, $orderBy: Operator_orderBy, $orderDirection: OrderDirection) {
query searchOperatorsByMetadata($first: Int, $skip: Int, $searchQuery: String, $id: ID!, $orderBy: Operator_orderBy, $orderDirection: OrderDirection) {
operators(
first: $first
skip: $skip
where: {metadataJsonString_contains_nocase: $searchQuery}
where: {or: [{id: $id}, {metadataJsonString_contains_nocase: $searchQuery}, {stakes_: {sponsorship_contains_nocase: $searchQuery}}]}
orderBy: $orderBy
orderDirection: $orderDirection
) {
Expand Down Expand Up @@ -4932,7 +4908,7 @@ export const GetAllSponsorshipsDocument = gql`
sponsorships(
first: $first
skip: $skip
where: {or: [{stream_contains_nocase: $searchQuery}, {id: $id}]}
where: {or: [{stream_contains_nocase: $searchQuery}, {id: $id}, {stakes_: {operator_contains_nocase: $searchQuery}}]}
orderBy: $orderBy
orderDirection: $orderDirection
) {
Expand All @@ -4946,7 +4922,7 @@ export const GetSponsorshipsByCreatorDocument = gql`
sponsorships(
first: $first
skip: $skip
where: {and: [{creator: $creator}, {or: [{stream_contains_nocase: $searchQuery}, {id: $id}]}]}
where: {and: [{creator: $creator}, {or: [{stream_contains_nocase: $searchQuery}, {id: $id}, {stakes_: {operator_contains_nocase: $searchQuery}}]}]}
orderBy: $orderBy
orderDirection: $orderDirection
) {
Expand Down
39 changes: 1 addition & 38 deletions src/getters/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ import {
GetOperatorByOwnerAddressQuery,
GetOperatorByOwnerAddressQueryVariables,
GetOperatorByOwnerAddressDocument,
SearchOperatorsByIdQuery,
SearchOperatorsByIdQueryVariables,
SearchOperatorsByIdDocument,
SearchOperatorsByMetadataQuery,
SearchOperatorsByMetadataQueryVariables,
SearchOperatorsByMetadataDocument,
Expand Down Expand Up @@ -527,41 +524,6 @@ export async function getOperatorsByDelegationAndMetadata({
return operators
}

export async function searchOperatorsById({
first,
skip,
operatorId,
orderBy = DEFAULT_OPERATOR_ORDER_BY,
orderDirection = DEFAULT_ORDER_DIRECTION,
force = false,
}: {
first?: number
skip?: number
operatorId?: string
orderBy?: Operator_OrderBy
orderDirection?: OrderDirection
force?: boolean
}): Promise<SearchOperatorsByIdQuery['operators']> {
const {
data: { operators },
} = await getGraphClient().query<
SearchOperatorsByIdQuery,
SearchOperatorsByIdQueryVariables
>({
query: SearchOperatorsByIdDocument,
variables: {
first,
skip,
operatorId,
orderBy,
orderDirection,
},
fetchPolicy: force ? 'network-only' : void 0,
})

return operators
}

export async function searchOperatorsByMetadata({
first,
skip,
Expand All @@ -588,6 +550,7 @@ export async function searchOperatorsByMetadata({
first,
skip,
searchQuery,
id: searchQuery?.toLowerCase() || '',
orderBy,
orderDirection,
},
Expand Down
8 changes: 0 additions & 8 deletions src/hooks/operators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
getParsedOperatorByOwnerAddress,
getParsedOperators,
getSpotApy,
searchOperatorsById,
searchOperatorsByMetadata,
} from '~/getters'
import { getQueryClient } from '~/utils'
Expand Down Expand Up @@ -332,13 +331,6 @@ export function useAllOperatorsQuery({
return getAllOperators(params) as Promise<Operator[]>
}

if (isAddress(searchQuery)) {
return searchOperatorsById({
...params,
operatorId: searchQuery,
}) as Promise<Operator[]>
}

return searchOperatorsByMetadata({
...params,
searchQuery,
Expand Down
43 changes: 22 additions & 21 deletions src/queries/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,35 +71,24 @@ gql`
}
}

query searchOperatorsById(
$first: Int
$skip: Int
$operatorId: ID
$orderBy: Operator_orderBy
$orderDirection: OrderDirection
) {
operators(
first: $first
skip: $skip
where: { id: $operatorId }
orderBy: $orderBy
orderDirection: $orderDirection
) {
...OperatorFields
}
}

query searchOperatorsByMetadata(
$first: Int
$skip: Int
$searchQuery: String
$id: ID!
$orderBy: Operator_orderBy
$orderDirection: OrderDirection
) {
operators(
first: $first
skip: $skip
where: { metadataJsonString_contains_nocase: $searchQuery }
where: {
or: [
{ id: $id }
{ metadataJsonString_contains_nocase: $searchQuery }
{ stakes_: { sponsorship_contains_nocase: $searchQuery } }
]
}
orderBy: $orderBy
orderDirection: $orderDirection
) {
Expand Down Expand Up @@ -220,7 +209,13 @@ gql`
sponsorships(
first: $first
skip: $skip
where: { or: [{ stream_contains_nocase: $searchQuery }, { id: $id }] }
where: {
or: [
{ stream_contains_nocase: $searchQuery }
{ id: $id }
{ stakes_: { operator_contains_nocase: $searchQuery } }
]
}
orderBy: $orderBy
orderDirection: $orderDirection
) {
Expand All @@ -243,7 +238,13 @@ gql`
where: {
and: [
{ creator: $creator }
{ or: [{ stream_contains_nocase: $searchQuery }, { id: $id }] }
{
or: [
{ stream_contains_nocase: $searchQuery }
{ id: $id }
{ stakes_: { operator_contains_nocase: $searchQuery } }
]
}
]
}
orderBy: $orderBy
Expand Down