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.

Sign up for GitHub

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

fix(billing): adjust ssh key list template and fix error prone code #14994

Merged
merged 1 commit into from
Jan 23, 2025
Merged

fix(billing): adjust ssh key list template and fix error prone code #14994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/manager/modules/billing/src/autoRenew/autorenew.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default class AutorenewCtrl {

this.parseExtraCriteria();

if (this.sort.predicate) {
if (this.sort?.predicate) {
this.columnsConfig = map(COLUMNS_CONFIG, (column) =>
column.property === this.sort.predicate
? {
Expand Down Expand Up @@ -193,7 +193,7 @@ export default class AutorenewCtrl {

return this.$q.resolve({
meta: {
totalCount: this.services.count,
totalCount: this.services?.count || 0,
},
data: this.billingServices,
});
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/modules/billing/src/autoRenew/ssh/user-ssh.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<tbody
data-ng-show="ctrlSsh.sshKeyList.length > 0 && !ctrlSsh.sshLoading"
>
<tr data-ng-repeat="ssh in ctrlSsh.sshKeys track by $index">
<tr data-ng-repeat="ssh in ctrlSsh.sshKeyList track by $index">
<td>
<span data-ng-bind-html="ssh.keyName"></span>
</td>
Expand Down
4 changes: 2 additions & 2 deletions packages/manager/modules/new-billing/src/autoRenew/autorenew.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default class AutorenewCtrl {

this.parseExtraCriteria();

if (this.sort.predicate) {
if (this.sort?.predicate) {
this.columnsConfig = map(COLUMNS_CONFIG, (column) =>
column.property === this.sort.predicate
? {
Expand Down Expand Up @@ -193,7 +193,7 @@ export default class AutorenewCtrl {

return this.$q.resolve({
meta: {
totalCount: this.services.count,
totalCount: this.services?.count || 0,
},
data: this.billingServices,
});
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/modules/new-billing/src/autoRenew/ssh/user-ssh.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<tbody
data-ng-show="ctrlSsh.sshKeyList.length > 0 && !ctrlSsh.sshLoading"
>
<tr data-ng-repeat="ssh in ctrlSsh.sshKeys track by $index">
<tr data-ng-repeat="ssh in ctrlSsh.sshKeyList track by $index">
<td>
<span data-ng-bind-html="ssh.keyName"></span>
</td>
Expand Down
Loading