From 22a5c4a12d285c76e4c48a655185f9d6a1ca5865 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Tue, 7 Dec 2021 15:15:40 -0800 Subject: [PATCH 1/2] Add production repolling once an hr. --- .../production-board-kanban.component.jsx | 7 ++++++- .../production-board-kanban.container.jsx | 5 ++++- .../production-list-table.component.jsx | 8 +++++++- .../production-list-table.container.jsx | 12 ++++++++++-- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/client/src/components/production-board-kanban/production-board-kanban.component.jsx b/client/src/components/production-board-kanban/production-board-kanban.component.jsx index a90e7b29e..10ed5d440 100644 --- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx +++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx @@ -2,7 +2,8 @@ import { useApolloClient } from "@apollo/client"; import Board, { moveCard } from "@asseinfo/react-kanban"; //import "@asseinfo/react-kanban/dist/styles.css"; import "./production-board-kanban.styles.scss"; -import { Grid, notification, PageHeader, Space, Statistic } from "antd"; +import { SyncOutlined } from '@ant-design/icons' +import { Grid, notification, Button, PageHeader, Space, Statistic } from "antd"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; @@ -33,6 +34,7 @@ const mapDispatchToProps = (dispatch) => ({ export function ProductionBoardKanbanComponent({ data, bodyshop, + refetch, technician, insertAuditTrail, associationSettings, @@ -192,6 +194,9 @@ export function ProductionBoardKanbanComponent({ } extra={ + + ; + return ( + + ); } From 26d22388c00675775451f9111f47be911c11faad Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 8 Dec 2021 09:25:55 -0800 Subject: [PATCH 2/2] Add IO Event tracking to graylog. --- client/src/utils/GraphQLClient.js | 17 +++++++++++++++-- server/ioevent/ioevent.js | 22 +++++++++++++++------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/client/src/utils/GraphQLClient.js b/client/src/utils/GraphQLClient.js index d0fa29461..64d712198 100644 --- a/client/src/utils/GraphQLClient.js +++ b/client/src/utils/GraphQLClient.js @@ -6,9 +6,10 @@ import { WebSocketLink } from "@apollo/client/link/ws"; import { getMainDefinition } from "@apollo/client/utilities"; //import { split } from "apollo-link"; import apolloLogger from "apollo-link-logger"; +import axios from "axios"; import { auth } from "../firebase/firebase.utils"; import errorLink from "../graphql/apollo-error-handling"; - +import { store } from "../redux/store"; const httpLink = new HttpLink({ uri: process.env.REACT_APP_GRAPHQL_ENDPOINT, }); @@ -47,7 +48,19 @@ const roundTripLink = new ApolloLink((operation, forward) => { }); const TrackExecutionTime = async (operationName, time) => { - //await axios.post("/ioevent", { operationName, time, dbevent: true }); + const rdxStore = store.getState(); + try { + console.log("trying"); + axios.post("/ioevent", { + operationName, + time, + dbevent: true, + user: rdxStore.user.currentUser.email, + imexshopid: rdxStore.user.bodyshop.imexshopid, + }); + } catch (error) { + console.log("IOEvent Error", error); + } }; const subscriptionMiddleware = { diff --git a/server/ioevent/ioevent.js b/server/ioevent/ioevent.js index 297ea1916..4ad524eb8 100644 --- a/server/ioevent/ioevent.js +++ b/server/ioevent/ioevent.js @@ -1,6 +1,7 @@ const client = require("../graphql-client/graphql-client").client; const queries = require("../graphql-client/queries"); const path = require("path"); +const logger = require("../utils/logger"); require("dotenv").config({ path: path.resolve( @@ -10,15 +11,22 @@ require("dotenv").config({ }); exports.default = async (req, res) => { - const { operationName, time, dbevent } = req.body; + const { operationName, time, dbevent, user, imexshopid } = req.body; try { - await client.request(queries.INSERT_IOEVENT, { - event: { - operationname: operationName, - time, - dbevent, - }, + // await client.request(queries.INSERT_IOEVENT, { + // event: { + // operationname: operationName, + // time, + // dbevent, + // }, + // }); + console.log("IOEVENT", operationName, time, dbevent, user, imexshopid); + logger.log("ioevent", "trace", user, null, { + imexshopid, + operationName, + time, + dbevent, }); res.sendStatus(200);