@@ -23,7 +23,7 @@ function onGetTypesDone(state, { payload, error }) {
23
23
return { ...state , loadingTypesError : true } ;
24
24
}
25
25
26
- const types = _ . map ( payload . sort ( ) , v => ( {
26
+ const types = _ . map ( _ . uniq ( payload . sort ( ) ) , v => ( {
27
27
key : v ,
28
28
name : v ,
29
29
} ) ) ;
@@ -59,7 +59,7 @@ function onGetManufacturersDone(state, { payload, error }) {
59
59
return { ...state , loadingManufacturersError : true } ;
60
60
}
61
61
62
- const manufacturers = _ . map ( payload . sort ( ) , v => ( {
62
+ const manufacturers = _ . map ( _ . uniq ( payload . sort ( ) ) , v => ( {
63
63
key : v ,
64
64
name : v ,
65
65
} ) ) ;
@@ -99,11 +99,14 @@ function onGetModelsDone(state, { payload, error }) {
99
99
return { ...state , loadingModelsError : true , isModelsLoading : false } ;
100
100
}
101
101
102
- let models = _ . orderBy ( payload , [ 'model' ] , [ 'asc' ] ) ;
102
+ let models = payload ;
103
103
104
104
if ( state . modelPage > 1 ) {
105
105
models = [ ...state . models , ...models ] ;
106
106
}
107
+ models = _ . orderBy ( models , [ 'model' ] , [ 'asc' ] ) ;
108
+ models = _ . uniqBy ( models , m => m . name ) ;
109
+
107
110
return ( {
108
111
...state ,
109
112
loadingModelsError : false ,
@@ -138,11 +141,13 @@ function onGetOsesDone(state, { payload, error }) {
138
141
return { ...state , loadingOsesError : true , isOsesLoading : false } ;
139
142
}
140
143
141
- let oses = _ . orderBy ( payload , [ 'operatingSystem' ] , [ 'asc' ] ) ;
144
+ let oses = payload ;
142
145
if ( state . osPage > 1 ) {
143
146
oses = [ ...state . oses , ...oses ] ;
144
147
}
148
+ oses = _ . orderBy ( payload , [ 'operatingSystem' ] , [ 'asc' ] ) ;
145
149
150
+ oses = _ . uniqBy ( oses , m => m . name ) ;
146
151
return ( {
147
152
...state ,
148
153
loadingOsesError : false ,
0 commit comments