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,16 +2770,26 @@ export type UpdateShotAnnotationsMutation = {
   __typename?: "Mutation";
   updateShotAnnotations: {
     __typename?: "UpdateShotAnnotationReturn";
-    value:
+    shot?: {
-      | { __typename?: "SuccessfulUpdate"; value: boolean }
+      __typename?: "ShotGQL";
-      | {
+      id: number;
-          __typename?: "UpdateShotAnnotationErrors";
+      annotations: Array<{
-          error?: {
+        __typename?: "ShotAnnotationGQL";
-            __typename?: "DoesNotOwnShotErr";
+        shotId: number;
-            shotId: number;
+        notes: string;
-            msg?: string | null;
+        errorDefault: boolean;
-          } | null;
+        type: {
+          __typename?: "ShotAnnotationTypeGQL";
+          id: number;
+          name: string;
         };
+      }>;
+    } | null;
+    error?: {
+      __typename?: "DoesNotOwnShotErr";
+      shotId: number;
+      msg?: string | null;
+    } | null;
   };
 };
 
@@ -3134,6 +3131,23 @@ export type GetUsernamesQuery = {
   getUsernames: Array<string>;
 };
 
+export type GetUsernamesAndFollowingQueryVariables = Exact<{
+  userId: Scalars["Int"]["input"];
+  matchString: Scalars["String"]["input"];
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+  after?: InputMaybe<Scalars["String"]["input"]>;
+}>;
+
+export type GetUsernamesAndFollowingQuery = {
+  __typename?: "Query";
+  getUsernamesAndFollowing: {
+    __typename?: "UsernamesAndFollowingResponse";
+    followers: Array<number>;
+    following: Array<number>;
+    usernames: Array<string>;
+  };
+};
+
 export type GetUserTagsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type GetUserTagsQuery = {
@@ -4355,17 +4369,22 @@ export const UpdateShotAnnotationsDocument = gql`
     $annotations: [UpdateAnnotationInputGQL!]!
   ) {
     updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-      value {
+      shot {
-        ... on SuccessfulUpdate {
+        id
-          value
+        annotations {
-        }
+          shotId
-        ... on UpdateShotAnnotationErrors {
+          type {
-          error {
+            id
-            shotId
+            name
-            msg
           }
+          notes
+          errorDefault
         }
       }
+      error {
+        shotId
+        msg
+      }
     }
   }
 `;
@@ -5100,6 +5119,94 @@ export type GetUsernamesQueryResult = Apollo.QueryResult<
   GetUsernamesQuery,
   GetUsernamesQueryVariables
 >;
+export const GetUsernamesAndFollowingDocument = gql`
+  query getUsernamesAndFollowing(
+    $userId: Int!
+    $matchString: String!
+    $limit: Int = null
+    $after: String = null
+  ) {
+    getUsernamesAndFollowing(
+      userId: $userId
+      matchString: $matchString
+      limit: $limit
+      after: $after
+    ) {
+      followers
+      following
+      usernames
+    }
+  }
+`;
+
+/**
+ * __useGetUsernamesAndFollowingQuery__
+ *
+ * To run a query within a React component, call `useGetUsernamesAndFollowingQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUsernamesAndFollowingQuery` 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 } = useGetUsernamesAndFollowingQuery({
+ *   variables: {
+ *      userId: // value for 'userId'
+ *      matchString: // value for 'matchString'
+ *      limit: // value for 'limit'
+ *      after: // value for 'after'
+ *   },
+ * });
+ */
+export function useGetUsernamesAndFollowingQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >(GetUsernamesAndFollowingDocument, options);
+}
+export function useGetUsernamesAndFollowingLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >(GetUsernamesAndFollowingDocument, options);
+}
+export function useGetUsernamesAndFollowingSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >(GetUsernamesAndFollowingDocument, options);
+}
+export type GetUsernamesAndFollowingQueryHookResult = ReturnType<
+  typeof useGetUsernamesAndFollowingQuery
+>;
+export type GetUsernamesAndFollowingLazyQueryHookResult = ReturnType<
+  typeof useGetUsernamesAndFollowingLazyQuery
+>;
+export type GetUsernamesAndFollowingSuspenseQueryHookResult = ReturnType<
+  typeof useGetUsernamesAndFollowingSuspenseQuery
+>;
+export type GetUsernamesAndFollowingQueryResult = Apollo.QueryResult<
+  GetUsernamesAndFollowingQuery,
+  GetUsernamesAndFollowingQueryVariables
+>;
 export const GetUserTagsDocument = gql`
   query GetUserTags {
     getUserTags {

src/operations/shots.gql

@@ -22,17 +22,22 @@ mutation UpdateShotAnnotations(
   $annotations: [UpdateAnnotationInputGQL!]!
 ) {
   updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    value {
+    shot {
-      ... on SuccessfulUpdate {
+      id
-        value
+      annotations {
-      }
+        shotId
-      ... on UpdateShotAnnotationErrors {
+        type {
-        error {
+          id
-          shotId
+          name
-          msg
         }
+        notes
+        errorDefault
       }
     }
+    error {
+      shotId
+      msg
+    }
   }
 }
 

src/operations/user.gql

@@ -57,6 +57,24 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
+query getUsernamesAndFollowing(
+  $userId: Int!
+  $matchString: String!
+  $limit: Int = null
+  $after: String = null
+) {
+  getUsernamesAndFollowing(
+    userId: $userId
+    matchString: $matchString
+    limit: $limit
+    after: $after
+  ) {
+    followers
+    following
+    usernames
+  }
+}
+
 query GetUserTags {
   getUserTags {
     id

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
 }