@@ -55,48 +55,47 @@ const HealthContextProvider: React.FC<Props> = React.memo(({ children }) => {
5555 */
5656
5757 const fetchHealthData = useCallback ( async servers => {
58- // console.log({servers})
5958 ipcRenderer . removeAllListeners ( 'healthResponse' ) ;
6059
6160 let temp : HealthDataObject [ ] = [ ] ;
62- //Promise.all(
63- let promises = await Promise . all ( servers . map ( async ( service : string ) => {
64- //NOT WORKING HERE
65- try {
66- const newPromise : any = await new Promise ( ( resolve , reject ) => {
67- ipcRenderer . send ( 'healthRequest' , `${ service } ` ) ;
68- ipcRenderer . on ( 'healthResponse' , ( event : Electron . Event , data : string ) => {
69- let result : object [ ] ;
70- // console.log({data})
71- if ( JSON . stringify ( data ) !== '{}' && tryParseJSON ( data ) ) {
72- result = JSON . parse ( data ) ;
73- // console.log('HealthContext.tsx line 68 result: ', result, 'service', service, 'Obj key', Object.keys(result[0])[0]);
74- //result exists, has a length prop, and the service name and database name are same
75- if ( result && result . length && `${ service } ` === Object . keys ( result [ 0 ] ) [ 0 ] ) {
76- resolve ( result [ 0 ] ) ;
77- }
78- }
79- } ) ;
80- } )
81- temp . push ( newPromise ) ;
82- // console.log('HealthContext.tsx line 80 temp populates?: ', temp, serv)
83- if ( checkServicesComplete ( temp , [ `${ service } ` ] ) ) {
84- setServices ( [ `${ service } ` ] ) ;
85- let transformedData : any = { } ;
86- // console.log('original healthData before transformation: ', temp);
87- // transformedData = {
88- // healthDataList: [1,2,3,4,5],
89- // healthTimeList: [1,2,3,4,5]
90- // } //testing typescript, transformedDATA of type 2 arrays with basic entries?
91- transformedData = healthTransformer ( temp ) ; //must match the setHealthData STATE format
92- // console.log('healthData after tranformation: ', transformedData);
93- setHealthData ( transformedData ) ;
61+ await Promise . all ( servers . map ( async ( service : string ) => {
62+ //NOT WORKING HERE
63+ try {
64+ const newPromise : any = await new Promise ( ( resolve , reject ) => {
65+ ipcRenderer . send ( 'healthRequest' , `${ service } ` ) ;
66+ ipcRenderer . on ( 'healthResponse' , ( event : Electron . Event , data : string ) => {
67+ let result : object [ ] ;
68+ // console.log({data})
69+ if ( JSON . stringify ( data ) !== '{}' && tryParseJSON ( data ) ) {
70+ result = JSON . parse ( data ) ;
71+ // console.log({result})
72+ // console.log('HealthContext.tsx line 68 result: ', result, 'service', service, 'Obj key', Object.keys(result[0])[0]);
73+ //result exists, has a length prop, and the service name and database name are same
74+ if ( result && result . length && `${ service } ` === Object . keys ( result [ 0 ] ) [ 0 ] ) {
75+ resolve ( result [ 0 ] ) ;
76+ }
9477 }
95- } catch ( err ) {
96- // console.log("healthcontext.tsx ERROR: ", err);
97- } ;
78+ } ) ;
79+ } )
80+ temp . push ( newPromise ) ;
81+ // console.log('HealthContext.tsx line 80 temp populates?: ', temp, serv)
82+ if ( checkServicesComplete ( temp , [ `${ service } ` ] ) ) {
83+ setServices ( [ `${ service } ` ] ) ;
84+ let transformedData : any = { } ;
85+ // console.log('original healthData before transformation: ', temp);
86+ // transformedData = {
87+ // healthDataList: [1,2,3,4,5],
88+ // healthTimeList: [1,2,3,4,5]
89+ // } //testing typescript, transformedDATA of type 2 arrays with basic entries?
90+ transformedData = healthTransformer ( temp ) ; //must match the setHealthData STATE format
91+ // console.log('healthData after tranformation: ', transformedData);
92+ setHealthData ( transformedData ) ;
9893 }
99- ) )
94+ } catch ( err ) {
95+ // console.log("healthcontext.tsx ERROR: ", err);
96+ } ;
97+ }
98+ ) )
10099 } , [ ] ) ;
101100
102101 const checkServicesComplete = ( temp : any [ ] , servers : string [ ] ) => {
0 commit comments