Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Add copy button for client/allocation UUIDs #5926

Merged
merged 28 commits into from
Jul 15, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e671478
Add Structure icons
backspace Jul 4, 2019
fbf729d
Add ember-cli-clipboard
backspace Jul 4, 2019
40dcfe2
Add qunit-dom
backspace Jul 4, 2019
e92b316
Add prototype copy button for client UUID
backspace Jul 4, 2019
398daec
Add hackish styling
backspace Jul 4, 2019
935c577
Add auto-reset after success
backspace Jul 5, 2019
042cf83
Fix size of success “button”
backspace Jul 5, 2019
8611562
Add copy button for allocation id
backspace Jul 5, 2019
190a20a
Move class name into component
backspace Jul 5, 2019
11afd99
Add always-showing success tooltip
backspace Jul 5, 2019
5b532ba
Change button to only hide when asked to
backspace Jul 5, 2019
827d086
Add button wrapper for error icon
backspace Jul 8, 2019
e584232
Change success/error “button”s to be static
backspace Jul 8, 2019
fb8e716
Move copy button up slightly
backspace Jul 8, 2019
4b08c30
Remove show-on-hover functionality
backspace Jul 8, 2019
b2d9e0c
Add default state
backspace Jul 8, 2019
a28e9de
Add tooltip for copy error
backspace Jul 8, 2019
fe30164
Rename component
backspace Jul 8, 2019
a1dd378
Move copy-button styling into its own file
backspace Jul 8, 2019
5270bec
Add copy button to styleguide
backspace Jul 8, 2019
9475188
Rename missed file
backspace Jul 8, 2019
3d46b61
Add another default property
backspace Jul 8, 2019
9180fbe
Add explanation of re-export
backspace Jul 8, 2019
a826034
Remove outdated FIXME
backspace Jul 8, 2019
f9f405c
Remove trailing newline
backspace Jul 8, 2019
5e302ee
Add changelog entry
backspace Jul 8, 2019
e8a1ae0
Convert success action to task
backspace Jul 15, 2019
5db4a87
Remove run.later in favour of timeout
backspace Jul 15, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename component
Thanks to @lukemelia for this suggestion on handling component
name overlaps:
emberjs/ember.js#17997 (comment)
  • Loading branch information
backspace committed Jul 8, 2019
commit fe30164eeba0f72559f704eed24b56a47b4f8e48
1 change: 1 addition & 0 deletions ui/app/components/addon-copy-button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from 'ember-cli-clipboard/components/copy-button';
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Component from '@ember/component';
import { run } from '@ember/runloop';

export default Component.extend({
classNames: ['x-copy-button'],
classNames: ['copy-button'],

state: null,

Expand Down
2 changes: 1 addition & 1 deletion ui/app/styles/core/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ $button-box-shadow-standard: 0 2px 0 0 rgba($grey, 0.2);
}
}

.x-copy-button {
.copy-button {
padding-left: 0.5rem;
margin-bottom: 2px;

Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/allocations/allocation/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<span class="bumper-left tag {{model.statusClass}}">{{model.clientStatus}}</span>
<span class="tag is-hollow is-small no-text-transform">
{{model.id}}
{{x-copy-button clipboardText=model.id}}
{{copy-button clipboardText=model.id}}
</span>
{{#if model.isRunning}}
{{two-step-button
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/clients/client.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{or model.name model.shortId}}
<span class="tag is-hollow is-small no-text-transform">
{{model.id}}
{{x-copy-button clipboardText=model.id}}
{{copy-button clipboardText=model.id}}
</span>
</h1>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
</span>
</div>
{{else}}
{{#copy-button
{{#addon-copy-button
class='button is-borderless is-small'
clipboardText=clipboardText
success=(action 'success')
error=(action (mut state) 'error')
}}
{{x-icon 'copy-action'}}
{{/copy-button}}
{{/addon-copy-button}}
{{/if}}
8 changes: 4 additions & 4 deletions ui/tests/integration/components/x-copy-button-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ import sinon from 'sinon';

import { triggerCopyError, triggerCopySuccess } from 'ember-cli-clipboard/test-support';

module('Integration | Component | x-copy-button', function(hooks) {
module('Integration | Component | copy-button', function(hooks) {
setupRenderingTest(hooks);

test('it shows the copy icon by default', async function(assert) {
await render(hbs`{{x-copy-button class='copy-button'}}`);
await render(hbs`{{copy-button class='copy-button'}}`);

assert.dom('.copy-button .icon-is-copy-action').exists();
});

test('it shows the success icon on success and resets afterward', async function(assert) {
const clock = sinon.useFakeTimers();

await render(hbs`{{x-copy-button class='copy-button'}}`);
await render(hbs`{{copy-button class='copy-button'}}`);

await click('.copy-button button');
await triggerCopySuccess('.copy-button button');
Expand All @@ -35,7 +35,7 @@ module('Integration | Component | x-copy-button', function(hooks) {
});

test('it shows the error icon on error', async function(assert) {
await render(hbs`{{x-copy-button class='copy-button'}}`);
await render(hbs`{{copy-button class='copy-button'}}`);

await click('.copy-button button');
await triggerCopyError('.copy-button button');
Expand Down