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

…14994) ref: MANAGER-16766 Signed-off-by: Jacques Larique <[email protected]>
ovh · Jan 23, 2025 · b2b345e · b2b345e
1 parent a82e535
commit b2b345e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/manager/modules/billing/src/autoRenew/autorenew.controller.js b/packages/manager/modules/billing/src/autoRenew/autorenew.controller.js
@@ -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
           ? {
@@ -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,
     });

diff --git a/packages/manager/modules/billing/src/autoRenew/ssh/user-ssh.html b/packages/manager/modules/billing/src/autoRenew/ssh/user-ssh.html
@@ -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>

diff --git a/packages/manager/modules/new-billing/src/autoRenew/autorenew.controller.js b/packages/manager/modules/new-billing/src/autoRenew/autorenew.controller.js
@@ -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
           ? {
@@ -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,
     });

diff --git a/packages/manager/modules/new-billing/src/autoRenew/ssh/user-ssh.html b/packages/manager/modules/new-billing/src/autoRenew/ssh/user-ssh.html
@@ -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>