Skip to content

Commit c6b694a

Browse files
committed
We got kubernetes to show up on graphs
1 parent fe50495 commit c6b694a

File tree

4 files changed

+29
-9
lines changed

4 files changed

+29
-9
lines changed

app/charts/EventChart.tsx

+12
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ const EventChart: React.FC<EventChartProps> = React.memo(props => {
2121
const { metric, timeList, valueList, sizing, colourGenerator } = props;
2222
const [solo, setSolo] = useState<SoloStyles | null>(null);
2323

24+
// THIS IS WHERE WE LEFT OFF~~~~~~~~
25+
// eslint-disable-next-line no-console
26+
console.log('metric', metric);
27+
// eslint-disable-next-line no-console
28+
console.log('timeList', timeList);
29+
// eslint-disable-next-line no-console
30+
console.log('valueList', valueList);
31+
// eslint-disable-next-line no-console
32+
console.log('sizing', sizing);
33+
// eslint-disable-next-line no-console
34+
console.log('colourGenerator', colourGenerator);
35+
2436
setInterval(() => {
2537
if (solo !== soloStyle) {
2638
setSolo(soloStyle);

app/containers/EventContainer.tsx

+10-8
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ interface EventContainerProps {
1010
}
1111

1212
const EventContainer: React.FC<EventContainerProps> = React.memo(props => {
13-
// eslint-disable-next-line no-console
14-
console.log(`PROPS ${props}`);
1513
const { eventData } = useContext(EventContext);
1614
const [eventChartsArr, setEventChartsArr] = useState<JSX.Element[]>([]);
1715
const { selectedMetrics } = useContext(QueryContext);
@@ -30,11 +28,11 @@ const EventContainer: React.FC<EventContainerProps> = React.memo(props => {
3028
});
3129

3230
eventDataList.forEach((element, id) => {
33-
// eslint-disable-next-line no-console
34-
console.log(`EVENTDATALIST ELEMENT ${element}`);
3531
const metric: string = Object.keys(element)[0];
3632
const valueList: any = Object.values(element)[0];
3733
if (selectedMetricsList.includes(metric)) {
34+
// eslint-disable-next-line no-console
35+
console.log('SELECTEDMETRICLIST INCLUDES METRIC', metric);
3836
const newEventChart = (
3937
<EventChart
4038
key={`Chart${id}`}
@@ -63,9 +61,13 @@ const EventContainer: React.FC<EventContainerProps> = React.memo(props => {
6361
}
6462
return lst;
6563
};
66-
// JJ-ADDITION
67-
return <div>{service.includes('kafkametrics' || 'kubernetesmetrics') ? eventChartsArr : []}</div>;
68-
// return <div>{service.includes('kafkametrics') ? eventChartsArr : []}</div>;
64+
return (
65+
<div>
66+
{service.includes('kafkametrics') || service.includes('kubernetesmetrics')
67+
? eventChartsArr
68+
: []}
69+
</div>
70+
);
6971
});
7072

71-
export default EventContainer;
73+
export default EventContainer;

app/containers/GraphsContainer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const GraphsContainer: React.FC<GraphsContainerProps> = React.memo(props => {
8282
}
8383
// JJ-ADDITION
8484
if (service.includes('kubernetesmetrics')) {
85-
fetchEventData();
85+
fetchEventData('kubernetesmetrics');
8686
}
8787
}
8888

app/context/EventContext.tsx

+6
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ const EventContextProvider: React.FC = React.memo(({ children }) => {
3232
}
3333

3434
const fetchEventData = useCallback((arg: any) => {
35+
// eslint-disable-next-line no-console
36+
console.log('WE ARE IN FETCH DATA');
3537
if (arg === 'kafkametrics') {
3638
ipcRenderer.removeAllListeners('kafkaResponse');
3739
ipcRenderer.send('kafkaRequest');
@@ -45,9 +47,13 @@ const EventContextProvider: React.FC = React.memo(({ children }) => {
4547
}
4648
});
4749
} else if (arg === 'kubernetesmetrics') {
50+
// eslint-disable-next-line no-console
51+
console.log(`KUBES FETCH DATA`);
4852
ipcRenderer.removeAllListeners('kubernetesResponse');
4953
ipcRenderer.send('kubernetesRequest');
5054
ipcRenderer.on('kubernetesResponse', (event: Electron.Event, data: any) => {
55+
// eslint-disable-next-line no-console
56+
console.log(`DATA IS ${data}`)
5157
let result: any;
5258
if (tryParseJSON(data)) result = JSON.parse(data);
5359
let transformedData: any = {};

0 commit comments

Comments
 (0)