Merge pull request 'Return ShotGQL w/ updateShotAnnotations' (#84) from loewy/annotations-return into master

Reviewed-on: #84
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>

src/index.tsx

@@ -2412,15 +2412,6 @@ export type SuccessfulAddAddShotAnnotationErrors =
   | AddShotAnnotationErrors
   | SuccessfulAdd;
 
-export type SuccessfulUpdate = {
-  __typename?: "SuccessfulUpdate";
-  value: Scalars["Boolean"]["output"];
-};
-
-export type SuccessfulUpdateUpdateShotAnnotationErrors =
-  | SuccessfulUpdate
-  | UpdateShotAnnotationErrors;
-
 export type TagGql = {
   __typename?: "TagGQL";
   group?: Maybe<Scalars["String"]["output"]>;
@@ -2463,14 +2454,10 @@ export type UpdateAnnotationInputGql = {
   notes?: InputMaybe<Scalars["String"]["input"]>;
 };
 
-export type UpdateShotAnnotationErrors = {
-  __typename?: "UpdateShotAnnotationErrors";
-  error?: Maybe<DoesNotOwnShotErr>;
-};
-
 export type UpdateShotAnnotationReturn = {
   __typename?: "UpdateShotAnnotationReturn";
-  value: SuccessfulUpdateUpdateShotAnnotationErrors;
+  error?: Maybe<DoesNotOwnShotErr>;
+  shot?: Maybe<ShotGql>;
 };
 
 export type UploadLink = {
@@ -2783,17 +2770,27 @@ export type UpdateShotAnnotationsMutation = {
   __typename?: "Mutation";
   updateShotAnnotations: {
     __typename?: "UpdateShotAnnotationReturn";
-    value:
+    shot?: {
-      | { __typename?: "SuccessfulUpdate"; value: boolean }
+      __typename?: "ShotGQL";
-      | {
+      id: number;
-          __typename?: "UpdateShotAnnotationErrors";
+      annotations: Array<{
+        __typename?: "ShotAnnotationGQL";
+        shotId: number;
+        notes: string;
+        errorDefault: boolean;
+        type: {
+          __typename?: "ShotAnnotationTypeGQL";
+          id: number;
+          name: string;
+        };
+      }>;
+    } | null;
     error?: {
       __typename?: "DoesNotOwnShotErr";
       shotId: number;
       msg?: string | null;
     } | null;
   };
-  };
 };
 
 export type GetShotsWithVideoGqlQueryVariables = Exact<{
@@ -4372,19 +4369,24 @@ export const UpdateShotAnnotationsDocument = gql`
     $annotations: [UpdateAnnotationInputGQL!]!
   ) {
     updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-      value {
+      shot {
-        ... on SuccessfulUpdate {
+        id
-          value
+        annotations {
+          shotId
+          type {
+            id
+            name
+          }
+          notes
+          errorDefault
+        }
       }
-        ... on UpdateShotAnnotationErrors {
       error {
         shotId
         msg
       }
     }
   }
-    }
-  }
 `;
 export type UpdateShotAnnotationsMutationFn = Apollo.MutationFunction<
   UpdateShotAnnotationsMutation,

src/operations/shots.gql

@@ -22,18 +22,23 @@ mutation UpdateShotAnnotations(
   $annotations: [UpdateAnnotationInputGQL!]!
 ) {
   updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    value {
+    shot {
-      ... on SuccessfulUpdate {
+      id
-        value
+      annotations {
+        shotId
+        type {
+          id
+          name
+        }
+        notes
+        errorDefault
+      }
     }
-      ... on UpdateShotAnnotationErrors {
     error {
       shotId
       msg
     }
   }
-    }
-  }
 }
 
 query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {

src/schema.gql

@@ -662,18 +662,7 @@ type OtherErrorNeedsNote {
 }
 
 type UpdateShotAnnotationReturn {
-  value: SuccessfulUpdateUpdateShotAnnotationErrors!
+  shot: ShotGQL
-}
-
-union SuccessfulUpdateUpdateShotAnnotationErrors =
-    SuccessfulUpdate
-  | UpdateShotAnnotationErrors
-
-type SuccessfulUpdate {
-  value: Boolean!
-}
-
-type UpdateShotAnnotationErrors {
   error: DoesNotOwnShotErr
 }