Skip to content

Commit 8312084

Browse files
package upgrades and some code stubbing
1 parent 00b0c7b commit 8312084

File tree

39 files changed

+2738
-5040
lines changed

39 files changed

+2738
-5040
lines changed

ui/packages/consul-peerings/app/components/consul/peer/form/generate/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
as |fsm|
1414
>
1515

16-
{{#let (unique-id) as |id reset|}}
16+
{{#let (dom-guid) as |id reset|}}
1717
<form {{on "submit" (fn fsm.dispatch "LOAD")}} id={{id}}>
1818

1919
<fsm.State @matches={{array "idle" "error"}}>

ui/packages/consul-peerings/app/components/consul/peer/form/initiate/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</Hds::Alert>
2626
</BlockSlot>
2727
<BlockSlot @name="content">
28-
{{#let (unique-id) as |id|}}
28+
{{#let (dom-guid) as |id|}}
2929
<form id={{id}} {{on "submit" (fn writer.persist @item)}}>
3030
{{yield
3131
(hash

ui/packages/consul-peerings/app/templates/dc/peers/index.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
as |modal|
7171
>
7272
<BlockSlot @name="header">
73-
{{did-insert (set this "create" modal)}}
73+
{{did-insert-helper (set this "create" modal)}}
7474
<h2>
7575
Add peer connection
7676
</h2>
@@ -84,7 +84,7 @@
8484
@onsubmit={{fn this.redirectToPeerShow modal.close}}
8585
as |form|
8686
>
87-
{{did-insert (set this "form" form)}}
87+
{{did-insert-helper (set this "form" form)}}
8888
<form.Fieldsets />
8989
</form.Form>
9090
</Consul::Peer::Form>
@@ -133,7 +133,7 @@
133133
as |modal|
134134
>
135135
<BlockSlot @name="header">
136-
{{did-insert (set this "regenerate" modal)}}
136+
{{did-insert-helper (set this "regenerate" modal)}}
137137
<h2>
138138
Regenerate token
139139
</h2>
@@ -146,7 +146,7 @@
146146
@regenerate={{true}}
147147
as |form|
148148
>
149-
{{did-insert (set this "regenerateForm" form)}}
149+
{{did-insert-helper (set this "regenerateForm" form)}}
150150
<form.Fieldsets />
151151
</Consul::Peer::Form::Generate>
152152
{{/if}}

ui/packages/consul-peerings/app/templates/dc/peers/show/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
}}
55

66
<Route @name={{routeName}} as |route|>
7-
{{did-insert this.transitionToImported}}
7+
{{did-insert-helper this.transitionToImported}}
88
</Route>

ui/packages/consul-ui/.eslintrc.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,17 @@
55

66
module.exports = {
77
root: true,
8-
parser: 'babel-eslint',
8+
parser: '@babel/eslint-parser',
99
parserOptions: {
10-
ecmaVersion: 2018,
10+
ecmaVersion: 2022,
1111
sourceType: 'module',
12+
requireConfigFile: false,
13+
babelOptions: {
14+
plugins: [
15+
['@babel/plugin-proposal-decorators', { legacy: true }],
16+
['@babel/plugin-proposal-class-properties', { loose: true }],
17+
],
18+
},
1219
ecmaFeatures: {
1320
legacyDecorators: true,
1421
},

ui/packages/consul-ui/app/abilities/base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { inject as service } from '@ember/service';
77
import { get } from '@ember/object';
8-
import { Ability } from 'ember-can';
8+
import Ability from 'ember-can/ability';
99

1010
export const ACCESS_READ = 'read';
1111
export const ACCESS_WRITE = 'write';

ui/packages/consul-ui/app/components/data-collection/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
SPDX-License-Identifier: BUSL-1.1
44
}}
55

6-
{{did-update (action (fn (set this 'term') '') @search)}}
6+
{{did-update-helper (action (fn (set this 'term') '') @search)}}
77
{{yield (hash
88
search=(action this.search)
99
items=this.items

ui/packages/consul-ui/app/components/data-loader/index.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
@onchange={{queue (action "change" value="data") (action dispatch "SUCCESS")}}
3232
@onerror={{api.dispatchError}}
3333
as |source|>
34-
{{did-insert (set this 'invalidate' source.invalidate)}}
34+
{{did-insert-helper (set this 'invalidate' source.invalidate)}}
3535
</DataSource>
3636
{{/if}}
3737
</State>
@@ -86,5 +86,5 @@
8686
</State>
8787

8888
{{/let}}
89-
{{did-update (fn dispatch "LOAD") src=@src}}
89+
{{did-update-helper (fn dispatch "LOAD") src=@src}}
9090
</StateChart>

ui/packages/consul-ui/app/components/data-source/index.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
style="width: 0;height: 0;font-size: 0;padding: 0;margin: 0;"
1313
/>
1414
{{else}}
15-
{{did-insert this.connect}}
15+
{{did-insert-helper this.connect}}
1616
{{/if}}
17-
{{did-update this.attributeChanged 'src' @src}}
18-
{{did-update this.attributeChanged 'loading' @loading}}
19-
{{will-destroy this.disconnect}}
17+
{{did-update-helper this.attributeChanged 'src' @src}}
18+
{{did-update-helper this.attributeChanged 'loading' @loading}}
19+
{{will-destroy-helper this.disconnect}}
2020
{{/if}}
21-
{{did-update this.attributeChanged 'disabled' @disabled}}
21+
{{did-update-helper this.attributeChanged 'disabled' @disabled}}
2222
{{yield (hash
2323
data=this.data
2424
error=this.error

ui/packages/consul-ui/app/components/disclosure/details/index.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
}}
55

66
{{#let
7-
(unique-id)
7+
(dom-guid)
88
as |id|}}
99
{{#if (or
1010
(and (eq @auto undefined) @disclosure.expanded)
@@ -16,6 +16,6 @@ as |id|}}
1616
expanded=@disclosure.expanded
1717
)}}
1818
{{/if}}
19-
{{did-insert (fn @disclosure.add id)}}
20-
{{will-destroy (fn @disclosure.remove id)}}
19+
{{did-insert-helper (fn @disclosure.add id)}}
20+
{{will-destroy-helper (fn @disclosure.remove id)}}
2121
{{/let}}

0 commit comments

Comments
 (0)