Merge pull request #7440 from jrjohnson/cleanup-feature-flags

Cleanup feature flags
ilios · Sep 29, 2023 · 782ceb9 · 782ceb9
2 parents b4304d1 + a3e66fa
commit 782ceb9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/app/components/program-year/overview.hbs b/app/components/program-year/overview.hbs
@@ -8,7 +8,7 @@
       {{t "general.overview"}}
     </h5>
     <div class="programyear-overview-actions" data-test-actions>
-      {{#if this.programYearVisualizations}}
+      {{#if (feature-flag "programYearVisualizations")}}
         <LinkTo
           @route="program-year-visualize-objectives"
           @model={{@programYear}}

diff --git a/app/components/program-year/overview.js b/app/components/program-year/overview.js
diff --git a/config/environment.js b/config/environment.js
@@ -77,13 +77,9 @@ module.exports = function (environment) {
       // Here you can pass flags/options to your application instance
       // when it is created
     },
-    //Hide a feature while it is in development
-    IliosFeatures: {
-      programYearVisualizations: false,
-    },
+    //using ember-feature-flags provided by common
     featureFlags: {
-      sessionLinkingAdminUi: true,
-      globalSearch: true,
+      programYearVisualizations: false,
     },
   };
 
@@ -100,9 +96,7 @@ module.exports = function (environment) {
       enabled: false,
     };
 
-    ENV.IliosFeatures.programYearVisualizations = true;
-
-    ENV.featureFlags['globalSearch'] = true;
+    ENV.featureFlags['programYearVisualizations'] = true;
 
     //put ember concurrency tasks into debug mode to make errors much easier to spot
     ENV.EmberENV.DEBUG_TASKS = true;
@@ -122,16 +116,14 @@ module.exports = function (environment) {
     ENV.serverVariables.defaults['api-name-space'] = 'api';
     ENV.serverVariables.defaults['api-host'] = '';
     ENV.disableServiceWorker = true;
-    ENV.featureFlags['globalSearch'] = true;
 
     ENV.APP.autoboot = false;
   }
 
   if (environment === 'production') {
     // here you can enable a production-specific feature
     if (process.env.ENABLE_PREVIEW_FEATURES) {
-      ENV.IliosFeatures.programYearVisualizations = true;
-      ENV.featureFlags['globalSearch'] = true;
+      ENV.featureFlags['programYearVisualizations'] = true;
     }
   }
 

diff --git a/tests/integration/components/program-year/overview-test.js b/tests/integration/components/program-year/overview-test.js
@@ -1,12 +1,12 @@
-import { module, skip, test } from 'qunit';
+import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { setupIntl } from 'ember-intl/test-support';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import ENV from 'ilios/config/environment';
 import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { component } from 'ilios/tests/pages/components/program-year/overview';
+import { enableFeature } from 'ember-feature-flags/test-support';
 
 module('Integration | Component | program-year/overview', function (hooks) {
   setupRenderingTest(hooks);
@@ -29,15 +29,14 @@ module('Integration | Component | program-year/overview', function (hooks) {
     assert.ok(true, 'no a11y errors found!');
   });
 
-  // @todo figure out a way how this can be tested. [ST 2022/08/05]
-  skip('visualizations button present', async function (assert) {
-    ENV.IliosFeatures.programYearVisualizations = true; //this doesn't work.
+  test('visualizations button present', async function (assert) {
     const program = this.server.create('program');
     const programYear = this.server.create('programYear', { program });
     const programYearModel = await this.owner
       .lookup('service:store')
       .findRecord('programYear', programYear.id);
     this.set('program', programYearModel);
+    enableFeature('programYearVisualizations');
     await render(hbs`<ProgramYear::Overview
       @programYear={{this.programYear}}
     />`);