fix(featuresList): sort in feature.service

infra-geo-ouverte · Mar 7, 2018 · 54a685d · 54a685d
1 parent ccf19c1
commit 54a685d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/lib/feature/shared/feature-group.pipe.ts b/src/lib/feature/shared/feature-group.pipe.ts
@@ -19,9 +19,7 @@ export class FeatureGroupPipe implements PipeTransform {
       groupedFeatures[source].push(feature);
     });
 
-    const sourceFeatures = Object.keys(groupedFeatures).sort((a, b) => {
-      return groupedFeatures[a][0].order - groupedFeatures[b][0].order;
-    }).map(
+    const sourceFeatures = Object.keys(groupedFeatures).map(
       (source: string) => [source, groupedFeatures[source]]
     );
 

diff --git a/src/lib/feature/shared/feature.service.ts b/src/lib/feature/shared/feature.service.ts
@@ -14,7 +14,7 @@ export class FeatureService {
   constructor() { }
 
   setFeatures(features: Feature[]) {
-    this.features$.next(features);
+    this.features$.next(features.sort(this.sortFeatures));
   }
 
   updateFeatures(features: Feature[], source: string, sourcesToKeep?: string[]) {
@@ -23,7 +23,8 @@ export class FeatureService {
         return feature.source !== source &&
                (!sourcesToKeep || sourcesToKeep.includes(feature.source));
       })
-      .concat(features);
+      .concat(features)
+      .sort(this.sortFeatures);
 
     this.features$.next(features_);
   }
@@ -61,4 +62,7 @@ export class FeatureService {
     return feature1.id === feature2.id && feature1.source === feature2.source;
   }
 
+  private sortFeatures(feature1, feature2) {
+    return feature1.order - feature2.order;
+  }
 }