Merge pull request 'Declare taxonomy filter variables on the makes/runs leaderboards' (#302) from dean/leaderboard-filter-operations into master

Reviewed-on: #302

src/index.tsx

@@ -3195,14 +3195,28 @@ export type QueryGetLiveTableStateArgs = {
 };
 
 export type QueryGetLongestRunsLeaderboardArgs = {
+  excludeDrills?: Scalars["Boolean"]["input"];
+  gameType?: InputMaybe<Scalars["String"]["input"]>;
   interval?: InputMaybe<TimeInterval>;
   limit?: Scalars["Int"]["input"];
+  pocketSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  rankedOnly?: Scalars["Boolean"]["input"];
   requiredTags?: InputMaybe<Array<Scalars["String"]["input"]>>;
+  tableSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  tableSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
   when?: InputMaybe<Scalars["DateTime"]["input"]>;
 };
 
 export type QueryGetMakesLeaderboardArgs = {
+  excludeDrills?: Scalars["Boolean"]["input"];
+  gameType?: InputMaybe<Scalars["String"]["input"]>;
   interval?: InputMaybe<TimeInterval>;
+  pocketSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  rankedOnly?: Scalars["Boolean"]["input"];
+  tableSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  tableSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
   when?: InputMaybe<Scalars["DateTime"]["input"]>;
 };
 
@@ -5222,6 +5236,11 @@ export type GetVideoFeedQuery = {
 export type GetMakesLeaderboardQueryVariables = Exact<{
   interval?: InputMaybe<TimeInterval>;
   when?: InputMaybe<Scalars["DateTime"]["input"]>;
+  gameType?: InputMaybe<Scalars["String"]["input"]>;
+  tableSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  tableSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
 }>;
 
 export type GetMakesLeaderboardQuery = {
@@ -5246,6 +5265,11 @@ export type GetMakesLeaderboardQuery = {
 export type GetRunsLeaderboardQueryVariables = Exact<{
   interval?: InputMaybe<TimeInterval>;
   when?: InputMaybe<Scalars["DateTime"]["input"]>;
+  gameType?: InputMaybe<Scalars["String"]["input"]>;
+  tableSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  tableSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
 }>;
 
 export type GetRunsLeaderboardQuery = {
@@ -5330,43 +5354,6 @@ export type GetMyDrillRunsQuery = {
   }>;
 };
 
-export type GetLiveStreamsQueryVariables = Exact<{
-  limit?: Scalars["Int"]["input"];
-}>;
-
-export type GetLiveStreamsQuery = {
-  __typename?: "Query";
-  getFeedVideos: {
-    __typename?: "VideoHistoryGQL";
-    videos: Array<{
-      __typename?: "VideoGQL";
-      id: number;
-      name?: string | null;
-      startTime?: any | null;
-      createdAt?: any | null;
-      screenshotUri?: string | null;
-      elapsedTime?: number | null;
-      owner?: {
-        __typename?: "UserGQL";
-        id: number;
-        username: string;
-        profileImageUri?: string | null;
-      } | null;
-      stream?: {
-        __typename?: "UploadStreamGQL";
-        id: string;
-        isCompleted: boolean;
-        lastSegmentUploadedAt?: any | null;
-      } | null;
-    }>;
-    pageInfo: {
-      __typename?: "PageInfoGQL";
-      hasNextPage: boolean;
-      endCursor?: string | null;
-    };
-  };
-};
-
 export type GetVideoMakePercentageIntervalsQueryVariables = Exact<{
   videoId: Scalars["ID"]["input"];
   intervalDuration: Scalars["Int"]["input"];
@@ -6708,11 +6695,11 @@ export type ReactToVideoMutation = {
   reactToVideo: boolean;
 };
 
-export type GetRecordedStreamsQueryVariables = Exact<{
+export type GetShotLabVideosQueryVariables = Exact<{
   limit?: Scalars["Int"]["input"];
 }>;
 
-export type GetRecordedStreamsQuery = {
+export type GetShotLabVideosQuery = {
   __typename?: "Query";
   getFeedVideos: {
     __typename?: "VideoHistoryGQL";
@@ -6730,6 +6717,12 @@ export type GetRecordedStreamsQuery = {
         username: string;
         profileImageUri?: string | null;
       } | null;
+      stream?: {
+        __typename?: "UploadStreamGQL";
+        id: string;
+        isCompleted: boolean;
+        lastSegmentUploadedAt?: any | null;
+      } | null;
     }>;
   };
 };
@@ -11771,8 +11764,24 @@ export type GetVideoFeedQueryResult = Apollo.QueryResult<
   GetVideoFeedQueryVariables
 >;
 export const GetMakesLeaderboardDocument = gql`
-  query GetMakesLeaderboard($interval: TimeInterval, $when: DateTime) {
-    getMakesLeaderboard(interval: $interval, when: $when) {
+  query GetMakesLeaderboard(
+    $interval: TimeInterval
+    $when: DateTime
+    $gameType: String
+    $tableSizeMin: Float
+    $tableSizeMax: Float
+    $pocketSizeMin: Float
+    $pocketSizeMax: Float
+  ) {
+    getMakesLeaderboard(
+      interval: $interval
+      when: $when
+      gameType: $gameType
+      tableSizeMin: $tableSizeMin
+      tableSizeMax: $tableSizeMax
+      pocketSizeMin: $pocketSizeMin
+      pocketSizeMax: $pocketSizeMax
+    ) {
       entries {
         user {
           id
@@ -11801,6 +11810,11 @@ export const GetMakesLeaderboardDocument = gql`
  *   variables: {
  *      interval: // value for 'interval'
  *      when: // value for 'when'
+ *      gameType: // value for 'gameType'
+ *      tableSizeMin: // value for 'tableSizeMin'
+ *      tableSizeMax: // value for 'tableSizeMax'
+ *      pocketSizeMin: // value for 'pocketSizeMin'
+ *      pocketSizeMax: // value for 'pocketSizeMax'
  *   },
  * });
  */
@@ -11854,8 +11868,24 @@ export type GetMakesLeaderboardQueryResult = Apollo.QueryResult<
   GetMakesLeaderboardQueryVariables
 >;
 export const GetRunsLeaderboardDocument = gql`
-  query GetRunsLeaderboard($interval: TimeInterval, $when: DateTime) {
-    getLongestRunsLeaderboard(interval: $interval, when: $when) {
+  query GetRunsLeaderboard(
+    $interval: TimeInterval
+    $when: DateTime
+    $gameType: String
+    $tableSizeMin: Float
+    $tableSizeMax: Float
+    $pocketSizeMin: Float
+    $pocketSizeMax: Float
+  ) {
+    getLongestRunsLeaderboard(
+      interval: $interval
+      when: $when
+      gameType: $gameType
+      tableSizeMin: $tableSizeMin
+      tableSizeMax: $tableSizeMax
+      pocketSizeMin: $pocketSizeMin
+      pocketSizeMax: $pocketSizeMax
+    ) {
       entries {
         id
         runLength
@@ -11887,6 +11917,11 @@ export const GetRunsLeaderboardDocument = gql`
  *   variables: {
  *      interval: // value for 'interval'
  *      when: // value for 'when'
+ *      gameType: // value for 'gameType'
+ *      tableSizeMin: // value for 'tableSizeMin'
+ *      tableSizeMax: // value for 'tableSizeMax'
+ *      pocketSizeMin: // value for 'pocketSizeMin'
+ *      pocketSizeMax: // value for 'pocketSizeMax'
  *   },
  * });
  */
@@ -12134,105 +12169,6 @@ export type GetMyDrillRunsQueryResult = Apollo.QueryResult<
   GetMyDrillRunsQuery,
   GetMyDrillRunsQueryVariables
 >;
-export const GetLiveStreamsDocument = gql`
-  query GetLiveStreams($limit: Int! = 25) {
-    getFeedVideos(
-      limit: $limit
-      filters: { isStreamCompleted: false, requireCursorCompletion: false }
-      includePrivate: MINE
-      feedInput: { allUsers: true }
-    ) {
-      videos {
-        id
-        name
-        startTime
-        createdAt
-        screenshotUri
-        elapsedTime
-        owner {
-          id
-          username
-          profileImageUri
-        }
-        stream {
-          id
-          isCompleted
-          lastSegmentUploadedAt
-        }
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-    }
-  }
-`;
-
-/**
- * __useGetLiveStreamsQuery__
- *
- * To run a query within a React component, call `useGetLiveStreamsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetLiveStreamsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetLiveStreamsQuery({
- *   variables: {
- *      limit: // value for 'limit'
- *   },
- * });
- */
-export function useGetLiveStreamsQuery(
-  baseOptions?: Apollo.QueryHookOptions<
-    GetLiveStreamsQuery,
-    GetLiveStreamsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<GetLiveStreamsQuery, GetLiveStreamsQueryVariables>(
-    GetLiveStreamsDocument,
-    options,
-  );
-}
-export function useGetLiveStreamsLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    GetLiveStreamsQuery,
-    GetLiveStreamsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<GetLiveStreamsQuery, GetLiveStreamsQueryVariables>(
-    GetLiveStreamsDocument,
-    options,
-  );
-}
-export function useGetLiveStreamsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetLiveStreamsQuery,
-    GetLiveStreamsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useSuspenseQuery<
-    GetLiveStreamsQuery,
-    GetLiveStreamsQueryVariables
-  >(GetLiveStreamsDocument, options);
-}
-export type GetLiveStreamsQueryHookResult = ReturnType<
-  typeof useGetLiveStreamsQuery
->;
-export type GetLiveStreamsLazyQueryHookResult = ReturnType<
-  typeof useGetLiveStreamsLazyQuery
->;
-export type GetLiveStreamsSuspenseQueryHookResult = ReturnType<
-  typeof useGetLiveStreamsSuspenseQuery
->;
-export type GetLiveStreamsQueryResult = Apollo.QueryResult<
-  GetLiveStreamsQuery,
-  GetLiveStreamsQueryVariables
->;
 export const GetVideoMakePercentageIntervalsDocument = gql`
   query GetVideoMakePercentageIntervals(
     $videoId: ID!
@@ -14531,11 +14467,10 @@ export type ReactToVideoMutationOptions = Apollo.BaseMutationOptions<
   ReactToVideoMutation,
   ReactToVideoMutationVariables
 >;
-export const GetRecordedStreamsDocument = gql`
-  query GetRecordedStreams($limit: Int! = 25) {
+export const GetShotLabVideosDocument = gql`
+  query GetShotLabVideos($limit: Int! = 25) {
     getFeedVideos(
       limit: $limit
-      filters: { isStreamCompleted: true, excludeVideosWithNoShots: true }
       includePrivate: MINE
       feedInput: { allUsers: true }
     ) {
@@ -14551,75 +14486,80 @@ export const GetRecordedStreamsDocument = gql`
           username
           profileImageUri
         }
+        stream {
+          id
+          isCompleted
+          lastSegmentUploadedAt
+        }
       }
     }
   }
 `;
 
 /**
- * __useGetRecordedStreamsQuery__
+ * __useGetShotLabVideosQuery__
  *
- * To run a query within a React component, call `useGetRecordedStreamsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetRecordedStreamsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * To run a query within a React component, call `useGetShotLabVideosQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetShotLabVideosQuery` returns an object from Apollo Client that contains loading, error, and data properties
  * you can use to render your UI.
  *
  * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
  *
  * @example
- * const { data, loading, error } = useGetRecordedStreamsQuery({
+ * const { data, loading, error } = useGetShotLabVideosQuery({
  *   variables: {
  *      limit: // value for 'limit'
  *   },
  * });
  */
-export function useGetRecordedStreamsQuery(
+export function useGetShotLabVideosQuery(
   baseOptions?: Apollo.QueryHookOptions<
-    GetRecordedStreamsQuery,
-    GetRecordedStreamsQueryVariables
+    GetShotLabVideosQuery,
+    GetShotLabVideosQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<
-    GetRecordedStreamsQuery,
-    GetRecordedStreamsQueryVariables
-  >(GetRecordedStreamsDocument, options);
+  return Apollo.useQuery<GetShotLabVideosQuery, GetShotLabVideosQueryVariables>(
+    GetShotLabVideosDocument,
+    options,
+  );
 }
-export function useGetRecordedStreamsLazyQuery(
+export function useGetShotLabVideosLazyQuery(
   baseOptions?: Apollo.LazyQueryHookOptions<
-    GetRecordedStreamsQuery,
-    GetRecordedStreamsQueryVariables
+    GetShotLabVideosQuery,
+    GetShotLabVideosQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useLazyQuery<
-    GetRecordedStreamsQuery,
-    GetRecordedStreamsQueryVariables
-  >(GetRecordedStreamsDocument, options);
+    GetShotLabVideosQuery,
+    GetShotLabVideosQueryVariables
+  >(GetShotLabVideosDocument, options);
 }
-export function useGetRecordedStreamsSuspenseQuery(
+export function useGetShotLabVideosSuspenseQuery(
   baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetRecordedStreamsQuery,
-    GetRecordedStreamsQueryVariables
+    GetShotLabVideosQuery,
+    GetShotLabVideosQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
-    GetRecordedStreamsQuery,
-    GetRecordedStreamsQueryVariables
-  >(GetRecordedStreamsDocument, options);
+    GetShotLabVideosQuery,
+    GetShotLabVideosQueryVariables
+  >(GetShotLabVideosDocument, options);
 }
-export type GetRecordedStreamsQueryHookResult = ReturnType<
-  typeof useGetRecordedStreamsQuery
+export type GetShotLabVideosQueryHookResult = ReturnType<
+  typeof useGetShotLabVideosQuery
 >;
-export type GetRecordedStreamsLazyQueryHookResult = ReturnType<
-  typeof useGetRecordedStreamsLazyQuery
+export type GetShotLabVideosLazyQueryHookResult = ReturnType<
+  typeof useGetShotLabVideosLazyQuery
 >;
-export type GetRecordedStreamsSuspenseQueryHookResult = ReturnType<
-  typeof useGetRecordedStreamsSuspenseQuery
+export type GetShotLabVideosSuspenseQueryHookResult = ReturnType<
+  typeof useGetShotLabVideosSuspenseQuery
 >;
-export type GetRecordedStreamsQueryResult = Apollo.QueryResult<
-  GetRecordedStreamsQuery,
-  GetRecordedStreamsQueryVariables
+export type GetShotLabVideosQueryResult = Apollo.QueryResult<
+  GetShotLabVideosQuery,
+  GetShotLabVideosQueryVariables
 >;
 export const GetRecordedStreamShotsDocument = gql`
   query GetRecordedStreamShots($videoId: Int!, $limit: Int! = 200) {

src/operations/leaderboards.gql

@@ -1,5 +1,21 @@
-query GetMakesLeaderboard($interval: TimeInterval, $when: DateTime) {
-  getMakesLeaderboard(interval: $interval, when: $when) {
+query GetMakesLeaderboard(
+  $interval: TimeInterval
+  $when: DateTime
+  $gameType: String
+  $tableSizeMin: Float
+  $tableSizeMax: Float
+  $pocketSizeMin: Float
+  $pocketSizeMax: Float
+) {
+  getMakesLeaderboard(
+    interval: $interval
+    when: $when
+    gameType: $gameType
+    tableSizeMin: $tableSizeMin
+    tableSizeMax: $tableSizeMax
+    pocketSizeMin: $pocketSizeMin
+    pocketSizeMax: $pocketSizeMax
+  ) {
     entries {
       user {
         id
@@ -13,8 +29,24 @@ query GetMakesLeaderboard($interval: TimeInterval, $when: DateTime) {
   }
 }
 
-query GetRunsLeaderboard($interval: TimeInterval, $when: DateTime) {
-  getLongestRunsLeaderboard(interval: $interval, when: $when) {
+query GetRunsLeaderboard(
+  $interval: TimeInterval
+  $when: DateTime
+  $gameType: String
+  $tableSizeMin: Float
+  $tableSizeMax: Float
+  $pocketSizeMin: Float
+  $pocketSizeMax: Float
+) {
+  getLongestRunsLeaderboard(
+    interval: $interval
+    when: $when
+    gameType: $gameType
+    tableSizeMin: $tableSizeMin
+    tableSizeMax: $tableSizeMax
+    pocketSizeMin: $pocketSizeMin
+    pocketSizeMax: $pocketSizeMax
+  ) {
     entries {
       id
       runLength

src/operations/live_streams.gql

@@ -1,34 +0,0 @@
-# Lightweight listing of live (in-progress) streams for pickers like the
-# Shot Lab "follow a live stream" flow. Selects only what a picker card
-# needs; intentionally avoids the heavy VideoCardFields fragment.
-query GetLiveStreams($limit: Int! = 25) {
-  getFeedVideos(
-    limit: $limit
-    filters: { isStreamCompleted: false, requireCursorCompletion: false }
-    includePrivate: MINE
-    feedInput: { allUsers: true }
-  ) {
-    videos {
-      id
-      name
-      startTime
-      createdAt
-      screenshotUri
-      elapsedTime
-      owner {
-        id
-        username
-        profileImageUri
-      }
-      stream {
-        id
-        isCompleted
-        lastSegmentUploadedAt
-      }
-    }
-    pageInfo {
-      hasNextPage
-      endCursor
-    }
-  }
-}

src/operations/recorded_shots.gql

@@ -1,8 +1,10 @@
-# Lightweight two-step picker data for loading a recorded shot into Shot Lab.
-query GetRecordedStreams($limit: Int! = 25) {
+# Lightweight two-step picker data for Shot Lab's video-first source: recent
+# videos (completed or still uploading — no completion gate, so an in-progress
+# recording with no shots yet still appears), then that video's shots. The
+# stream fields let the client hint at "actively updating" without gating.
+query GetShotLabVideos($limit: Int! = 25) {
   getFeedVideos(
     limit: $limit
-    filters: { isStreamCompleted: true, excludeVideosWithNoShots: true }
     includePrivate: MINE
     feedInput: { allUsers: true }
   ) {
@@ -18,6 +20,11 @@ query GetRecordedStreams($limit: Int! = 25) {
         username
         profileImageUri
       }
+      stream {
+        id
+        isCompleted
+        lastSegmentUploadedAt
+      }
     }
   }
 }

src/schema.gql

@@ -1005,6 +1005,13 @@ type Query {
     when: DateTime = null
     limit: Int! = 50
     requiredTags: [String!] = null
+    gameType: String = null
+    rankedOnly: Boolean! = false
+    excludeDrills: Boolean! = true
+    tableSizeMin: Float = null
+    tableSizeMax: Float = null
+    pocketSizeMin: Float = null
+    pocketSizeMax: Float = null
   ): RunLeaderboardGQL!
   getDrillRunLeaderboard(
     drillTag: String!
@@ -1019,6 +1026,13 @@ type Query {
   getMakesLeaderboard(
     interval: TimeInterval = null
     when: DateTime = null
+    gameType: String = null
+    rankedOnly: Boolean! = false
+    excludeDrills: Boolean! = true
+    tableSizeMin: Float = null
+    tableSizeMax: Float = null
+    pocketSizeMin: Float = null
+    pocketSizeMax: Float = null
   ): CountLeaderboardGQL!
   getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
   notifications(