Hylozoic · lorenjohnson · Jan 21, 2022 · Jan 21, 2022 · Jan 21, 2022 · Jan 21, 2022
diff --git a/graphql.config.json b/graphql.config.json
@@ -1,10 +1,10 @@
 {
-  "schema": "https://www.hylo.com/noo/graphql",
-  "documents": "src/components/**/*.js",
+  "schema": "http://localhost:3001/noo/graphql",
+  "documents": "/src/**/*.js",
   "extension": {
     "endpoints": {
       "default": {
-        "url": "https://www.hylo.com/noo/graphql"
+        "url": "http://localhost:3001/noo/graphql"
       }
     }
   }

diff --git a/src/components/CreateGroup/CreateGroup.store.js b/src/components/CreateGroup/CreateGroup.store.js
@@ -1,6 +1,7 @@
 import orm from 'store/models'
 import { createSelector as ormCreateSelector } from 'redux-orm'
 import { AnalyticsEvents } from 'hylo-utils/constants'
+import gql from 'graphql-tag'
 
 export const MODULE_NAME = `CreateGroup`
 export const ADD_GROUP_NAME = `${MODULE_NAME}/ADD_GROUP_NAME`
@@ -69,8 +70,8 @@ export function fetchGroupExists (slug) {
   return {
     type: FETCH_GROUP_EXISTS,
     graphql: {
-      query: `
-        query ($slug: String) {
+      query: gql`
+        query GroupExists($slug: String) {
           groupExists (slug: $slug) {
             exists
           }
@@ -87,28 +88,29 @@ export function createGroup (data) {
   return {
     type: CREATE_GROUP,
     graphql: {
-      query: `mutation ($data: GroupInput) {
-        createGroup(data: $data) {
-          id
-          hasModeratorRole
-          group {
+      query: gql`
+        mutation CreateGroup($data: GroupInput) {
+          createGroup(data: $data) {
             id
-            name
-            slug
-            parentGroups {
-              items {
-                id
+            hasModeratorRole
+            group {
+              id
+              name
+              slug
+              parentGroups {
+                items {
+                  id
+                }
               }
             }
-          }
-          person {
-            id
-          }
-          settings {
-            showJoinForm
+            person {
+              id
+            }
+            settings {
+              showJoinForm
+            }
           }
         }
-      }
       `,
       variables: {
         data

diff --git a/src/components/CreateTopic/CreateTopic.store.js b/src/components/CreateTopic/CreateTopic.store.js
@@ -1,4 +1,5 @@
 import { get, omit } from 'lodash/fp'
+import gql from 'graphql-tag'
 import { AnalyticsEvents } from 'hylo-utils/constants'
 
 export const MODULE_NAME = 'CreateTopic'
@@ -9,11 +10,13 @@ export function fetchGroupTopic (topicName, groupSlug) {
   return {
     type: FETCH_GROUP_TOPIC,
     graphql: {
-      query: `query ($topicName: String, $groupSlug: String) {
-        groupTopic(groupSlug: $groupSlug, topicName: $topicName) {
-          id
+      query: gql`
+        query GroupTopic($topicName: String, $groupSlug: String) {
+          groupTopic(groupSlug: $groupSlug, topicName: $topicName) {
+            id
+          }
         }
-      }`,
+      `,
       variables: {
         groupSlug,
         topicName
@@ -30,29 +33,31 @@ export function createTopic (topicName, groupId, isDefault = false, isSubscribin
   return {
     type: CREATE_TOPIC,
     graphql: {
-      query: `mutation ($topicName: String, $groupId: ID, $isDefault: Boolean, $isSubscribing: Boolean) {
-        createTopic(topicName: $topicName, groupId: $groupId, isDefault: $isDefault, isSubscribing: $isSubscribing) {
-          id
-          name
-          groupTopics {
-            items {
-              id
-              group {
+      query: gql`
+        mutation CreateTopic($topicName: String, $groupId: ID, $isDefault: Boolean, $isSubscribing: Boolean) {
+          createTopic(topicName: $topicName, groupId: $groupId, isDefault: $isDefault, isSubscribing: $isSubscribing) {
+            id
+            name
+            groupTopics {
+              items {
                 id
-                slug
+                group {
+                  id
+                  slug
+                }
+                isDefault
+                isSubscribed
+                newPostCount
+                postsTotal
+                followersTotal
+                visibility
               }
-              isDefault
-              isSubscribed
-              newPostCount
-              postsTotal
-              followersTotal
-              visibility
             }
+            followersTotal
+            postsTotal
           }
-          followersTotal
-          postsTotal
         }
-      }`,
+      `,
       variables: {
         groupId,
         topicName,

diff --git a/src/components/CreateTopic/__snapshots__/CreateTopic.store.test.js.snap b/src/components/CreateTopic/__snapshots__/CreateTopic.store.test.js.snap
@@ -3,8 +3,13 @@
 exports[`matches the last snapshot for createTopic 1`] = `
 Object {
   "graphql": Object {
-    "query": "mutation ($topicName: String, $groupId: ID, $isDefault: Boolean, $isSubscribing: Boolean) {
-        createTopic(topicName: $topicName, groupId: $groupId, isDefault: $isDefault, isSubscribing: $isSubscribing) {
+    "query": "mutation CreateTopic($topicName: String, $groupId: ID, $isDefault: Boolean, $isSubscribing: Boolean) {
+        createTopic(
+          topicName: $topicName
+          groupId: $groupId
+          isDefault: $isDefault
+          isSubscribing: $isSubscribing
+        ) {
           id
           name
           groupTopics {
@@ -58,7 +63,7 @@ Object {
 exports[`matches the last snapshot for fetchGroupTopic 1`] = `
 Object {
   "graphql": Object {
-    "query": "query ($topicName: String, $groupSlug: String) {
+    "query": "query GroupTopic($topicName: String, $groupSlug: String) {
         groupTopic(groupSlug: $groupSlug, topicName: $topicName) {
           id
         }

diff --git a/src/components/EventInviteDialog/EventInviteDialog.store.js b/src/components/EventInviteDialog/EventInviteDialog.store.js
@@ -1,7 +1,8 @@
 import { createSelector } from 'redux-orm'
 import orm from 'store/models'
-import getMe from 'store/selectors/getMe'
 import { pick, uniqBy, orderBy, flow, reject, map, reduce } from 'lodash/fp'
+import gql from 'graphql-tag'
+import getMe from 'store/selectors/getMe'
 
 export const MODULE_NAME = 'EventInviteDialog'
 export const INVITE_PEOPLE_TO_EVENT = `${MODULE_NAME}/INVITE_PEOPLE_TO_EVENT`
@@ -36,24 +37,26 @@ export function invitePeopleToEvent (eventId, inviteeIds) {
   return {
     type: INVITE_PEOPLE_TO_EVENT,
     graphql: {
-      query: `mutation ($eventId: ID, $inviteeIds: [ID]) {
-        invitePeopleToEvent(eventId: $eventId, inviteeIds: $inviteeIds) {
-          id
-          eventInvitations {
-            total
-            hasMore
-            items {
-              id
-              response
-              person {
+      query: gql`
+        mutation InvitePeopleToEvent($eventId: ID, $inviteeIds: [ID]) {
+          invitePeopleToEvent(eventId: $eventId, inviteeIds: $inviteeIds) {
+            id
+            eventInvitations {
+              total
+              hasMore
+              items {
                 id
-                name
-                avatarUrl
+                response
+                person {
+                  id
+                  name
+                  avatarUrl
+                }
               }
             }
           }
         }
-      }`,
+      `,
       variables: { eventId, inviteeIds }
     },
     meta: {

diff --git a/src/components/EventInviteDialog/__snapshots__/EventInviteDialog.store.test.js.snap b/src/components/EventInviteDialog/__snapshots__/EventInviteDialog.store.test.js.snap
@@ -3,7 +3,7 @@
 exports[`invitePeopleToEvent matches snapshot 1`] = `
 Object {
   "graphql": Object {
-    "query": "mutation ($eventId: ID, $inviteeIds: [ID]) {
+    "query": "mutation InvitePeopleToEvent($eventId: ID, $inviteeIds: [ID]) {
         invitePeopleToEvent(eventId: $eventId, inviteeIds: $inviteeIds) {
           id
           eventInvitations {

diff --git a/src/components/FeedList/FeedList.store.js b/src/components/FeedList/FeedList.store.js
@@ -1,8 +1,9 @@
 import { createSelector } from 'reselect'
 import { get } from 'lodash/fp'
+import gql from 'graphql-tag'
 import { FETCH_POSTS } from 'store/constants'
-import groupViewPostsQueryFragment from 'graphql/fragments/groupViewPostsQueryFragment'
-import postsQueryFragment from 'graphql/fragments/postsQueryFragment'
+import GroupViewPostsQueryFragment from 'graphql/fragments/GroupViewPostsQueryFragment'
+import PostsQueryFragment from 'graphql/fragments/PostsQueryFragment'
 import { makeGetQueryResults, makeQueryResultsModelSelector } from 'store/reducers/queryResults'
 export const MODULE_NAME = 'FeedList'
 export const STORE_FETCH_POSTS_PARAM = `${MODULE_NAME}/STORE_FETCH_POSTS_PARAM`
@@ -12,11 +13,11 @@ export function fetchPosts ({ afterTime, beforeTime, context, filter, offset, or
   var query, extractModel, getItems
 
   if (context === 'groups') {
-    query = groupQuery
+    query = GroupQuery
     extractModel = 'Group'
     getItems = get('payload.data.group.posts')
   } else if (context === 'all' || context === 'public') {
-    query = postsQuery
+    query = PostsQuery
     extractModel = 'Post'
     getItems = get('payload.data.posts')
   } else {
@@ -51,52 +52,62 @@ export function fetchPosts ({ afterTime, beforeTime, context, filter, offset, or
   }
 }
 
-const groupQuery = `query (
-  $afterTime: Date,
-  $beforeTime: Date,
-  $boundingBox: [PointInput],
-  $filter: String,
-  $first: Int,
-  $offset: Int,
-  $order: String,
-  $search: String,
-  $slug: String,
-  $sortBy: String,
-  $topic: ID
-) {
-  group(slug: $slug, updateLastViewed: true) {
-    id
-    slug
-    name
-    locationObject {
-      center {
-        lat
-        lng
+const GroupQuery = gql`
+  query GroupQuery(
+    $afterTime: Date,
+    $beforeTime: Date,
+    $boundingBox: [PointInput],
+    $filter: String,
+    $first: Int,
+    $offset: Int,
+    $order: String,
+    $search: String,
+    $slug: String,
+    $sortBy: String,
+    $topic: ID,
+    $withComments: Boolean = false
+  ) {
+    group(slug: $slug, updateLastViewed: true) {
+      id
+      slug
+      name
+      locationObject {
+        center {
+          lat
+          lng
+        }
       }
+      avatarUrl
+      bannerUrl
+      postCount
+      ...GroupViewPostsQueryFragment
     }
-    avatarUrl
-    bannerUrl
-    postCount
-    ${groupViewPostsQueryFragment}
   }
-}`
 
-const postsQuery = `query (
-  $afterTime: Date,
-  $beforeTime: Date,
-  $boundingBox: [PointInput],
-  $context: String,
-  $filter: String,
-  $first: Int,
-  $groupSlugs: [String],
-  $offset: Int,
-  $order: String,
-  $search: String,
-  $sortBy: String,
-  $topic: ID,
-) {
-  ${postsQueryFragment}
-}`
+  ${GroupViewPostsQueryFragment}
+`
+
+const PostsQuery = gql`
+  query PostsQuery(
+    $afterTime: Date,
+    $beforeTime: Date,
+    $boundingBox: [PointInput],
+    $context: String,
+    $filter: String,
+    $first: Int,
+    $groupSlugs: [String],
+    $offset: Int,
+    $order: String,
+    $search: String,
+    $sortBy: String,
+    $topic: ID,
+    $withComments: Boolean = false
+  ) {
+    ...PostsQueryFragment
+  }
+
+  ${PostsQueryFragment}
+`
 
 export function storeFetchPostsParam (props) {
   return {