WIP stage-main-Juneteenth (6.19) -pre

.env.example

@@ -46,4 +46,5 @@ EMAIL_FROM=
 TWILIO_MESSAGE_VALIDITY_PERIOD=
 DST_REFERENCE_TIMEZONE='America/New_York'
 PASSPORT_STRATEGY=local
-SHOW_TAGS=false
+EXPERIMENTAL_TAGS=1
+TEXTER_SIDEBOXES=contact-reference,tag-contact

.github/workflows/jest-tests.yaml

@@ -37,6 +37,37 @@ jobs:
           ${{ runner.os }}-${{ matrix.node-version }}-yarn-
     - run: yarn
     - run: yarn test
+  test-rediscache-contactcache:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    services:
+      redis:
+        image: redis
+        ports:
+        - 6379:6379
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_USER: spoke_test
+          POSTGRES_PASSWORD: spoke_test
+          POSTGRES_DB: spoke_test
+        ports:
+        - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+    - uses: actions/checkout@v2
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+    - uses: actions/cache@v1
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-yarn-
+    - run: yarn
+    - run: yarn test-rediscache-contactcache
   test-rediscache:
     runs-on: ubuntu-latest
     timeout-minutes: 10

README.md

@@ -7,12 +7,12 @@ Spoke is an open source text-distribution tool for organizations to mobilize sup
 
 Spoke was created by Saikat Chakrabarti and Sheena Pakanati, and is now maintained by MoveOn.org.
 
-The latest version is [6.1](https://github.com/MoveOnOrg/Spoke/tree/v6.1) (see [release notes](https://github.com/MoveOnOrg/Spoke/blob/main/docs/RELEASE_NOTES.md#v61))
+The latest version is [7.0](https://github.com/MoveOnOrg/Spoke/tree/v7.0) (see [release notes](https://github.com/MoveOnOrg/Spoke/blob/main/docs/RELEASE_NOTES.md#v70))
 
 ## Deploy to Heroku
 
 Use the Heroku Button to deploy a version of Spoke suitable for testing. This won't cost any money and will not support production usage. It's a great way to practice deploying Spoke or see it in action.
-<a href="https://heroku.com/deploy?template=https://github.com/MoveOnOrg/Spoke/tree/v6.1">
+<a href="https://heroku.com/deploy?template=https://github.com/MoveOnOrg/Spoke/tree/v7.0">
   <img src="https://www.herokucdn.com/deploy/button.svg" alt="Deploy">
 </a>
 

__test__/backend.test.js

@@ -1,6 +1,6 @@
 import { resolvers } from "../src/server/api/schema";
 import { schema } from "../src/api/schema";
-import { assignmentRequired } from "../src/server/api/errors";
+import { assignmentRequiredOrAdminRole } from "../src/server/api/errors";
 import { graphql } from "graphql";
 
 console.log("This is an intentional error");
@@ -260,34 +260,6 @@ describe("graphql test suite", async () => {
     );
   });
 
-  it("should add texters to a organization", async () => {
-    testTexterUser = await createUser({
-      auth0_id: "test456",
-      first_name: "TestTexterFirst",
-      last_name: "TestTexterLast",
-      cell: "555-555-6666",
-      email: "[email protected]"
-    });
-    const joinQuery = `
-    mutation joinOrganization($organizationUuid: String!) {
-      joinOrganization(organizationUuid: $organizationUuid) {
-        id
-      }
-    }`;
-    const variables = {
-      organizationUuid: testOrganization.data.createOrganization.uuid
-    };
-    const context = getContext({ user: testTexterUser });
-    const result = await graphql(
-      mySchema,
-      joinQuery,
-      rootValue,
-      context,
-      variables
-    );
-    expect(result.data.joinOrganization.id).toBeTruthy();
-  });
-
   it("should assign texters to campaign contacts", async () => {
     const campaignEditQuery = `
     mutation editCampaign($campaignId: String!, $campaign: CampaignInput!) {
@@ -331,6 +303,8 @@ describe("graphql test suite", async () => {
     const context = getContext({ user: testAdminUser });
     const updateCampaign = Object.assign({}, testCampaign.data.createCampaign);
     const campaignId = updateCampaign.id;
+    testTexterUser = await helperCreateTexter(testOrganization);
+
     updateCampaign.texters = [
       {
         id: testTexterUser.id
@@ -527,34 +501,6 @@ describe("graphql test suite", async () => {
         );
         expect(results).toEqual(false);
       });
-
-      test("test assignmentRequired access control", async () => {
-        const user = await createUser();
-
-        const assignment = await new Assignment({
-          user_id: user.id,
-          campaign_id: campaign.id
-        }).save();
-
-        const allowUser = await assignmentRequired(
-          user,
-          assignment.id,
-          assignment
-        );
-        expect(allowUser).toEqual(true);
-        const allowUserAssignmentId = await assignmentRequired(
-          user,
-          assignment.id
-        );
-        expect(allowUserAssignmentId.user_id).toEqual(user.id);
-        expect(allowUserAssignmentId.id).toEqual(assignment.id);
-        try {
-          const notAllowed = await assignmentRequired(user, -1);
-          throw new Exception("should throw BEFORE this exception");
-        } catch (err) {
-          expect(/not authorized/.test(String(err))).toEqual(true);
-        }
-      });
     });
 
     describe("Copy Campaign", () => {

__test__/containers/AssignmentTexterContact.test.js

@@ -27,6 +27,10 @@ const campaign = {
     textingHoursEnd: 21
   },
   customFields: [],
+  texterUIConfig: {
+    sideboxChoices: [],
+    options: "{}"
+  },
   interactionSteps: [
     {
       id: 11,

__test__/containers/Tags.test.js

@@ -11,7 +11,7 @@ describe("Tags list with several tags", () => {
   // given
 
   const data = {
-    tags: {
+    organization: {
       tags: [
         {
           id: "1",

__test__/containers/UserMenu.test.js

@@ -17,7 +17,13 @@ describe("UserMenu", () => {
         id: 1,
         displayName: "TestName",
         email: "[email protected]",
-        organizations: [
+        superVolOrganizations: [
+          {
+            id: 2,
+            name: "testOrg"
+          }
+        ],
+        texterOrganizations: [
           {
             id: 2,
             name: "testOrg"
@@ -46,7 +52,8 @@ describe("UserMenu", () => {
         id: 1,
         displayName: "TestName",
         email: "[email protected]",
-        organizations: [
+        superVolOrganizations: [],
+        texterOrganizations: [
           {
             id: 2,
             name: "testOrg"

__test__/integrations/action-handlers/index.test.js

@@ -1,4 +1,4 @@
-import { r, createLoaders } from "../../../src/server/models";
+import { r } from "../../../src/server/models";
 import each from "jest-each";
 import {
   setupTest,
@@ -532,12 +532,9 @@ describe("action-handlers/index", () => {
   });
 
   describe("#getActionChoiceData", () => {
-    let loaders;
     let expectedReturn;
 
     beforeEach(async () => {
-      loaders = createLoaders();
-
       expectedReturn = [
         {
           details: '{"hex":"#B22222","rgb":{"r":178,"g":34,"b":34}}',
@@ -557,38 +554,36 @@ describe("action-handlers/index", () => {
       const returned = await ActionHandlers.getActionChoiceData(
         ComplexTestAction,
         organization,
-        user,
-        loaders
+        user
       );
 
       expect(returned).toEqual(expectedReturn);
 
       expect(ComplexTestAction.clientChoiceDataCacheKey.mock.calls).toEqual([
-        [organization, user, loaders]
+        [organization, user]
       ]);
 
       expect(ComplexTestAction.getClientChoiceData.mock.calls).toEqual([
-        [organization, user, loaders]
+        [organization, user]
       ]);
 
       // handles the second call from the cache
       const secondCallReturned = await ActionHandlers.getActionChoiceData(
         ComplexTestAction,
         organization,
-        user,
-        loaders
+        user
       );
 
       expect(secondCallReturned).toEqual(expectedReturn);
 
       expect(ComplexTestAction.clientChoiceDataCacheKey.mock.calls).toEqual([
-        [organization, user, loaders],
-        [organization, user, loaders]
+        [organization, user],
+        [organization, user]
       ]);
 
       expect(ComplexTestAction.getClientChoiceData.mock.calls).toEqual([
-        [organization, user, loaders],
-        ...(!r.redis && [[organization, user, loaders]])
+        [organization, user],
+        ...(!r.redis && [[organization, user]])
       ]);
     });
 
@@ -597,8 +592,7 @@ describe("action-handlers/index", () => {
         const returned = await ActionHandlers.getActionChoiceData(
           TestAction,
           organization,
-          user,
-          loaders
+          user
         );
         expect(returned).toEqual([]);
       });
@@ -621,8 +615,7 @@ describe("action-handlers/index", () => {
           const returned = await ActionHandlers.getActionChoiceData(
             fakeAction,
             { id: 99 },
-            user,
-            loaders
+            user
           );
           expect(returned).toEqual(expectedReturn);
           expect(ActionHandlers.getSetCacheableResult.mock.calls).toEqual([
@@ -642,8 +635,7 @@ describe("action-handlers/index", () => {
           const returned = await ActionHandlers.getActionChoiceData(
             fakeAction,
             organization,
-            user,
-            loaders
+            user
           );
           expect(returned).toEqual([]);
         });
@@ -659,8 +651,7 @@ describe("action-handlers/index", () => {
           const returned = await ActionHandlers.getActionChoiceData(
             fakeAction,
             organization,
-            user,
-            loaders
+            user
           );
           expect(returned).toEqual([]);
         });
@@ -677,8 +668,7 @@ describe("action-handlers/index", () => {
           const returned = await ActionHandlers.getActionChoiceData(
             fakeAction,
             organization,
-            user,
-            loaders
+            user
           );
           expect(returned).toEqual([]);
         });
@@ -695,8 +685,7 @@ describe("action-handlers/index", () => {
           const returned = await ActionHandlers.getActionChoiceData(
             fakeAction,
             organization,
-            user,
-            loaders
+            user
           );
           expect(returned).toEqual([]);
         });
@@ -714,8 +703,7 @@ describe("action-handlers/index", () => {
           const returned = await ActionHandlers.getActionChoiceData(
             fakeAction,
             organization,
-            user,
-            loaders
+            user
           );
           expect(returned).toEqual([]);
           expect(log.error.mock.calls).toEqual([
@@ -740,8 +728,7 @@ describe("action-handlers/index", () => {
           const returned = await ActionHandlers.getActionChoiceData(
             fakeAction,
             organization,
-            user,
-            loaders
+            user
           );
           expect(returned).toEqual(expectedReturn);
           expect(log.error.mock.calls).toEqual([
@@ -769,8 +756,7 @@ describe("action-handlers/index", () => {
           const returned = await ActionHandlers.getActionChoiceData(
             fakeAction,
             organization,
-            user,
-            loaders
+            user
           );
           expect(returned).toEqual([]);
           expect(log.error.mock.calls).toEqual([