Revert "Support data in v2 (#194)" (#199)

This reverts commit 0d95143.

.env.dev

@@ -1,5 +1,3 @@
-API_URL_V1=https://api.dev.ror.org/v1
-API_URL_V2=https://api.dev.ror.org/v2
+API_URL=https://api.dev.ror.org
 SENTRY_DSN=https://1c334995f85448b1afa561c8ccf13791@sentry.io/1422597
 BASE_URL=https://dev.ror.org
-LAUNCH_DARKLY_CLIENT_SIDE_ID=6390f62d05087a11e466bfc9

.env.production

@@ -1,5 +1,3 @@
-API_URL_V1=https://api.ror.org/v1
-API_URL_V2=https://api.ror.org/v2
+API_URL=https://api.ror.org
 SENTRY_DSN=https://1c334995f85448b1afa561c8ccf13791@sentry.io/1422597
 BASE_URL=https://ror.org
-LAUNCH_DARKLY_CLIENT_SIDE_ID=636d08a3d56cf611cc88019d

.env.staging

@@ -1,5 +1,3 @@
-API_URL_V1=https://api.staging.ror.org/v1
-API_URL_V2=https://api.staging.ror.org/v2
+API_URL=https://api.staging.ror.org
 SENTRY_DSN=https://1c334995f85448b1afa561c8ccf13791@sentry.io/1422597
 BASE_URL=https://staging.ror.org
-LAUNCH_DARKLY_CLIENT_SIDE_ID=636d08a3d56cf611cc88019c

app/adapters/application.js

@@ -1,11 +1,6 @@
 import DS from 'ember-data';
 import ENV from 'ror-app/config/environment';
-import { inject as service } from '@ember/service';
-import { computed } from '@ember/object';
 
 export default DS.JSONAPIAdapter.extend({
-  launchDarkly: service(),
-  host: computed('launchDarkly.variation', function() {
-    return this.launchDarkly.variation('v2_ui') ? ENV.API_URL_V2 : ENV.API_URL_V1;
-  }),
+  host: ENV.API_URL
 });

app/adapters/organization.js

@@ -1,16 +1,11 @@
 import DS from 'ember-data';
 import ENV from 'ror-app/config/environment';
-import { inject as service } from '@ember/service';
-import { computed } from '@ember/object';
 
 export default DS.JSONAPIAdapter.extend({
-  launchDarkly: service(),
-  host: computed('launchDarkly.variation', function() {
-    return this.launchDarkly.variation('v2_ui') ? ENV.API_URL_V2 : ENV.API_URL_V1;
-  }),
+  host: ENV.API_URL,
 
   urlForFindRecord(id, modelName) {
-    return `${this.host}/${modelName}s/ror.org/${id}`;
+    return `${ENV.API_URL}/${modelName}s/ror.org/${id}`;
   },
 
   init() {

app/models/organization.js

@@ -3,8 +3,7 @@ import DS from 'ember-data';
 export default DS.Model.extend({
   meta: DS.attr(),
 
-  name: DS.attr('string'), //TODO: Remove this when v1 has been retired
-  names: DS.attr(),
+  name: DS.attr('string'),
   local: DS.attr('string'),
   types: DS.attr(),
   links: DS.attr(),
@@ -16,8 +15,6 @@ export default DS.Model.extend({
   country: DS.attr(),
   addresses: DS.attr(),
   relationships: DS.attr(),
-  status: DS.attr('string'),
-  admin: DS.attr(),
-  locations: DS.attr()
+  status: DS.attr('string')
 });
 

app/routes/application.js

@@ -1,11 +1,5 @@
 import Route from '@ember/routing/route';
 
 export default Route.extend({
-  beforeModel(){
-    let user = {
-      key: 'user-key-123abc',
-      anonymous: true
-    };
-    return this.launchDarkly.initialize(user);
-  }
+
 });

app/templates/organizations/index.hbs

@@ -11,11 +11,7 @@
         </div>
         <div class="col-md-10 col-sm-12">
         {{#each model as |organization|}}
-          {{#if (variation "v2_ui")}}
-            {{v2/organization-item model=organization view="list"}}
-          {{else}}
-           {{v1/organization-item model=organization}}
-          {{/if}} 
+          {{organization-item model=organization}}
         {{/each}}
         </div>
         {{#if (gt model.meta.totalPages 1)}}