Merge pull request #2458 from StateVoicesNational/mz/revert-short-codes

Revert short codes
StateVoicesNational · Sep 19, 2024 · a5779a0 · a5779a0
2 parents f0ee27e + 23f9733
commit a5779a0
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 276 deletions.
diff --git a/src/api/schema.js b/src/api/schema.js
@@ -411,9 +411,6 @@ const rootSchema = gql`
       areaCode: String!
       limit: Int!
     ): JobRequest
-    getShortCodes(
-      organizationId: ID!
-    ): JobRequest
     deletePhoneNumbers(organizationId: ID!, areaCode: String!): JobRequest
     releaseCampaignNumbers(campaignId: ID!): Campaign!
     clearCachedOrgAndExtensionCaches(organizationId: String!): String

diff --git a/src/containers/AdminPhoneNumberInventory.js b/src/containers/AdminPhoneNumberInventory.js
@@ -67,8 +67,7 @@ class AdminPhoneNumberInventory extends React.Component {
       sortCol: "state",
       sortOrder: "asc",
       filters: {},
-      deleteNumbersDialogOpen: false,
-      queriedShortcodes: false
+      deleteNumbersDialogOpen: false
     };
   }
 
@@ -127,13 +126,6 @@ class AdminPhoneNumberInventory extends React.Component {
     });
   };
 
-  handleGetShortcodes = async() => {
-    this.setState({
-      queriedShortcodes: true
-    });
-    await this.props.mutations.getShortCodes();
-  };
-
   handleDeleteNumbersOpen = ([areaCode, , , availableCount]) => {
     this.setState({
       deleteNumbersDialogOpen: true,
@@ -339,10 +331,6 @@ class AdminPhoneNumberInventory extends React.Component {
       tableData = tableData.filter(data => data.state === filters.state);
     }
 
-    if (this.state.queriedShortcodes){
-      this.numShortcodes = ownedAreaCodes.filter(j => ownedAreaCodes.indexOf('Shortcode') === -1).length
-    }
-
     this.sortTable(tableData, this.state.sortCol, this.state.sortOrder);
     const handleSortOrderChange = (key, order) => {
       this.setState({
@@ -388,41 +376,17 @@ class AdminPhoneNumberInventory extends React.Component {
           columns={this.tableColumns()}
           options={options}
         />
-        <div
-          style={theme.layouts.buttons}
-        >
-          {this.props.params.ownerPerms ? (
-            // <Fab
-            <Button
-              {...dataTest("buyPhoneNumbers")}
-              color="primary"
-              variant="contained"
-              type="button"
-              style={theme.components.buyPhoneNumbersButton}
-              onClick={this.handleBuyNumbersOpen}
-            >
-              Buy Phone Numbers
-            </Button>
-          ) : null}
 
-          {this.props.params.ownerPerms ? (
-            <Button
-              {...dataTest("getShortcodes")}
-              color="primary"
-              variant="contained"
-              type="button"
-              style={theme.components.checkShortCodesButton}
-              onClick={this.handleGetShortcodes}
-            >
-              Check for Short Codes
-            </Button>
-          ) : null}
-        </div>
-        <p>
-          {this.state.queriedShortcodes ? (
-               `This service has ${this.numShortcodes} shortcodes.`
-          ) : null}
-        </p>
+        {this.props.params.ownerPerms ? (
+          <Fab
+            {...dataTest("buyPhoneNumbers")}
+            color="primary"
+            style={theme.components.floatingButton}
+            onClick={this.handleBuyNumbersOpen}
+          >
+            <AddIcon />
+          </Fab>
+        ) : null}
 
         <Dialog
           open={this.state.buyNumbersDialogOpen}
@@ -509,23 +473,6 @@ const queries = {
 };
 
 const mutations = {
-  getShortCodes: ownProps => () => ({
-    mutation: gql`
-      mutation getShortCodes(
-        $organizationId: ID!
-      ) {
-        getShortCodes(
-          organizationId: $organizationId
-        ) {
-          id
-        }
-      }
-    `,
-    variables: {
-      organizationId: ownProps.params.organizationId,
-    },
-    refetchQueries: () => ["getOrganizationData"]
-  }),
   buyPhoneNumbers: ownProps => (areaCode, limit) => ({
     mutation: gql`
       mutation buyPhoneNumbers(

diff --git a/src/extensions/service-managers/per-campaign-messageservices/index.js b/src/extensions/service-managers/per-campaign-messageservices/index.js
@@ -245,14 +245,6 @@ export async function onBuyPhoneNumbers({ organization, serviceName, opts }) {
   };
 }
 
-export async function onGetShortcodes({ organization, serviceName, opts }) {
-  return {
-    opts: {
-      skipOrgMessageService: true
-    }
-  };
-}
-
 export async function onVendorServiceFullyConfigured({
   organization,
   serviceName

diff --git a/src/extensions/service-managers/test-fake-example/index.js b/src/extensions/service-managers/test-fake-example/index.js
@@ -130,13 +130,6 @@ export async function onBuyPhoneNumbers({
   opts
 }) {}
 
-export async function onGetShortcodes({
-  organization,
-  user,
-  serviceName,
-  opts
-}) {}
-
 export async function onOrganizationServiceVendorSetup({
   organization,
   user,

diff --git a/src/extensions/service-vendors/twilio/index.js b/src/extensions/service-vendors/twilio/index.js
@@ -772,54 +772,6 @@ async function getPhoneNumbersForService(organization, messagingServiceSid) {
     .phoneNumbers.list({ limit: 400 });
 }
 
-/**
- * Figure out if Twilio account has a shortcode and if so, add it
- * to the owned_phone_numbers table
- * 
- * TO DO: what happens if you've already added that phone number to the table?
- * TO DO: what should we do with allocation fields 
- */
-export async function getShortCode(
-  organization,
-  opts = {},
-) {
-
-  // var for count of short codes
-  let shortCodeCount = 0;
-
-  // getting the shortcode list from twilio
-  const twilioInstance = await exports.getTwilio(organization);
-  const response = await twilioInstance.shortCodes.list();
-
-  // throw error if we get a bad response
-  if (response.error) {
-    throw new Error(`Error collecting ShortCode: ${response.error}`);
-  }
-
-  // add each shortcode to the table
-  async function addShortCodeToPhoneNumberTable(shortcode){
-    return await r.knex("owned_phone_number").insert({
-      organization_id: organization.id,
-      phone_number: shortcode.shortCode,
-      service: "twilio",
-      service_id: shortcode.sid,
-      area_code: "Shortcode"
-      //...allocationFields
-    });
-
-  }
-
-  // for each response, add it to the table
-  const shortcodeResponse = response.map(shortcode => {
-    addShortCodeToPhoneNumberTable(shortcode);
-    shortCodeCount++;
-  });
-
-  // return the count of short codes
-  return shortCodeCount;
-
-}
-
 /**
  * Add bought phone number to a Messaging Service
  */
@@ -1269,7 +1221,6 @@ export default {
   getTwilio,
   getServiceConfig,
   getMessageServiceSid,
-  getShortCode,
   messageServiceLink,
   updateConfig,
   getMetadata,

diff --git a/src/server/api/mutations/getShortCodes.js b/src/server/api/mutations/getShortCodes.js
diff --git a/src/server/api/mutations/index.js b/src/server/api/mutations/index.js
@@ -1,7 +1,6 @@
 export { bulkSendMessages } from "./bulkSendMessages";
 export { bulkUpdateScript } from "./bulkUpdateScript";
 export { buyPhoneNumbers, deletePhoneNumbers } from "./buyPhoneNumbers";
-export { getShortCodes} from "./getShortCodes";
 export { editOrganization } from "./editOrganization";
 export { findNewCampaignContact } from "./findNewCampaignContact";
 export { getOptOutMessage } from "./getOptOutMessage";

diff --git a/src/server/api/schema.js b/src/server/api/schema.js
@@ -60,7 +60,6 @@ import {
   bulkUpdateScript,
   buyPhoneNumbers,
   deletePhoneNumbers,
-  getShortCodes,
   findNewCampaignContact,
   getOptOutMessage,
   joinOrganization,
@@ -498,7 +497,6 @@ const rootMutations = {
     bulkSendMessages,
     bulkUpdateScript,
     buyPhoneNumbers,
-    getShortCodes,
     deletePhoneNumbers,
     editOrganization,
     findNewCampaignContact,

diff --git a/src/styles/theme.js b/src/styles/theme.js
@@ -65,30 +65,17 @@ const layouts = {
     marginLeft: "auto",
     marginRight: "auto",
     textAlign: "center"
-  },
-  buttons: {
-    display: "flex",
-    justifyContent: "space-evenly",
-    marginTop: 20
   }
 };
 
 const components = {
-  buyPhoneNumberButton: {
+  floatingButton: {
     margin: 0,
     top: "auto",
     right: 20,
     bottom: 20,
     left: "auto",
-    position: "inherit"
-  },
-  checkShortCodesButton: {
-    marginLeft: 0,
-    top: "auto",
-    right: 20,
-    bottom: 20,
-    left: "auto",
-    position: "inherit"
+    position: "fixed"
   },
   logoDiv: {
     margin: "50 auto",

diff --git a/src/workers/job-processes.js b/src/workers/job-processes.js
@@ -16,7 +16,6 @@ import {
   clearOldJobs,
   importScript,
   buyPhoneNumbers,
-  getShortCodes,
   deletePhoneNumbers,
   startCampaign,
   extensionJob
@@ -45,16 +44,14 @@ export const Jobs = Object.freeze({
   BUY_PHONE_NUMBERS: "buy_phone_numbers",
   DELETE_PHONE_NUMBERS: "delete_phone_numbers",
   START_CAMPAIGN: "start_campaign",
-  EXTENSION_JOB: "extension_job",
-  GET_SHORT_CODES: "get_short_codes"
+  EXTENSION_JOB: "extension_job"
 });
 
 const jobMap = Object.freeze({
   [Jobs.EXPORT]: exportCampaign,
   [Jobs.ASSIGN_TEXTERS]: assignTexters,
   [Jobs.IMPORT_SCRIPT]: importScript,
   [Jobs.BUY_PHONE_NUMBERS]: buyPhoneNumbers,
-  [Jobs.GET_SHORT_CODES]: getShortCodes,
   [Jobs.DELETE_PHONE_NUMBERS]: deletePhoneNumbers,
   [Jobs.START_CAMPAIGN]: startCampaign,
   [Jobs.EXTENSION_JOB]: extensionJob