some minor changes

src/components/Admin/ChangeServices-Doctors.js

@@ -14,10 +14,6 @@ export default class ChangeServicesDoctors extends React.Component {
         this.setState({showConfirm: !this.state.showConfirm})
     };
 
-    componentDidUpdate(prevProps) {
-        if (this.props.data !== prevProps.data) this.setState({flag: false})
-    };
-
     changeFlag = (e) => {
         e.preventDefault();
         this.setState({flag: !this.state.flag})
@@ -50,7 +46,6 @@ export default class ChangeServicesDoctors extends React.Component {
             } : obj,
             id: this.props.itemId
         })
-
     };
 
     deleteItem = () => {
@@ -59,12 +54,10 @@ export default class ChangeServicesDoctors extends React.Component {
     };
 
     changeId = (e) => {
-        console.log ("data", this.props.data)
         this.props.changeId({
-            item: e.target,
+            item: e,
             data: this.props.data,
         })
-        
     };
 
     render() {
@@ -77,14 +70,16 @@ export default class ChangeServicesDoctors extends React.Component {
             changeSpecialityArray,
             specialityArray
         } = this.props;
-        let doctor = data.find(el => el._id === itemId);
-        if (doctor) doctor = doctor.speciality;
-        // console.log(data,specialityArray)
         return (
             <div className="change-services-doctors">
                 {this.state.flag &&
-                <CheckBoxWindow categories={categories} specialityArray={specialityArray} changeFlag={this.changeFlag}
-                                changeSpecialityArray={changeSpecialityArray}/>}
+                <CheckBoxWindow
+                    categories={categories}
+                    specialityArray={specialityArray}
+                    changeFlag={this.changeFlag}
+                    changeSpecialityArray={changeSpecialityArray}
+                />
+                }
                 <div className="admin-item">
                     <form className="form-doctors" onSubmit={itemId ? this.changeItem : this.postNewItem}>
                         {
@@ -103,14 +98,14 @@ export default class ChangeServicesDoctors extends React.Component {
                         }
                         {categories &&
                         <button className=" btn servise-btn" onClick={this.changeFlag}>Выбрать сервисы</button>}
-                        <input className="btn link"
-                               type='submit'
-                               value={itemId ? 'Изменить' : 'Добавить'}
+                        <input
+                            className="btn link"
+                            type='submit'
+                            value={itemId ? 'Изменить' : 'Добавить'}
                         />
                     </form>
                 </div>
                 <div className="admin-item">
-
                     <CustomSelect
                         label="Выбрать"
                         options={data}
@@ -123,8 +118,11 @@ export default class ChangeServicesDoctors extends React.Component {
                     }
                 </div>
                 {this.state.showConfirm &&
-                <ConfirmButton yes={this.deleteItem} no={this.changeConfirm}
-                               text={'Are you sure you want to Delete Item?'}/>
+                <ConfirmButton
+                    yes={this.deleteItem}
+                    no={this.changeConfirm}
+                    text={'Are you sure you want to Delete Item?'}
+                />
                 }
             </div>
         );

src/components/Admin/Input.js

@@ -16,6 +16,7 @@ export default class Input extends React.Component {
                 required={el.required}
                 pattern={el.pattern}
                 checked={el.checked}
+                readOnly={el.readOnly}
                 onChange={(e) => changeInputValues(e)}
             />
         );

src/reducers/reducers.js

@@ -71,21 +71,14 @@ export const appReducer = (state = defaultState,action) => {
 
         case types.CHANGE_SELECTED_DOCTOR_ID : {
             let doctor = action.payload.data.find(el => el.name === action.payload.item);
-            let result;
             let specArray=[];
-            if (doctor){
-                result = Object.keys(doctor).map(key => {
-                    return [key, doctor[key]];
-                });
-                doctor.speciality.map(el => specArray.push(el._id))
-            }
             return {
                 ...state,
                 specialityArray:specArray,
                 changeDoctorId: doctor ? doctor._id : null,
-                postNewDoctor:doctor ? state.postNewDoctor.map(el => result.find(item => item[0] === el.name) ? {
+                postNewDoctor:doctor ? state.postNewDoctor.map(el => Object.keys(doctor).find(item => item === el.name) ? {
                     ...el,
-                    value:result.find(item => item[0] === el.name)[1]
+                    value:doctor[el.name]
                 } : el) : postNewDoctorForm
             };
         }
@@ -94,18 +87,12 @@ export const appReducer = (state = defaultState,action) => {
 
         case types.CHANGE_SELECTED_SERVICE_ID : {
             let service = action.payload.data.find(el => el.name === action.payload.item);
-            let result;
-                if (service){
-                    result = Object.keys(service).map(key => {
-                        return [key, service[key]];
-                    });
-                }
             return {
                 ...state,
                 changeServiceId: service ? service._id : null,
-                postNewService: service ? state.postNewService.map(el => result.find(item => item[0] === el.name) ? {
+                postNewService: service ? state.postNewService.map(el => Object.keys(service).find(item => item === el.name) ? {
                     ...el,
-                    value:result.find(item => item[0] === el.name)[1]
+                    value:service[el.name]
                 } : el) : postNewServiceForm
             };
         }
@@ -114,18 +101,12 @@ export const appReducer = (state = defaultState,action) => {
 
         case types.CHANGE_SHEDULE_DOCTOR : {
             let doctor = state.doctors.find(el=>el.name === action.payload);
-            let array = [[],[],[],[],[],[],[],[],[],[],[],[]];
-            // eslint-disable-next-line array-callback-return
-            doctor.shedule.map(el => {
-                array[new Date(el.data).getMonth()].push(el)
-            });
             return {
                 ...state,
                 postNewShedule: {
                     ...state.postNewShedule,
                     doctor:doctor._id
                 },
-                sheduleMonthArray: array
             };
         }
 

src/utils/formFields.js

@@ -255,6 +255,7 @@ export const adminChangeUserForm =[
 		value:"",
 		name:'email',
 		placeholder:'Введите E-mail',
+		readOnly:true,
 		required:true
 	},
 	{
@@ -270,6 +271,7 @@ export const adminChangeUserForm =[
 		type:'text',
 		value:"",
 		name:'_id',
+		readOnly:true,
 		required:true
 	},
 	{