Skip to content

Commit 8aafb81

Browse files
committed
settings/api-tokens/new: Move description into template
1 parent c92d324 commit 8aafb81

File tree

2 files changed

+9
-12
lines changed
  • app
    • controllers/settings/tokens
    • templates/settings/tokens

2 files changed

+9
-12
lines changed

app/controllers/settings/tokens/new.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export default class NewTokenController extends Controller {
2525

2626
ENDPOINT_SCOPES = ['change-owners', 'publish-new', 'publish-update', 'yank'];
2727

28+
patternDescription = patternDescription;
2829
scopeDescription = scopeDescription;
2930

3031
constructor() {
@@ -157,16 +158,6 @@ class CratePattern {
157158
return this.pattern.endsWith('*');
158159
}
159160

160-
get description() {
161-
if (!this.pattern) {
162-
return 'Please enter a crate name pattern';
163-
} else if (this.isValid) {
164-
return patternDescription(this.pattern);
165-
} else {
166-
return 'Invalid crate name pattern';
167-
}
168-
}
169-
170161
@action resetValidation() {
171162
this.showAsInvalid = false;
172163
}

app/templates/settings/tokens/new.gjs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import autoFocus from '@zestia/ember-auto-focus/modifiers/auto-focus';
77
import perform from 'ember-concurrency/helpers/perform';
88
import preventDefault from 'ember-event-helpers/helpers/prevent-default';
99
import svgJar from 'ember-svg-jar/helpers/svg-jar';
10-
import eq from 'ember-truth-helpers/helpers/eq';
10+
import { eq, not } from 'ember-truth-helpers';
1111

1212
import LoadingSpinner from 'crates-io/components/loading-spinner';
1313

@@ -152,7 +152,13 @@ import LoadingSpinner from 'crates-io/components/loading-spinner';
152152
/>
153153

154154
<span class='pattern-description' data-test-description>
155-
{{pattern.description}}
155+
{{#if (not pattern.pattern)}}
156+
Please enter a crate name pattern
157+
{{else if pattern.isValid}}
158+
{{@controller.patternDescription pattern.pattern}}
159+
{{else}}
160+
Invalid crate name pattern
161+
{{/if}}
156162
</span>
157163
</div>
158164

0 commit comments

Comments
 (0)