From 043dbc373640bffd8c267281ade4f6dffc494a17 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 28 Apr 2022 17:49:03 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20move=20loading-button?= =?UTF-8?q?=20component=20to=20core=20addon=20(#1083)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components}/loading-button/index.hbs | 6 +-- .../addon/components}/loading-button/index.js | 6 +-- addons/core/app/components/loading-button.js | 1 + .../components}/loading-button-test.js | 10 ++--- .../rose/loading-button/index.stories.mdx | 43 ------------------- .../app/components/rose/loading-button.js | 1 - .../scopes/scope/projects/sessions/index.hbs | 4 +- 7 files changed, 13 insertions(+), 58 deletions(-) rename addons/{rose/addon/components/rose => core/addon/components}/loading-button/index.hbs (78%) rename addons/{rose/addon/components/rose => core/addon/components}/loading-button/index.js (80%) create mode 100644 addons/core/app/components/loading-button.js rename addons/{rose/tests/integration/components/rose => core/tests/integration/components}/loading-button-test.js (62%) delete mode 100644 addons/rose/addon/components/rose/loading-button/index.stories.mdx delete mode 100644 addons/rose/app/components/rose/loading-button.js diff --git a/addons/rose/addon/components/rose/loading-button/index.hbs b/addons/core/addon/components/loading-button/index.hbs similarity index 78% rename from addons/rose/addon/components/rose/loading-button/index.hbs rename to addons/core/addon/components/loading-button/index.hbs index b5be619a5..bfea9f7ee 100644 --- a/addons/rose/addon/components/rose/loading-button/index.hbs +++ b/addons/core/addon/components/loading-button/index.hbs @@ -8,11 +8,11 @@ }} class={{if this.isLoading - 'rose-loading-button is-loading' - 'rose-loading-button' + 'loading-button is-loading' + 'loading-button' }} @disabled={{this.isLoading}} {{on 'click' this.toggleRefresh}} > {{yield}} - \ No newline at end of file + diff --git a/addons/rose/addon/components/rose/loading-button/index.js b/addons/core/addon/components/loading-button/index.js similarity index 80% rename from addons/rose/addon/components/rose/loading-button/index.js rename to addons/core/addon/components/loading-button/index.js index 50fec7f80..1bac7a5ea 100644 --- a/addons/rose/addon/components/rose/loading-button/index.js +++ b/addons/core/addon/components/loading-button/index.js @@ -1,11 +1,9 @@ -import button from '../button/index'; - +import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; import { action } from '@ember/object'; import { later } from '@ember/runloop'; - -export default class LoadingButton extends button { +export default class LoadingButton extends Component { // =actions @tracked isLoading = false; diff --git a/addons/core/app/components/loading-button.js b/addons/core/app/components/loading-button.js new file mode 100644 index 000000000..434f2a48d --- /dev/null +++ b/addons/core/app/components/loading-button.js @@ -0,0 +1 @@ +export { default } from 'core/components/loading-button'; diff --git a/addons/rose/tests/integration/components/rose/loading-button-test.js b/addons/core/tests/integration/components/loading-button-test.js similarity index 62% rename from addons/rose/tests/integration/components/rose/loading-button-test.js rename to addons/core/tests/integration/components/loading-button-test.js index ec01498e6..9d778f224 100644 --- a/addons/rose/tests/integration/components/rose/loading-button-test.js +++ b/addons/core/tests/integration/components/loading-button-test.js @@ -3,18 +3,18 @@ import { setupRenderingTest } from 'ember-qunit'; import { render, find, click } from '@ember/test-helpers'; import hbs from 'htmlbars-inline-precompile'; -module('Integration | Component | rose/loading-button', function (hooks) { +module('Integration | Component | loading-button', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs``); - assert.ok(find('.rose-loading-button')); + await render(hbs``); + assert.ok(find('.loading-button')); }); test('it executes a function on refresh button click', async function (assert) { assert.expect(2); this.onClick = () => assert.ok(true, 'refresh was clicked'); - await render(hbs``); - assert.ok(find('.rose-loading-button')); + await render(hbs``); + assert.ok(find('.loading-button')); await click('button'); }); }); diff --git a/addons/rose/addon/components/rose/loading-button/index.stories.mdx b/addons/rose/addon/components/rose/loading-button/index.stories.mdx deleted file mode 100644 index bd791219c..000000000 --- a/addons/rose/addon/components/rose/loading-button/index.stories.mdx +++ /dev/null @@ -1,43 +0,0 @@ -import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; -import { hbs } from 'ember-cli-htmlbars'; -import { action } from '@storybook/addon-actions'; -import { text, boolean, select } from '@storybook/addon-knobs'; - - - -# LoadingButton - -A simple LoadingButton component with two states - loading and reloading that renders an HTML `