-
+
) : null}
- {hasFeedbackToAcknowledge && (
-
+ Export started -
+ {this.props.organizationData &&
+ this.props.organizationData.emailEnabled
+ ? " we'll e-mail you when it's done."
+ : null}
+ {campaign.cacheable ? (
+
+ {
+ this.props.data.refetch();
+ }}
+ style={{ textDecoration: "underline" }}
+ >
+ Reload the page
+ {" "}
+ to see a download link when its ready.
+
+ ) : null}
+
+ }
+ autoHideDuration={campaign.cacheable ? null : 5000}
onRequestClose={() => {
this.setState({ exportMessageOpen: false });
}}
@@ -434,6 +485,11 @@ const queries = {
unrepliedCount: contactsCount(contactsFilter: $needsResponseFilter)
contactsCount
}
+ exportResults {
+ error
+ campaignExportUrl
+ campaignMessagesExportUrl
+ }
pendingJobs {
id
jobType
@@ -462,6 +518,7 @@ const queries = {
link
}
}
+ cacheable
}
}
`,
@@ -489,6 +546,7 @@ const queries = {
organization(id: $organizationId) {
id
campaignPhoneNumbersEnabled
+ emailEnabled
}
}
`,
diff --git a/src/containers/AdminOrganizationsDashboard.jsx b/src/containers/AdminOrganizationsDashboard.jsx
index bb8a44891..5e2aa44b7 100644
--- a/src/containers/AdminOrganizationsDashboard.jsx
+++ b/src/containers/AdminOrganizationsDashboard.jsx
@@ -155,6 +155,7 @@ class AdminOrganizationsDashboard extends React.Component {
this.props.data.organizations.reverse();
}
}}
+ initialSort={{ column: "id", order: "desc" }}
/>
{this.renderActionButton()}
diff --git a/src/containers/AdminPersonList.jsx b/src/containers/AdminPersonList.jsx
index 3cabd3977..bd563091d 100644
--- a/src/containers/AdminPersonList.jsx
+++ b/src/containers/AdminPersonList.jsx
@@ -44,7 +44,8 @@ class AdminPersonList extends React.Component {
this.state = {
open: false,
userEdit: false,
- passwordResetHash: ""
+ passwordResetHash: "",
+ resetLink: false
};
}
@@ -162,6 +163,12 @@ class AdminPersonList extends React.Component {
this.setState({ open: false, passwordResetHash: "" });
}
+ handleResetInviteLink = async () => {
+ console.log("handleResetInviteLink");
+ await this.props.mutations.resetOrganizationJoinLink();
+ this.setState({ resetLink: false });
+ };
+
handleSortByChanged = (event, index, sortBy) => {
this.handleFilterChange({ sortBy });
};
@@ -246,7 +253,38 @@ class AdminPersonList extends React.Component {
const {
userData: { currentUser }
} = this.props;
-
+ const joinActions = [
+
{sideboxList}
@@ -283,7 +271,8 @@ AssignmentSummary.propTypes = {
router: PropTypes.object,
assignment: PropTypes.object,
texter: PropTypes.object,
- refreshData: PropTypes.func
+ refreshData: PropTypes.func,
+ todoLink: PropTypes.func
};
export default withRouter(AssignmentSummary);
diff --git a/src/components/AssignmentTexter/ContactController.jsx b/src/components/AssignmentTexter/ContactController.jsx
index 14b3f2516..5336e9084 100644
--- a/src/components/AssignmentTexter/ContactController.jsx
+++ b/src/components/AssignmentTexter/ContactController.jsx
@@ -284,6 +284,8 @@ export class ContactController extends React.Component {
this.setState({ finishedContactId: contactId }, () => {
if (!this.props.reviewContactId) {
this.props.refreshData();
+ this.clearContactIdOldData(contactId);
+ this.updateCurrentContactIndex(this.state.currentContactIndex);
}
});
}
diff --git a/src/components/AssignmentTexter/Controls.jsx b/src/components/AssignmentTexter/Controls.jsx
index 665c22a7a..3205a2c30 100644
--- a/src/components/AssignmentTexter/Controls.jsx
+++ b/src/components/AssignmentTexter/Controls.jsx
@@ -19,7 +19,9 @@ import yup from "yup";
import theme from "../../styles/theme";
import Form from "react-formal";
import Popover from "material-ui/Popover";
+import SearchBar from "material-ui-search-bar";
import { messageListStyles, inlineStyles, flexStyles } from "./StyleControls";
+import { searchFor } from "../../lib/search-helpers";
import { renderSidebox } from "../../extensions/texter-sideboxes/components";
@@ -48,8 +50,17 @@ export class AssignmentTexterContactControls extends React.Component {
questionResponses,
props.campaign.interactionSteps
);
+
+ let currentInteractionStep = null;
+ if (availableSteps.length > 0) {
+ currentInteractionStep = availableSteps[availableSteps.length - 1];
+ currentInteractionStep.question.filteredAnswerOptions =
+ currentInteractionStep.question.answerOptions;
+ }
+
this.state = {
questionResponses,
+ filteredCannedResponses: props.campaign.cannedResponses,
optOutMessageText: props.campaign.organization.optOutMessage,
responsePopoverOpen: false,
answerPopoverOpen: false,
@@ -62,10 +73,8 @@ export class AssignmentTexterContactControls extends React.Component {
messageFocus: false,
availableSteps,
messageReadOnly: false,
- currentInteractionStep:
- availableSteps.length > 0
- ? availableSteps[availableSteps.length - 1]
- : null
+ hideMedia: false,
+ currentInteractionStep
};
}
@@ -159,7 +168,7 @@ export class AssignmentTexterContactControls extends React.Component {
// console.log('KEYBOARD', evt.key, document.activeElement);
if (
// SEND: Ctrl-Enter/Ctrl-z
- (evt.key === "Enter" || evt.key === "z") &&
+ evt.key === "Enter" &&
// need to use ctrlKey in non-first texting context for accessibility
evt.ctrlKey
) {
@@ -228,6 +237,28 @@ export class AssignmentTexterContactControls extends React.Component {
}
};
+ handleSearchChange = searchValue => {
+ // filter answerOptions for this step's question
+ const answerOptions = this.state.currentInteractionStep.question
+ .answerOptions;
+ const filteredAnswerOptions = searchFor(searchValue, answerOptions, [
+ "value",
+ "nextInteractionStep.script"
+ ]);
+ this.state.currentInteractionStep.question.filteredAnswerOptions = filteredAnswerOptions;
+
+ const filteredCannedResponses = searchFor(
+ searchValue,
+ this.props.campaign.cannedResponses,
+ ["title", "text"]
+ );
+
+ this.setState({
+ currentInteractionStep: this.state.currentInteractionStep,
+ filteredCannedResponses
+ });
+ };
+
handleCannedResponseChange = cannedResponseScript => {
const currentCannedResponseId =
this.state.cannedResponseScript && this.state.cannedResponseScript.id;
@@ -312,29 +343,27 @@ export class AssignmentTexterContactControls extends React.Component {
handleMessageFormChange = ({ messageText }) => this.setState({ messageText });
- handleOpenAnswerPopover = event => {
+ handleOpenAnswerResponsePopover = event => {
event.preventDefault();
- this.setState({
+ const newState = {
answerPopoverAnchorEl: event.currentTarget,
- answerPopoverOpen: true
- });
+ answerPopoverOpen: true,
+ responsePopoverAnchorEl: event.currentTarget,
+ responsePopoverOpen: true,
+ filteredCannedResponses: this.props.campaign.cannedResponses
+ };
+ if (this.state.currentInteractionStep) {
+ this.state.currentInteractionStep.question.filteredAnswerOptions = this.state.currentInteractionStep.question.answerOptions;
+ newState.currentInteractionStep = this.state.currentInteractionStep;
+ }
+ this.setState(newState);
};
- handleCloseAnswerPopover = () => {
+ handleCloseAnswerResponsePopover = () => {
this.setState({
answerPopoverOpen: false
});
- };
-
- handleOpenResponsePopover = event => {
- event.preventDefault();
- this.setState({
- responsePopoverAnchorEl: event.currentTarget,
- responsePopoverOpen: true
- });
- };
- handleCloseResponsePopover = () => {
// delay to avoid accidental tap pass-through with focusing on
// the text field -- this is annoying on mobile where the keyboard
// pops up, inadvertantly
@@ -395,7 +424,9 @@ export class AssignmentTexterContactControls extends React.Component {
const {
answerPopoverOpen,
questionResponses,
- cannedResponseScript
+ cannedResponseScript,
+ currentInteractionStep,
+ filteredCannedResponses
} = this.state;
const { messages } = contact;
@@ -405,9 +436,9 @@ export class AssignmentTexterContactControls extends React.Component {
);
const otherResponsesLink =
- this.state.currentInteractionStep &&
- this.state.currentInteractionStep.question.answerOptions.length > 6 &&
- campaign.cannedResponses.length ? (
+ currentInteractionStep &&
+ currentInteractionStep.question.filteredAnswerOptions.length > 6 &&
+ filteredCannedResponses.length ? (
+ {campaign.exportResults ? (
+
+ {campaign.exportResults.error ? (
+
+ ) : null}
{campaign.joinToken && campaign.useDynamicAssignment ? (
Export failed: {campaign.exportResults.error}
+ ) : null}
+ {campaign.exportResults.campaignExportUrl &&
+ campaign.exportResults.campaignExportUrl.startsWith("http") ? (
+
+ Most recent export:
+
+ Contacts Export CSV
+
+
+ Messages Export CSV
+
+
+ ) : (
+
+ Local export was successful, saved on the server at:
+
+ {campaign.exportResults.campaignExportUrl} +
+ {campaign.exportResults.campaignMessagesExportUrl} +
+ )}
+ + {campaign.exportResults.campaignExportUrl} +
+ {campaign.exportResults.campaignMessagesExportUrl} +
- ]}
+ actions={joinActions}
modal={false}
open={this.state.open}
onRequestClose={this.handleClose}
@@ -327,6 +358,22 @@ AdminPersonList.propTypes = {
location: PropTypes.object
};
+const mutations = {
+ resetOrganizationJoinLink: ownProps => () => ({
+ mutation: gql`
+ mutation resetOrganizationJoinLink($organizationId: String!) {
+ resetOrganizationJoinLink(organizationId: $organizationId) {
+ id
+ uuid
+ }
+ }
+ `,
+ variables: {
+ organizationId: ownProps.organizationData.organization.id
+ }
+ })
+};
+
const queries = {
userData: {
query: gql`
@@ -374,4 +421,4 @@ const queries = {
}
};
-export default loadData({ queries })(withRouter(AdminPersonList));
+export default loadData({ queries, mutations })(withRouter(AdminPersonList));
diff --git a/src/containers/AdminPhoneNumberInventory.js b/src/containers/AdminPhoneNumberInventory.js
index 8030c0687..f149b39a9 100644
--- a/src/containers/AdminPhoneNumberInventory.js
+++ b/src/containers/AdminPhoneNumberInventory.js
@@ -3,6 +3,7 @@ import React from "react";
import gql from "graphql-tag";
import ContentAdd from "material-ui/svg-icons/content/add";
+import DeleteIcon from "material-ui/svg-icons/action/delete-forever";
import DataTables from "material-ui-datatables";
import Dialog from "material-ui/Dialog";
import Paper from "material-ui/Paper";
@@ -16,7 +17,12 @@ import Form from "react-formal";
import theme from "../styles/theme";
import { dataTest } from "../lib/attributes";
import loadData from "./hoc/load-data";
-import { CircularProgress, FlatButton, Toggle } from "material-ui";
+import {
+ CircularProgress,
+ FlatButton,
+ RaisedButton,
+ Toggle
+} from "material-ui";
const inlineStyles = {
column: {
@@ -42,6 +48,7 @@ const inlineStyles = {
class AdminPhoneNumberInventory extends React.Component {
static propTypes = {
data: PropTypes.object,
+ params: PropTypes.object,
mutations: PropTypes.object
};
@@ -55,7 +62,8 @@ class AdminPhoneNumberInventory extends React.Component {
},
sortCol: "state",
sortOrder: "asc",
- filters: {}
+ filters: {},
+ deleteNumbersDialogOpen: false
};
}
@@ -124,6 +132,32 @@ class AdminPhoneNumberInventory extends React.Component {
});
};
+ handleDeleteNumbersOpen = row => {
+ this.setState({
+ deleteNumbersDialogOpen: true,
+ deleteNumbersAreaCode: row.areaCode,
+ deleteNumbersCount: row.availableCount
+ });
+ };
+
+ handleDeleteNumbersCancel = () => {
+ this.setState({
+ deleteNumbersDialogOpen: false,
+ deleteNumbersAreaCode: null,
+ deleteNumbersCount: 0
+ });
+ };
+
+ handleDeletePhoneNumbersSubmit = async () => {
+ await this.props.mutations.deletePhoneNumbers(
+ this.state.deleteNumbersAreaCode
+ );
+ this.setState({
+ deleteNumbersDialogOpen: false,
+ deleteNumbersAreaCode: null
+ });
+ };
+
tableColumns() {
const { pendingPhoneNumberJobs } = this.props.data.organization;
return [
@@ -157,6 +191,18 @@ class AdminPhoneNumberInventory extends React.Component {
textAlign: "center"
}
},
+ {
+ key: "deleteButton",
+ label: "",
+ style: inlineStyles.column,
+ render: (columnKey, row) =>
+ this.props.params.ownerPerms ? (
+
-
+ {this.props.params.ownerPerms ? (
+
+
+ ) : null}
+
+ ,
+
);
}
@@ -405,6 +477,23 @@ const mutations = {
addToOrganizationMessagingService
},
refetchQueries: () => ["getOrganizationData"]
+ }),
+ deletePhoneNumbers: ownProps => areaCode => ({
+ mutation: gql`
+ mutation deletePhoneNumbers($organizationId: ID!, $areaCode: String!) {
+ deletePhoneNumbers(
+ organizationId: $organizationId
+ areaCode: $areaCode
+ ) {
+ id
+ }
+ }
+ `,
+ variables: {
+ organizationId: ownProps.params.organizationId,
+ areaCode
+ },
+ refetchQueries: () => ["getOrganizationData"]
})
};
diff --git a/src/containers/TexterTodo.jsx b/src/containers/TexterTodo.jsx
index bac8a3bbe..a01190396 100644
--- a/src/containers/TexterTodo.jsx
+++ b/src/containers/TexterTodo.jsx
@@ -34,6 +34,10 @@ export const contactDataFragment = `
id
createdAt
text
+ media {
+ type
+ url
+ }
isFromContact
userId
}
diff --git a/src/containers/TexterTodoList.jsx b/src/containers/TexterTodoList.jsx
index 858ff73fe..fb8c11a0a 100644
--- a/src/containers/TexterTodoList.jsx
+++ b/src/containers/TexterTodoList.jsx
@@ -17,28 +17,25 @@ class TexterTodoList extends React.Component {
}
renderTodoList(assignments) {
- const organizationId = this.props.params.organizationId;
return assignments
.sort((x, y) => {
- const xToText = x.unmessagedCount + x.unrepliedCount;
- const yToText = y.unmessagedCount + y.unrepliedCount;
- if (xToText === yToText) {
- return Number(y.id) - Number(x.id);
- }
- return xToText > yToText ? -1 : 1;
- })
- .sort((x, y) => {
- // sort again to bring feedback to the top
+ // Sort with feedback at the top, and then based on Text assignment size
const xHasFeedback =
x.feedback && x.feedback.sweepComplete && !x.feedback.isAcknowledged;
const yHasFeedback =
y.feedback && y.feedback.sweepComplete && !y.feedback.isAcknowledged;
- if (xHasFeedback && yHasFeedback) {
- return 0;
- } else if (xHasFeedback && !yHasFeedback) {
+ if (xHasFeedback && !yHasFeedback) {
return -1;
}
- return 1;
+ if (yHasFeedback && !xHasFeedback) {
+ return 1;
+ }
+ const xToText = x.unmessagedCount + x.unrepliedCount;
+ const yToText = y.unmessagedCount + y.unrepliedCount;
+ if (xToText === yToText) {
+ return Number(y.id) - Number(x.id);
+ }
+ return xToText > yToText ? -1 : 1;
})
.map(assignment => {
if (
@@ -47,7 +44,7 @@ class TexterTodoList extends React.Component {
) {
return (
- {userId ?
+
+ Spoke is developed and maintained by people committed to fighting
+ oppressive systems and structures, including economic injustice,
+ racism, patriarchy, and militarism.
+
+
);
}
diff --git a/src/integrations/action-handlers/action-network.js b/src/extensions/action-handlers/action-network.js
similarity index 100%
rename from src/integrations/action-handlers/action-network.js
rename to src/extensions/action-handlers/action-network.js
diff --git a/src/extensions/contact-loaders/s3-pull/index.js b/src/extensions/contact-loaders/s3-pull/index.js
new file mode 100644
index 000000000..5fd74ac98
--- /dev/null
+++ b/src/extensions/contact-loaders/s3-pull/index.js
@@ -0,0 +1,361 @@
+import {
+ completeContactLoad,
+ failedContactLoad,
+ getTimezoneByZip,
+ sendJobToAWSLambda
+} from "../../../workers/jobs";
+import { r } from "../../../server/models";
+import { getConfig, hasConfig } from "../../../server/api/lib/config";
+import { getFormattedPhoneNumber } from "../../../lib/phone-format.js";
+import { log, gunzip } from "../../../lib";
+
+import path from "path";
+import Papa from "papaparse";
+import AWS from "aws-sdk";
+
+export const name = "s3-pull";
+
+export function displayName() {
+ return "S3 CSV Pull";
+}
+
+export function serverAdministratorInstructions() {
+ return {
+ environmentVariables: [
+ "AWS_ACCESS_KEY_ID",
+ "AWS_SECRET_ACCESS_KEY",
+ "AWS_S3_BUCKET_NAME",
+ "AWS_REGION"
+ ],
+ description: "S3 Contact load",
+ setupInstructions: "AWS S3 needs to be setup"
+ };
+}
+
+export async function available(organization, user) {
+ /// return an object with two keys: result: true/false
+ /// these keys indicate if the ingest-contact-loader is usable
+ /// Sometimes credentials need to be setup, etc.
+ /// A second key expiresSeconds: should be how often this needs to be checked
+ /// If this is instantaneous, you can have it be 0 (i.e. always), but if it takes time
+ /// to e.g. verify credentials or test server availability,
+ /// then it's better to allow the result to be cached
+ const result =
+ hasConfig("AWS_S3_BUCKET_NAME") &&
+ hasConfig("AWS_REGION") &&
+ hasConfig("AWS_ACCESS_KEY_ID") &&
+ hasConfig("AWS_SECRET_ACCESS_KEY");
+ return {
+ result,
+ expiresSeconds: 0
+ };
+}
+
+export function addServerEndpoints(expressApp) {
+ /// If you need to create API endpoints for server-to-server communication
+ /// this is where you would run e.g. app.post(....)
+ /// Be mindful of security and make sure there's
+ /// This is NOT where or how the client send or receive contact data
+ return;
+}
+
+export function clientChoiceDataCacheKey(organization, campaign, user) {
+ /// returns a string to cache getClientChoiceData -- include items that relate to cacheability
+ //return `${organization.id}-${campaign.id}`;
+ return "";
+}
+
+export async function getClientChoiceData(organization, campaign, user) {
+ /// data to be sent to the admin client to present options to the component or similar
+ /// The react-component will be sent this data as a property
+ /// return a json object which will be cached for expiresSeconds long
+ /// `data` should be a single string -- it can be JSON which you can parse in the client component
+
+ // FUTURE: maybe expose list of exports visible
+ return {
+ data: "",
+ expiresSeconds: 0
+ };
+}
+
+export async function loadContactS3PullProcessFile(jobEvent, contextVars) {
+ const {
+ fileIndex,
+ campaign_id,
+ manifestData,
+ s3Bucket,
+ s3Path,
+ indexes,
+ customIndexes,
+ region
+ } = jobEvent;
+ const s3 = new AWS.S3({
+ region,
+ signatureVersion: "v4"
+ });
+
+ if (jobEvent.completeContactLoad) {
+ await completeContactLoad(
+ jobEvent,
+ null,
+ jobEvent.completeContactLoad.ingestDataReference,
+ jobEvent.completeContactLoad.ingestResult
+ );
+ return;
+ }
+ const fileData = await s3
+ .getObject({
+ Bucket: s3Bucket,
+ // removes the protocol/domain parts
+ Key: manifestData.entries[fileIndex].url
+ .split("/")
+ .slice(3)
+ .join("/")
+ })
+ .promise();
+ const fileString = await gunzip(fileData.Body);
+ const { data, errors } = await new Promise((resolve, reject) => {
+ Papa.parse(fileString.toString(), {
+ delimiter: "|",
+ skipEmptyLines: true,
+ escapeChar: "\\",
+ error: (err, file, inputElem, reason) => {
+ console.log("s3pull ERROR", err, reason);
+ resolve({ errors: [err] });
+ },
+ complete: ({ data, errors, meta }) => {
+ console.log("s3pull data", data.length, errors, meta);
+ resolve({ data, errors });
+ }
+ });
+ });
+
+ if (data) {
+ let insertRows = data.map(colData => {
+ const contact = {
+ campaign_id,
+ assignment_id: null,
+ message_status: "needsMessage"
+ };
+ const customFields = {};
+ Object.keys(indexes).forEach(n => {
+ contact[n] = indexes[n] === -1 ? "" : colData[indexes[n]];
+ });
+ contact.cell = getFormattedPhoneNumber(
+ contact.cell,
+ process.env.PHONE_NUMBER_COUNTRY || "US"
+ );
+ customIndexes.forEach(i => {
+ customFields[manifestData.schema.elements[i].name] = colData[i];
+ });
+ contact.custom_fields = JSON.stringify(customFields);
+ if (customFields.hasOwnProperty("timezone_offset")) {
+ contact.timezone_offset = customFields["timezone_offset"];
+ }
+ return contact;
+ });
+ // memoize and update all the timezone_offsets:
+ const tzOffsets = {};
+ insertRows
+ .filter(r => r.zip && !r.timezone_offset)
+ .forEach(r => {
+ tzOffsets[r.zip] = "";
+ });
+ if (Object.keys(tzOffsets).length) {
+ for (let zip in tzOffsets) {
+ tzOffsets[zip] = await getTimezoneByZip(zip);
+ }
+ insertRows = insertRows.map(r => {
+ if (r.zip && !r.timezone_offset && tzOffsets[r.zip]) {
+ r.timezone_offset = tzOffsets[r.zip];
+ }
+ return r;
+ });
+ }
+ // In case the job was discarded, before we save,
+ // we confirm the job still exists.
+ const jobCompleted = await r
+ .knex("job_request")
+ .where("id", jobEvent.id)
+ .select("status")
+ .first();
+ if (!jobCompleted) {
+ console.log(
+ "loadContactS3PullProcessFile job no longer exists",
+ jobEvent
+ );
+ return { alreadyComplete: 1 };
+ }
+
+ await r.knex.batchInsert("campaign_contact", insertRows);
+ }
+
+ if (fileIndex < manifestData.entries.length - 1) {
+ await r
+ .knex("job_request")
+ .where("id", jobEvent.id)
+ .update({
+ status: Math.round(
+ (100 * (fileIndex + 1)) / manifestData.entries.length
+ )
+ });
+ const newJobEvent = {
+ ...jobEvent,
+ fileIndex: fileIndex + 1,
+ command: "loadContactS3PullProcessFileJob"
+ };
+ if (process.env.WAREHOUSE_DB_LAMBDA_ITERATION) {
+ console.log(
+ "SENDING TO LAMBDA loadContactS3PullProcessFileJob",
+ newJobEvent
+ );
+ await sendJobToAWSLambda(newJobEvent);
+ return { invokedAgain: 1 };
+ } else {
+ return await loadContactS3PullProcessFile(newJobEvent, contextVars);
+ }
+ } else {
+ // Finished last insert
+ const validationStats = {};
+ // delete invalid cells
+ await r
+ .knex("campaign_contact")
+ .whereRaw("length(cell) != 12")
+ .andWhere("campaign_id", campaign_id)
+ .delete()
+ .then(result => {
+ console.log(
+ `loadContactS3PullProcessFile # of contacts with invalid cells removed from DW query (${campaign_id}): ${result}`
+ );
+ validationStats.invalidCellCount = result;
+ });
+ if (process.env.WAREHOUSE_DB_LAMBDA_ITERATION) {
+ await completeContactLoad(
+ jobEvent,
+ null,
+ { manifestData, s3Path },
+ { errors, validationStats }
+ );
+ } else {
+ const newJobEvent = {
+ ...jobEvent,
+ completeContactLoad: {
+ ingestDataReference: { manifestData, s3Path },
+ ingestResult: { errors, validationStats }
+ },
+ command: "loadContactS3PullProcessFileJob"
+ };
+ await sendJobToAWSLambda(newJobEvent);
+ }
+ }
+}
+
+export async function processContactLoad(job, maxContacts, organization) {
+ console.log("STARTING s3-pull load", job.id, job.payload);
+ const jobMessages = [];
+ const s3Path = JSON.parse(job.payload).s3Path;
+ const s3Bucket = getConfig("AWS_S3_BUCKET_NAME", organization);
+ const region = getConfig("AWS_REGION", organization);
+ const s3 = new AWS.S3({
+ region,
+ signatureVersion: "v4"
+ });
+
+ const manifestPath = s3Path.endsWith("manifest")
+ ? s3Path
+ : path.join(s3Path, "manifest");
+ console.log("s3-pull manifest path: ", manifestPath.replace(/^\//, ""));
+ let manifestData;
+ try {
+ const manifestFile = await s3
+ .getObject({
+ Bucket: s3Bucket,
+ Key: manifestPath.replace(/^\//, "")
+ })
+ .promise();
+ manifestData = JSON.parse(manifestFile.Body.toString("utf-8"));
+ } catch (err) {
+ await failedContactLoad(
+ job,
+ null,
+ { s3Path },
+ {
+ errors: [err],
+ manifestPath: manifestPath.replace(/^\//, "")
+ }
+ );
+ return;
+ }
+ console.log("s3-pull manifest found", manifestData);
+ // 1. check manifestData.schema -- if not demand "MANIFEST VERBOSE"
+ if (!manifestData.schema || !manifestData.schema.elements) {
+ await failedContactLoad(
+ job,
+ null,
+ { s3Path, manifestData },
+ {
+ errors: [
+ "Manifest file did not have schema info -- make sure to run with MANIFEST VERBOSE"
+ ]
+ }
+ );
+ return;
+ }
+
+ // 2. check for cell, first_name, last_name in columns
+ const indexes = {
+ first_name: manifestData.schema.elements.findIndex(
+ x => x.name === "first_name"
+ ),
+ last_name: manifestData.schema.elements.findIndex(
+ x => x.name === "last_name"
+ ),
+ cell: manifestData.schema.elements.findIndex(x => x.name === "cell"),
+ zip: manifestData.schema.elements.findIndex(x => x.name === "zip"),
+ external_id: manifestData.schema.elements.findIndex(
+ x => x.name === "external_id"
+ )
+ };
+ if (
+ indexes.first_name === -1 ||
+ indexes.last_name === -1 ||
+ indexes.cell === -1
+ ) {
+ const colNames = manifestData.schema.elements.map(x => x.name).join(", ");
+ const error = `Missing at least one required column: first_name, last_name, cell. Columns: ${colNames}`;
+ await failedContactLoad(
+ job,
+ null,
+ { s3Path, manifestData },
+ {
+ errors: [error]
+ }
+ );
+ return;
+ }
+ const customIndexes = manifestData.schema.elements
+ .map((x, i) => [x.name, i])
+ .filter(x => !(x[0] in indexes))
+ .map(x => x[1]);
+
+ // Delete old data; FUTURE: checkbox to 'pick up from before?'
+ await r
+ .knex("campaign_contact")
+ .where("campaign_id", job.campaign_id)
+ .delete();
+
+ const event = {
+ id: job.id,
+ campaign_id: job.campaign_id,
+ job_type: "ingest.s3-pull",
+ // beyond job object:
+ s3Path,
+ s3Bucket,
+ region,
+ manifestData,
+ indexes,
+ customIndexes,
+ fileIndex: 0
+ };
+ return await loadContactS3PullProcessFile(event);
+}
diff --git a/src/extensions/contact-loaders/s3-pull/react-component.js b/src/extensions/contact-loaders/s3-pull/react-component.js
new file mode 100644
index 000000000..6eb72dc28
--- /dev/null
+++ b/src/extensions/contact-loaders/s3-pull/react-component.js
@@ -0,0 +1,121 @@
+import type from "prop-types";
+import React from "react";
+import RaisedButton from "material-ui/RaisedButton";
+import GSForm from "../../../components/forms/GSForm";
+import Form from "react-formal";
+import { ListItem, List } from "material-ui/List";
+import CampaignFormSectionHeading from "../../../components/CampaignFormSectionHeading";
+import theme from "../../../styles/theme";
+import { StyleSheet, css } from "aphrodite";
+import yup from "yup";
+
+export class CampaignContactsForm extends React.Component {
+ constructor(props) {
+ super(props);
+ const { lastResult } = props;
+ let cur = {};
+ if (lastResult && lastResult.reference) {
+ cur = JSON.parse(lastResult.reference);
+ }
+ console.log("s3-pull", lastResult, props);
+ this.state = {
+ s3Path: cur.s3Path || ""
+ };
+ }
+
+ render() {
+ const { lastResult } = this.props;
+ let results = {};
+ if (lastResult && lastResult.result) {
+ results = JSON.parse(lastResult.result);
+ console.log("s3-pull results", results);
+ }
+ return (
+ User Id: {userId}
: null}
+
+ {userId ?
+ User Id: {userId}
: null}
+ {results.errors && results.errors.length ? (
+ {
+ // sets values locally
+ this.setState({ ...formValues });
+ // and now do whatever happens when clicking 'Next'
+ this.props.onSubmit();
+ }}
+ onChange={formValues => {
+ console.log("onChange", formValues);
+ this.setState(formValues);
+ this.props.onChange(JSON.stringify(formValues));
+ }}
+ >
+
+
+ );
+ }
+}
+
+CampaignContactsForm.propTypes = {
+ onChange: type.func,
+ onSubmit: type.func,
+ campaignIsStarted: type.bool,
+
+ icons: type.object,
+
+ saveDisabled: type.bool,
+ saveLabel: type.string,
+
+ clientChoiceData: type.string,
+ jobResultMessage: type.string
+};
diff --git a/src/extensions/contact-loaders/test-fakedata/index.js b/src/extensions/contact-loaders/test-fakedata/index.js
index 0cf733823..29f147d47 100644
--- a/src/extensions/contact-loaders/test-fakedata/index.js
+++ b/src/extensions/contact-loaders/test-fakedata/index.js
@@ -113,6 +113,17 @@ export async function processContactLoad(job, maxContacts, organization) {
return; // bail early
}
const areaCodes = ["213", "323", "212", "718", "646", "661"];
+ // FUTURE -- maybe based on campaign default use 'surrounding' offsets
+ const timezones = [
+ "-12_1",
+ "-11_0",
+ "-5_1",
+ "-4_1",
+ "0_0",
+ "5_0",
+ "10_0",
+ ""
+ ];
const contactCount = Math.min(
contactData.requestContactCount || 0,
maxContacts ? maxContacts : areaCodes.length * 100,
@@ -136,6 +147,8 @@ export async function processContactLoad(job, maxContacts, organization) {
cell: `+1${ac}555${suffix}`,
zip: "10011",
custom_fields: genCustomFields(i, campaignId),
+ timezone_offset:
+ timezones[parseInt(Math.random() * timezones.length, 10)],
message_status: "needsMessage",
campaign_id: campaignId
});
diff --git a/src/extensions/message-handlers/ngpvan/index.js b/src/extensions/message-handlers/ngpvan/index.js
index 6490668f9..aec7a037c 100644
--- a/src/extensions/message-handlers/ngpvan/index.js
+++ b/src/extensions/message-handlers/ngpvan/index.js
@@ -26,12 +26,16 @@ export const available = organization =>
// export const preMessageSave = async () => {};
-export const postMessageSave = async ({ contact, organization }) => {
- if (!available(organization)) {
+export const postMessageSave = async ({ message, contact, organization }) => {
+ if (!exports.available(organization)) {
return {};
}
- if (contact.message_status !== "needsMessage") {
+ if (
+ message.is_from_contact ||
+ !contact ||
+ contact.message_status !== "needsMessage"
+ ) {
return {};
}
@@ -41,10 +45,19 @@ export const postMessageSave = async ({ contact, organization }) => {
DEFAULT_NGP_VAN_INITIAL_TEXT_CANVASS_RESULT;
const texted = clientChoiceData.find(ccd => ccd.name === initialTextResult);
+ if (!texted) {
+ // eslint-disable-next-line no-console
+ console.error(
+ `NGPVAN message handler -- not handling message because no action choice data found for ${initialTextResult}`
+ );
+
+ return {};
+ }
+
const body = JSON.parse(texted.details);
return Van.postCanvassResponse(contact, organization, body)
- .then(() => {})
+ .then(() => ({}))
.catch(caughtError => {
// eslint-disable-next-line no-console
console.error(
diff --git a/src/extensions/texter-sideboxes/components.js b/src/extensions/texter-sideboxes/components.js
index 1f34b82c1..0ec6a3c98 100644
--- a/src/extensions/texter-sideboxes/components.js
+++ b/src/extensions/texter-sideboxes/components.js
@@ -5,6 +5,8 @@ function getComponents() {
"TEXTER_SIDEBOXES" in global
? (global.TEXTER_SIDEBOXES && global.TEXTER_SIDEBOXES.split(",")) || []
: [
+ "hide-media",
+ "texter-feedback",
"celebration-gif",
"default-dynamicassignment",
"default-releasecontacts",
diff --git a/src/extensions/texter-sideboxes/default-dynamicassignment/react-component.js b/src/extensions/texter-sideboxes/default-dynamicassignment/react-component.js
index 90ef809b6..dcf6fe24f 100644
--- a/src/extensions/texter-sideboxes/default-dynamicassignment/react-component.js
+++ b/src/extensions/texter-sideboxes/default-dynamicassignment/react-component.js
@@ -120,8 +120,8 @@ export class TexterSideboxClass extends React.Component {
+
+ ) : (
+ ""
+ )}
+ Previous Errors
+-
+ {results.errors.map(e => (
+
+
+
+ Instead of uploading contacts, you can load them from an AWS S3
+ Bucket path as long as Spoke has access to it. Paths should NOT
+ include the S3 bucket and should start with a '/'.
+
+
+ You can load data from a Redshift instance with a command like
+ this:
+
+
+ UNLOAD ('SELECT first_name, last_name, cell, zip FROM ...')
+
+
+ TO
+ 's3://<YOUR_S3_BUCKET>/<some_path_for_this_campaign>/'
+
+ iam_role
+ 'arn:aws:iam::<AWS_ACCOUNT_ID>:role/<AWS_ROLE_FOR_UNLOAD>'
+
+ manifest verbose gzip ESCAPE ALLOWOVERWRITE region
+ '<REGION>'
+
+
+ );
+ }
+}
+
+AdminConfig.propTypes = {
+ settingsData: type.object,
+ onToggle: type.func
+};
diff --git a/src/extensions/texter-sideboxes/mobilize-event-shifter/react-component.js b/src/extensions/texter-sideboxes/mobilize-event-shifter/react-component.js
new file mode 100644
index 000000000..bba379fcf
--- /dev/null
+++ b/src/extensions/texter-sideboxes/mobilize-event-shifter/react-component.js
@@ -0,0 +1,248 @@
+import type from "prop-types";
+import React from "react";
+import yup from "yup";
+import Form from "react-formal";
+import FlatButton from "material-ui/FlatButton";
+import Dialog from "material-ui/Dialog";
+import CircularProgress from "material-ui/CircularProgress";
+import { Tabs, Tab } from "material-ui/Tabs";
+import { css, StyleSheet } from "aphrodite";
+import {
+ flexStyles,
+ inlineStyles
+} from "../../../components/AssignmentTexter/StyleControls";
+
+export const displayName = () => "Mobilize Event Shifter";
+
+export const showSidebox = ({ contact, messageStatusFilter, settingsData }) =>
+ contact &&
+ messageStatusFilter !== "needsMessage" &&
+ (settingsData.mobilizeEventShifterBaseUrl ||
+ window.MOBILIZE_EVENT_SHIFTER_URL);
+
+const styles = StyleSheet.create({
+ dialog: {
+ paddingTop: 0,
+ zIndex: 5000
+ },
+ dialogContentStyle: {
+ width: "100%" // Still exists a maxWidth of 768px
+ },
+ iframe: {
+ height: "80vh",
+ width: "100%",
+ border: "none"
+ },
+ loader: {
+ paddingTop: 50,
+ paddingLeft: "calc(50% - 25px)"
+ }
+});
+
+export class TexterSidebox extends React.Component {
+ constructor(props) {
+ super(props);
+
+ const { settingsData, contact } = props;
+
+ const customFields = contact.customFields || {};
+ const eventId =
+ customFields.event_id || settingsData.mobilizeEventShifterDefaultEventId;
+
+ this.state = {
+ dialogOpen: false,
+ eventiFrameLoading: true,
+ alliFrameLoading: true,
+ dialogTab: eventId ? "event" : "all"
+ };
+ }
+
+ cleanPhoneNumber = phone => {
+ // take the last 10 digits
+ return phone
+ .replace(/[^\d]/g, "")
+ .split("")
+ .reverse()
+ .slice(0, 10)
+ .reverse()
+ .join("");
+ };
+
+ openDialog = () => {
+ this.setState({
+ dialogOpen: true
+ });
+ };
+
+ iframeLoaded = iframeLoadingName => {
+ const update = {};
+ update[iframeLoadingName] = false;
+ this.setState(update);
+ };
+
+ changeTab = e => {
+ this.setState({
+ dialogTab: e
+ });
+ };
+
+ closeDialog = () => {
+ this.setState({
+ dialogOpen: false,
+ eventiFrameLoading: true,
+ alliFrameLoading: true
+ });
+ };
+
+ buildUrlParamString = urlParams => {
+ return _.map(
+ urlParams,
+ (val, key) => `${key}=${encodeURIComponent(val)}`
+ ).join("&");
+ };
+
+ render() {
+ const { settingsData, contact, campaign } = this.props;
+
+ const customFields = contact.customFields || {};
+
+ const eventId =
+ customFields.event_id || settingsData.mobilizeEventShifterDefaultEventId;
+ const urlParams = {
+ first_name: contact.firstName || "",
+ last_name: contact.lastName || "",
+ phone: this.cleanPhoneNumber(contact.cell || ""),
+ email: customFields.email || "",
+ zip: customFields.zip || "",
+ source: "P2P"
+ };
+
+ const urlParamString = this.buildUrlParamString(urlParams);
+ const allEventsUrlParams = this.buildUrlParamString({
+ zip: customFields.zip || ""
+ });
+
+ const mobilizeBaseUrl =
+ settingsData.mobilizeEventShifterBaseUrl ||
+ window.MOBILIZE_EVENT_SHIFTER_URL;
+
+ return (
+ + When contacts reply with images/media Spoke will have a prompt for the + contact to view the image/media. However, this is often a vehicle for + offensive and graphic responses. We recommend enabling hiding media + for most outreach campaigns, and to enable this for contacts that are + more likely allies. +
+
+ this.setState({ dialogOpen: true })}
+ className={css(flexStyles.flatButton)}
+ labelStyle={inlineStyles.flatButtonLabel}
+ />
+
+ ]}
+ open={this.state.dialogOpen}
+ onRequestClose={this.closeDialog}
+ className={css(styles.dialog)}
+ contentClassName={css(styles.dialogContentStyle)}
+ >
+ {eventId ? (
+
+
+ ) : (
+ ""
+ )}
+ {eventId ? (
+
+ {this.state.eventiFrameLoading ? (
+