upgrade apollo

__test__/components/AssignmentSummary.test.js

@@ -5,7 +5,7 @@ import React from "react";
 import { mount } from "enzyme";
 import { StyleSheetTestUtils } from "aphrodite";
 import each from "jest-each";
-import { ApolloProvider } from "react-apollo";
+import { ApolloProvider } from "@apollo/client";
 import ApolloClientSingleton from "../../src/network/apollo-client-singleton";
 import { AssignmentSummaryBase as AssignmentSummary } from "../../src/components/AssignmentSummary";
 import Badge from "@material-ui/core/Badge";

__test__/components/IncomingMessageList/ConversationPreviewModal.test.js

@@ -11,7 +11,7 @@ import { prepareDataTableData } from "../../../src/components/IncomingMessageLis
 import ReactTestUtils from "react-dom/test-utils";
 import { createMemoryHistory } from "react-router";
 import ApolloClientSingleton from "../../../src/network/apollo-client-singleton";
-import { ApolloProvider } from "react-apollo";
+import { ApolloProvider } from "@apollo/client";
 import Dialog from "@material-ui/core/Dialog";
 
 import { r } from "../../../src/server/models";

__test__/server/api/campaign/campaign.test.js

@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { campaignDataQuery as AdminCampaignEditQuery } from "../../../../src/containers/AdminCampaignEdit";
 import {
   bulkReassignCampaignContactsMutation,

__test__/server/api/organization.test.js

@@ -2,7 +2,7 @@
 import { isSqlite, r } from "../../../src/server/models/";
 import { getCampaignsQuery } from "../../../src/containers/AdminCampaignList";
 import { GraphQLError } from "graphql/error";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import * as messagingServices from "../../../src/extensions/service-vendors";
 
 import {

__test__/test_helpers.js

@@ -9,7 +9,7 @@ import {
   r
 } from "../src/server/models/";
 import { graphql } from "graphql";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 // Cypress integration tests do not use jest but do use these helpers
 // They would benefit from mocking mail services, though, so something to look in to.

package.json

@@ -95,13 +95,8 @@
     "@date-io/date-fns": "^1.3.13",
     "@trt2/gsm-charset-utils": "^1.0.13",
     "aphrodite": "^2.3.1",
-    "apollo-cache-inmemory": "^1.6.6",
-    "apollo-client": "^2.6.10",
-    "apollo-link": "^1.2.14",
-    "apollo-link-error": "^1.1.13",
-    "apollo-link-http": "^1.5.17",
-    "apollo-server-express": "^1.2.0",
-    "apollo-utilities": "^1.3.4",
+    "@apollo/client": "^3.8.8",
+    "@apollo/server": "^4.9.5",
     "auth0-js": "^9.14.3",
     "aws-serverless-express": "^3.3.6",
     "babel-loader": "^9.1.0",
@@ -112,17 +107,17 @@
     "camelcase-keys": "^4.1.0",
     "color-difference": "^0.3.4",
     "cookie-session": "^2.0.0-alpha.1",
+    "cors": "^2.8.5",
     "dataloader": "^1.2.0",
     "dotenv": "^2.0.0",
     "express": "^4.14.0",
     "fs": "^0.0.2",
     "google-libphonenumber": "^3.0.0",
     "googleapis": "^39.2.0",
-    "graphql": "^0.13.2",
+    "graphql": "^16.8.1",
     "graphql-date": "^1.0.3",
-    "graphql-tag": "^2.10.3",
-    "graphql-tools": "^2.8.0",
-    "graphql-type-json": "^0.1.4",
+    "@graphql-tools/schema": "^10.0.2",
+    "graphql-type-json": "^0.3.2",
     "heroku-ssl-redirect": "^0.1.1",
     "humps": "^1.1.0",
     "is-url": "^1.2.2",
@@ -222,7 +217,6 @@
     "draft-js": "^0.11.7",
     "material-ui-search-bar": "^1.0.0",
     "mui-datatables": "^3.7.7",
-    "react-apollo": "2.5.7",
     "react-async-script": "^0.6.0",
     "react-chartjs-2": "^2.11.1",
     "react-color": "^2.19.3",

src/api/campaign.js

@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 // TODO: rename phoneNumbers to messagingServiceNumbers or something like that
 export const schema = gql`

src/api/organization.js

@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 export const schema = gql`
   type ActionChoice {

src/api/schema.js

@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 import { schema as userSchema } from "./user";
 import { schema as conversationSchema } from "./conversations";
@@ -176,6 +176,12 @@ const rootSchema = gql`
     value: String
   }
 
+  type Action {
+    name: String
+    displayName: String
+    instructions: String
+  }
+
   type FoundContact {
     found: Boolean
     assignment: Assignment
@@ -410,7 +416,7 @@ const rootSchema = gql`
   }
 `;
 
-export const schema = [
+export default [
   rootSchema,
   userSchema,
   "scalar Date",

src/api/service.js

@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 export const schema = gql`
   type ServiceVendor {

src/api/tag.js

@@ -1,4 +1,4 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 export const schema = gql`
   type Tag {

src/api/user.js

@@ -1,4 +1,6 @@
-export const schema = `
+import { gql } from "@apollo/client";
+
+export const schema = gql`
   type User {
     id: ID
     firstName: String

src/client/index.jsx

@@ -4,7 +4,7 @@ import { Router, browserHistory } from "react-router";
 import { StyleSheet } from "aphrodite";
 import errorCatcher from "./error-catcher";
 import makeRoutes from "../routes";
-import { ApolloProvider } from "react-apollo";
+import { ApolloProvider } from "@apollo/client";
 import ApolloClientSingleton from "../network/apollo-client-singleton";
 import { login, logout } from "./auth-service";
 

src/components/AdminDashboard.jsx

@@ -4,7 +4,7 @@ import { StyleSheet, css } from "aphrodite";
 import theme from "../styles/theme";
 import { hasRole } from "../lib";
 import TopNav from "./TopNav";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 import loadData from "../containers/hoc/load-data";
 import AdminNavigation from "../containers/AdminNavigation";

src/components/CampaignCannedResponsesForm.jsx

@@ -24,7 +24,7 @@ import theme from "../styles/theme";
 import { StyleSheet, css } from "aphrodite";
 import { dataTest } from "../lib/attributes";
 import loadData from "../containers/hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import TagChips from "./TagChips";
 import { parseCannedResponseCsv } from "../lib/parse_csv";
 

src/components/IncomingMessageList/ConversationPreviewModal.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { compose } from "recompose";
 import { StyleSheet, css } from "aphrodite";
 

src/components/IncomingMessageList/MessageResponse.jsx

@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import Form from "react-formal";
 import * as yup from "yup";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { StyleSheet, css } from "aphrodite";
 
 import Button from "@material-ui/core/Button";

src/components/IncomingMessageList/index.jsx

@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import type from "prop-types";
 import moment from "moment";
 import { Link as RouterLink, withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { compose } from "recompose";
 
 import MUIDataTable from "mui-datatables";

src/components/OrganizationWrapper.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { compose, lifecycle } from "recompose";
 
 import loadData from "../containers/hoc/load-data";

src/components/Slider.jsx

@@ -1,6 +1,6 @@
 import type from "prop-types";
 import React from "react";
-import { compose } from "react-apollo";
+import { compose } from "recompose";
 import withMuiTheme from "./../containers/hoc/withMuiTheme";
 
 const Slider = ({ maxValue, value, color, direction, muiTheme }) => {

src/containers/AdminBulkScriptEditor.jsx

@@ -1,7 +1,7 @@
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import pick from "lodash/pick";
 import React, { Component } from "react";
-import { compose } from "react-apollo";
+import { compose } from "recompose";
 
 import Paper from "@material-ui/core/Paper";
 import Dialog from "@material-ui/core/Dialog";

src/containers/AdminCampaignCopy.jsx

@@ -5,7 +5,7 @@ import Snackbar from "@material-ui/core/Snackbar";
 
 import { withRouter, Link } from "react-router";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { dataTest } from "../lib/attributes";
 import { getButtonProps } from "../components/utils";
 

src/containers/AdminCampaignEdit.jsx

@@ -1,6 +1,6 @@
 import PropTypes from "prop-types";
 import React from "react";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { Link } from "react-router";
 import { compose } from "recompose";
 

src/containers/AdminCampaignList.jsx

@@ -2,7 +2,7 @@ import PropTypes from "prop-types";
 import React from "react";
 import { StyleSheet, css } from "aphrodite";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 
 import Fab from "@material-ui/core/Fab";
 import AddIcon from "@material-ui/icons/Add";

src/containers/AdminCampaignMessagingService.jsx

@@ -2,7 +2,7 @@ import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
 import { withRouter } from "react-router";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import theme from "../styles/theme";
 import DisplayLink from "../components/DisplayLink";
 import { StyleSheet, css } from "aphrodite";

src/containers/AdminCampaignStats.jsx

@@ -18,7 +18,7 @@ import AdminCampaignCopy from "./AdminCampaignCopy";
 import { withRouter, Link as RouterLink } from "react-router";
 import { StyleSheet, css } from "aphrodite";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import theme from "../styles/theme";
 import { dataTest } from "../lib/attributes";
 

src/containers/AdminIncomingMessageList.jsx

@@ -1,15 +1,15 @@
 import PropTypes from "prop-types";
 import React, { Component } from "react";
 import _ from "lodash";
-import { compose } from "react-apollo";
+import { compose } from "recompose";
 
 import IncomingMessageActions from "../components/IncomingMessageActions";
 import IncomingMessageFilter, {
   ALL_CAMPAIGNS
 } from "../components/IncomingMessageFilter";
 import IncomingMessageList from "../components/IncomingMessageList";
 import PaginatedCampaignsRetriever from "./PaginatedCampaignsRetriever";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import loadData from "./hoc/load-data";
 import { withRouter } from "react-router";
 import PaginatedUsersRetriever from "./PaginatedUsersRetriever";

src/containers/AdminOrganizationsDashboard.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import TopNav from "../components/TopNav";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import loadData from "./hoc/load-data";
 import { withRouter, Link as RouterLink } from "react-router";
 

src/containers/AdminPersonList.jsx

@@ -16,7 +16,7 @@ import MenuItem from "@material-ui/core/MenuItem";
 
 import theme from "../styles/theme";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { dataTest } from "../lib/attributes";
 import PeopleList from "../containers/PeopleList";
 import { StyleSheet, css } from "aphrodite";

src/containers/AdminPhoneNumberInventory.js

@@ -1,6 +1,6 @@
 import PropTypes from "prop-types";
 import React from "react";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import * as yup from "yup";
 import Form from "react-formal";
 

src/containers/AdminReplySender.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import { compose } from "recompose";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import Form from "react-formal";
 import * as yup from "yup";
 import { StyleSheet, css } from "aphrodite";

src/containers/AssignmentTexterContact.jsx

@@ -3,7 +3,7 @@ import React from "react";
 import { StyleSheet, css } from "aphrodite";
 import Controls from "../components/AssignmentTexter/Controls";
 import { applyScript } from "../lib/scripts";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import loadData from "./hoc/load-data";
 import * as yup from "yup";
 import BulkSendButton from "../components/AssignmentTexter/BulkSendButton";

src/containers/CreateAdditionalOrganization.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import Form from "react-formal";
 import * as yup from "yup";
 import { StyleSheet, css } from "aphrodite";

src/containers/CreateOrganization.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import Form from "react-formal";
 import * as yup from "yup";
 import { StyleSheet, css } from "aphrodite";

src/containers/DashboardLoader.jsx

@@ -1,6 +1,6 @@
 import PropTypes from "prop-types";
 import React from "react";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 import loadData from "./hoc/load-data";
 

src/containers/Home.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { StyleSheet, css } from "aphrodite";
 import theme from "../styles/theme";
 import { withRouter } from "react-router";

src/containers/JoinTeam.jsx

@@ -1,7 +1,7 @@
 import PropTypes from "prop-types";
 import React from "react";
 import loadData from "./hoc/load-data";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import { withRouter } from "react-router";
 import { StyleSheet, css } from "aphrodite";
 import theme from "../styles/theme";

src/containers/PaginatedCampaignsRetriever.jsx

@@ -1,6 +1,6 @@
 import { Component } from "react";
 import PropTypes from "prop-types";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import isEqual from "lodash/isEqual";
 
 import apolloClient from "../network/apollo-client-singleton";

src/containers/PaginatedUsersRetriever.jsx

@@ -1,6 +1,6 @@
 import { Component } from "react";
 import PropTypes from "prop-types";
-import gql from "graphql-tag";
+import { gql } from "@apollo/client";
 import isEqual from "lodash/isEqual";
 
 import apolloClient from "../network/apollo-client-singleton";