Merge pull request 'Rename Session Coach feedback enums' (#323) from loewy/session-coach-feedback-enums into master

Reviewed-on: #323

src/index.tsx

@@ -476,6 +476,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -520,6 +521,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -564,6 +566,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -608,6 +611,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -652,6 +656,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -696,6 +701,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -740,6 +746,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -784,6 +791,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -828,6 +836,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -872,6 +881,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -916,6 +926,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -960,6 +971,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1004,6 +1016,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1048,6 +1061,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1092,6 +1106,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1136,6 +1151,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1180,6 +1196,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1224,6 +1241,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1268,6 +1286,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1312,6 +1331,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1356,6 +1376,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1400,6 +1421,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1444,6 +1466,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1488,6 +1511,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1532,6 +1556,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1576,6 +1601,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1620,6 +1646,7 @@ export type FilterInput =
       missAngleInDegrees: FloatRangeFilter;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1664,6 +1691,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter: FilterInput;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1708,6 +1736,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters: Array<FilterInput>;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1752,6 +1781,52 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex: Array<Scalars["Int"]["input"]>;
+      runId?: never;
+      runLength?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tableSize?: never;
+      tags?: never;
+      targetPocketAngle?: never;
+      targetPocketAngleDirection?: never;
+      targetPocketDistance?: never;
+      totalDistance?: 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;
+      fargoRating?: never;
+      intendedPocketType?: never;
+      isBreakHeuristic?: 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;
+      playerIndex?: never;
       runId: Array<Scalars["Int"]["input"]>;
       runLength?: never;
       shotDirection?: never;
@@ -1796,6 +1871,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength: FloatRangeFilter;
       shotDirection?: never;
@@ -1840,6 +1916,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection: Array<ShotDirectionEnum>;
@@ -1884,6 +1961,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1928,6 +2006,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -1972,6 +2051,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -2016,6 +2096,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -2060,6 +2141,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -2104,6 +2186,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -2148,6 +2231,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -2192,6 +2276,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -2236,6 +2321,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -2280,6 +2366,7 @@ export type FilterInput =
       missAngleInDegrees?: never;
       notFilter?: never;
       orFilters?: never;
+      playerIndex?: never;
       runId?: never;
       runLength?: never;
       shotDirection?: never;
@@ -3708,10 +3795,10 @@ export type SessionCoachFeedbackGql = {
 };
 
 export enum SessionCoachFeedbackResponseEnum {
-  AlreadyWorkingOnThis = "ALREADY_WORKING_ON_THIS",
   Helpful = "HELPFUL",
   NotEnoughEvidence = "NOT_ENOUGH_EVIDENCE",
-  WrongFocus = "WRONG_FOCUS",
+  NotInsightful = "NOT_INSIGHTFUL",
+  NotRelevant = "NOT_RELEVANT",
 }
 
 export type SessionCoachGql = {
@@ -3882,6 +3969,7 @@ export type ShotProjectionGql = {
 
 export type ShotTableStateGql = {
   __typename?: "ShotTableStateGQL";
+  frameImage?: Maybe<Scalars["String"]["output"]>;
   frameIndex: Scalars["Int"]["output"];
   shotId: Scalars["Int"]["output"];
   tableState: TableStateGql;
@@ -7735,6 +7823,7 @@ export type GetShotTableStateQuery = {
     shotId: number;
     videoId: number;
     frameIndex: number;
+    frameImage?: string | null;
     tableState: {
       __typename?: "TableStateGQL";
       identifierToPosition: Array<Array<number>>;
@@ -16515,6 +16604,7 @@ export const GetShotTableStateDocument = gql`
       shotId
       videoId
       frameIndex
+      frameImage
       tableState {
         ...TableStateLayoutFields
       }

src/operations/shot_simulation.gql

@@ -44,9 +44,10 @@ fragment DetectionPocketPointFields on PocketPointsGQL {
 # positions. Boxes, pocket boxes, and source points share the crop's
 # coordinate space; the crop locates that space in the full frame.
 #
-# Only the photo query selects this. The live and shot queries read a
+# Only the photo query selects this. The shot query returns its source
-# frame out of a video the app never holds, so there is no image to
+# frame (frameImage) but positions there come from the stored homography,
-# overlay, and getLiveTableState is polled every five seconds.
+# so there are no fresh boxes to draw; the live query returns no image at
+# all and is polled every five seconds.
 fragment TableStateDetectionFields on TableStateGQL {
   identifierToBox {
     ...DetectionBoxFields
@@ -97,6 +98,9 @@ query GetShotTableState($shotId: Int!) {
     shotId
     videoId
     frameIndex
+    # The b64 JPEG frame the layout was detected in, so the client can show
+    # the shot's actual starting frame instead of the video's thumbnail.
+    frameImage
     tableState {
       ...TableStateLayoutFields
     }

src/schema.gql

@@ -250,11 +250,6 @@ input CreatePoolHallCameraInput {
   claimTermsText: String = null
 }
 
-input CreateShotShareLinkInput {
-  shotIds: [Int!]!
-  paddingSeconds: Float = null
-}
-
 input CreatePoolHallInput {
   name: String!
   address: String = null
@@ -413,6 +408,7 @@ input FilterInput @oneOf {
   userId: [Int!]
   runId: [Int!]
   username: [String!]
+  playerIndex: [Int!]
   fargoRating: FloatRangeFilter
   make: [Boolean!]
   tags: [VideoTagInput!]
@@ -1411,8 +1407,8 @@ type SessionCoachFeedbackGQL {
 
 enum SessionCoachFeedbackResponseEnum {
   HELPFUL
-  WRONG_FOCUS
+  NOT_RELEVANT
-  ALREADY_WORKING_ON_THIS
+  NOT_INSIGHTFUL
   NOT_ENOUGH_EVIDENCE
 }
 
@@ -1573,6 +1569,7 @@ type ShotTableStateGQL {
   videoId: Int!
   frameIndex: Int!
   tableState: TableStateGQL!
+  frameImage: String
 }
 
 input ShotsOrderingComponent @oneOf {
@@ -1966,11 +1963,6 @@ type UserSubscriptionStatusGQL {
   stripeSubscriptionId: String
 }
 
-type ShareLinkGQL {
-  slug: String!
-  url: String!
-}
-
 type VideoExportJobGQL {
   id: Int!
   videoId: Int!