feat(tasks-new): remove beta label functionality from modal header (#1314)

booc0mtaco · mergify[bot] · commit dca414b88a0d · 2019-06-21T01:05:07.000Z
diff --git a/src/elements/content-sidebar/ActivitySidebar.js b/src/elements/content-sidebar/ActivitySidebar.js
@@ -11,7 +11,7 @@ import flow from 'lodash/flow';
 import messages from '../common/messages';
 import { withAPIContext } from '../common/api-context';
 import { withErrorBoundary } from '../common/error-boundary';
-import { FeatureFlag, withFeatureConsumer, isFeatureEnabled, getFeatureConfig } from '../common/feature-checking';
+import { FeatureFlag, withFeatureConsumer, isFeatureEnabled } from '../common/feature-checking';
 import { getBadUserError, getBadItemError } from '../../utils/error';
 import API from '../../api';
 import { withLogger } from '../common/logger';
@@ -576,7 +576,7 @@ class ActivitySidebar extends React.PureComponent<Props, State> {
     };
 
     renderAddTaskButton = () => {
-        const { isDisabled, features } = this.props;
+        const { isDisabled } = this.props;
         const { approverSelectorContacts } = this.state;
         const {
             getApproverWithQuery,
@@ -586,7 +586,6 @@ class ActivitySidebar extends React.PureComponent<Props, State> {
         } = this;
         const props = {
             isDisabled,
-            feedbackUrl: getFeatureConfig(features, 'activityFeed.tasks').feedbackUrl || '',
             onTaskModalClose,
         };
         const taskFormProps = {
@@ -598,11 +597,7 @@ class ActivitySidebar extends React.PureComponent<Props, State> {
             message: '',
             approvers: [],
         };
-        return (
-            <FeatureFlag feature="activityFeed.tasks.newApi">
-                <AddTaskButton {...props} taskFormProps={taskFormProps} />
-            </FeatureFlag>
-        );
+        return <AddTaskButton {...props} taskFormProps={taskFormProps} />;
     };
 
     render() {
diff --git a/src/elements/content-sidebar/AddTaskButton.js b/src/elements/content-sidebar/AddTaskButton.js
@@ -7,7 +7,6 @@ import type { TaskFormProps } from './activity-feed/task-form/TaskForm';
 import type { TaskType } from '../../common/types/tasks';
 
 type Props = {|
-    feedbackUrl: string,
     isDisabled: boolean,
     onTaskModalClose: () => void,
     taskFormProps: TaskFormProps,
@@ -42,15 +41,14 @@ class AddTaskButton extends React.Component<Props, State> {
     handleSubmitError = (e: ElementsXhrError) => this.setState({ error: e });
 
     render() {
-        const { isDisabled, feedbackUrl, taskFormProps } = this.props;
+        const { isDisabled, taskFormProps } = this.props;
         const { isTaskFormOpen, taskType, error } = this.state;
 
         return (
             <React.Fragment>
                 <AddTaskMenu isDisabled={isDisabled} onMenuItemClick={this.handleClickMenuItem} />
                 <TaskModal
                     error={error}
-                    feedbackUrl={feedbackUrl}
                     onSubmitError={this.handleSubmitError}
                     onSubmitSuccess={this.handleSubmitSuccess}
                     onModalClose={this.handleModalClose}
diff --git a/src/elements/content-sidebar/TaskModal.js b/src/elements/content-sidebar/TaskModal.js
@@ -2,7 +2,6 @@
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
 import type { MessageDescriptor } from 'react-intl';
-import BetaFeedbackBadge from '../../features/beta-feedback';
 import Modal from '../../components/modal/Modal';
 import TaskForm from './activity-feed/task-form';
 import messages from '../common/messages';
@@ -13,7 +12,6 @@ import type { TaskType, TaskEditMode } from '../../common/types/tasks';
 type TaskModalProps = {
     editMode?: TaskEditMode,
     error: ?ElementsXhrError,
-    feedbackUrl: string,
     isTaskFormOpen: boolean,
     onModalClose: () => void,
     onSubmitError: (e: ElementsXhrError) => void,
@@ -46,7 +44,6 @@ const TaskModal = (props: TaskModalProps) => {
         onSubmitSuccess,
         onModalClose,
         taskType,
-        feedbackUrl,
         isTaskFormOpen,
         taskFormProps,
     } = props;
@@ -59,12 +56,7 @@ const TaskModal = (props: TaskModalProps) => {
             focusElementSelector={focusTargetSelector}
             isOpen={isTaskFormOpen}
             onRequestClose={onModalClose}
-            title={
-                <React.Fragment>
-                    <FormattedMessage {...getMessageForModalTitle(taskType, editMode)} />
-                    <BetaFeedbackBadge tooltip formUrl={feedbackUrl} />
-                </React.Fragment>
-            }
+            title={<FormattedMessage {...getMessageForModalTitle(taskType, editMode)} />}
         >
             <div className="be">
                 <TaskForm
diff --git a/src/elements/content-sidebar/__tests__/__snapshots__/TaskModal-test.js.snap b/src/elements/content-sidebar/__tests__/__snapshots__/TaskModal-test.js.snap
@@ -14,16 +14,10 @@ exports[`elements/content-sidebar/TaskModal render should render a default compo
     }
   }
   title={
-    <React.Fragment>
-      <FormattedMessage
-        defaultMessage="Create Approval Task"
-        id="be.tasks.createTask.approval.title"
-      />
-      <BetaFeedbackBadge
-        formUrl="http://example.dentist/"
-        tooltip={true}
-      />
-    </React.Fragment>
+    <FormattedMessage
+      defaultMessage="Create Approval Task"
+      id="be.tasks.createTask.approval.title"
+    />
   }
 >
   <div
@@ -56,16 +50,10 @@ exports[`elements/content-sidebar/TaskModal render using type APPROVAL and mode
     }
   }
   title={
-    <React.Fragment>
-      <FormattedMessage
-        defaultMessage="Create Approval Task"
-        id="be.tasks.createTask.approval.title"
-      />
-      <BetaFeedbackBadge
-        formUrl="http://example.dentist/"
-        tooltip={true}
-      />
-    </React.Fragment>
+    <FormattedMessage
+      defaultMessage="Create Approval Task"
+      id="be.tasks.createTask.approval.title"
+    />
   }
 >
   <div
@@ -99,16 +87,10 @@ exports[`elements/content-sidebar/TaskModal render using type APPROVAL and mode
     }
   }
   title={
-    <React.Fragment>
-      <FormattedMessage
-        defaultMessage="Modify Approval Task"
-        id="be.tasks.editTask.approval.title"
-      />
-      <BetaFeedbackBadge
-        formUrl="http://example.dentist/"
-        tooltip={true}
-      />
-    </React.Fragment>
+    <FormattedMessage
+      defaultMessage="Modify Approval Task"
+      id="be.tasks.editTask.approval.title"
+    />
   }
 >
   <div
@@ -142,16 +124,10 @@ exports[`elements/content-sidebar/TaskModal render using type GENERAL and mode C
     }
   }
   title={
-    <React.Fragment>
-      <FormattedMessage
-        defaultMessage="Create General Task"
-        id="be.tasks.createTask.general.title"
-      />
-      <BetaFeedbackBadge
-        formUrl="http://example.dentist/"
-        tooltip={true}
-      />
-    </React.Fragment>
+    <FormattedMessage
+      defaultMessage="Create General Task"
+      id="be.tasks.createTask.general.title"
+    />
   }
 >
   <div
@@ -185,16 +161,10 @@ exports[`elements/content-sidebar/TaskModal render using type GENERAL and mode E
     }
   }
   title={
-    <React.Fragment>
-      <FormattedMessage
-        defaultMessage="Modify General Task"
-        id="be.tasks.editTask.general.title"
-      />
-      <BetaFeedbackBadge
-        formUrl="http://example.dentist/"
-        tooltip={true}
-      />
-    </React.Fragment>
+    <FormattedMessage
+      defaultMessage="Modify General Task"
+      id="be.tasks.editTask.general.title"
+    />
   }
 >
   <div

Original file line number	Diff line number	Diff line change
@@ -14,16 +14,10 @@ exports[`elements/content-sidebar/TaskModal render should render a default compo
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`	`title={`
`17`		`- <React.Fragment>`
`18`		`- <FormattedMessage`
`19`		`- defaultMessage="Create Approval Task"`
`20`		`- id="be.tasks.createTask.approval.title"`
`21`		`- />`
`22`		`- <BetaFeedbackBadge`
`23`		`- formUrl="http://example.dentist/"`
`24`		`- tooltip={true}`
`25`		`- />`
`26`		`- </React.Fragment>`
	`17`	`+ <FormattedMessage`
	`18`	`+ defaultMessage="Create Approval Task"`
	`19`	`+ id="be.tasks.createTask.approval.title"`
	`20`	`+ />`
`27`	`21`	`}`
`28`	`22`	`>`
`29`	`23`	`<div`
@@ -56,16 +50,10 @@ exports[`elements/content-sidebar/TaskModal render using type APPROVAL and mode
`56`	`50`	`}`
`57`	`51`	`}`
`58`	`52`	`title={`
`59`		`- <React.Fragment>`
`60`		`- <FormattedMessage`
`61`		`- defaultMessage="Create Approval Task"`
`62`		`- id="be.tasks.createTask.approval.title"`
`63`		`- />`
`64`		`- <BetaFeedbackBadge`
`65`		`- formUrl="http://example.dentist/"`
`66`		`- tooltip={true}`
`67`		`- />`
`68`		`- </React.Fragment>`
	`53`	`+ <FormattedMessage`
	`54`	`+ defaultMessage="Create Approval Task"`
	`55`	`+ id="be.tasks.createTask.approval.title"`
	`56`	`+ />`
`69`	`57`	`}`
`70`	`58`	`>`
`71`	`59`	`<div`
@@ -99,16 +87,10 @@ exports[`elements/content-sidebar/TaskModal render using type APPROVAL and mode
`99`	`87`	`}`
`100`	`88`	`}`
`101`	`89`	`title={`
`102`		`- <React.Fragment>`
`103`		`- <FormattedMessage`
`104`		`- defaultMessage="Modify Approval Task"`
`105`		`- id="be.tasks.editTask.approval.title"`
`106`		`- />`
`107`		`- <BetaFeedbackBadge`
`108`		`- formUrl="http://example.dentist/"`
`109`		`- tooltip={true}`
`110`		`- />`
`111`		`- </React.Fragment>`
	`90`	`+ <FormattedMessage`
	`91`	`+ defaultMessage="Modify Approval Task"`
	`92`	`+ id="be.tasks.editTask.approval.title"`
	`93`	`+ />`
`112`	`94`	`}`
`113`	`95`	`>`
`114`	`96`	`<div`
@@ -142,16 +124,10 @@ exports[`elements/content-sidebar/TaskModal render using type GENERAL and mode C
`142`	`124`	`}`
`143`	`125`	`}`
`144`	`126`	`title={`
`145`		`- <React.Fragment>`
`146`		`- <FormattedMessage`
`147`		`- defaultMessage="Create General Task"`
`148`		`- id="be.tasks.createTask.general.title"`
`149`		`- />`
`150`		`- <BetaFeedbackBadge`
`151`		`- formUrl="http://example.dentist/"`
`152`		`- tooltip={true}`
`153`		`- />`
`154`		`- </React.Fragment>`
	`127`	`+ <FormattedMessage`
	`128`	`+ defaultMessage="Create General Task"`
	`129`	`+ id="be.tasks.createTask.general.title"`
	`130`	`+ />`
`155`	`131`	`}`
`156`	`132`	`>`
`157`	`133`	`<div`
@@ -185,16 +161,10 @@ exports[`elements/content-sidebar/TaskModal render using type GENERAL and mode E
`185`	`161`	`}`
`186`	`162`	`}`
`187`	`163`	`title={`
`188`		`- <React.Fragment>`
`189`		`- <FormattedMessage`
`190`		`- defaultMessage="Modify General Task"`
`191`		`- id="be.tasks.editTask.general.title"`
`192`		`- />`
`193`		`- <BetaFeedbackBadge`
`194`		`- formUrl="http://example.dentist/"`
`195`		`- tooltip={true}`
`196`		`- />`
`197`		`- </React.Fragment>`
	`164`	`+ <FormattedMessage`
	`165`	`+ defaultMessage="Modify General Task"`
	`166`	`+ id="be.tasks.editTask.general.title"`
	`167`	`+ />`
`198`	`168`	`}`
`199`	`169`	`>`
`200`	`170`	`<div`