Merge pull request #1481 from appknox/PD-1559-fix-deprecation-analyti…

…cs-billing-ac-settings fix deprecations in analytics, billing & account-settings
appknox · Nov 7, 2024 · 6edbeed · 6edbeed
2 parents 11c3dbc + 7bba24d
commit 6edbeed
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 18 deletions.
diff --git a/app/components/account-settings/developer-settings/personal-token-list/index.ts b/app/components/account-settings/developer-settings/personal-token-list/index.ts
@@ -26,7 +26,7 @@ export default class AccountSettingsDeveloperSettingsPersonaltokenListComponent
   );
 
   get personalTokenList() {
-    return this.personalTokens.records?.toArray() || [];
+    return this.personalTokens.records?.slice() || [];
   }
 
   get hasPersonalTokens() {

diff --git a/app/components/account-settings/security/multi-factor-auth/index.ts b/app/components/account-settings/security/multi-factor-auth/index.ts
@@ -72,19 +72,19 @@ export default class AccountSettingsSecurityMultiFactorAuthComponent extends Com
 
   @computed('[email protected]')
   get isMFAEnabled() {
-    return !!this.mfas.records?.findBy('enabled', true);
+    return !!this.mfas.records?.find((it) => it.enabled === true);
   }
 
   @computed('[email protected]')
   get isEmailMFAEnabled() {
-    const emailMFA = this.mfas.records?.findBy('isEmail', true);
+    const emailMFA = this.mfas.records?.find((it) => it.isEmail === true);
 
     return emailMFA?.enabled ?? false;
   }
 
   @computed('[email protected]')
   get isAppMFAEnabled() {
-    const appMFA = this.mfas.records?.findBy('isApp', true);
+    const appMFA = this.mfas.records?.find((it) => it.isApp === true);
 
     return appMFA?.enabled ?? false;
   }

diff --git a/app/components/ak-date-picker/calendar-nav/index.ts b/app/components/ak-date-picker/calendar-nav/index.ts
@@ -35,5 +35,6 @@ export default class AkDatePickerCalendarNavComponent extends Component<AkDatePi
 declare module '@glint/environment-ember-loose/registry' {
   export default interface Registry {
     'AkDatePicker::CalendarNav': typeof AkDatePickerCalendarNavComponent;
+    'ak-date-picker/calendar-nav': typeof AkDatePickerCalendarNavComponent;
   }
 }
diff --git a/app/components/ak-date-picker/index.hbs b/app/components/ak-date-picker/index.hbs
@@ -1,7 +1,4 @@
-{{#let
-  (component (ensure-safe-component this.componentName))
-  as |CalendarComponent|
-}}
+{{#let (component this.componentName) as |CalendarComponent|}}
   <div ...attributes>
     <div
       local-class='ak-date-picker-trigger'
@@ -29,7 +26,7 @@
         <CalendarComponent
           data-test-akDatePicker-calendar
           class='ak-date-picker-calendar'
-          @navComponent={{this.navComponent}}
+          @navComponent={{component this.navComponent}}
           @center={{this.center}}
           @onCenterChange={{this.handleCenterChange}}
           @selected={{@selected}}

diff --git a/app/components/organization-billing/index.ts b/app/components/organization-billing/index.ts
@@ -43,12 +43,16 @@ export default class OrganizationBillingComponent extends Component {
     }
   });
 
+  get subscriptionList() {
+    return this.subscriptions?.slice() || [];
+  }
+
   get subscription() {
-    return this.subscriptions?.firstObject;
+    return this.subscriptionList[0];
   }
 
   get subscriptionCount() {
-    return (this.subscriptions?.slice() || []).length;
+    return this.subscriptionList.length;
   }
 
   get hasSubscription() {
@@ -60,7 +64,7 @@ export default class OrganizationBillingComponent extends Component {
   }
 
   get sortedPlans() {
-    return this.plans?.sortBy(...this.sortPlanProperties);
+    return this.plans?.slice().sortBy(...this.sortPlanProperties);
   }
 
   get durations() {

diff --git a/app/components/organization-billing/invoice-list/index.hbs b/app/components/organization-billing/invoice-list/index.hbs
@@ -6,7 +6,7 @@
 
     <AkTable
       class='my-2'
-      @variant='bordered'
+      @variant='full-bordered'
       @borderColor='dark'
       data-test-billingInvoice-list
       as |t|

diff --git a/app/components/organization-billing/subscription/index.hbs b/app/components/organization-billing/subscription/index.hbs
@@ -1,6 +1,6 @@
 <div {{style width='400px'}}>
   {{#if this.isNotPerScan}}
-    <AkTable class='my-2' @variant='bordered' @borderColor='dark' as |t|>
+    <AkTable class='my-2' @variant='full-bordered' @borderColor='dark' as |t|>
       <t.head @columns={{this.columns}} as |h|>
         <h.row as |r|>
           <r.cell colspan='2' as |columnValue|>

diff --git a/app/models/analytics/recent-issue.ts b/app/models/analytics/recent-issue.ts
@@ -1,12 +1,12 @@
-import Model, { attr, belongsTo } from '@ember-data/model';
-import VulnerabilityModel from 'irene/models/vulnerability';
+import Model, { attr, belongsTo, type AsyncBelongsTo } from '@ember-data/model';
+import type VulnerabilityModel from 'irene/models/vulnerability';
 
 export default class AnalyticsRecentIssueModel extends Model {
   @attr('number')
   declare count: number;
 
-  @belongsTo('vulnerability')
-  declare vulnerability: VulnerabilityModel;
+  @belongsTo('vulnerability', { async: true, inverse: null })
+  declare vulnerability: AsyncBelongsTo<VulnerabilityModel>;
 }
 
 declare module 'ember-data/types/registries/model' {