Merge remote-tracking branch 'upstream/master' into fastboot-index

Author: carols10cents

.dependabot/config.yml

@@ -0,0 +1,8 @@
+version: 1
+update_configs:
+  - package_manager: "javascript"
+    directory: "/"
+    update_schedule: "weekly"
+    version_requirement_updates: "increase_versions"
+    commit_message:
+      prefix: ""

.template-lintrc.js

@@ -7,7 +7,8 @@ module.exports = {
 
   rules: {
     'img-alt-attributes': false,
-    'triple-curlies': false,
-    'html-comments': false,
+    'no-html-comments': false,
+    'no-unnecessary-concat': false,
+    quotes: false,
   },
 };

.travis.yml

@@ -2,6 +2,12 @@ language: rust
 sudo: required
 dist: xenial
 
+branches:
+  only:
+  - auto
+  - try
+  - master
+
 cache:
   cargo: true
   directories:
@@ -21,7 +27,7 @@ env:
     - PERCY_PROJECT=crates-io/crates.io
     - PGPORT=5433
     - PATH=$HOME/.cargo/bin:$PATH
-    - RUSTFLAGS="-C debuginfo=0"
+    - RUSTFLAGS="-C debuginfo=0 -D warnings"
 
 install:
   - sudo cp /etc/postgresql/10/main/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf

Cargo.lock

@@ -60,8 +60,7 @@ derive_deref = "1.0.0"
 reqwest = "0.9.1"
 tempdir = "0.3.7"
 parking_lot = "0.7.1"
-jemallocator = { version = "0.1.8", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
-jemalloc-ctl = "0.2.0"
+jemallocator = { version = "0.3", features = ['unprefixed_malloc_on_supported_platforms', 'profiling'] }
 
 lettre = "0.9"
 lettre_email = "0.9"

Cargo.toml

@@ -7,8 +7,9 @@ export default Component.extend({
   serverError: null,
 
   didInsertElement() {
-    if (this.get('api_token.isNew')) {
-      this.$('input').focus();
+    let input = this.element.querySelector('input');
+    if (input && input.focus) {
+      input.focus();
     }
   },
 

app/components/api-token-row.js

@@ -0,0 +1,16 @@
+import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
+import Component from '@ember/component';
+
+export default Component.extend({
+  tagName: 'span',
+  classNames: ['badge'],
+  repository: alias('badge.attributes.repository'),
+  branch: computed('badge.attributes.branch', function() {
+    return encodeURIComponent(this.get('badge.attributes.branch'));
+  }),
+  text: computed('badge.attributes.branch', function() {
+    const branch = this.get('badge.attributes.branch');
+    return `Bitbucket Pipelines build status for the ${branch} branch`;
+  }),
+});

app/components/badge-bitbucket-pipelines.js

@@ -0,0 +1,19 @@
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
+
+export default Component.extend({
+  tagName: 'li',
+
+  name: alias('ownedCrate.name'),
+  controlId: computed('ownedCrate.id', function() {
+    return `${this.ownedCrate.id}-email-notifications`;
+  }),
+  emailNotifications: alias('ownedCrate.email_notifications'),
+
+  actions: {
+    toggleEmailNotifications() {
+      this.set('emailNotifications', !this.get('emailNotifications'));
+    },
+  },
+});

app/components/owned-crate-row.js

@@ -70,9 +70,19 @@ export default Controller.extend({
     }
 
     return PromiseArray.create({
-      promise: deps.then(deps => {
-        return deps.filter(dep => dep.get('kind') !== 'dev').uniqBy('crate_id');
-      }),
+      promise: deps.then(deps => deps.filterBy('kind', 'normal').uniqBy('crate_id')),
+    });
+  }),
+
+  currentBuildDependencies: computed('currentVersion.dependencies', function() {
+    let deps = this.get('currentVersion.dependencies');
+
+    if (deps === null) {
+      return [];
+    }
+
+    return PromiseArray.create({
+      promise: deps.then(deps => deps.filterBy('kind', 'build').uniqBy('crate_id')),
     });
   }),
 
@@ -82,9 +92,7 @@ export default Controller.extend({
       return [];
     }
     return PromiseArray.create({
-      promise: deps.then(deps => {
-        return deps.filterBy('kind', 'dev');
-      }),
+      promise: deps.then(deps => deps.filterBy('kind', 'dev').uniqBy('crate_id')),
     });
   }),
 

app/controllers/crate/version.js

@@ -1,6 +1,7 @@
 import Controller from '@ember/controller';
-import { sort, filterBy, notEmpty } from '@ember/object/computed';
+import { alias, sort, filterBy, notEmpty } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
+import ajax from 'ember-fetch/ajax';
 
 export default Controller.extend({
   // eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
@@ -12,10 +13,50 @@ export default Controller.extend({
 
   isResetting: false,
 
+  ownedCrates: alias('model.ownedCrates'),
+
   newTokens: filterBy('model.api_tokens', 'isNew', true),
   disableCreate: notEmpty('newTokens'),
 
+  emailNotificationsError: false,
+  emailNotificationsSuccess: false,
+
+  setAllEmailNotifications(value) {
+    this.get('ownedCrates').forEach(c => {
+      c.set('email_notifications', value);
+    });
+  },
+
   actions: {
+    async saveEmailNotifications() {
+      try {
+        await ajax(`/api/v1/me/email_notifications`, {
+          method: 'PUT',
+          body: JSON.stringify(
+            this.get('ownedCrates').map(c => ({
+              id: parseInt(c.id, 10),
+              email_notifications: c.email_notifications,
+            })),
+          ),
+        });
+        this.setProperties({
+          emailNotificationsError: false,
+          emailNotificationsSuccess: true,
+        });
+      } catch (err) {
+        console.error(err);
+        this.setProperties({
+          emailNotificationsError: true,
+          emailNotificationsSuccess: false,
+        });
+      }
+    },
+    emailNotificationsSelectAll() {
+      this.setAllEmailNotifications(true);
+    },
+    emailNotificationsSelectNone() {
+      this.setAllEmailNotifications(false);
+    },
     startNewToken() {
       this.store.createRecord('api-token', {
         created_at: new Date(Date.now() + 2000),

app/controllers/me/index.js

@@ -0,0 +1,6 @@
+import DS from 'ember-data';
+
+export default DS.Model.extend({
+  name: DS.attr('string'),
+  email_notifications: DS.attr('boolean'),
+});

app/models/owned-crate.js

@@ -1,7 +1,7 @@
 import { observer } from '@ember/object';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import semver from 'semver';
+import { prerelease } from 'semver';
 
 import fetch from 'fetch';
 import ajax from 'ember-fetch/ajax';
@@ -21,7 +21,7 @@ export default Route.extend({
     const controller = this.controllerFor(this.routeName);
     const maxVersion = crate.get('max_version');
 
-    const isUnstableVersion = version => !!semver.prerelease(version);
+    const isUnstableVersion = version => !!prerelease(version);
 
     const fetchCrateDocumentation = () => {
       if (!crate.get('documentation') || crate.get('documentation').substr(0, 16) === 'https://docs.rs/') {

app/routes/crate/version.js

@@ -3,9 +3,20 @@ import Route from '@ember/routing/route';
 import AuthenticatedRoute from '../../mixins/authenticated-route';
 
 export default Route.extend(AuthenticatedRoute, {
+  actions: {
+    willTransition: function() {
+      this.controller
+        .setProperties({
+          emailNotificationsSuccess: false,
+          emailNotificationsError: false,
+        })
+        .clear();
+    },
+  },
   model() {
     return {
       user: this.get('session.currentUser'),
+      ownedCrates: this.get('session.ownedCrates'),
       api_tokens: this.store.findAll('api-token'),
     };
   },

app/routes/me/index.js

@@ -1,3 +1,4 @@
+import { A } from '@ember/array';
 import Service, { inject as service } from '@ember/service';
 import ajax from 'ember-fetch/ajax';
 
@@ -7,6 +8,7 @@ export default Service.extend({
   isLoggedIn: false,
   currentUser: null,
   currentUserDetected: false,
+  ownedCrates: A(),
 
   store: service(),
   router: service(),
@@ -66,6 +68,9 @@ export default Service.extend({
   fetchUser() {
     return ajax('/api/v1/me').then(response => {
       this.set('currentUser', this.store.push(this.store.normalize('user', response.user)));
+      this.ownedCrates.pushObjects(
+        response.owned_crates.map(c => this.store.push(this.store.normalize('owned-crate', c))),
+      );
     });
   },