Merged in release/2021-12-10 (pull request #291)

release/2021-12-10

Approved-by: Patrick Fic

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={
           <Space wrap>
+            <Button onClick={() => refetch && refetch()}>
+              <SyncOutlined />
+            </Button>
             <ProductionBoardFilters
               filter={filter}
               setFilter={setFilter}

client/src/components/production-board-kanban/production-board-kanban.container.jsx

@@ -20,7 +20,9 @@ const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
 export function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
-  const { loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION);
+  const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
+    pollInterval: 3600000,
+  });
   const client = useApolloClient();
   const [joblist, setJoblist] = useState([]);
   const { data: updatedJobs } = useSubscription(
@@ -69,6 +71,7 @@ export function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
     <ProductionBoardKanbanComponent
       loading={loading || associationSettingsLoading}
       data={data ? data.jobs : []}
+      refetch={refetch}
       associationSettings={
         associationSettings && associationSettings.associations[0]
           ? associationSettings.associations[0]

client/src/components/production-list-table/production-list-table.component.jsx

@@ -1,4 +1,7 @@
+import { SyncOutlined } from "@ant-design/icons";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
+  Button,
   Dropdown,
   Input,
   Menu,
@@ -24,7 +27,6 @@ import ProductionListSaveConfigButton from "../production-list-save-config-butto
 import ProductionListPrint from "./production-list-print.component";
 import ProductionListTableViewSelect from "./production-list-table-view-select.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
-import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -35,6 +37,7 @@ const mapStateToProps = createStructuredSelector({
 export function ProductionListTable({
   loading,
   data,
+  refetch,
   bodyshop,
   technician,
   currentUser,
@@ -196,6 +199,9 @@ export function ProductionListTable({
         }
         extra={
           <Space wrap>
+            <Button onClick={() => refetch && refetch()}>
+              <SyncOutlined />
+            </Button>
             <ProductionListColumnsAdd
               columnState={[columns, setColumns]}
               tableState={state}

client/src/components/production-list-table/production-list-table.container.jsx

@@ -9,7 +9,9 @@ import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";
 
 export default function ProductionListTableContainer() {
-  const { loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION);
+  const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
+    pollInterval: 3600000,
+  });
   const client = useApolloClient();
   const [joblist, setJoblist] = useState([]);
   const { data: updatedJobs } = useSubscription(
@@ -49,5 +51,11 @@ export default function ProductionListTableContainer() {
     });
   };
 
-  return <ProductionListTable loading={loading} data={data ? data.jobs : []} />;
+  return (
+    <ProductionListTable
+      loading={loading}
+      data={data ? data.jobs : []}
+      refetch={refetch}
+    />
+  );
 }

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 = {

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);