From e020dc4b77c2c16ebf86bacab025c7bd8ead2a1b Mon Sep 17 00:00:00 2001
From: Cilibiu Bogdan <pionnegru@users.noreply.github.com>
Date: Tue, 4 Dec 2018 18:32:49 +0200
Subject: [PATCH] [ACA-1923] Extensions - sort children by order (#850)

* sort children by order

* update cspell
---
 cspell.json                             | 3 ++-
 src/app/extensions/extension.service.ts | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cspell.json b/cspell.json
index ecc4c0ed8..b63c3393a 100644
--- a/cspell.json
+++ b/cspell.json
@@ -56,7 +56,8 @@
     "keycodes",
     "denysvuika",
     "submenu",
-    "submenus"
+    "submenus",
+    "simpletask"
   ],
   "dictionaries": ["html", "en-gb", "en_US"]
 }
diff --git a/src/app/extensions/extension.service.ts b/src/app/extensions/extension.service.ts
index 3f1b140cb..cf25260d9 100644
--- a/src/app/extensions/extension.service.ts
+++ b/src/app/extensions/extension.service.ts
@@ -360,6 +360,7 @@ export class AppExtensionService implements RuleContext {
             disabled
           };
         })
+        .sort(sortByOrder)
         .reduce(reduceEmptyMenus, [])
         .reduce(reduceSeparators, []);
     }
@@ -377,6 +378,7 @@ export class AppExtensionService implements RuleContext {
           if (copy.children && copy.children.length > 0) {
             copy.children = copy.children
               .filter(childAction => this.filterByRules(childAction))
+              .sort(sortByOrder)
               .reduce(reduceSeparators, []);
           }
           return copy;
@@ -413,6 +415,7 @@ export class AppExtensionService implements RuleContext {
             copy.children = copy.children
               .filter(entry => !entry.disabled)
               .filter(childAction => this.filterByRules(childAction))
+              .sort(sortByOrder)
               .reduce(reduceSeparators, []);
           }
           return copy;