refactor: modify the sorting in the inbox based on descending creatio…

…n time # Conflicts: # app/services/inbox_service.rb
ComPlat · Oct 23, 2023 · 12953d0 · 12953d0
1 parent 5f6d6ad
commit 12953d0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/app/api/entities/inbox_entity.rb b/app/api/entities/inbox_entity.rb
@@ -22,7 +22,12 @@ def children
       dataset_page = options[:dataset_page].to_i || 1
       start_index = (dataset_page - 1) * DATASETS_PER_PAGE
       end_index = start_index + DATASETS_PER_PAGE - 1
-      serialize_children(object.hash_tree(limit_depth: depth)[object].to_a.slice(start_index..end_index).to_h)
+
+      parent_objects = object.hash_tree(limit_depth: depth)[object].to_a
+      sorted_parents = parent_objects.sort_by { |container, _| container.created_at }.reverse
+      parents_slice = sorted_parents[start_index..end_index]
+
+      serialize_children(parents_slice.to_h)
     end
 
     def serialize_children(container_tree_hash)
@@ -49,7 +54,7 @@ def unlinked_attachments
         attachable_type: 'Container',
         attachable_id: nil,
         created_for: object&.containable&.id,
-      )
+      ).order(created_at: :desc)
     end
 
     def all_descendants_attachments
@@ -59,7 +64,7 @@ def all_descendants_attachments
                                                          FROM attachments AS sub_attachments
                                                          WHERE sub_attachments.attachable_id = attachments.attachable_id
                                                          LIMIT 50
-                                                       )")
+                                                       )").order(created_at: :desc)
     end
 
     def inbox_count

diff --git a/app/packs/src/apps/mydb/collections/CollectionTree.js b/app/packs/src/apps/mydb/collections/CollectionTree.js
@@ -191,9 +191,6 @@ export default class CollectionTree extends React.Component {
 
     let boxes = '';
     if (inbox.children) {
-      inbox.children.sort((a, b) => {
-        if (a.name > b.name) { return 1; } if (a.name < b.name) { return -1; } return 0;
-      });
       boxes = inbox.children.map((deviceBox) => (
         <DeviceBox key={`box_${deviceBox.id}`} device_box={deviceBox} fromCollectionTree />
       ));

diff --git a/app/packs/src/apps/mydb/inbox/DeviceBox.js b/app/packs/src/apps/mydb/inbox/DeviceBox.js
@@ -275,10 +275,6 @@ export default class DeviceBox extends React.Component {
       </span>
     );
 
-    device_box.children.sort((a, b) => {
-      if (a.name > b.name) { return 1; } if (a.name < b.name) { return -1; } return 0;
-    });
-
     const datasets = device_box.children.map((dataset) => (
       <DatasetContainer
         key={`dataset_${dataset.id}`}

diff --git a/app/packs/src/apps/mydb/inbox/InboxModal.js b/app/packs/src/apps/mydb/inbox/InboxModal.js
@@ -155,9 +155,6 @@ export default class InboxModal extends React.Component {
 
     let boxes = '';
     if (inbox.children) {
-      inbox.children.sort((a, b) => {
-        if (a.name > b.name) { return 1; } if (a.name < b.name) { return -1; } return 0;
-      });
       boxes = inbox.children.map(deviceBox => (
         <DeviceBox
           key={`box_${deviceBox.id}`}