irontec · cruzccl · Oct 7, 2025 · Sep 10, 2025 · Sep 10, 2025 · Sep 10, 2025
diff --git a/...voz/Provider/Infrastructure/Persistence/Doctrine/CallForwardSettingDoctrineRepository.php b/...voz/Provider/Infrastructure/Persistence/Doctrine/CallForwardSettingDoctrineRepository.php
@@ -61,7 +61,10 @@ public function prepareAndJoinByUser(UserInterface $user): QueryBuilder
                 $qb->expr()->eq('self.user', $user->getId())
             )
             ->leftJoin('self.extension', 'e')
-            ->leftJoin('self.voicemail', 'v');
+            ->leftJoin('self.voicemail', 'v')
+            ->orderBy('self.enabled', 'DESC')
+            ->addOrderBy('self.callTypeFilter', 'ASC')
+            ->addOrderBy('self.callForwardType', 'ASC');
 
         return $response;
     }

diff --git a/web/portal/user/src/entities/Account/Account.tsx b/web/portal/user/src/entities/Account/Account.tsx
@@ -57,6 +57,7 @@ const Account: EntityInterface = {
   ...User,
   icon: AccountCircleIcon,
   localPath: '/my/account',
+  defaultOrderBy: '',
   acl: {
     ...User.acl,
     create: false,

diff --git a/web/portal/user/src/entities/CallForwardSetting/CallForwardSetting.tsx b/web/portal/user/src/entities/CallForwardSetting/CallForwardSetting.tsx
@@ -91,6 +91,7 @@ const CallForwardSetting: EntityInterface = {
   toStr: (row: CallForwardSettingPropertyList<string>) => `${row.id}`,
   properties,
   columns,
+  defaultOrderBy: '',
   foreignKeyResolver: async () => {
     const module = await import('./ForeignKeyResolver');
 

diff --git a/web/portal/user/src/entities/Country/Country.tsx b/web/portal/user/src/entities/Country/Country.tsx
@@ -25,6 +25,7 @@ const country: EntityInterface = {
     return (row.name as EntityValues)[language] as string;
   },
   properties,
+  defaultOrderBy: '',
   selectOptions: async () => {
     const module = await import('./SelectOptions');
 

diff --git a/web/portal/user/src/entities/Extension/Extension.tsx b/web/portal/user/src/entities/Extension/Extension.tsx
@@ -12,6 +12,7 @@ const extension: EntityInterface = {
   iden: 'Extension',
   title: _('Extension', { count: 2 }),
   path: '/my/company_extensions',
+  defaultOrderBy: '',
   acl: {
     ...defaultEntityBehavior.acl,
     iden: 'Extension',

diff --git a/web/portal/user/src/entities/FaxesIn/FaxesIn.tsx b/web/portal/user/src/entities/FaxesIn/FaxesIn.tsx
@@ -16,6 +16,7 @@ const FaxesIn: EntityInterface = {
     );
   },
   localPath: '/faxes_in',
+  defaultOrderBy: '',
   acl: {
     ...FaxesInOut.acl,
     create: false,

diff --git a/web/portal/user/src/entities/FaxesOut/FaxesOut.tsx b/web/portal/user/src/entities/FaxesOut/FaxesOut.tsx
@@ -9,6 +9,7 @@ const FaxesOut: EntityInterface = {
   localPath: '/faxes_out',
   title: _('Outgoing faxfile', { count: 2 }),
   columns: ['calldate', 'dst', 'status', 'file'],
+  defaultOrderBy: '',
   customActions: Action,
   Form: async () => {
     const module = await import('./Form');

diff --git a/web/portal/user/src/entities/Preferences/Preferences.tsx b/web/portal/user/src/entities/Preferences/Preferences.tsx
@@ -8,6 +8,7 @@ const Preferences: EntityInterface = {
   ...User,
   icon: ManageAccountsIcon,
   localPath: '/my/preferences',
+  defaultOrderBy: '',
   acl: {
     ...User.acl,
     create: false,

diff --git a/web/portal/user/src/entities/Timezone/Timezone.tsx b/web/portal/user/src/entities/Timezone/Timezone.tsx
@@ -10,6 +10,7 @@ const timezone: EntityInterface = {
   iden: 'Timezones',
   title: _('Timezone', { count: 2 }),
   path: '/timezones',
+  defaultOrderBy: '',
   acl: {
     ...defaultEntityBehavior.acl,
     iden: 'Timezones',

diff --git a/web/portal/user/src/entities/User/User.tsx b/web/portal/user/src/entities/User/User.tsx
@@ -47,6 +47,7 @@ const User: EntityInterface = {
   toStr: (row: UserPropertyList<string>) => `${row.id}`,
   properties,
   columns,
+  defaultOrderBy: '',
   Form: async () => {
     const module = await import('./Form');
 

diff --git a/web/rest/user/config/api/raw/provider.yml b/web/rest/user/config/api/raw/provider.yml
@@ -157,6 +157,8 @@ Ivoz\Provider\Domain\Model\VoicemailMessage\VoicemailMessage:
     get: ~
   attributes:
     access_control: '"ROLE_COMPANY_USER" in roles'
+    order:
+      calldate: DESC
     read_access_control:
       ROLE_COMPANY_USER:
         - or:
@@ -286,6 +288,8 @@ Ivoz\Provider\Domain\Model\WebPortal\WebTheme:
 
 Ivoz\Provider\Domain\Model\UsersCdr\UsersCdr:
   attributes:
+    order:
+      startTime: DESC
     pagination_client_enabled: true
     access_control: '"ROLE_COMPANY_USER" in roles'
     read_access_control:
@@ -359,7 +363,7 @@ Ivoz\Provider\Domain\Model\FaxesInOut\FaxesInOut:
   attributes:
     access_control: '"ROLE_COMPANY_USER" in roles'
     order:
-      calldate: ASC
+      calldate: DESC
     read_access_control:
       inherited:
         fax: 'Ivoz\Provider\Domain\Model\Fax\Fax'

diff --git a/web/rest/user/features/my/call_forward_settings/getCallForwardSettings.feature b/web/rest/user/features/my/call_forward_settings/getCallForwardSettings.feature
@@ -15,13 +15,13 @@ Feature: Retrieve call forward settings
       """
       [
           {
-              "callTypeFilter": "internal",
-              "callForwardType": "inconditional",
+              "callTypeFilter": "external",
+              "callForwardType": "busy",
               "targetType": "number",
               "numberValue": "946002053",
               "noAnswerTimeout": 0,
               "enabled": true,
-              "id": 1,
+              "id": 3,
               "user": "~",
               "extension": null,
               "voicemail": null,
@@ -42,25 +42,25 @@ Feature: Retrieve call forward settings
           },
           {
               "callTypeFilter": "external",
-              "callForwardType": "busy",
+              "callForwardType": "userNotRegistered",
               "targetType": "number",
-              "numberValue": "946002053",
+              "numberValue": "946002054",
               "noAnswerTimeout": 0,
               "enabled": true,
-              "id": 3,
+              "id": 4,
               "user": "~",
               "extension": null,
               "voicemail": null,
               "numberCountry": "~"
           },
           {
-              "callTypeFilter": "external",
-              "callForwardType": "userNotRegistered",
+              "callTypeFilter": "internal",
+              "callForwardType": "inconditional",
               "targetType": "number",
-              "numberValue": "946002054",
+              "numberValue": "946002053",
               "noAnswerTimeout": 0,
               "enabled": true,
-              "id": 4,
+              "id": 1,
               "user": "~",
               "extension": null,
               "voicemail": null,

diff --git a/web/rest/user/features/provider/faxesInOut/getFaxesInOut.feature b/web/rest/user/features/provider/faxesInOut/getFaxesInOut.feature
@@ -15,12 +15,12 @@ Feature: Retrieve faxes in outs
       """
       [
           {
-              "calldate": "2018-01-01 01:00:00",
+              "calldate": "2018-01-02 01:00:00",
               "src": "34688888888",
               "dst": "34688888881",
               "type": "In",
-              "status": "error",
-              "id": 1,
+              "status": "completed",
+              "id": 2,
               "file": {
                   "fileSize": null,
                   "mimeType": null,
@@ -31,22 +31,22 @@ Feature: Retrieve faxes in outs
               "calldate": "2018-01-02 01:00:00",
               "src": "34688888888",
               "dst": "34688888881",
-              "type": "In",
-              "status": "completed",
-              "id": 2,
+              "type": "Out",
+              "status": "error",
+              "id": 3,
               "file": {
                   "fileSize": null,
                   "mimeType": null,
                   "baseName": null
               }
           },
           {
-              "calldate": "2018-01-02 01:00:00",
+              "calldate": "2018-01-01 01:00:00",
               "src": "34688888888",
               "dst": "34688888881",
-              "type": "Out",
+              "type": "In",
               "status": "error",
-              "id": 3,
+              "id": 1,
               "file": {
                   "fileSize": null,
                   "mimeType": null,

diff --git a/web/rest/user/features/provider/voicemail_message/getVoicemailMessage.feature b/web/rest/user/features/provider/voicemail_message/getVoicemailMessage.feature
@@ -15,18 +15,18 @@ Feature: Retrieve voicemail messages
       """
       [
           {
-              "calldate": "2022-03-31 14:08:43",
+              "calldate": "2022-04-01 14:31:52",
               "folder": "INBOX",
               "caller": "Alice <101>",
-              "duration": 4,
-              "id": 1
+              "duration": 21,
+              "id": 4
           },
           {
-              "calldate": "2022-04-01 14:31:52",
+              "calldate": "2022-03-31 14:08:43",
               "folder": "INBOX",
               "caller": "Alice <101>",
-              "duration": 21,
-              "id": 4
+              "duration": 4,
+              "id": 1
           }
       ]
       """