Merge pull request #193 from UoA-eResearch/rc2.5.0

Rc2.5.0

Author: rosemcc

.gitignore

@@ -23,6 +23,8 @@ research-hub-web/cypress/screenshots/
 research-hub-web/src/app/graphql/possible-types.ts
 research-hub-web/src/app/graphql/schema.ts
 
+research-hub-web/.angular/cache
+
 # Custom environment file - use it in special local development situations
 research-hub-web/src/environments/environment.custom.ts
 
@@ -47,3 +49,6 @@ serverless-now/env/local.env
 
 # ====================== cer-graphql =================== #
 cer-graphql/build
+
+# ====================== subhub-link-checker =========== #
+subhub-link-checker/build/*

README.md

@@ -16,6 +16,8 @@ A [Serverless Framework](https://www.serverless.com/) ([AWS Lambda](https://aws.
 ### 4. [terraform/](terraform/)
 Terraform infrastructure as code to create the Research Hub AWS infrastructure.
 
+### 4. [subhub-link-checker/](subhub-link-checker/)
+A [Contentful App Framework app](https://www.contentful.com/developers/docs/extensibility/app-framework/) that checks to prevent cyclical content references in SubHubs.
 ## Deployment
 CI/CD is achieved via the monorepo's [Jenkinsfile](Jenkinsfile) which is triggered when code is pushed to one of 4 Git branches (`sandbox`, `dev`, `test`, `prod`) corresponding to environments across the three [UoA AWS accounts](http://aws.auckland.ac.nz/) (`sandbox`, `nonprod`, `prod`). 
 

ResearchHubArchitecture.png

@@ -7,16 +7,16 @@ import fetch from "cross-fetch";
 import { validateUnauthenticatedQuery } from "./validateUnauthenticatedQuery";
 import authenticateByJwt, { fetchCognitoPublicKeys } from "./authenticateByJwt";
 import assertResultsArePublicItems from "./assertResultsArePublicItems";
-import { AuthenticationError } from "apollo-server-errors";
-import {
-  ApolloServer, 
+import { AuthenticationError, ApolloServer } from "apollo-server";
+import { 
   mergeSchemas,
   makeRemoteExecutableSchema,
   delegateToSchema,
   introspectSchema,
-} from "apollo-server";
+} from "graphql-tools";
 import { HttpLink } from "apollo-link-http";
 import depthLimit from "graphql-depth-limit";
+import { ApolloServerPluginLandingPageGraphQLPlayground, ApolloServerPluginLandingPageProductionDefault } from "apollo-server-core";
 
   // Measure server startup time
   var startTime = new Date().getTime(); 
@@ -206,7 +206,19 @@ export async function createServer (config: CerGraphqlServerConfig) {
     return new ApolloServer({
       schema,
       introspection: true,
-      playground: enablePlayground,
+      plugins: [
+        // Since Apollo 3, the GraphQL Playground environment
+        // is replaced by a link to Apollo Sandbox, a proprietary cloud-based
+        // service. They have also provided an option to re-enable GraphQL Playground,
+        // which is used here.
+        // GraphQL Playground is being merged with graphiql, though
+        // seems progress is stalled. (https://github.com/graphql/graphql-playground/issues/1143)
+        // May need to migrate to graphiql when that is available.
+        enablePlayground ?
+        ApolloServerPluginLandingPageGraphQLPlayground() :
+        ApolloServerPluginLandingPageProductionDefault()
+      ]
+      ,
       rootValue: (document: DocumentNode) => {
         // This sets the root value for each resolver to be the query document,
         // enabling us to have the whole query document in resolvers.