Update schema for projects

client/cypress/integration/frontend/portfolio/new-project.spec.js

@@ -1,35 +1,35 @@
+import {getMinimalMe} from '../../../support/helpers';
+
 describe('New project', () => {
+  const MeQuery = getMinimalMe({isTeacher: false});
+  const schoolClass = MeQuery.me.selectedClass;
+
   const operations = {
     ProjectsQuery: {
-      projects: {
+      projects: [
-        edges: [
+        {
-          {
+          id: 'UHJvamVjdE5vZGU6NjY=',
-            node: {
+          title: 'Some random title',
-              id: 'UHJvamVjdE5vZGU6NjY=',
+          appearance: 'blue',
-              title: 'Some random title',
+          description: 'This description rocks',
-              appearance: 'blue',
+          slug: 'some-random-title',
-              description: 'This description rocks',
+          objectives: 'Git gud',
-              slug: 'some-random-title',
+          final: false,
-              objectives: 'Git gud',
+          schoolClass,
-              final: false,
+          student: {
-              student: {
+            firstName: 'Rachel',
-                firstName: 'Rachel',
+            lastName: 'Green',
-                lastName: 'Green',
+            id: 'VXNlck5vZGU6NQ==',
-                id: 'VXNlck5vZGU6NQ==',
+            avatarUrl: '',
-                avatarUrl: '',
-              },
-              entriesCount: 0,
-            },
           },
-        ],
+          entriesCount: 0,
-      },
+        },
-    },
+      ],
-    MeQuery: {
-      me: {},
     },
+    MeQuery,
     AddProject: variables => ({
       addProject: {
-        project: Object.assign({}, variables.input.project),
+        project: Object.assign({}, variables.input.project, {schoolClass}),
         errors: null,
         __typename: 'AddProjectPayload',
       },

client/cypress/integration/frontend/portfolio/project-entry.spec.js

@@ -7,30 +7,26 @@ describe('Project Entry', () => {
       },
     },
     ProjectsQuery: {
-      projects: {
+      projects: [
-        edges: [{
+        {
-          node: {
+          id: 'UHJvamVjdE5vZGU6MzM=',
-            id: 'UHJvamVjdE5vZGU6MzM=',
+          title: 'Groot',
-            title: 'Groot',
+          appearance: 'red',
-            appearance: 'red',
+          'description': 'I am Groot',
-            'description': 'I am Groot',
+          'slug': 'groot',
-            'slug': 'groot',
+          'objectives': 'Be Groot\nBe awesome',
-            'objectives': 'Be Groot\nBe awesome',
+          'final': false,
-            'final': false,
+          'student': {
-            'student': {
+            'firstName': 'Rachel',
-              'firstName': 'Rachel',
+            'lastName': 'Green',
-              'lastName': 'Green',
+            'id': 'VXNlck5vZGU6NQ==',
-              'id': 'VXNlck5vZGU6NQ==',
+            'avatarUrl': '',
-              'avatarUrl': '',
+            '__typename': 'UserNode',
-              '__typename': 'UserNode',
-            },
-            'entriesCount': 2,
-            '__typename': 'ProjectNode',
           },
-          '__typename': 'ProjectNodeEdge',
+          'entriesCount': 2,
-        }],
+          '__typename': 'ProjectNode',
-        '__typename': 'ProjectNodeConnection',
+        },
-      },
+      ],
     },
     ProjectQuery: {
       'project': {
@@ -85,8 +81,7 @@ describe('Project Entry', () => {
     }),
     DeleteProjectEntry: {
       deleteProjectEntry: {
-        success: true,
+        success: true
-        __typename: 'DeleteProjectEntryPayload',
       },
     },
   };

client/src/components/content-forms/TextForm.vue

@@ -11,7 +11,15 @@
 
 <script>
   export default {
-    props: ['value', 'index'],
+    props: {
+      value: {
+        type: Object,
+        default: null,
+        validator(value) {
+          return value.hasOwnProperty('text');
+        }
+      }
+  },
 
     computed: {
       text() {
@@ -22,7 +30,7 @@
 </script>
 
 <style scoped lang="scss">
-  @import "@/styles/_variables.scss";
+  @import "~styles/helpers";
 
   .text-form {
     &__input {

server/portfolio/schema.py

@@ -33,7 +33,7 @@ class ProjectEntryNode(DjangoObjectType):
 
 class PortfolioQuery(object):
     project = graphene.Field(ProjectNode, id=graphene.ID(), slug=graphene.String())
-    projects = DjangoFilterConnectionField(ProjectNode)
+    projects = graphene.List(ProjectNode)
 
     def resolve_projects(self, info, **kwargs):
         user = info.context.user

server/schema.graphql

@@ -461,7 +461,7 @@ type CustomQuery {
   survey(id: ID): SurveyNode
   surveys(offset: Int, before: String, after: String, first: Int, last: Int): SurveyNodeConnection
   project(id: ID, slug: String): ProjectNode
-  projects(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, appearance: String): ProjectNodeConnection
+  projects: [ProjectNode]
   instrument(slug: String, id: ID): InstrumentNode
   instruments(offset: Int, before: String, after: String, first: Int, last: Int, slug: String, type: String): InstrumentNodeConnection
   studentSubmission(id: ID!): StudentSubmissionNode
@@ -891,16 +891,6 @@ type ProjectNode implements Node {
   entriesCount: Int
 }
 
-type ProjectNodeConnection {
-  pageInfo: PageInfo!
-  edges: [ProjectNodeEdge]!
-}
-
-type ProjectNodeEdge {
-  node: ProjectNode
-  cursor: String!
-}
-
 type PublicUserNode implements Node {
   firstName: String!
   lastName: String!