Skip to content

Commit 8d0e1f9

Browse files
committed
Better feature flag types and add forks route flag
1 parent d0a7ca7 commit 8d0e1f9

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

app/components/osf-navbar/component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ export default class OsfNavbar extends Component {
5454
indexRoute: string = 'dashboard';
5555
showNavLinks: boolean = false;
5656

57-
// @ts-ignore - we can be sure we have institutions route
5857
@computed(`features.${camelize(config.featureFlags.routes.institutions)}`)
5958
get osfApps(this: OsfNavbar) {
6059
return osfServices.filter(each => !each.flag || this.features.isEnabled(each.flag));

app/router.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ import { inject as service } from '@ember/service';
33
import config from 'ember-get-config';
44
import { Blocker } from 'ember-osf-web/services/ready';
55

6+
const {
7+
featureFlags: {
8+
routes,
9+
},
10+
} = config as { featureFlags: { routes: { [index: string]: string } } }; // eslint-disable-line no-use-before-define
11+
612
const Router = EmberRouter.extend({
713
currentUser: service('current-user'),
814
statusMessages: service('status-messages'),
@@ -13,7 +19,7 @@ const Router = EmberRouter.extend({
1319
rootURL: config.rootURL,
1420

1521
async willTransition(oldInfo: any, newInfo: any, transition: { targetName: string }) {
16-
const flag = config.featureFlags.routes[transition.targetName];
22+
const flag = routes[transition.targetName];
1723

1824
if (flag) {
1925
const enabled = await this.get('currentUser').getWaffle(flag);

config/environment.d.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,13 @@ declare const config: {
118118
noteworthyNode: string;
119119
};
120120
featureFlags: {
121-
routes: { [index: string]: string | undefined };
121+
routes: {
122+
support: string;
123+
dashboard: string;
124+
home: string;
125+
institutions: string;
126+
'guid-node.forks': string;
127+
};
122128
};
123129
gReCaptcha: {
124130
siteKey: string;

config/environment.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ module.exports = function(environment) {
181181
dashboard: 'ember_home_page',
182182
home: 'ember_home_page',
183183
institutions: 'ember_institutional_landing_page',
184+
'guid-node.forks': 'ember_project_forks_page',
184185
},
185186
},
186187
gReCaptcha: {

0 commit comments

Comments
 (0)