Skip to content

Maintenance #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/components/averages.tsx
Original file line number Diff line number Diff line change
@@ -13,16 +13,11 @@ const Averages = () => {
const store = useAppSelector((state) => state);
const resolverData = store.data;

// iterate through resolverData
// set count variable for resolvers of same type
// sum duration and find average for resolvers of same type
// save averages as object { resolverName: averageDuration }

const tableData: JSX.Element[] = [];

let totalSum = 0;
let totalCount = 0;
let totalAverage;
let totalSum: number = 0;
let totalCount: number = 0;
let totalAverage: number | undefined;

// if no resolver data set total average to 0
totalCount === 0 ? totalAverage = 0 : totalAverage = totalSum / totalCount;
1 change: 0 additions & 1 deletion src/components/liveFeed.tsx
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@ const LiveFeed = () => {

const store = useAppSelector(state => state)
const data = store.data.rawdata;
console.log('DATA FROM LIVE FEED: ', data);

const items = data.map((obj: Object, i: Key) => {
return (
6 changes: 3 additions & 3 deletions src/components/metricsTable.tsx
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@ import { Flex } from '@chakra-ui/layout';
const MetricsTable = ({ data }: any) => {

const details: Array<any> = [];
let response;
let errors = '';
let response: string | undefined;
let errors: string = '';

for (let str of Object.keys(data)) {
for (let str of Object.keys(data)) {
if (str === 'trace_id') continue;
if (str === 'errors') {
errors += JSON.stringify(data[str]);
1 change: 0 additions & 1 deletion src/components/navitem.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React, { useEffect, useState } from 'react'
import {
Flex,
Text,
6 changes: 3 additions & 3 deletions src/components/resolverMetric.tsx
Original file line number Diff line number Diff line change
@@ -23,10 +23,10 @@ const ResolverMetric = ({ data, id }: any) => {
}
}, [data])

const colors = ['orange.300', 'orange.400', 'orange.500', 'orange.600', 'orange.700'];
const errColors = ['red.500', 'red.600', 'red.700', 'red.800', 'red.900'];
const colors: string[] = ['orange.300', 'orange.400', 'orange.500', 'orange.600', 'orange.700'];
const errColors: string[] = ['red.500', 'red.600', 'red.700', 'red.800', 'red.900'];
let index = 0;
const filteredData = Object.keys(data).filter(key => (
const filteredData: any[] = Object.keys(data).filter(key => (
key !== 'dateAndTime' && key !== 'totalDuration' && key !== 'trace_id' && key !== 'errors' && key !== 'response'
));

10 changes: 1 addition & 9 deletions src/state/action-creators/index.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
import * as types from '../constants/actionTypes'

// create action creators and export them all individually
// "export const [nameOfCreator]""

export const updateDataActionCreator = newData => ({
type: types.UPDATE_DATA,
payload: newData
})

export const deleteDataActionCreator = () => ({
type: types.DELETE_DATA
})

// maybe add some actions for options
// actions can update how many resolvers to show for each graph

// do we need action for darkmode? or chakra ui provides native method?
})
5 changes: 3 additions & 2 deletions src/state/reducers/dataReducer.js
Original file line number Diff line number Diff line change
@@ -17,9 +17,10 @@ const dataReducer = (state = initialState, action) => {
// UPDATE RAW DATA ARRAY
clone.rawdata.push(data);

// UPDATE AVERAGES + COUNT
// UPDATE AVERAGES + COUNT
const unrelatedKeys = ['dateAndTime', 'errors', 'response', 'totalDuration', 'trace_id'];
for (let key in data) {
if (key !== 'dateAndTime' && key !== 'errors' && key !== 'response' && key !== 'totalDuration' && key !== 'trace_id') {
if (!unrelatedKeys.includes(key)) {
if (clone.averages[key]) {
let sum = clone.averages[key] * clone.count[key];
sum += data[key];
6 changes: 3 additions & 3 deletions tracer-npm-package/goTrace.js
Original file line number Diff line number Diff line change
@@ -40,15 +40,15 @@ module.exports = async function goTrace(schema, query, root, context, variables)
if (errors.length === 0) {
console.log(`Validation successful query can be executed`);
} else {
Object.keys(rootQueryObj).includes('errors') ? rootQueryObj['errors'].push(errors) : rootQueryObj['errors'] = [...errors];
rootQueryObj.hasOwnProperty('errors') ? rootQueryObj['errors'].push(errors) : rootQueryObj['errors'] = [...errors];
}

let endTime;
let response;

// Execute the query against the schema
const currentDate = new Date();
const timestamp = currentDate. getTime()
const timestamp = currentDate.getTime()
const dateAndTime = `${currentDate} | ${timestamp}`;

rootQueryObj['dateAndTime'] = dateAndTime;
@@ -62,7 +62,7 @@ module.exports = async function goTrace(schema, query, root, context, variables)
.then(() => { return rootQueryObj })
.catch(err => {
// rootQueryObj.hasOwnProperty('errors')
Object.keys(rootQueryObj).includes('errors') ? rootQueryObj['errors'].push(err.message) : rootQueryObj['errors'] = [...err.message];
rootQueryObj.hasOwnProperty('errors') ? rootQueryObj['errors'].push(err.message) : rootQueryObj['errors'] = [...err.message];
});

rootQueryObj.totalDuration = JSON.parse((endTime[1] / 1e6).toFixed(2));
1 change: 0 additions & 1 deletion tracer-npm-package/server.js
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@ app.use(express.static('out'))
app.use(express.json())

app.post('/socketio', (req, res) => {
console.log(req.body)
req.app.io.emit('data', req.body)
res.end()
})