From 3468a2d7c7acb755a087975917f4ab2e8f93b360 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 1 Dec 2020 14:25:10 -0500 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20disable=20origin=20and?= =?UTF-8?q?=20auth=20forms=20when=20loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/.template-lintrc.js | 2 +- ui/admin/app/templates/scopes/scope/authenticate/method.hbs | 1 + ui/desktop/.template-lintrc.js | 2 +- ui/desktop/app/routes/origin.js | 2 ++ ui/desktop/app/templates/origin.hbs | 1 + ui/desktop/app/templates/scopes/scope/authenticate/method.hbs | 1 + 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/admin/.template-lintrc.js b/ui/admin/.template-lintrc.js index 4db5af2b0..b887df9af 100644 --- a/ui/admin/.template-lintrc.js +++ b/ui/admin/.template-lintrc.js @@ -5,6 +5,6 @@ module.exports = { rules: { 'no-bare-strings': true, 'no-curly-component-invocation': { allow: ['app-name', 'company-name', 'company-copyright'] }, - 'no-implicit-this': { allow: ['app-name', 'company-name', 'company-copyright', 'doc-url'] } + 'no-implicit-this': { allow: ['app-name', 'company-name', 'company-copyright', 'doc-url', 'is-loading'] } } }; diff --git a/ui/admin/app/templates/scopes/scope/authenticate/method.hbs b/ui/admin/app/templates/scopes/scope/authenticate/method.hbs index f45762068..709c1f491 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/method.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/method.hbs @@ -5,6 +5,7 @@ password=this.password )}} @cancel={{false}} + @disabled={{is-loading}} as |form| > diff --git a/ui/desktop/.template-lintrc.js b/ui/desktop/.template-lintrc.js index 61df6a727..68511a97a 100644 --- a/ui/desktop/.template-lintrc.js +++ b/ui/desktop/.template-lintrc.js @@ -5,6 +5,6 @@ module.exports = { rules: { 'no-bare-strings': true, 'no-curly-component-invocation': { allow: ['app-name'] }, - 'no-implicit-this': { allow: ['app-name'] } + 'no-implicit-this': { allow: ['app-name', 'is-loading'] } } }; diff --git a/ui/desktop/app/routes/origin.js b/ui/desktop/app/routes/origin.js index ea8104367..9d3704e92 100644 --- a/ui/desktop/app/routes/origin.js +++ b/ui/desktop/app/routes/origin.js @@ -1,6 +1,7 @@ import Route from '@ember/routing/route'; import { inject as service } from '@ember/service'; import { action } from '@ember/object'; +import loading from 'ember-loading/decorator'; export default class OriginRoute extends Route { // =services @@ -45,6 +46,7 @@ export default class OriginRoute extends Route { * @param {string} origin */ @action + @loading async setOrigin(origin) { try { await this.origin.setOrigin(origin); diff --git a/ui/desktop/app/templates/origin.hbs b/ui/desktop/app/templates/origin.hbs index 58e06b1b2..1421af91d 100644 --- a/ui/desktop/app/templates/origin.hbs +++ b/ui/desktop/app/templates/origin.hbs @@ -7,6 +7,7 @@ class="full-width" @onSubmit={{route-action "setOrigin" this.origin}} @cancel={{false}} + @disabled={{is-loading}} as |form| >