Merge pull request 'Add id to shots: video items to prevent cache merge issues' (#72) from loewy/add-id-to-fix-cache-merging-issue into master

Reviewed-on: #72

src/index.tsx

@@ -211,6 +211,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -222,6 +223,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -248,6 +250,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -259,6 +262,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -285,6 +289,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -296,6 +301,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -322,6 +328,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -333,6 +340,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -359,6 +367,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -370,6 +379,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -396,6 +406,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -407,6 +418,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -433,6 +445,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -444,6 +457,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -470,6 +484,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -481,6 +496,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -507,6 +523,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -518,6 +535,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -544,6 +562,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -555,6 +574,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -581,6 +601,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -592,6 +613,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -618,6 +640,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -629,6 +652,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -655,6 +679,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -666,6 +691,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -692,6 +718,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -703,6 +730,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -729,6 +757,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -740,6 +769,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -766,6 +796,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -777,6 +808,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -803,6 +835,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -814,6 +847,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -840,6 +874,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -851,6 +886,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -877,6 +913,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -888,6 +925,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -914,6 +952,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -925,6 +964,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -951,6 +991,7 @@ export type FilterInput =
       kickAngle: FloatRangeFilter;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -962,6 +1003,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -988,6 +1030,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance: FloatRangeFilter;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -999,6 +1042,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1025,6 +1069,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make: Array<Scalars["Boolean"]["input"]>;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1036,6 +1081,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1062,6 +1108,46 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees: FloatRangeFilter;
+      missAngleInDegrees?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tableSize?: never;
+      tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
+      targetPocketDistance?: never;
+      userId?: never;
+      username?: never;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      backcut?: never;
+      bankAngle?: never;
+      bankDistance?: never;
+      createdAt?: never;
+      cueAngleAfterObject?: never;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
+      difficulty?: never;
+      falsePositiveScore?: never;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees: FloatRangeFilter;
       notFilter?: never;
       orFilters?: never;
@@ -1073,6 +1159,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1099,6 +1186,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter: FilterInput;
       orFilters?: never;
@@ -1110,6 +1198,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1136,6 +1225,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters: Array<FilterInput>;
@@ -1147,6 +1237,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1173,6 +1264,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1184,6 +1276,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1210,6 +1303,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1221,6 +1315,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1247,6 +1342,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1258,6 +1354,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1284,6 +1381,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1295,6 +1393,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1321,6 +1420,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1332,6 +1432,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1358,6 +1459,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1369,6 +1471,7 @@ export type FilterInput =
       targetPocketAngleDirection: Array<ShotDirectionEnum>;
       targetPocketDistance?: never;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1395,6 +1498,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1406,6 +1510,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance: FloatRangeFilter;
       userId?: never;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1432,6 +1537,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1443,6 +1549,7 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId: Array<Scalars["Int"]["input"]>;
+      username?: never;
       videoId?: never;
     }
   | {
@@ -1469,6 +1576,7 @@ export type FilterInput =
       kickAngle?: never;
       kickDistance?: never;
       make?: never;
+      marginOfErrorInDegrees?: never;
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
@@ -1480,6 +1588,46 @@ export type FilterInput =
       targetPocketAngleDirection?: never;
       targetPocketDistance?: never;
       userId?: never;
+      username: Array<Scalars["String"]["input"]>;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      backcut?: never;
+      bankAngle?: never;
+      bankDistance?: never;
+      createdAt?: never;
+      cueAngleAfterObject?: never;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
+      difficulty?: never;
+      falsePositiveScore?: never;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      marginOfErrorInDegrees?: never;
+      missAngleInDegrees?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tableSize?: never;
+      tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
+      targetPocketDistance?: never;
+      userId?: never;
+      username?: never;
       videoId: Array<Scalars["Int"]["input"]>;
     };
 
@@ -1698,6 +1846,7 @@ export type PocketingIntentionFeaturesGql = {
   difficulty?: Maybe<Scalars["Float"]["output"]>;
   intendedPocketType?: Maybe<PocketEnum>;
   make?: Maybe<Scalars["Boolean"]["output"]>;
+  marginOfErrorInDegrees?: Maybe<Scalars["Float"]["output"]>;
   targetPocketAngle?: Maybe<Scalars["Float"]["output"]>;
   targetPocketAngleDirection?: Maybe<ShotDirectionEnum>;
   targetPocketDistance?: Maybe<Scalars["Float"]["output"]>;
@@ -2252,6 +2401,29 @@ export type GetShotAnnotationTypesQuery = {
   }>;
 };
 
+export type GetShotsWithVideoGqlQueryVariables = Exact<{
+  filterInput: FilterInput;
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+}>;
+
+export type GetShotsWithVideoGqlQuery = {
+  __typename?: "Query";
+  getShotsWithMetadata: {
+    __typename?: "GetShotsResult";
+    ids: Array<number>;
+    shots: Array<{
+      __typename?: "ShotGQL";
+      id: number;
+      videoId: number;
+      video?: {
+        __typename?: "VideoGQL";
+        screenshotUri?: string | null;
+        endTime?: any | null;
+      } | null;
+    }>;
+  };
+};
+
 export type GetShotsWithMetadataQueryVariables = Exact<{
   filterInput: FilterInput;
   shotsPagination?: InputMaybe<GetShotsPagination>;
@@ -2277,6 +2449,7 @@ export type GetShotsWithMetadataQuery = {
       user?: { __typename?: "UserGQL"; id: number } | null;
       video?: {
         __typename?: "VideoGQL";
+        id: number;
         stream?: {
           __typename?: "UploadStreamGQL";
           resolution: {
@@ -2296,8 +2469,11 @@ export type GetShotsWithMetadataQuery = {
       } | null;
       pocketingIntentionFeatures?: {
         __typename?: "PocketingIntentionFeaturesGQL";
-        targetPocketDistance?: number | null;
         make?: boolean | null;
+        targetPocketDistance?: number | null;
+        targetPocketAngle?: number | null;
+        targetPocketAngleDirection?: ShotDirectionEnum | null;
+        marginOfErrorInDegrees?: number | null;
         intendedPocketType?: PocketEnum | null;
       } | null;
       pocketingIntentionInfo?: {
@@ -2332,6 +2508,7 @@ export type GetShotsByIdsQuery = {
     user?: { __typename?: "UserGQL"; id: number } | null;
     video?: {
       __typename?: "VideoGQL";
+      id: number;
       stream?: {
         __typename?: "UploadStreamGQL";
         resolution: {
@@ -2351,8 +2528,11 @@ export type GetShotsByIdsQuery = {
     } | null;
     pocketingIntentionFeatures?: {
       __typename?: "PocketingIntentionFeaturesGQL";
-      targetPocketDistance?: number | null;
       make?: boolean | null;
+      targetPocketDistance?: number | null;
+      targetPocketAngle?: number | null;
+      targetPocketAngleDirection?: ShotDirectionEnum | null;
+      marginOfErrorInDegrees?: number | null;
       intendedPocketType?: PocketEnum | null;
     } | null;
     pocketingIntentionInfo?: {
@@ -2380,6 +2560,7 @@ export type ShotWithAllFeaturesFragment = {
   user?: { __typename?: "UserGQL"; id: number } | null;
   video?: {
     __typename?: "VideoGQL";
+    id: number;
     stream?: {
       __typename?: "UploadStreamGQL";
       resolution: {
@@ -2399,8 +2580,11 @@ export type ShotWithAllFeaturesFragment = {
   } | null;
   pocketingIntentionFeatures?: {
     __typename?: "PocketingIntentionFeaturesGQL";
-    targetPocketDistance?: number | null;
     make?: boolean | null;
+    targetPocketDistance?: number | null;
+    targetPocketAngle?: number | null;
+    targetPocketAngleDirection?: ShotDirectionEnum | null;
+    marginOfErrorInDegrees?: number | null;
     intendedPocketType?: PocketEnum | null;
   } | null;
   pocketingIntentionInfo?: {
@@ -2969,6 +3153,7 @@ export const ShotWithAllFeaturesFragmentDoc = gql`
     }
     falsePositiveScore
     video {
+      id
       stream {
         resolution {
           width
@@ -2986,8 +3171,11 @@ export const ShotWithAllFeaturesFragmentDoc = gql`
       spinType
     }
     pocketingIntentionFeatures {
-      targetPocketDistance
       make
+      targetPocketDistance
+      targetPocketAngle
+      targetPocketAngleDirection
+      marginOfErrorInDegrees
       intendedPocketType
     }
     pocketingIntentionInfo {
@@ -3491,6 +3679,88 @@ export type GetShotAnnotationTypesQueryResult = Apollo.QueryResult<
   GetShotAnnotationTypesQuery,
   GetShotAnnotationTypesQueryVariables
 >;
+export const GetShotsWithVideoGqlDocument = gql`
+  query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+    getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+      ids
+      shots {
+        id
+        videoId
+        video {
+          screenshotUri
+          endTime
+        }
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetShotsWithVideoGqlQuery__
+ *
+ * To run a query within a React component, call `useGetShotsWithVideoGqlQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetShotsWithVideoGqlQuery` 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 } = useGetShotsWithVideoGqlQuery({
+ *   variables: {
+ *      filterInput: // value for 'filterInput'
+ *      limit: // value for 'limit'
+ *   },
+ * });
+ */
+export function useGetShotsWithVideoGqlQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetShotsWithVideoGqlQuery,
+    GetShotsWithVideoGqlQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetShotsWithVideoGqlQuery,
+    GetShotsWithVideoGqlQueryVariables
+  >(GetShotsWithVideoGqlDocument, options);
+}
+export function useGetShotsWithVideoGqlLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetShotsWithVideoGqlQuery,
+    GetShotsWithVideoGqlQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetShotsWithVideoGqlQuery,
+    GetShotsWithVideoGqlQueryVariables
+  >(GetShotsWithVideoGqlDocument, options);
+}
+export function useGetShotsWithVideoGqlSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetShotsWithVideoGqlQuery,
+    GetShotsWithVideoGqlQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetShotsWithVideoGqlQuery,
+    GetShotsWithVideoGqlQueryVariables
+  >(GetShotsWithVideoGqlDocument, options);
+}
+export type GetShotsWithVideoGqlQueryHookResult = ReturnType<
+  typeof useGetShotsWithVideoGqlQuery
+>;
+export type GetShotsWithVideoGqlLazyQueryHookResult = ReturnType<
+  typeof useGetShotsWithVideoGqlLazyQuery
+>;
+export type GetShotsWithVideoGqlSuspenseQueryHookResult = ReturnType<
+  typeof useGetShotsWithVideoGqlSuspenseQuery
+>;
+export type GetShotsWithVideoGqlQueryResult = Apollo.QueryResult<
+  GetShotsWithVideoGqlQuery,
+  GetShotsWithVideoGqlQueryVariables
+>;
 export const GetShotsWithMetadataDocument = gql`
   query GetShotsWithMetadata(
     $filterInput: FilterInput!

src/operations/shots.gql

@@ -17,6 +17,20 @@ query GetShotAnnotationTypes {
   }
 }
 
+query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+    ids
+    shots {
+      id
+      videoId
+      video {
+        screenshotUri
+        endTime
+      }
+    }
+  }
+}
+
 query GetShotsWithMetadata(
   $filterInput: FilterInput!
   $shotsPagination: GetShotsPagination
@@ -53,6 +67,7 @@ fragment ShotWithAllFeatures on ShotGQL {
   }
   falsePositiveScore
   video {
+    id
     stream {
       resolution {
         width
@@ -70,8 +85,11 @@ fragment ShotWithAllFeatures on ShotGQL {
     spinType
   }
   pocketingIntentionFeatures {
-    targetPocketDistance
     make
+    targetPocketDistance
+    targetPocketAngle
+    targetPocketAngleDirection
+    marginOfErrorInDegrees
     intendedPocketType
   }
   pocketingIntentionInfo {

src/schema.gql

@@ -141,6 +141,7 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
+  username: [String!]
   make: [Boolean!]
   tags: [VideoTagInput!]
   annotations: [ShotAnnotationInput!]
@@ -163,6 +164,7 @@ input FilterInput @oneOf {
   targetPocketAngleDirection: [ShotDirectionEnum!]
   targetPocketAngle: FloatRangeFilter
   missAngleInDegrees: FloatRangeFilter
+  marginOfErrorInDegrees: FloatRangeFilter
   createdAt: DateRangeFilter
 }
 
@@ -283,6 +285,7 @@ type PocketingIntentionFeaturesGQL {
   difficulty: Float
   targetPocketAngle: Float
   targetPocketAngleDirection: ShotDirectionEnum
+  marginOfErrorInDegrees: Float
   backcut: Boolean
 }