remove feature flag useRepositories #249

datacite · Nov 4, 2019 · cfd74d2 · cfd74d2
1 parent b208bdc
commit cfd74d2
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 80 deletions.
diff --git a/app/templates/clients/show.hbs b/app/templates/clients/show.hbs
@@ -6,17 +6,13 @@
       <ol class="breadcrumb">
         {{#if (can "read index")}}
           <li class="breadcrumb-item">{{#link-to "index"}}DataCite{{/link-to}}</li>
-          <li class="breadcrumb-item">{{#link-to "providers"}}{{if (feature-flag 'useRepositories') 'Members' 'Providers'}}{{/link-to}}</li>
+          <li class="breadcrumb-item">{{#link-to "providers"}}Members{{/link-to}}</li>
         {{/if}}
         {{#if (and (can "read provider" model.provider.consortium) (eq model.provider.memberType "consortium_organization"))}}
           <li class="breadcrumb-item">{{#link-to "providers.show.index" model.provider.consortium.id}}{{model.provider.consortium.name}}{{/link-to}}</li>
         {{/if}}
         <li class="breadcrumb-item">{{#link-to "providers.show" model.provider.id}}{{model.provider.name}}{{/link-to}}</li>
-        {{#if (or (eq model.provider.memberType "consortium") (eq model.provider.memberType "consortium_organization"))}}
-          <li class="breadcrumb-item">{{#link-to "providers.show.repositories" model.provider.id}}Repositories{{/link-to}}</li>
-        {{else}}
-          <li class="breadcrumb-item">{{#link-to "providers.show.clients" model.provider.id}}Clients{{/link-to}}</li>
-        {{/if}}
+        <li class="breadcrumb-item">{{#link-to "providers.show.repositories" model.provider.id}}Repositories{{/link-to}}</li>
       </ol>
     {{/if}}
 

diff --git a/app/templates/components/doi-list.hbs b/app/templates/components/doi-list.hbs
@@ -148,7 +148,7 @@
   {{#if (and (not-eq link "clients.show.dois") (not-eq link "repositories.show.dois") (or model.meta.clients model.query.client-id))}}
     <div class="panel facets">
       <div class="panel-body">
-        <h4>{{if (feature-flag 'useRepositories') 'Repository' 'Client'}}</h4>
+        <h4>Repository</h4>
         <ul>
           {{#if model.meta.clients}}
             {{#each model.meta.clients as |client|}}

diff --git a/app/templates/components/index-header.hbs b/app/templates/components/index-header.hbs
@@ -4,13 +4,8 @@
   {{#bs-nav type="tabs" as |nav|}}
     {{#nav.item route="index" class="nav-link"}}Info{{/nav.item}}
     {{#nav.item route="settings" class="nav-link"}}Settings{{/nav.item}}
-    {{#if (feature-flag 'useRepositories')}}
-      {{#nav.item route="providers" class="nav-link"}}Members{{/nav.item}}
-      {{#nav.item route="repositories" class="nav-link"}}Repositories{{/nav.item}}
-    {{else}}
-      {{#nav.item route="providers" class="nav-link"}}Providers{{/nav.item}}
-      {{#nav.item route="clients" class="nav-link"}}Clients{{/nav.item}}
-    {{/if}}
+    {{#nav.item route="providers" class="nav-link"}}Members{{/nav.item}}
+    {{#nav.item route="repositories" class="nav-link"}}Repositories{{/nav.item}}
     {{#if (feature-flag 'showResearchers')}}
       {{#nav.item route="users" class="nav-link"}}Users{{/nav.item}}
     {{/if}}

diff --git a/app/templates/components/provider-list.hbs b/app/templates/components/provider-list.hbs
@@ -1,7 +1,7 @@
 {{#if new}}
   <div class="panel panel-transparent">
     <div class="panel-body">
-      <div class="col-md-9 col-md-offset-3"><h3 class="edit">Create {{if (feature-flag 'useRepositories') 'Member' 'Provider'}}</h3></div>
+      <div class="col-md-9 col-md-offset-3"><h3 class="edit">Create Member</h3></div>
 
       {{#bs-form formLayout="horizontal" horizontalLabelGridClass="col-md-3" model=provider onSubmit=(action "submit" provider model) submitOnEnter=true as |form|}}
         <div class="col-md-12">
@@ -227,7 +227,7 @@
         {{/if}}
 
         <div class="col-md-9 col-md-offset-3">
-          <button type="submit" class="btn btn-sm btn-fill">Create {{if (feature-flag 'useRepositories') 'Member' 'Provider'}}</button>
+          <button type="submit" class="btn btn-sm btn-fill">Create Member</button>
           <button {{action "cancel"}} class="btn btn-sm">Cancel</button>
         </div>
       {{/bs-form}}
@@ -240,7 +240,7 @@
         <div class="panel-body">
           <div class="btn-toolbar">
             <div class="btn-group btn-group-sm">
-              <button {{action "new"}} class="btn btn-warning">{{fa-icon "plus"}}Create {{if (feature-flag 'useRepositories') 'Member' 'Provider'}}</button>
+              <button {{action "new"}} class="btn btn-warning">{{fa-icon "plus"}}Create Member</button>
             </div>
           </div>
         </div>
@@ -438,7 +438,7 @@
   </div>
   <div class="col-md-9 panel-list" id="content">
     {{#if searchable}}
-      {{model-search model=model sortable=true name=(if (feature-flag 'useRepositories') 'Member' 'Provider') link="providers"}}
+      {{model-search model=model sortable=true name='Member' link="providers"}}
     {{/if}}
 
     {{#if model}}

diff --git a/app/templates/components/provider-show.hbs b/app/templates/components/provider-show.hbs
@@ -1,7 +1,7 @@
 {{#if edit}}
   <div class="panel panel-transparent">
     <div class="panel-body">
-      <div class="col-md-offset-3 form-help-header"><h3 class="edit">Update {{if (eq currentUser.uid model.id) 'Account' (if (feature-flag 'useRepositories') 'Member' 'Provider')}}</h3></div>
+      <div class="col-md-offset-3 form-help-header"><h3 class="edit">Update {{if (eq currentUser.uid model.id) 'Account' 'Member'}}</h3></div>
 
       {{#bs-form formLayout="horizontal" horizontalLabelGridClass="col-md-3" model=model onSubmit=(action "submit" model) as |form|}}
         <div class="col-md-12">
@@ -229,7 +229,7 @@
         {{/if}}
 
         <div class="col-md-9 col-md-offset-3">
-          <button type="submit" disabled={{v-get model 'isInvalid'}} class="btn btn-sm btn-fill">Update {{if (eq currentUser.uid model.id) 'Account' (if (feature-flag 'useRepositories') 'Member' 'Provider')}}</button>
+          <button type="submit" disabled={{v-get model 'isInvalid'}} class="btn btn-sm btn-fill">Update {{if (eq currentUser.uid model.id) 'Account' 'Member'}}</button>
           <button {{action "cancel" model}} class="btn btn-sm" id="cancel">Cancel</button> 
         </div>
       {{/bs-form}}
@@ -309,9 +309,9 @@
             <div class="btn-toolbar">
               <div class="btn-group-vertical btn-group-sm">
                 <button {{action "change" model}} class="btn btn-warning" id="set-password-provider">{{fa-icon "key"}} Set Password</button>
-                <button {{action "edit" model}} class="btn btn-warning" id="edit-provider">{{fa-icon "pencil"}} Update {{if (eq currentUser.uid model.id) 'Account' (if (feature-flag 'useRepositories') 'Member' 'Provider')}}</button>
+                <button {{action "edit" model}} class="btn btn-warning" id="edit-provider">{{fa-icon "pencil"}} Update {{if (eq currentUser.uid model.id) 'Account' 'Member'}}</button>
                 {{#if (and (not admin) (can "delete provider" model))}}
-                  <button {{action "delete" model}} class="btn btn-warning" id="delete-provider">{{fa-icon "trash"}} Delete {{if (feature-flag 'useRepositories') 'Member' 'Provider'}}</button>
+                  <button {{action "delete" model}} class="btn btn-warning" id="delete-provider">{{fa-icon "trash"}} Delete Member</button>
                 {{/if}}
               </div>
             </div>
@@ -327,7 +327,7 @@
 
           <h4>Organization Information</h4>
           {{#if (not admin)}}
-            <h5>{{if (feature-flag 'useRepositories') 'Member' 'Provider'}} ID</h5>
+            <h5>Member ID</h5>
             {{model.symbol}}
           {{/if}}
 

diff --git a/app/templates/dois/show.hbs b/app/templates/dois/show.hbs
@@ -4,36 +4,19 @@
   <ol class="breadcrumb">
     {{#if (can "read index")}}
       <li class="breadcrumb-item">{{#link-to "index"}}DataCite{{/link-to}}</li>
-      <li class="breadcrumb-item">{{#link-to "providers"}}{{if (feature-flag 'useRepositories') 'Members' 'Providers'}}{{/link-to}}</li>
+      <li class="breadcrumb-item">{{#link-to "providers"}}Members{{/link-to}}</li>
       <li class="breadcrumb-item">{{#link-to "providers.show" model.client.provider.id}}{{model.client.provider.name}}{{/link-to}}</li>
-      {{#if (feature-flag 'useRepositories')}}
-        <li class="breadcrumb-item">{{#link-to "providers.show.repositories" model.client.provider.id}}Repositories{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "repositories.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "repositories.show.dois" model.client.id}}DOIs{{/link-to}}</li>
-      {{else}}
-        <li class="breadcrumb-item">{{#link-to "providers.show.clients" model.client.provider.id}}Clients{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "clients.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "clients.show.dois" model.client.id}}DOIs{{/link-to}}</li>
-      {{/if}}
+      <li class="breadcrumb-item">{{#link-to "providers.show.repositories" model.client.provider.id}}Repositories{{/link-to}}</li>
+      <li class="breadcrumb-item">{{#link-to "repositories.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
+      <li class="breadcrumb-item">{{#link-to "repositories.show.dois" model.client.id}}DOIs{{/link-to}}</li>
     {{else if (can "read provider" model.client.provider)}}
       <li class="breadcrumb-item">{{#link-to "providers.show" model.client.provider.id}}{{model.client.provider.name}}{{/link-to}}</li>
-      {{#if (feature-flag 'useRepositories')}}
-        <li class="breadcrumb-item">{{#link-to "providers.show.repositories" model.client.provider.id}}Repositories{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "repositories.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "repositories.show.dois" model.client.id}}DOIs{{/link-to}}</li> 
-      {{else}}
-        <li class="breadcrumb-item">{{#link-to "providers.show.clients" model.client.provider.id}}Clients{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "clients.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "clients.show.dois" model.client.id}}DOIs{{/link-to}}</li>
-      {{/if}}
+      <li class="breadcrumb-item">{{#link-to "providers.show.repositories" model.client.provider.id}}Repositories{{/link-to}}</li>
+      <li class="breadcrumb-item">{{#link-to "repositories.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
+      <li class="breadcrumb-item">{{#link-to "repositories.show.dois" model.client.id}}DOIs{{/link-to}}</li> 
     {{else if (can "read repository" model.client)}}
-      {{#if (feature-flag 'useRepositories')}}
-        <li class="breadcrumb-item">{{#link-to "repositories.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "repositories.show.dois" model.client.id}}DOIs{{/link-to}}</li>
-      {{else}}
-        <li class="breadcrumb-item">{{#link-to "clients.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
-        <li class="breadcrumb-item">{{#link-to "clients.show.dois" model.client.id}}DOIs{{/link-to}}</li>
-      {{/if}}
+      <li class="breadcrumb-item">{{#link-to "repositories.show" model.client.id}}{{model.client.name}}{{/link-to}}</li>
+      <li class="breadcrumb-item">{{#link-to "repositories.show.dois" model.client.id}}DOIs{{/link-to}}</li>
     {{/if}}
   </ol>
 

diff --git a/app/templates/index.hbs b/app/templates/index.hbs
@@ -6,13 +6,8 @@
 
     <div class="content">
       <div class="row">
-        {{#if (feature-flag 'useRepositories')}}
-          {{bar-chart data=model.providerCount label="Member" link="providers"}}
-          {{bar-chart data=model.clientCount label="Repository" link="repositories"}}
-        {{else}}
-          {{bar-chart data=model.providerCount label="Provider" link="providers"}}
-          {{bar-chart data=model.clientCount label="Client" link="clients"}}
-        {{/if}}
+        {{bar-chart data=model.providerCount label="Member" link="providers"}}
+        {{bar-chart data=model.clientCount label="Repository" link="repositories"}}
         {{bar-chart data=model.doiCount label="DOI" link="dois" cumulative=false}}
       </div>
 

diff --git a/app/templates/providers/show.hbs b/app/templates/providers/show.hbs
@@ -6,7 +6,7 @@
       <ol class="breadcrumb">
         {{#if (can "read index")}}
           <li class="breadcrumb-item">{{#link-to "index"}}DataCite{{/link-to}}</li>
-          <li class="breadcrumb-item">{{#link-to "providers"}}{{if (feature-flag 'useRepositories') 'Members' 'Providers'}}{{/link-to}}</li>
+          <li class="breadcrumb-item">{{#link-to "providers"}}Members{{/link-to}}</li>
         {{/if}}
         {{#if (eq model.memberType "consortium_organization")}}
           <li class="breadcrumb-item">{{#link-to "providers.show.index" model.consortium_id}}{{model.consortium_name}}{{/link-to}}</li>
@@ -31,11 +31,7 @@
         {{/if}}
 
         {{#if (not-eq model.memberType "member_only")}}
-          {{#if (feature-flag 'useRepositories')}}
-            {{#nav.item route="providers.show.repositories" model=model.id class="nav-link"}}Repositories{{/nav.item}}
-          {{else}}
-            {{#nav.item route="providers.show.clients" model=model.id class="nav-link"}}Clients{{/nav.item}}
-          {{/if}}
+          {{#nav.item route="providers.show.repositories" model=model.id class="nav-link"}}Repositories{{/nav.item}}
           {{#if (not-eq model.memberType "consortium")}}
             {{#nav.item route="providers.show.prefixes" model=model.id class="nav-link"}}Prefixes{{/nav.item}}
           {{/if}}

diff --git a/app/templates/providers/show/index.hbs b/app/templates/providers/show/index.hbs
@@ -9,21 +9,12 @@
       }}
     {{/if}}
     {{#if (not-eq model.memberType "member_only")}}
-      {{#if (feature-flag 'useRepositories')}}
-        {{bar-chart 
-          data=model.clientCount 
-          label="Repository" 
-          model=model 
-          link="providers.show.repositories"
-        }}
-      {{else}}
-        {{bar-chart 
-          data=model.clientCount 
-          label="Client" 
-          model=model 
-          link="providers.show.clients"
-        }}
-      {{/if}}
+      {{bar-chart 
+        data=model.clientCount 
+        label="Repository" 
+        model=model 
+        link="providers.show.repositories"
+      }}
       {{bar-chart 
         data=model.doiCount 
         label="DOI" 

diff --git a/config/environment.js b/config/environment.js
@@ -74,7 +74,6 @@ module.exports = function(environment) {
   if (deployTarget === 'staging') {
     // add staging-specific settings here
     ENV.COOKIE_DOMAIN = ".test.datacite.org";
-    ENV.featureFlags['use-repositories'] = true;
   }
 
   if (deployTarget === 'production') {
@@ -95,7 +94,6 @@ module.exports = function(environment) {
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
 
-    ENV.featureFlags['use-repositories'] = true;
     ENV.COOKIE_DOMAIN = "localhost";
     ENV.SENTRY_DSN = null;
   }
@@ -114,7 +112,6 @@ module.exports = function(environment) {
     ENV.API_JWT= process.env.API_JWT || '',
     ENV.APP.rootElement = '#ember-testing';
 
-    ENV.featureFlags['use-repositories'] = true;
     ENV.featureFlags['show-researchers'] = true;
 
     ENV.APP.autoboot = false;