Browse Source

fixed color and default value for SelectStatus + handle response 204 in handleFetchResult

Skylsmoi 6 years ago
parent
commit
66c496472d

+ 3 - 2
src/component/Input/SelectStatus/SelectStatus.jsx View File

16
         data-toggle='dropdown'
16
         data-toggle='dropdown'
17
         aria-haspopup='true'
17
         aria-haspopup='true'
18
         aria-expanded='false'
18
         aria-expanded='false'
19
+        style={{color: props.selectedStatus ? props.selectedStatus.hexcolor : 'transparent'}}
19
       >
20
       >
20
-        {props.selectedStatus.label}
21
+        {props.selectedStatus ? props.selectedStatus.label : ''}
21
         <div className='selectStatus__dropdownbtn__icon'>
22
         <div className='selectStatus__dropdownbtn__icon'>
22
-          <i className={`fa fa-${props.selectedStatus.faIcon}`} />
23
+          <i className={`fa fa-${props.selectedStatus ? props.selectedStatus.faIcon : ''}`} />
23
         </div>
24
         </div>
24
       </button>
25
       </button>
25
 
26
 

+ 0 - 1
src/component/Input/SelectStatus/SelectStatus.styl View File

12
     color grey
12
     color grey
13
   &__dropdownbtn
13
   &__dropdownbtn
14
     border 1px solid grey
14
     border 1px solid grey
15
-    width 150px
16
     background-color transparent
15
     background-color transparent
17
     cursor pointer
16
     cursor pointer
18
     &::after
17
     &::after

+ 1 - 0
src/helper.js View File

8
         body: resultJson
8
         body: resultJson
9
       }))
9
       }))
10
     case 204:
10
     case 204:
11
+      return fetchResult
11
     case 400:
12
     case 400:
12
     case 404:
13
     case 404:
13
     case 409:
14
     case 409: