4 files changed, 29 insertions, 30 deletions
diff --git a/app/assets/javascripts/organizations/shared/graphql/fragments/organization.fragment.graphql b/app/assets/javascripts/organizations/shared/graphql/fragments/organization.fragment.graphql
new file mode 100644
index 00000000000..c0bccdcc120
--- /dev/null
+++ b/app/assets/javascripts/organizations/shared/graphql/fragments/organization.fragment.graphql
@@ -0,0 +1,7 @@
+fragment Organization on Organization {
+  id
+  name
+  descriptionHtml
+  avatarUrl
+  webUrl
+}
diff --git a/app/assets/javascripts/organizations/shared/graphql/queries/organization.query.graphql b/app/assets/javascripts/organizations/shared/graphql/queries/organization.query.graphql
index 1d95786fcb0..a8d8d63c27a 100644
--- a/app/assets/javascripts/organizations/shared/graphql/queries/organization.query.graphql
+++ b/app/assets/javascripts/organizations/shared/graphql/queries/organization.query.graphql
@@ -1,9 +1,7 @@
-query getOrganization($id: ID!) {
-  organization(id: $id) @client {
-    id
-    name
-    descriptionHtml
-    avatarUrl
-    webUrl
+#import "../fragments/organization.fragment.graphql"
+
+query getOrganization($id: OrganizationsOrganizationID!) {
+  organization(id: $id) {
+    ...Organization
   }
 }
diff --git a/app/assets/javascripts/organizations/shared/graphql/queries/organizations.query.graphql b/app/assets/javascripts/organizations/shared/graphql/queries/organizations.query.graphql
new file mode 100644
index 00000000000..d69e7916512
--- /dev/null
+++ b/app/assets/javascripts/organizations/shared/graphql/queries/organizations.query.graphql
@@ -0,0 +1,16 @@
+#import "~/graphql_shared/fragments/page_info.fragment.graphql"
+#import "../fragments/organization.fragment.graphql"
+
+query getCurrentUserOrganizations($first: Int, $last: Int, $before: String, $after: String) {
+  currentUser {
+    id
+    organizations(first: $first, last: $last, before: $before, after: $after) {
+      nodes {
+        ...Organization
+      }
+      pageInfo {
+        ...PageInfo
+      }
+    }
+  }
+}
diff --git a/app/assets/javascripts/organizations/shared/graphql/resolvers.js b/app/assets/javascripts/organizations/shared/graphql/resolvers.js
index 9ed1be62352..efde13852d8 100644
--- a/app/assets/javascripts/organizations/shared/graphql/resolvers.js
+++ b/app/assets/javascripts/organizations/shared/graphql/resolvers.js
@@ -1,9 +1,4 @@
-import {
-  organizations,
-  organizationProjects,
-  organizationGroups,
-  updateOrganizationResponse,
-} from '../../mock_data';
+import { organizations, organizationProjects, organizationGroups } from '../../mock_data';
 
 const simulateLoading = () => {
   return new Promise((resolve) => {
@@ -24,21 +19,4 @@ export default {
       };
     },
   },
-  UserCore: {
-    organizations: async () => {
-      await simulateLoading();
-
-      return {
-        nodes: organizations,
-      };
-    },
-  },
-  Mutation: {
-    updateOrganization: async () => {
-      // Simulate API loading
-      await simulateLoading();
-
-      return updateOrganizationResponse;
-    },
-  },
 };