@@ -9,6 +9,7 @@ import SearchInput from '../modules/SearchInput'
99
1010import Lists from '../utils/Lists'
1111import userStory from '../services/user_story'
12+ import ProductSelect from './ProductSelect'
1213
1314const Stories = ( { authorId, followerId } ) => {
1415 const [ currentStateSelected , selectState ] = useState ( 'Under consideration' )
@@ -25,7 +26,7 @@ const Stories = ({ authorId, followerId }) => {
2526
2627 const [ category , setCategory ] = useState ( 'All' )
2728
28- const [ products , setProducts ] = useState ( [ ] )
29+ const [ products , setProducts ] = useState ( null )
2930
3031 const [ categories , setCategories ] = useState ( [ ] )
3132
@@ -39,8 +40,6 @@ const Stories = ({ authorId, followerId }) => {
3940
4041 const statusDropdownContainer = useRef ( )
4142
42- const productDropdownContainer = useRef ( )
43-
4443 const sortDropdownContainer = useRef ( )
4544
4645 const categoryDropdownContainer = useRef ( )
@@ -139,13 +138,8 @@ const Stories = ({ authorId, followerId }) => {
139138 const fetchProducts = async ( ) => {
140139 const response = await userStory . getProducts ( )
141140 return response . data . data . product !== null
142- ? setProducts ( [
143- 'All' ,
144- ...response . data . data . products ?. map ( ( ele ) => {
145- return ele . Name
146- } )
147- ] )
148- : setProducts ( [ 'All' ] )
141+ ? setProducts ( [ ...response . data . data . products ] )
142+ : setProducts ( [ ] )
149143 }
150144 fetchProducts ( )
151145 } , [ ] )
@@ -186,6 +180,11 @@ const Stories = ({ authorId, followerId }) => {
186180
187181 return (
188182 < div >
183+ < ProductSelect
184+ product = { product }
185+ products = { products }
186+ setProduct = { setProduct }
187+ />
189188 < div className = 'roadmap-container' >
190189 < div className = 'roadmap' >
191190 { Lists . stateList &&
@@ -234,14 +233,6 @@ const Stories = ({ authorId, followerId }) => {
234233 setAuthorQuery = { setAuthorQuery }
235234 />
236235 < div className = 'flex flex-row options-bar' >
237- < Dropdown
238- title = 'Product'
239- reference = { productDropdownContainer }
240- curr = { product }
241- setCurr = { setProduct }
242- itemList = { products }
243- data-cy = 'product-dropdown'
244- />
245236 < Dropdown
246237 title = 'Categories'
247238 reference = { categoryDropdownContainer }
0 commit comments