Merge dev to staging: Ember 3.28 upgrade

.ember-cli

@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}

.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/v2
 SENTRY_DSN=https://[email protected]/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/v2
 SENTRY_DSN=https://[email protected]/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/v2
 SENTRY_DSN=https://[email protected]/1422597
 BASE_URL=https://staging.ror.org
-LAUNCH_DARKLY_CLIENT_SIDE_ID=636d08a3d56cf611cc88019c

.eslintrc.js

@@ -1,5 +1,6 @@
 module.exports = {
   root: true,
+  parser: "babel-eslint",
   parserOptions: {
     ecmaVersion: 2017,
     sourceType: 'module'
@@ -29,7 +30,7 @@ module.exports = {
       },
       env: {
         browser: false,
-        node: true
+        node: true,
       }
     }
   ]

.github/workflows/dev.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '18'
 
       - name: Extract branch name
         shell: bash

.github/workflows/master.yml

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '18'
 
       - name: Extract branch name
         shell: bash

.github/workflows/staging.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '18'
 
       - name: Extract branch name
         shell: bash

.prettierignore

@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.template-lintrc.js

@@ -15,7 +15,7 @@ module.exports = {
     'no-triple-curlies': false,
     'no-unused-block-params': false,
     'simple-unless': false,
-    'no-console': false,
+    'no-log': false,
     'no-bare-strings': false
   }
 };

app/adapters/application.js

@@ -1,11 +1,6 @@
-import DS from 'ember-data';
+import JSONAPIAdapter from '@ember-data/adapter/json-api';
 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;
-  }),
+export default JSONAPIAdapter.extend({
+  host: ENV.API_URL
 });

app/adapters/organization.js

@@ -1,13 +1,8 @@
-import DS from 'ember-data';
+import JSONAPIAdapter from '@ember-data/adapter/json-api';
 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;
-  }),
+export default JSONAPIAdapter.extend({
+  host: ENV.API_URL,
 
   urlForFindRecord(id, modelName) {
     return `${this.host}/${modelName}s/ror.org/${id}`;

app/components/application-header.js

@@ -8,10 +8,10 @@ export default Component.extend({
 
   actions: {
     search() {
-      this.get('globalSearch').doSearch(this.query);
+      this.globalSearch.doSearch(this.query);
     },
     clear() {
-      this.get('globalSearch').doSearch(null);
+      this.globalSearch.doSearch(null);
     }
   }
 });

app/components/filter-sidebar.js

@@ -9,6 +9,9 @@ export default Component.extend({
     filterValue: '',
 
     actions: {
+        toggleStatus(e){
+            this.set(e.target.name, e.target.checked)
+        },
         applyFilter() {
             this.filterValue = ''
             if (this.activeStatus == true){
@@ -22,8 +25,7 @@ export default Component.extend({
             }
             this.filterValue = this.filterValue.slice(0, -1)
             this.set('model.query.filter', this.filterValue)
-            //this.get('globalSearch').doSearch(this.query, this.allStatus)
-            this.get('router').transitionTo('organizations.index', { queryParams: { query: this.model.query.query, page: this.model.query.page, all_status: this.model.query.allStatus, filter: this.model.query.filter}});
+            this.router.transitionTo('organizations.index', { queryParams: { query: this.model.query.query, page: this.model.query.page, all_status: this.model.query.allStatus, filter: this.model.query.filter}});
         },
         clearFilter() {
             this.filterValue = ''
@@ -32,7 +34,7 @@ export default Component.extend({
             this.set('withdrawnStatus', false);
             this.filterValue = "status:active"
             this.set('model.query.filter', this.filterValue)
-            this.get('router').transitionTo('organizations.index', { queryParams: { query: this.model.query.query, page: this.model.query.page, all_status: this.model.query.allStatus, filter: this.model.query.filter}});
+            this.router.transitionTo('organizations.index', { queryParams: { query: this.model.query.query, page: this.model.query.page, all_status: this.model.query.allStatus, filter: this.model.query.filter}});
         }
     }
 

app/components/page-numbers.js

@@ -1,15 +1,16 @@
+import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 
 export default Component.extend({
   tagName: 'row',
 
-  currentPage: computed.alias("model.query.page"),
-  totalPages: computed.alias("model.meta.totalPages"),
+  currentPage: alias("model.query.page"),
+  totalPages: alias("model.meta.totalPages"),
 
   pageItems: computed("currentPage","totalPages", function() {
-    const page = Number(this.get("currentPage") || 1);
-    const totalPages = Number(this.get("totalPages"));
+    const page = Number(this.currentPage || 1);
+    const totalPages = Number(this.totalPages);
 
     return Array.from(Array(totalPages).keys()).reduce(function (sum, i) {
       if (i < 2 || (i > (page - 4) && i < (page + 2)) || i > (totalPages - 3)) {
@@ -24,8 +25,8 @@ export default Component.extend({
   }),
 
   nextPage: computed("currentPage", "totalPages", function() {
-    const page = Number(this.get("currentPage"));
-    const totalPages = Number(this.get("totalPages"));
+    const page = Number(this.currentPage);
+    const totalPages = Number(this.totalPages);
     if (page < totalPages) {
       return page + 1;
     } else {
@@ -34,7 +35,7 @@ export default Component.extend({
   }),
 
   previousPage: computed("currentPage", function() {
-    const page = Number(this.get("currentPage"));
+    const page = Number(this.currentPage);
     if (page > 1) {
       return page - 1;
     } else {

app/helpers/decimal-format.js

@@ -0,0 +1,13 @@
+import { helper } from '@ember/component/helper';
+
+export function decimalFormat(params) {
+  const [number] = params;
+
+  if (isNaN(number) || number === '') {
+    return "";
+  }
+
+  return new Intl.NumberFormat().format(number);
+}
+
+export default helper(decimalFormat);

app/index.html

@@ -35,4 +35,4 @@
 
     <script src="//rum-static.pingdom.net/pa-5c4d5ca09a3f8300160004e3.js" async></script>
   </body>
-</html>
+</html>

app/models/organization.js

@@ -1,23 +1,23 @@
-import DS from 'ember-data';
+import Model, { attr } from '@ember-data/model';
 
-export default DS.Model.extend({
-  meta: DS.attr(),
+export default Model.extend({
+  meta: attr(),
 
-  name: DS.attr('string'), //TODO: Remove this when v1 has been retired
-  names: DS.attr(),
-  local: DS.attr('string'),
-  types: DS.attr(),
-  links: DS.attr(),
-  aliases: DS.attr(),
-  acronyms: DS.attr(),
-  external_ids: DS.attr(),
-  wikipediaUrl: DS.attr('string'),
-  labels: DS.attr(),
-  country: DS.attr(),
-  addresses: DS.attr(),
-  relationships: DS.attr(),
-  status: DS.attr('string'),
-  admin: DS.attr(),
-  locations: DS.attr()
+  name: attr('string'), //TODO: Remove this when v1 has been retired
+  names: attr(),
+  local: attr('string'),
+  types: attr(),
+  links: attr(),
+  aliases: attr(),
+  acronyms: attr(),
+  external_ids: attr(),
+  wikipediaUrl: attr('string'),
+  labels: attr(),
+  country: attr(),
+  addresses: attr(),
+  relationships: attr(),
+  status: attr('string'),
+  admin: attr(),
+  locations: attr()
 });
 

app/router.js

@@ -1,10 +1,10 @@
 import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const Router = EmberRouter.extend({
-  location: config.locationType,
-  rootURL: config.rootURL
-});
+class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
 
 Router.map(function() {
   this.route('organizations', { path: '/' }, function() {

app/routes/application.js

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