[IN-91][IN-101][Preprints] Update EmberCLI version #553

baylee-d · 2018-03-29T15:52:17Z

Purpose

To update Preprints to use Ember 2.18

Summary of Changes

Update Ember to 2.18 and update other packages
Remove almost all bower dependencies
Update syntax to match 2.18 standards

TODO

This is a work in progress. Still to complete before it can be merged:

Edit page:

Fix Upload section to be editable (can open primary collapsible-panel but none of the secondary panels
Fix License section to only include Copyright holder box if the license requires it (currently displays it in all cases and won't let user save until they put something inside it)
Editing disciplines currently overrides previously selected disciplines. Should only add to the array of current disciplines
Moderation message at the bottom of the edit page is currently broken

Detail page:

Citation widget's placeholder has a broken translation (fix in separate ember-osf PR)

Submit page:

Stop the user from going between panels when they shouldn't be allowed to (ex. going from disciplines to provider carousel shouldn't be allowed, but currently is)
Selected disciplines do not show when the panel is collapsed
Copyright holder field shows up even when it isn't needed (and is required to save the section)
Abstract field is too small
License text doesn't show
Selected basics fields do not show when the panel is collapsed
Can create a preprint to branded providers, but fails to transition to the new preprint

Routing:

Can not transition to a branded provider. Will put the user through an infinite transition loop.
Can not go to a branded preprint detail page. The route on transition adds the guid a second time at the end of the url and makes a broken link

Side Effects / Testing Notes

This changes a lot of the syntax and packages being used in preprints. Because of that, it will need a full regression to make sure that things are still working the way they currently are on production.

Ticket

https://openscience.atlassian.net/browse/IN-91
https://openscience.atlassian.net/browse/IN-101

Reviewer Checklist

…er-preprints into feature/EOSF_915 # Conflicts: # package.json # yarn.lock

…er-preprints into feature/EOSF_915 # Conflicts: # CHANGELOG.md # package.json # yarn.lock

…er-preprints into feature/EOSF_915 # Conflicts: # app/locales/en/translations.js # app/templates/index.hbs # package.json # yarn.lock

…er-preprints into feature/EOSF_915 # Conflicts: # public/assets/osf-assets # yarn.lock

Small fixes and preventing an error

…rOpenScience/ember-osf-preprints into feature/IN-91-update-cli-version # Conflicts: # app/components/preprint-form-header.js # app/components/preprint-form-project-select.js # app/components/preprint-title-editor.js # app/components/provider-carousel.js # app/components/subject-picker/component.js # app/controllers/content/index.js # app/controllers/index.js # app/controllers/submit.js # app/mixins/setup-submit-controller.js # app/templates/components/provider-carousel.hbs # app/templates/index.hbs # package.json # public/assets/osf-assets # tests/integration/components/supplementary-file-browser-test.js # tests/unit/controllers/content/index-test.js # tests/unit/controllers/submit-test.js # yarn.lock

Merge next-interfaces and Fix Errors

adlius · 2018-04-17T20:41:43Z

app/index.html

    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.1.1/min/basic.min.css" rel="stylesheet" type="text/css">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.1.1/min/dropzone.min.css" rel="stylesheet" type="text/css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.1.1/min/dropzone.min.js"></script>


These script-tag style import of dependencies doesn't look right. Talked to @baylee-d and it seems that Dropzone.js does not work without these imports. Same thing with tagsinput. Somehow ember-osf-web is also importing Dropzone.js this way, in addition to including them in package.json.

Ember-cli-dropzonejs could be a future solution.

jamescdavis · 2018-04-18T05:25:14Z

app/components/add-preprint-box.js

@@ -1,4 +1,5 @@
-import Ember from 'ember';
+import { inject } from '@ember/service';


The recommended way to do this is:

import { inject as service } from '@ember/service';

jamescdavis · 2018-04-18T05:30:55Z

app/components/preprint-form-authors.js

-    i18n: Ember.inject.service(),
-    valid: Ember.computed.alias('newContributorId'),
+    i18n: inject(),
+    valid: computed.alias('newContributorId'),


can also import { alias } from '@ember/object/computed'; and just do:

valid: alias('newContributorId'),

jamescdavis · 2018-04-18T05:46:03Z

app/components/supplementary-file-browser.js

+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { observer } from '@ember/object';
+import { get } from '@ember/object';


You can roll these into one.

jamescdavis · 2018-04-18T05:46:40Z

app/components/unregistered-contributor-form.js

@@ -1,4 +1,6 @@
-import Ember from 'ember';
+import { get } from '@ember/object';
+import { computed } from '@ember/object';


combine with line above

Those are all caught by ESLint and will go into the same release. There is another PR branched off this one that is partially done.

jamescdavis · 2018-04-18T05:48:06Z

app/controllers/submit.js

+                });
+            this.set('currentPanelName', nextPanel);
+        },
+        */


jamescdavis · 2018-04-18T05:48:19Z

app/controllers/submit.js

            this.get('panelActions').open(this.get(`_names.${this.get('_names').indexOf(currentPanelName) + 1}`));
+            this.set('currentPanelName', this.get(`_names.${this.get('_names').indexOf(currentPanelName) + 1}`));
+//            this.set('currentPanelName', currentPanelName);


jamescdavis · 2018-04-18T05:55:45Z

app/routes/content/index.js

@@ -251,7 +256,7 @@ export default Ember.Route.extend(Analytics, ResetScrollMixin, SetupSubmitContro
    actions: {
        error(error) {
            // Handle API Errors
-            if (error && error.errors && Ember.isArray(error.errors)) {
+            if (error && error.errors && isArray(error.errors)) {


Array.isArray() would work here too and save you an import

jamescdavis · 2018-04-18T05:57:09Z

app/routes/index.js

    model() {
-        return Ember.RSVP.hash({
+        return hash({


This is a case where I'd import RSVP from 'rsvp'; and do RSVP.hash({

jamescdavis · 2018-04-18T06:00:50Z

app/routes/submit.js

    model() {
        // Store the empty preprint to be created on the model hook for page. Node will be fetched
        //  internally during submission process.
-        return this.store.createRecord('preprint', {
+        return this.get('store').createRecord('preprint', {


The previous code will be fine when Preprints goes to Ember 3.1 😉

jamescdavis · 2018-04-18T06:08:34Z

app/utils/build-provider-asset-path.js

@@ -5,7 +5,7 @@ export default function buildProviderAssetPath(config, providerId, assetName, is
        return pathJoin(config.providerAssetsURL, providerId, assetName);
    }
    if (config.ASSET_SUFFIX) {
-        assetName = assetName.replace(/\.[^\.]+$/, `-${config.ASSET_SUFFIX}$&`);
+        assetName = assetName.replace(/\.[^.]+$/, `-${config.ASSET_SUFFIX}$&`);


jamescdavis · 2018-04-18T06:09:47Z

bower.json

-  "resolutions": {
-    "jquery": "2.2.4"
+    "sanitize.js": "^1.0.0",
+    "jquery.tagsinput": "1.3.6"
  }
 }


You should be able to remove this file completely now.

jamescdavis · 2018-04-18T06:12:59Z

ember-cli-build.js

@@ -33,7 +33,7 @@ module.exports = function(defaults) {
    }

    // Reference: https://github.com/travis-ci/travis-web/blob/master/ember-cli-build.js
-    const app = new EmberApp(defaults, {
+    let app = new EmberApp(defaults, {


const app is appropriate here because app is never reassigned.

jamescdavis · 2018-04-18T06:15:08Z

tests/helpers/module-for-acceptance.js

@@ -42,7 +41,7 @@ export default function(name, options = {}) {
    afterEach() {
        FakeServer.stop();
        let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
-        return Promise.resolve(afterEach).then(() => destroyApp(this.application));
+        return resolve(afterEach).then(() => destroyApp(this.application));


RSVP.resolve

jamescdavis · 2018-04-18T06:15:45Z

tests/helpers/start-app.js

-  Ember.run(() => {
-    application = Application.create(attributes);
+  return run(() => {
+    let application = Application.create(attributes);


adlius · 2018-04-18T13:47:07Z

Also did a first pass. The only problem that stands out is the script-tag style imports. Maybe installing dropzone with bower could solve the problem, as that was what we did previously. If not, then we could probably address this later by using addons like ember-cli-dropzonejs.

baylee-d · 2018-05-02T15:44:16Z

Okay, I updated a few things:
~ Changed all metrics calls to use this.get('metrics') instead of get(this, 'metrics')
~ Changed injections to be referenced as service
~ Merged imports together to remove redundant calls
~ Removed all observers

I looked back into moving dropzone imports from index.html back to bower.json to remove the static import strings, but I was getting the same error about not knowing what Dropzone was. For now, I think it'll be okay as it is, but it can definitely be something that we look into in the future since we'll also have to revisit removing bower imports entirely.

alexschiller

Few minor things to look into/remove

alexschiller · 2018-05-03T12:22:47Z

app/routes/application.js

@@ -26,6 +27,7 @@ export default Ember.Route.extend(Analytics, OSFAgnosticAuthRouteMixin, {
                    {
                        filter: {
                            domain: `${window.location.origin}/`,
+                            /*domain: 'http://local.engrxiv:4201',*/


alexschiller · 2018-05-03T12:25:43Z

app/services/i18n.js

+import EmberObject from '@ember/object';
+import { get } from '@ember/object';
+import { merge } from '@ember/polyfills';
+import I18nService from 'ember-i18n/services/i18n';


Was this file newly added? Or did it get accidentally revived?

This was added to fix the problems I was having with variables in translation strings. I think there was a fix for it at the time but it wasn't released yet. Updating to the latest next-interfaces should fix this.

alexschiller · 2018-05-03T12:27:41Z

config/environment.js

@@ -92,8 +92,7 @@ module.exports = function(environment) {

    if (environment === 'test') {
        // Testem prefers this...


this comment referred to the below iirc, so probably remove

alexschiller · 2018-05-03T12:29:06Z

package.json

  "bugs": {
    "url": "https://github.com/CenterForOpenScience/ember-osf-preprints/issues"
  },
-  "homepage": "https://github.com/CenterForOpenScience/ember-osf-preprints#readme"
+  "homepage": "https://github.com/CenterForOpenScience/ember-osf-preprints#readme",
+  "dependencies": {


Can any of these be moved to dev deps?

alexschiller · 2018-05-03T12:30:19Z

public/crossdomain.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0"?>


did we delete this or coming from elsewhere? Might need to get up to date with develop

It was removed from ember-cli: ember-cli/ember-new-output@v2.11.0...v2.18.0#diff-ee1e9c1082dd87318aa6d8b1111ef7d4

alexschiller · 2018-05-03T12:30:52Z

tests/helpers/resolver.js

@@ -1,11 +0,0 @@
-import Resolver from '../../resolver';


same question as others, is this just no longer needed or what's up?

alexschiller · 2018-05-03T12:33:55Z

CHANGELOG.md

@@ -109,6 +109,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Wording on `Edit preprint` button to `Edit and resubmit` on preprint detail page if the preprint is rejected
 and the workflow is pre-moderation.
 - Removed footer styling
+- Update preprints to work with a new unified version of ember-osf (works with both preprints and reviews apps)


Can you move this to the correct spot and add CHANGELOG for 2.18 update

…ndencies

…rOpenScience/ember-osf-preprints into feature/TAKE_FIVE_IN-91-update-cli-version # Conflicts: # app/components/preprint-form-header.js # public/assets/osf-assets

…e-cli-version Feature/take five in 91 update cli version

alexschiller

go time

alexschiller

¯\_(ツ)_/¯

…nce#553) * Update dependencies * Update translation service * Update wording in changelog * Update eslint version * Use ember-tag-input instead of tags-widget * Update tests * Update confirm-share-modal to according to ember-bootstrap updates * Update package and yarn.lock * Update dependent ember-i18n * restore translation * Use preprint-word util from ember-osf * avoid bare strings * Apply requested changes * Remove unused wait import * Update packages, convert CLI things * First commits, update dependencies * Prevent errors * upgrade/downgrade dependencies. point to different ember-osf branch * Fix import for submit controller * Update dependencies, change provider-asset path * Work on cp-panels * Get submit page working without errors * Work on submit page, get disciplines working, submit modal to display * Work on updating disciplines * Finish disciplines to work on edit and submit * Fix some cp-panels on submit page, remove npm ember call from ember-cli-build to enable tests locally * Fix tests * Fix cp-panels * Update package.json * Finalize fixing of cp-panels * Fix tests * Get template working * Revert to using 1.0.0 collapsible-panels * Fix tests, linting, panels * Update ember-cli-moment, fix import in i18n, add scss changes * Fix imports, remove uneeded code * Remove and replace observers * Get disciplines to show and save * Add to CHANGELOG, remove commented code, move dependencies to devdependencies

sheriefvt and others added 30 commits November 30, 2017 15:25

Update dependencies

0081ece

Update translation service

9390ceb

Merge branch 'develop' of https://github.com/CenterForOpenScience/emb…

b52510b

…er-preprints into feature/EOSF_915 # Conflicts: # package.json # yarn.lock

Update wording in changelog

00dc23b

Update eslint version

4c9311a

Use ember-tag-input instead of tags-widget

7257ac8

Update tests

17989ab

Update confirm-share-modal to according to ember-bootstrap updates

1f1abdf

Update package and yarn.lock

b970b18

Update dependent ember-i18n

13c1280

restore translation

4bba400

Use preprint-word util from ember-osf

bd3ef18

avoid bare strings

30a2fb5

Merge branch 'develop' of https://github.com/CenterForOpenScience/emb…

7b22f58

…er-preprints into feature/EOSF_915 # Conflicts: # CHANGELOG.md # package.json # yarn.lock

Apply requested changes

7f28ae3

Merge branch 'develop' of https://github.com/CenterForOpenScience/emb…

b1384de

…er-preprints into feature/EOSF_915 # Conflicts: # app/locales/en/translations.js # app/templates/index.hbs # package.json # yarn.lock

Merge branch 'develop' of https://github.com/CenterForOpenScience/emb…

0d53a86

…er-preprints into feature/EOSF_915 # Conflicts: # public/assets/osf-assets # yarn.lock

Remove unused wait import

bfac43e

Update packages, convert CLI things

691db9c

First commits, update dependencies

d1517f5

Prevent errors

5d10b68

Merge pull request #1 from laurenbarker/feature/upgrade-ember

f65ded5

Small fixes and preventing an error

upgrade/downgrade dependencies. point to different ember-osf branch

9df4ae5

Fix import for submit controller

2c3790d

Merge pull request #2 from alexschiller/feature/IN-91-update-cli-version

2445dc0

Merge next-interfaces and Fix Errors

Update dependencies, change provider-asset path

e32641b

Work on cp-panels

9753a22

Get submit page working without errors

da7cb5f

Work on submit page, get disciplines working, submit modal to display

eb87078

adlius reviewed Apr 17, 2018

View reviewed changes

jamescdavis reviewed Apr 18, 2018

View reviewed changes

app/controllers/submit.js Outdated

});

this.set('currentPanelName', nextPanel);

},

*/

Copy link

Member

jamescdavis Apr 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete?

jamescdavis reviewed Apr 18, 2018

View reviewed changes

Fix imports, remove uneeded code

247a744

baylee-d force-pushed the feature/IN-91-update-cli-version branch from 43521e0 to 247a744 Compare April 23, 2018 19:36

laurenbarker mentioned this pull request Apr 25, 2018

[IN-101][Preprints] Update preprints to work with the unified ember-osf versions #493

Closed

5 tasks

Baylee Swenson added 2 commits May 1, 2018 16:14

Remove and replace observers

b6f223f

Get disciplines to show and save

beff3be

alexschiller suggested changes May 3, 2018

View reviewed changes

Baylee Swenson and others added 3 commits May 3, 2018 11:27

Add to CHANGELOG, remove commented code, move dependencies to devdepe…

f6e5554

…ndencies

Merge branch 'release/next-interfaces' of https://github.com/CenterFo…

e5b4fe5

…rOpenScience/ember-osf-preprints into feature/TAKE_FIVE_IN-91-update-cli-version # Conflicts: # app/components/preprint-form-header.js # public/assets/osf-assets

Merge pull request #8 from alexschiller/feature/TAKE_FIVE_IN-91-updat…

4b95235

…e-cli-version Feature/take five in 91 update cli version

alexschiller approved these changes May 3, 2018

View reviewed changes

alexschiller merged commit c529336 into CenterForOpenScience:release/next-interfaces May 3, 2018

		@@ -1,4 +1,5 @@
		import Ember from 'ember';
		import { inject } from '@ember/service';

		@@ -92,8 +92,7 @@ module.exports = function(environment) {

		if (environment === 'test') {
		// Testem prefers this...

[IN-91][IN-101][Preprints] Update EmberCLI version #553

[IN-91][IN-101][Preprints] Update EmberCLI version #553

Uh oh!

Conversation

baylee-d commented Mar 29, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose

Summary of Changes

TODO

Edit page:

Detail page:

Submit page:

Routing:

Side Effects / Testing Notes

Ticket

Reviewer Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jamescdavis Apr 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adlius commented Apr 18, 2018

Uh oh!

baylee-d commented May 2, 2018

Uh oh!

alexschiller left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexschiller left a comment

Choose a reason for hiding this comment

baylee-d commented Mar 29, 2018 •

edited

Loading

jamescdavis Apr 18, 2018 •

edited

Loading

alexschiller left a comment •

edited

Loading