remove EXPERIMENTAL_TAGS env var -- tags are now enabled by default

chonigbe · Aug 18, 2020 · 24f7dfb · 24f7dfb
1 parent dbce65a
commit 24f7dfb
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 85 deletions.
diff --git a/.env.example b/.env.example
@@ -49,6 +49,5 @@ EMAIL_FROM=
 TWILIO_MESSAGE_VALIDITY_PERIOD=
 DST_REFERENCE_TIMEZONE='America/New_York'
 PASSPORT_STRATEGY=local
-EXPERIMENTAL_TAGS=1
 TEXTER_SIDEBOXES=celebration-gif,default-dynamicassignment,default-releasecontacts,contact-reference,tag-contact
 OWNER_CONFIGURABLE=ALL
diff --git a/__test__/extensions/message-handlers/profanity-tagger.test.js b/__test__/extensions/message-handlers/profanity-tagger.test.js
@@ -57,7 +57,7 @@ describe("Message Hanlder: profanity-tagger", () => {
       .knex("organization")
       .update(
         "features",
-        '{"EXPERIMENTAL_TAGS": "1", "PROFANITY_CONTACT_TAG_ID": "1", "PROFANITY_TEXTER_TAG_ID": "2", "PROFANITY_TEXTER_SUSPEND_COUNT": "1"}'
+        '{"PROFANITY_CONTACT_TAG_ID": "1", "PROFANITY_TEXTER_TAG_ID": "2", "PROFANITY_TEXTER_SUSPEND_COUNT": "1"}'
       );
     await cacheableData.organization.clear(c.organizationId);
 
@@ -117,7 +117,7 @@ describe("Message Hanlder: profanity-tagger", () => {
       .knex("organization")
       .update(
         "features",
-        '{"EXPERIMENTAL_TAGS": "1", "PROFANITY_CONTACT_TAG_ID": "1", "PROFANITY_TEXTER_TAG_ID": "2", "PROFANITY_TEXTER_SUSPEND_COUNT": "2"}'
+        '{"PROFANITY_CONTACT_TAG_ID": "1", "PROFANITY_TEXTER_TAG_ID": "2", "PROFANITY_TEXTER_SUSPEND_COUNT": "2"}'
       );
     await cacheableData.organization.clear(c.organizationId);
     const org = await cacheableData.organization.load(c.organizationId);
@@ -200,7 +200,7 @@ describe("Message Hanlder: profanity-tagger", () => {
       .knex("organization")
       .update(
         "features",
-        '{"EXPERIMENTAL_TAGS": "1", "PROFANITY_CONTACT_TAG_ID": "1", "PROFANITY_TEXTER_TAG_ID": "2", "PROFANITY_TEXTER_BLOCK_SEND": "1"}'
+        '{"PROFANITY_CONTACT_TAG_ID": "1", "PROFANITY_TEXTER_TAG_ID": "2", "PROFANITY_TEXTER_BLOCK_SEND": "1"}'
       );
     await cacheableData.organization.clear(c.organizationId);
     const org = await cacheableData.organization.load(c.organizationId);

diff --git a/__test__/test_helpers.js b/__test__/test_helpers.js
@@ -168,7 +168,17 @@ export async function createOrganization(user, invite) {
     name,
     inviteId
   };
-  return await graphql(mySchema, orgQuery, rootValue, context, variables);
+  const result = await graphql(
+    mySchema,
+    orgQuery,
+    rootValue,
+    context,
+    variables
+  );
+  if (result && result.errors) {
+    throw new Exception("createOrganization failed " + JSON.stringify(result));
+  }
+  return result;
 }
 
 export async function setTwilioAuth(user, organization) {

diff --git a/jest.config.js b/jest.config.js
@@ -27,8 +27,7 @@ module.exports = {
     TWILIO_MESSAGE_SERVICE_SID: "TEST_MESSAGE_SID",
     TEST_ENVIRONMENT: "1",
     TEST_ENVIRONMENT_FAKE: "0",
-    TEST_ENVIRONMENT_FAKE2: "false",
-    EXPERIMENTAL_TAGS: "1"
+    TEST_ENVIRONMENT_FAKE2: "false"
   },
   moduleFileExtensions: ["js", "jsx"],
   transform: {

diff --git a/src/components/AdminDashboard.jsx b/src/components/AdminDashboard.jsx
@@ -105,10 +105,6 @@ class AdminDashboard extends React.Component {
       }
     ];
 
-    if (window.EXPERIMENTAL_TAGS === false) {
-      sections = sections.filter(section => section.name !== "Tags");
-    }
-
     if (!this.props.data.organization.phoneInventoryEnabled) {
       sections = sections.filter(section => section.name !== "Phone Numbers");
     }

diff --git a/src/components/CampaignCannedResponseForm.jsx b/src/components/CampaignCannedResponseForm.jsx
@@ -71,39 +71,35 @@ export default class CannedResponseForm extends React.Component {
             multiLine
             fullWidth
           />
-          {window.EXPERIMENTAL_TAGS && (
-            <AutoComplete
-              ref="autocompleteInput"
-              floatingLabelText="Tags"
-              filter={AutoComplete.fuzzyFilter}
-              dataSource={
-                tags && tags.filter(t => this.state.tagIds.indexOf(t.id) === -1)
-              }
-              maxSearchResults={8}
-              onNewRequest={({ id }) => {
-                this.refs.autocompleteInput.setState({ searchText: "" });
-                this.setState({ tagIds: [...this.state.tagIds, id] });
-              }}
-              dataSourceConfig={{
-                text: "name",
-                value: "id"
-              }}
-              fullWidth
-            />
-          )}
-          {window.EXPERIMENTAL_TAGS && (
-            <TagChips
-              tags={tags}
-              tagIds={this.state.tagIds}
-              onRequestDelete={listedTag => {
-                this.setState({
-                  tagIds: this.state.tagIds.filter(
-                    tagId => tagId !== listedTag.id
-                  )
-                });
-              }}
-            />
-          )}
+          <AutoComplete
+            ref="autocompleteInput"
+            floatingLabelText="Tags"
+            filter={AutoComplete.fuzzyFilter}
+            dataSource={
+              tags && tags.filter(t => this.state.tagIds.indexOf(t.id) === -1)
+            }
+            maxSearchResults={8}
+            onNewRequest={({ id }) => {
+              this.refs.autocompleteInput.setState({ searchText: "" });
+              this.setState({ tagIds: [...this.state.tagIds, id] });
+            }}
+            dataSourceConfig={{
+              text: "name",
+              value: "id"
+            }}
+            fullWidth
+          />
+          <TagChips
+            tags={tags}
+            tagIds={this.state.tagIds}
+            onRequestDelete={listedTag => {
+              this.setState({
+                tagIds: this.state.tagIds.filter(
+                  tagId => tagId !== listedTag.id
+                )
+              });
+            }}
+          />
           <div className={css(styles.buttonRow)}>
             <FlatButton
               {...dataTest("addResponse")}

diff --git a/src/components/CampaignCannedResponsesForm.jsx b/src/components/CampaignCannedResponsesForm.jsx
@@ -168,14 +168,12 @@ export class CampaignCannedResponsesForm extends React.Component {
       >
         <div className={css(styles.title)}>{response.title}</div>
         <div className={css(styles.text)}>{response.text}</div>
-        {window.EXPERIMENTAL_TAGS &&
-          response.tagIds &&
-          response.tagIds.length > 0 && (
-            <TagChips
-              tags={this.props.data.organization.tags}
-              tagIds={response.tagIds}
-            />
-          )}
+        {response.tagIds && response.tagIds.length > 0 && (
+          <TagChips
+            tags={this.props.data.organization.tags}
+            tagIds={response.tagIds}
+          />
+        )}
       </ListItem>
     ));
     return listItems;

diff --git a/src/components/IncomingMessageFilter.jsx b/src/components/IncomingMessageFilter.jsx
@@ -357,13 +357,11 @@ class IncomingMessageFilter extends Component {
               />
             </div>
             <div>
-              {window.EXPERIMENTAL_TAGS === true && (
-                <TagsSelector
-                  onChange={this.onTagsFilterChanged}
-                  tagsFilter={this.state.tagsFilter}
-                  tags={this.props.tags}
-                />
-              )}
+              <TagsSelector
+                onChange={this.onTagsFilterChanged}
+                tagsFilter={this.state.tagsFilter}
+                tags={this.props.tags}
+              />
               <SelectedCampaigns
                 campaigns={this.state.selectedCampaigns}
                 onDeleteRequested={this.handleCampaignRemoved}

diff --git a/src/components/IncomingMessageList/ConversationPreviewModal.jsx b/src/components/IncomingMessageList/ConversationPreviewModal.jsx
@@ -127,12 +127,10 @@ class ConversationPreviewBody extends Component {
   render() {
     return (
       <div>
-        {window.EXPERIMENTAL_TAGS && (
-          <TagList
-            organizationTags={this.props.organizationTags}
-            tags={this.props.conversation.tags}
-          />
-        )}
+        <TagList
+          organizationTags={this.props.organizationTags}
+          tags={this.props.conversation.tags}
+        />
         <MessageList messages={this.state.messages} />
         <MessageResponse
           conversation={this.props.conversation}

diff --git a/src/components/IncomingMessageList/index.jsx b/src/components/IncomingMessageList/index.jsx
@@ -203,7 +203,7 @@ export class IncomingMessageList extends Component {
               }}
               icon={<ActionOpenInNew />}
             />
-            {window.EXPERIMENTAL_TAGS && this.renderTags(row.tags)}
+            {this.renderTags(row.tags)}
           </div>
         )
     }
@@ -299,9 +299,7 @@ export class IncomingMessageList extends Component {
           selectedRows={clearSelectedMessages ? null : this.state.selectedRows}
         />
         <ConversationPreviewModal
-          {...(window.EXPERIMENTAL_TAGS && {
-            organizationTags: this.state.tags
-          })}
+          organizationTags={this.state.tags}
           conversation={this.state.activeConversation}
           onRequestClose={this.handleCloseConversation}
           onForceRefresh={this.props.onForceRefresh}

diff --git a/src/extensions/texter-sideboxes/components.js b/src/extensions/texter-sideboxes/components.js
@@ -10,6 +10,7 @@ function getComponents() {
           "default-releasecontacts",
           "celebration-gif",
           "contact-reference",
+          "tag-contact",
           "default-editinitial"
         ];
   const components = {};

diff --git a/src/server/api/campaign-contact.js b/src/server/api/campaign-contact.js
@@ -91,9 +91,6 @@ export const resolvers = {
     tags: async campaignContact => {
       // TODO: there's more to do here to avoid cache-misses
       // maybe preload with campaignContact.loadMany
-      if (!getConfig("EXPERIMENTAL_TAGS", null, { truthy: 1 })) {
-        return [];
-      }
       if (campaignContact.message_status === "needsMessage") {
         return []; // it's the beginning, so there won't be any
       }

diff --git a/src/server/api/conversations.js b/src/server/api/conversations.js
@@ -53,11 +53,7 @@ function getConversationsJoinsAndWhereClause(
     query = query.where("is_opted_out", contactsFilter.isOptedOut);
   }
 
-  if (
-    getConfig("EXPERIMENTAL_TAGS", null, { truthy: 1 }) &&
-    contactsFilter &&
-    contactsFilter.tags
-  ) {
+  if (contactsFilter && contactsFilter.tags) {
     const tags = contactsFilter.tags;
 
     let tagsSubquery = r.knex
@@ -229,7 +225,7 @@ export async function getConversations(
   }
 
   // tags query
-  if (getConfig("EXPERIMENTAL_TAGS", null, { truthy: 1 }) && includeTags) {
+  if (includeTags) {
     const tagsQuery = r.knex
       .select(
         "tag_campaign_contact.campaign_contact_id as campaign_contact_id",

diff --git a/src/server/api/tag.js b/src/server/api/tag.js
@@ -3,10 +3,6 @@ import { Tag, r } from "../models";
 import { getConfig } from "../api/lib/config";
 
 export async function getTags(organization, group) {
-  if (getConfig("EXPERIMENTAL_TAGS", null, { truthy: 1 }) === false) {
-    return [];
-  }
-
   // TODO: need to cache this on organization object
   let query = r.knex
     .select("*")

diff --git a/src/server/middleware/render-index.js b/src/server/middleware/render-index.js
@@ -98,9 +98,6 @@ export default function renderIndex(html, css, assetMap) {
       window.CAN_GOOGLE_IMPORT=${canGoogleImport}
       window.EXPERIMENTAL_TWILIO_PER_CAMPAIGN_MESSAGING_SERVICE=${process.env
         .EXPERIMENTAL_TWILIO_PER_CAMPAIGN_MESSAGING_SERVICE || false}
-      window.EXPERIMENTAL_TAGS=${getConfig("EXPERIMENTAL_TAGS", null, {
-        truthy: 1
-      }) || false}
       window.TWILIO_MULTI_ORG=${process.env.TWILIO_MULTI_ORG || false}
       window.DEPRECATED_TEXTERUI="${process.env.DEPRECATED_TEXTERUI || ""}"
       ${