Merge pull request #723 from iambrandonn/remove-flags

Removes RESCOI-1126 feature flag
kuali · Jan 6, 2017 · a5430e9 · a5430e9
2 parents 00a4ec7 + b52aab3
commit a5430e9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/client/scripts/components/admin/detail-view/admin-declarations-summary/index.js b/client/scripts/components/admin/detail-view/admin-declarations-summary/index.js
@@ -27,7 +27,6 @@ import PopOver from '../../../pop-over';
 import Dropdown from '../../../dropdown';
 import {AdminActions} from '../../../../actions/admin-actions';
 import { ROLES } from '../../../../../../coi-constants';
-import {flagIsOn} from '../../../../feature-flags';
 
 function getUniqueProjects(declarations, configState) {
   const projects = [];
@@ -128,7 +127,7 @@ export class AdminDeclarationsSummary extends React.Component {
             isReviewer &&
             config.general.reviewerDispositionsEnabled
           )
-        ) && flagIsOn('RESCOI-1126')
+        )
       ) {
         setAllButton = (
           <button id="setAllProjectDispositions" className={styles.setAllLink}>

diff --git a/client/scripts/components/admin/detail-view/project-declaration-summary/index.js b/client/scripts/components/admin/detail-view/project-declaration-summary/index.js
@@ -26,7 +26,6 @@ import classNames from 'classnames';
 import Dropdown from '../../../dropdown';
 import {AdminActions} from '../../../../actions/admin-actions';
 import PopOver from '../../../pop-over';
-import {flagIsOn} from '../../../../feature-flags';
 
 @autobind
 export default class ProjectDeclarationsSummary extends React.Component {
@@ -203,7 +202,7 @@ export default class ProjectDeclarationsSummary extends React.Component {
 
         if (config.general.adminRelationshipEnabled) {
           let setAllButton;
-          if (!readonly && flagIsOn('RESCOI-1126')) {
+          if (!readonly) {
             setAllButton = (
               <button
                 id={`setAll${project.id}`}
@@ -236,7 +235,7 @@ export default class ProjectDeclarationsSummary extends React.Component {
       ) {
         if (config.general.reviewerEntityProjectDispositionsEnabled) {
           let setAllButton;
-          if (!readonly && flagIsOn('RESCOI-1126')) {
+          if (!readonly) {
             setAllButton = (
               <button
                 id={`setAll${project.id}`}

diff --git a/feature-flags.json b/feature-flags.json
@@ -1,3 +1,2 @@
 [
-  "RESCOI-1126"
-]
+]
diff --git a/newclient/scripts/components/admin/detail-view/admin-declarations-summary/index.js b/newclient/scripts/components/admin/detail-view/admin-declarations-summary/index.js
@@ -27,7 +27,6 @@ import PopOver from '../../../pop-over';
 import Dropdown from '../../../dropdown';
 import {AdminActions} from '../../../../actions/admin-actions';
 import { ROLES } from '../../../../../../coi-constants';
-import {flagIsOn} from '../../../../feature-flags';
 
 function getUniqueProjects(declarations, configState) {
   const projects = [];
@@ -128,7 +127,7 @@ export class AdminDeclarationsSummary extends React.Component {
             isReviewer &&
             config.general.reviewerDispositionsEnabled
           )
-        ) && flagIsOn('RESCOI-1126')
+        )
       ) {
         setAllButton = (
           <button id="setAllProjectDispositions" className={styles.setAllLink}>

diff --git a/newclient/scripts/components/admin/detail-view/project-declaration-summary/index.js b/newclient/scripts/components/admin/detail-view/project-declaration-summary/index.js
@@ -26,7 +26,6 @@ import classNames from 'classnames';
 import Dropdown from '../../../dropdown';
 import {AdminActions} from '../../../../actions/admin-actions';
 import PopOver from '../../../pop-over';
-import {flagIsOn} from '../../../../feature-flags';
 
 @autobind
 export default class ProjectDeclarationsSummary extends React.Component {
@@ -203,7 +202,7 @@ export default class ProjectDeclarationsSummary extends React.Component {
 
         if (config.general.adminRelationshipEnabled) {
           let setAllButton;
-          if (!readonly && flagIsOn('RESCOI-1126')) {
+          if (!readonly) {
             setAllButton = (
               <button
                 id={`setAll${project.id}`}
@@ -236,7 +235,7 @@ export default class ProjectDeclarationsSummary extends React.Component {
       ) {
         if (config.general.reviewerEntityProjectDispositionsEnabled) {
           let setAllButton;
-          if (!readonly && flagIsOn('RESCOI-1126')) {
+          if (!readonly) {
             setAllButton = (
               <button
                 id={`setAll${project.id}`}