Remove edges from rooms query

client/cypress/integration/frontend/read-only/rooms.spec.js

@@ -13,24 +13,18 @@ describe('Room Team Management - Read only', () => {
       },
     },
     RoomsQuery: {
-      rooms: {
+      rooms: [{
-        edges: [
+        id: '',
-          {
+        slug: '',
-            node: {
+        title: 'some room',
-              id: '',
+        entryCount: 3,
-              slug: '',
+        appearance: 'red',
-              title: 'some room',
+        description: 'some description',
-              entryCount: 3,
+        schoolClass: {
-              appearance: 'red',
+          id: SELECTED_CLASS_ID,
-              description: 'some description',
+          name: 'bla',
-              schoolClass: {
+        },
-                id: SELECTED_CLASS_ID,
+      }],
-                name: 'bla',
-              },
-            },
-          },
-        ],
-      },
     },
   });
 

client/cypress/integration/frontend/rooms/room-page.spec.js

@@ -156,9 +156,7 @@ describe('The Room Page', () => {
       MeQuery,
       RoomsQuery() {
         return {
-          rooms: {
+          rooms
-            edges: rooms.map(room => ({node: room})),
-          },
         };
       },
       RoomEntriesQuery: {

client/cypress/integration/frontend/rooms/rooms-page.spec.js

@@ -4,17 +4,11 @@ describe('The Rooms Page', () => {
   const getOperations = (isTeacher) => ({
     MeQuery: getMinimalMe({isTeacher}),
     RoomsQuery: {
-      rooms: {
+      rooms: [{
-        edges: [
+        schoolClass: {
-          {
+          id: btoa('SchoolClassNode:selectedClassId'),
-            node: {
+        },
-              schoolClass: {
+      }],
-                id: btoa('SchoolClassNode:selectedClassId'),
-              },
-            },
-          },
-        ],
-      },
     },
   });
 
@@ -23,9 +17,7 @@ describe('The Rooms Page', () => {
     return {
       ...operations,
       RoomsQuery: {
-        rooms: {
+        rooms: [],
-          edges: [],
-        },
       },
     };
   };
@@ -105,9 +97,7 @@ describe('The Rooms Page', () => {
       MeQuery,
       RoomsQuery() {
         return {
-          rooms: {
+          rooms
-            edges: rooms.map(room => ({node: room})),
-          },
         };
       },
       AddRoom({input: {room: {title, appearance, description}}}) {

client/src/components/rooms/RoomActions.vue

@@ -59,9 +59,16 @@
           },
           update: (store, {data: {deleteRoom: {success}}}) => {
             if (success) {
-              const data = store.readQuery({query: ROOMS_QUERY});
+              const {rooms} = store.readQuery({query: ROOMS_QUERY});
-              if (data) {
+              if (rooms) {
-                data.rooms.edges.splice(data.rooms.edges.findIndex(edge => edge.node.id === this.id), 1);
+                const index = rooms.findIndex(edge => edge.node.id === this.id);
+                const slicedRooms = [
+                  rooms.slice(0, index),
+                  rooms.slice(index+1)
+                ];
+                const data = {
+                  rooms: slicedRooms
+                };
                 store.writeQuery({query: ROOMS_QUERY, data});
               }
             }

client/src/components/rooms/room-entries/NewRoomEntryWizard.vue

@@ -53,12 +53,25 @@
             try {
               const query = ROOM_ENTRIES_QUERY;
               const variables = {slug: this.room.slug};
-              const data = store.readQuery({query, variables});
+              const {room} = store.readQuery({query, variables});
-              if (data.room && data.room.roomEntries) {
+              if (room && room.roomEntries) {
-                data.room.roomEntries.edges.unshift({
+                const newEdge ={
                   node: roomEntry,
-                  __typename: 'RoomEntryNode'
+                  __typename: 'RoomEntryNodeEdge'
-                });
+                };
+                const edges = [
+                  newEdge,
+                  ...room.roomEntries.edges
+                ];
+                const data = {
+                  room: {
+                    ...room,
+                    roomEntries: {
+                      ...room.roomEntries,
+                      edges
+                    }
+                  }
+                };
                 store.writeQuery({query, variables, data});
               }
             } catch (e) {

client/src/graphql/gql/queries/roomsQuery.gql

@@ -1,10 +1,6 @@
 #import "../fragments/roomParts.gql"
 query RoomsQuery {
   rooms {
-    edges {
+    ...RoomParts
-      node {
-        ...RoomParts
-      }
-    }
   }
 }

client/src/pages/newRoom.vue

@@ -40,12 +40,15 @@
           },
           update: (store, {data: {addRoom: {room}}}) => {
             try {
-              const data = store.readQuery({query: ROOMS_QUERY});
+              const {rooms} = store.readQuery({query: ROOMS_QUERY});
-              if (data.rooms) {
+              if (rooms) {
-                data.rooms.edges.push({
+                const expandedRooms = [
-                  node: room,
+                  ...rooms,
-                  __typename: 'RoomNodeEdge'
+                  room
-                });
+                ];
+                const data = {
+                  rooms: expandedRooms
+                };
                 store.writeQuery({query: ROOMS_QUERY, data});
               }
             } catch (e) {

client/src/pages/rooms.vue

@@ -69,9 +69,6 @@
     apollo: {
       rooms: {
         query: ROOMS_QUERY,
-        update(data) {
-          return this.$getRidOfEdges(data).rooms;
-        },
         pollInterval: 5000,
       },
       me: {

server/rooms/schema.py

@@ -67,7 +67,7 @@ class RoomsQuery(object):
     room_entry = graphene.Field(RoomEntryNode, id=graphene.ID(), slug=graphene.String())
     room = graphene.Field(RoomNode, slug=graphene.String(), id=graphene.ID(), appearance=graphene.String())
 
-    rooms = DjangoFilterConnectionField(RoomNode)
+    rooms = graphene.List(RoomNode)
     all_room_entries = DjangoFilterConnectionField(RoomEntryNode)
 
     def resolve_rooms(self, info, **kwargs):

server/schema.graphql

@@ -474,7 +474,7 @@ type CustomQuery {
   objectiveGroups(offset: Int, before: String, after: String, first: Int, last: Int, title: String, module_Slug: String): ObjectiveGroupNodeConnection
   roomEntry(id: ID, slug: String): RoomEntryNode
   room(slug: String, id: ID, appearance: String): RoomNode
-  rooms(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, appearance: String): RoomNodeConnection
+  rooms: [RoomNode]
   allRoomEntries(offset: Int, before: String, after: String, first: Int, last: Int, slug: String): RoomEntryNodeConnection
   moduleRoom(slug: String, classId: ID): RoomNode
   me: PrivateUserNode
@@ -933,16 +933,6 @@ type RoomNode implements Node {
   entryCount: Int
 }
 
-type RoomNodeConnection {
-  pageInfo: PageInfo!
-  edges: [RoomNodeEdge]!
-}
-
-type RoomNodeEdge {
-  node: RoomNode
-  cursor: String!
-}
-
 input SchoolClassInput {
   id: ID
   name: String