Merge pull request #2117 from HHS/mb/TTAHUB-2399/remove-feature-flags

[TTAHUB-2399] Remove feature flags
HHS · Apr 26, 2024 · c0d7e37 · c0d7e37
2 parents 6f66787 + 471c942
commit c0d7e37
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 60 deletions.
diff --git a/docs/logical_data_model.encoded b/docs/logical_data_model.encoded
diff --git a/docs/logical_data_model.puml b/docs/logical_data_model.puml
@@ -1059,10 +1059,7 @@ class Users{
 enum enum_Users_flags {
  anv_statistics
  closed_goal_merge_override
- merge_goals
- monitoring
  regional_goal_dashboard
- resources_dashboard
  training_reports_dashboard
 }
 

diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -258,9 +258,7 @@ function App() {
           path="/dashboards/resources-dashboard"
           render={() => (
             <AppWrapper authenticated logout={logout}>
-              <FeatureFlag flag="resources_dashboard" renderNotFound>
-                <ResourcesDashboard user={user} />
-              </FeatureFlag>
+              <ResourcesDashboard user={user} />
             </AppWrapper>
           )}
         />

diff --git a/frontend/src/components/GoalCards/__tests__/GoalsCardsHeader.js b/frontend/src/components/GoalCards/__tests__/GoalsCardsHeader.js
@@ -11,7 +11,6 @@ describe('GoalDataController', () => {
   const DEFAULT_USER = {
     name: '',
     id: 1,
-    flags: ['merge_goals'],
   };
 
   const REGION_ID = 1;

diff --git a/frontend/src/components/SiteNav.js b/frontend/src/components/SiteNav.js
@@ -112,15 +112,13 @@ const SiteNav = ({
                       </NavLink>
                     </li>
                   </FeatureFlag>
-                  <FeatureFlag flag="resources_dashboard">
-                    <li>
-                      <NavLink
-                        to="/dashboards/resources-dashboard"
-                      >
-                        Resources Dashboard
-                      </NavLink>
-                    </li>
-                  </FeatureFlag>
+                  <li>
+                    <NavLink
+                      to="/dashboards/resources-dashboard"
+                    >
+                      Resources Dashboard
+                    </NavLink>
+                  </li>
                   <li>
                     <NavLink
                       to="/recipient-tta-records"

diff --git a/frontend/src/components/filter/DateRangePicker.scss b/frontend/src/components/filter/DateRangePicker.scss
@@ -1,6 +1,6 @@
 @use '../../mixins.scss';
 
-.ttahub-custom-date-range-picker {    
+.ttahub-custom-date-range-picker-fields:not([hidden]) {    
     z-index: 2;
 }
 

diff --git a/frontend/src/pages/RecipientRecord/pages/Profile.js b/frontend/src/pages/RecipientRecord/pages/Profile.js
@@ -6,7 +6,6 @@ import RecipientSummary from '../components/RecipientSummary';
 import GrantList from '../components/GrantsList';
 import RecipientLeadership from '../components/RecipientLeadership';
 import './Profile.css';
-import FeatureFlag from '../../../components/FeatureFlag';
 import ClassReview from './components/ClassReview';
 import MonitoringReview from './components/MonitoringReview';
 import { useGrantData } from './GrantDataContext';
@@ -35,39 +34,37 @@ export default function Profile({
           <Grid desktop={{ col: 12 }} tabletLg={{ col: 12 }}>
             <GrantList summary={recipientSummary} />
           </Grid>
-          <FeatureFlag flag="monitoring">
-            {activeGrants.map((grant) => (
-              <React.Fragment key={grant.number}>
-                {hasMonitoringData(grant.number) || hasClassData(grant.number) ? (
-                  <Grid desktop={{ col: 12 }}>
-                    <h2 className="smart-hub-title-big-serif">
-                      Grant number
-                      {' '}
-                      {grant.number}
-                    </h2>
-                  </Grid>
-                ) : null}
-                <Grid desktop={{ col: 6 }} tabletLg={{ col: 12 }}>
-                  <div>
-                    <ClassReview
-                      grantNumber={grant.number}
-                      regionId={regionId}
-                      recipientId={recipientId}
-                    />
-                  </div>
+          {activeGrants.map((grant) => (
+            <React.Fragment key={grant.number}>
+              {hasMonitoringData(grant.number) || hasClassData(grant.number) ? (
+                <Grid desktop={{ col: 12 }}>
+                  <h2 className="smart-hub-title-big-serif">
+                    Grant number
+                    {' '}
+                    {grant.number}
+                  </h2>
                 </Grid>
-                <Grid desktop={{ col: 6 }} tabletLg={{ col: 12 }}>
-                  <div>
-                    <MonitoringReview
-                      grantNumber={grant.number}
-                      regionId={regionId}
-                      recipientId={recipientId}
-                    />
-                  </div>
-                </Grid>
-              </React.Fragment>
-            ))}
-          </FeatureFlag>
+              ) : null}
+              <Grid desktop={{ col: 6 }} tabletLg={{ col: 12 }}>
+                <div>
+                  <ClassReview
+                    grantNumber={grant.number}
+                    regionId={regionId}
+                    recipientId={recipientId}
+                  />
+                </div>
+              </Grid>
+              <Grid desktop={{ col: 6 }} tabletLg={{ col: 12 }}>
+                <div>
+                  <MonitoringReview
+                    grantNumber={grant.number}
+                    regionId={regionId}
+                    recipientId={recipientId}
+                  />
+                </div>
+              </Grid>
+            </React.Fragment>
+          ))}
         </Grid>
       </div>
     </>

diff --git a/frontend/src/pages/RecipientRecord/pages/__tests__/GoalsObjectives.js b/frontend/src/pages/RecipientRecord/pages/__tests__/GoalsObjectives.js
@@ -109,12 +109,6 @@ describe('Goals and Objectives', () => {
       ...user,
     };
 
-    if (canMergeGoals) {
-      userForContext.flags = [
-        'merge_goals',
-      ];
-    }
-
     render(
       <Router history={memoryHistory}>
         <AppLoadingContext.Provider value={{ setIsAppLoading: () => {}, isAppLoading: false }}>

diff --git a/src/constants.js b/src/constants.js
@@ -244,11 +244,8 @@ const MAINTENANCE_TYPE = {
 };
 
 const FEATURE_FLAGS = [
-  'resources_dashboard',
   'anv_statistics',
   'regional_goal_dashboard',
-  'merge_goals',
-  'monitoring',
   'closed_goal_merge_override',
   'training_reports_dashboard',
 ];

diff --git a/src/migrations/20240426130641-remove-three-flags.js b/src/migrations/20240426130641-remove-three-flags.js
@@ -0,0 +1,20 @@
+const { prepMigration, updateUsersFlagsEnum } = require('../lib/migration');
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface) {
+    await queryInterface.sequelize.transaction(async (transaction) => {
+      const sessionSig = __filename;
+      await prepMigration(queryInterface, transaction, sessionSig);
+      return updateUsersFlagsEnum(
+        queryInterface,
+        transaction,
+        ['merge_goals', 'monitoring', 'resources_dashboard'],
+      );
+    });
+  },
+
+  async down() {
+    // no rollbacks on enum mods, create a new migration to do that
+  },
+};