Merge pull request #1489 from appknox/PD-1561-ember-5-upgrade-fix-dep…

…recation-in-partner-routes

fix deprecation warnings in partner routes

app/components/home-page/organization-dashboard/side-nav/index.ts

@@ -146,6 +146,8 @@ export default class HomePageOrganizationDashboardSideNavComponent extends Compo
         route: 'authenticated.partner.clients',
         hasBadge: true,
         badgeLabel: this.intl.t('beta'),
+        currentWhen:
+          'authenticated.partner.clients authenticated.partner.client authenticated.partner.analytics',
       },
       this.args.isSecurityEnabled && {
         label: this.intl.t('security'),

app/components/partner/client-list/index.ts

@@ -37,7 +37,7 @@ export default class PartnerClientListComponent extends Component {
   }
 
   get partnerClientList() {
-    return this.partnerClientReponse?.toArray() || [];
+    return this.partnerClientReponse?.slice() || [];
   }
 
   get totalParnterClientCount() {

app/components/partner/client-plan/component.js

@@ -11,7 +11,7 @@ export default class ClientPlanComponent extends Component {
 
   @task(function* () {
     try {
-      this.clientPlan = yield this.store.find(
+      this.clientPlan = yield this.store.findRecord(
         'partner/partnerclient-plan',
         this.args.clientId
       );

app/components/partner/client-project-list/index.ts

@@ -45,7 +45,7 @@ export default class PartnerClientProjectListComponent extends Component<Partner
   }
 
   get partnerClientProjectList() {
-    return this.partnerClientProjectsReponse?.toArray() || [];
+    return this.partnerClientProjectsReponse?.slice() || [];
   }
 
   get totalParnterClientProjectsCount() {

app/components/partner/client-report-download/index.js

@@ -63,9 +63,7 @@ export default class PartnerClientReportDownloadComponent extends Component {
         }
       );
       if (this.reports.length) {
-        await waitForPromise(
-          this.getReport.perform(this.reports.firstObject.id)
-        );
+        await waitForPromise(this.getReport.perform(this.reports[0].id));
 
         this.pollReportProgress();
       } else {

app/components/partner/client-uploads-list/index.ts

@@ -45,7 +45,7 @@ export default class PartnerClientUploadsListComponent extends Component<Partner
   }
 
   get partnerClientUploadList() {
-    return this.partnerClientUploadsReponse?.toArray() || [];
+    return this.partnerClientUploadsReponse?.slice() || [];
   }
 
   get totalParnterClientUploadsCount() {

app/components/partner/credit-transfer/index.js

@@ -90,7 +90,7 @@ export default class PartnerCreditTransferComponent extends Component {
 
   fetchClientPlan = task(async () => {
     try {
-      this.clientPlan = await this.store.find(
+      this.clientPlan = await this.store.findRecord(
         'partner/partnerclient-plan',
         this.args.client.id
       );

app/components/partner/invitation-list/index.ts

@@ -6,6 +6,7 @@ import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
 import IntlService from 'ember-intl/services/intl';
 import Store from '@ember-data/store';
+import dayjs from 'dayjs';
 
 // eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import { DS } from 'ember-data';
@@ -33,8 +34,6 @@ export default class PartnerInvitationListComponent extends Component {
   @tracked limit = 10;
   @tracked offset = 0;
 
-  sortProperties = ['updatedOn:asc'];
-
   constructor(owner: unknown, args: object) {
     super(owner, args);
 
@@ -71,8 +70,10 @@ export default class PartnerInvitationListComponent extends Component {
   get partnerRegistrationRequestList() {
     return (
       this.partnerRegistrationRequestReponse
-        ?.toArray()
-        .sortBy(...this.sortProperties) || []
+        ?.slice()
+        .sort(
+          (a, b) => dayjs(b.updatedOn).valueOf() - dayjs(a.updatedOn).valueOf()
+        ) || []
     );
   }
 

app/components/partner/registration-request-pending-list/index.ts

@@ -7,6 +7,7 @@ import { task } from 'ember-concurrency';
 import IntlService from 'ember-intl/services/intl';
 import Store from '@ember-data/store';
 import { waitForPromise } from '@ember/test-waiters';
+import dayjs from 'dayjs';
 
 // eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import { DS } from 'ember-data';
@@ -34,8 +35,6 @@ export default class PartnerRegistrationRequestPendingListComponent extends Comp
   @tracked limit = 10;
   @tracked offset = 0;
 
-  sortProperties = ['createdOn:desc'];
-
   constructor(owner: unknown, args: object) {
     super(owner, args);
 
@@ -73,8 +72,10 @@ export default class PartnerRegistrationRequestPendingListComponent extends Comp
   get partnerRegistrationRequestList() {
     return (
       this.partnerRegistrationRequestReponse
-        ?.toArray()
-        .sortBy(...this.sortProperties) || []
+        ?.slice()
+        .sort(
+          (a, b) => dayjs(b.createdOn).valueOf() - dayjs(a.createdOn).valueOf()
+        ) || []
     );
   }
 

app/components/partner/registration-request-rejected-list/index.ts

@@ -6,6 +6,7 @@ import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
 import IntlService from 'ember-intl/services/intl';
 import Store from '@ember-data/store';
+import dayjs from 'dayjs';
 
 // eslint-disable-next-line ember/use-ember-data-rfc-395-imports
 import { DS } from 'ember-data';
@@ -33,8 +34,6 @@ export default class PartnerRegistrationRequestRejectedListComponent extends Com
   @tracked limit = 10;
   @tracked offset = 0;
 
-  sortProperties = ['createdOn:desc'];
-
   constructor(owner: unknown, args: object) {
     super(owner, args);
 
@@ -71,8 +70,10 @@ export default class PartnerRegistrationRequestRejectedListComponent extends Com
   get partnerRegistrationRequestList() {
     return (
       this.partnerRegistrationRequestReponse
-        ?.toArray()
-        .sortBy(...this.sortProperties) || []
+        ?.slice()
+        .sort(
+          (a, b) => dayjs(b.createdOn).valueOf() - dayjs(a.createdOn).valueOf()
+        ) || []
     );
   }