- The Config Form
-
+
+
diff --git a/client/src/graphql/csi.queries.js b/client/src/graphql/csi.queries.js
index f835f1d56..d2b62af43 100644
--- a/client/src/graphql/csi.queries.js
+++ b/client/src/graphql/csi.queries.js
@@ -57,19 +57,15 @@ export const INSERT_CSI = gql`
`;
export const QUERY_CSI_RESPONSE_PAGINATED = gql`
- query QUERY_CSI_RESPONSE_PAGINATED(
- $offset: Int
- $limit: Int
- $order: [csi_order_by!]!
- ) {
- csi(offset: $offset, limit: $limit, order_by: $order) {
+ query QUERY_CSI_RESPONSE_PAGINATED {
+ csi(order_by: { completedon: desc_nulls_last }) {
id
completedon
job {
ownr_fn
ownr_ln
+ ownerid
ro_number
-
id
}
}
@@ -83,6 +79,7 @@ export const QUERY_CSI_RESPONSE_PAGINATED = gql`
export const QUERY_CSI_RESPONSE_BY_PK = gql`
query QUERY_CSI_RESPONSE_BY_PK($id: uuid!) {
csi_by_pk(id: $id) {
+ completedon
relateddata
valid
validuntil
diff --git a/client/src/pages/csi/csi.container.page.jsx b/client/src/pages/csi/csi.container.page.jsx
index 4076a01a4..96b9663a9 100644
--- a/client/src/pages/csi/csi.container.page.jsx
+++ b/client/src/pages/csi/csi.container.page.jsx
@@ -1,88 +1,62 @@
-import { useQuery, useMutation } from "@apollo/client";
-import { Form, Layout, Typography, Button, Result } from "antd";
-import React, { useState } from "react";
+// import { useMutation, useQuery } from "@apollo/client";
+import { Button, Form, Layout, Result, Typography } from "antd";
+import axios from "axios";
+import React, { useCallback, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
import { useParams } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
import AlertComponent from "../../components/alert/alert.component";
import ConfigFormComponents from "../../components/config-form-components/config-form-components.component";
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
-import { QUERY_SURVEY, COMPLETE_SURVEY } from "../../graphql/csi.queries";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
import { selectCurrentUser } from "../../redux/user/user.selectors";
+import { DateTimeFormat } from "./../../utils/DateFormatter";
const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser,
});
-const mapDispatchToProps = (dispatch) => ({
- //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+const mapDispatchToProps = (dispatch) => ({});
+
export default connect(mapStateToProps, mapDispatchToProps)(CsiContainerPage);
export function CsiContainerPage({ currentUser }) {
const { surveyId } = useParams();
const [form] = Form.useForm();
+ const [axiosResponse, setAxiosResponse] = useState(null);
const [submitting, setSubmitting] = useState({
loading: false,
submitted: false,
});
-
- const { loading, error, data } = useQuery(QUERY_SURVEY, {
- variables: { surveyId },
- fetchPolicy: "network-only",
- nextFetchPolicy: "network-only",
- });
-
const { t } = useTranslation();
- const [completeSurvey] = useMutation(COMPLETE_SURVEY);
- if (loading) return
;
- if (error || !!!data.csi_by_pk)
- return (
-
-
- {error ? (
- ERROR: {error.graphQLErrors.map((e) => e.message)}
- ) : null}
-
-
- );
-
- const handleFinish = async (values) => {
- setSubmitting({ ...submitting, loading: true });
-
- const result = await completeSurvey({
- variables: {
- surveyId,
- survey: {
- response: values,
- valid: false,
- completedon: new Date(),
- },
- },
- });
-
- if (!!!result.errors) {
- setSubmitting({ ...submitting, loading: false, submitted: true });
- } else {
- setSubmitting({
- ...submitting,
+ const getAxiosData = useCallback(async () => {
+ try {
+ setSubmitting((prevSubmitting) => ({ ...prevSubmitting, loading: true }));
+ const response = await axios.post("/csi/lookup", { surveyId });
+ setSubmitting((prevSubmitting) => ({
+ ...prevSubmitting,
loading: false,
- error: JSON.stringify(result.errors),
+ }));
+ setAxiosResponse(response.data);
+ } catch (error) {
+ console.error(`Something went wrong...: ${error.message}`);
+ console.dir({
+ stack: error?.stack,
+ message: error?.message,
});
}
- };
+ }, [setAxiosResponse, surveyId]);
- const {
- relateddata: { bodyshop, job },
- csiquestion: { config: csiquestions },
- } = data.csi_by_pk;
+ useEffect(() => {
+ getAxiosData().catch((err) =>
+ console.error(
+ `Something went wrong fetching axios data: ${err.message || ""}`
+ )
+ );
+ }, [getAxiosData]);
- if (currentUser && currentUser.authorized)
+ // Return if authorized
+ if (currentUser && currentUser.authorized) {
return (
);
+ }
- return (
-
-
-
- {bodyshop.logo_img_path && bodyshop.logo_img_path.src ? (
-
- ) : null}
-
-
{bodyshop.shopname || ""}
-
{`${bodyshop.address1 || ""}`}
-
{`${bodyshop.address2 || ""}`}
-
{`${bodyshop.city || ""} ${bodyshop.state || ""} ${
- bodyshop.zip_post || ""
- }`}
+ if (submitting.loading) return
;
+
+ const handleFinish = async (values) => {
+ try {
+ setSubmitting({ ...submitting, loading: true, submitting: true });
+ const result = await axios.post("/csi/submit", { surveyId, values });
+ console.log("result", result);
+ if (!!!result.errors && result.data.update_csi.affected_rows > 0) {
+ setSubmitting({ ...submitting, loading: false, submitted: true });
+ }
+ } catch (error) {
+ console.error(`Something went wrong...: ${error.message}`);
+ console.dir({
+ stack: error?.stack,
+ message: error?.message,
+ });
+ }
+ };
+
+ if (!axiosResponse || axiosResponse.csi_by_pk === null) {
+ // Do something here , this is where you would return a loading box or something
+ return (
+ <>
+
+
+
+
+
+ {t("csi.labels.copyright")}{" "}
+ {t("csi.fields.surveyid", { surveyId: surveyId })}
+
+
+
+ );
+ } else {
+ const {
+ relateddata: { bodyshop, job },
+ csiquestion: { config: csiquestions },
+ } = axiosResponse.csi_by_pk;
+
+ return (
+
+
+
+ {bodyshop.logo_img_path && bodyshop.logo_img_path.src ? (
+
+ ) : null}
+
+
+ {bodyshop.shopname || ""}
+
+
+ {`${bodyshop.address1 || ""}${bodyshop.address2 ? ", " : ""}${
+ bodyshop.address2 || ""
+ }`.trim()}
+
+
+ {`${bodyshop.city || ""}${
+ bodyshop.city && bodyshop.state ? ", " : ""
+ }${bodyshop.state || ""} ${bodyshop.zip_post || ""}`.trim()}
+
+
+
{t("csi.labels.title")}
+
+ {t("csi.labels.greeting", {
+ name: job.ownr_co_nm || job.ownr_fn || "",
+ })}
+
+
+ {t("csi.labels.intro", { shopname: bodyshop.shopname || "" })}
+
- {submitting.error ? (
-
- ) : null}
+ {submitting.error ? (
+
+ ) : null}
- {submitting.submitted ? (
-
-
-
- ) : (
-
-
-
- )}
-
-
- {`Copyright ImEX.Online. Survey ID: ${surveyId}`}
-
-
- );
+ {submitting.submitted ? (
+
+
+
+ ) : (
+
+
+
+ )}
+
+ {t("csi.labels.copyright")}{" "}
+ {t("csi.fields.surveyid", { surveyId: surveyId })}
+
+
+ );
+ }
}
diff --git a/client/src/pages/shop-csi/shop-csi.container.page.jsx b/client/src/pages/shop-csi/shop-csi.container.page.jsx
index f0c295685..e9d304b53 100644
--- a/client/src/pages/shop-csi/shop-csi.container.page.jsx
+++ b/client/src/pages/shop-csi/shop-csi.container.page.jsx
@@ -1,22 +1,20 @@
-import { Row, Col } from "antd";
import { useQuery } from "@apollo/client";
-import queryString from "query-string";
+import { Col, Row } from "antd";
import React, { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import AlertComponent from "../../components/alert/alert.component";
import CsiResponseFormContainer from "../../components/csi-response-form/csi-response-form.container";
import CsiResponseListPaginated from "../../components/csi-response-list-paginated/csi-response-list-paginated.component";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import { QUERY_CSI_RESPONSE_PAGINATED } from "../../graphql/csi.queries";
import {
setBreadcrumbs,
setSelectedHeader,
} from "../../redux/application/application.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
-import {pageLimit} from "../../utils/config";
+
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
@@ -33,28 +31,11 @@ export function ShopCsiContainer({
}) {
const { t } = useTranslation();
- const searchParams = queryString.parse(useLocation().search);
- const { page, sortcolumn, sortorder } = searchParams;
-
const { loading, error, data, refetch } = useQuery(
QUERY_CSI_RESPONSE_PAGINATED,
{
fetchPolicy: "network-only",
nextFetchPolicy: "network-only",
- variables: {
- //search: search || "",
- offset: page ? (page - 1) * pageLimit : 0,
- limit: pageLimit,
- order: [
- {
- [sortcolumn || "completedon"]: sortorder
- ? sortorder === "descend"
- ? "desc_nulls_last"
- : "asc"
- : "desc_nulls_last",
- },
- ],
- },
}
);
@@ -73,12 +54,7 @@ export function ShopCsiContainer({
if (error) return
;
return (
-
- // }
- >
+
{
diff --git a/server/csi/csi.js b/server/csi/csi.js
new file mode 100644
index 000000000..819a9ebc7
--- /dev/null
+++ b/server/csi/csi.js
@@ -0,0 +1,2 @@
+exports.lookup = require("./lookup").default;
+exports.submit = require("./submit").default;
\ No newline at end of file
diff --git a/server/csi/lookup.js b/server/csi/lookup.js
new file mode 100644
index 000000000..81a44c2b8
--- /dev/null
+++ b/server/csi/lookup.js
@@ -0,0 +1,24 @@
+const path = require("path");
+const queries = require("../graphql-client/queries");
+const logger = require("../utils/logger");
+require("dotenv").config({
+ path: path.resolve(
+ process.cwd(),
+ `.env.${process.env.NODE_ENV || "development"}`
+ ),
+});
+
+const client = require("../graphql-client/graphql-client").client;
+
+exports.default = async (req, res) => {
+ try {
+ logger.log("csi-surveyID-lookup", "DEBUG", "csi", req.body.surveyId, null);
+ const gql_response = await client.request(queries.QUERY_SURVEY, {
+ surveyId: req.body.surveyId,
+ });
+ res.status(200).json(gql_response);
+ } catch (error) {
+ logger.log("csi-surveyID-lookup", "ERROR", "csi", req.body.surveyId, error);
+ res.status(400).json(error);
+ }
+};
diff --git a/server/csi/submit.js b/server/csi/submit.js
new file mode 100644
index 000000000..a232425ae
--- /dev/null
+++ b/server/csi/submit.js
@@ -0,0 +1,29 @@
+const path = require("path");
+const queries = require("../graphql-client/queries");
+const logger = require("../utils/logger");
+require("dotenv").config({
+ path: path.resolve(
+ process.cwd(),
+ `.env.${process.env.NODE_ENV || "development"}`
+ ),
+});
+
+const client = require("../graphql-client/graphql-client").client;
+
+exports.default = async (req, res) => {
+ try {
+ logger.log("csi-surveyID-submit", "DEBUG", "csi", req.body.surveyId, null);
+ const gql_response = await client.request(queries.COMPLETE_SURVEY, {
+ surveyId: req.body.surveyId,
+ survey: {
+ response: req.body.values,
+ valid: false,
+ completedon: new Date(),
+ },
+ });
+ res.status(200).json(gql_response);
+ } catch (error) {
+ logger.log("csi-surveyID-submit", "ERROR", "csi", req.body.surveyId, error);
+ res.status(400).json(error);
+ }
+};
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index fe1c7b6e5..b2fd4e23e 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -2156,3 +2156,23 @@ exports.ACTIVE_SHOP_BY_USER = `query ACTIVE_SHOP_BY_USER($user: String) {
shopid
}
}`;
+
+exports.QUERY_SURVEY = `query QUERY_SURVEY($surveyId: uuid!) {
+ csi_by_pk(id: $surveyId) {
+ completedon
+ csiquestion {
+ id
+ config
+ }
+ id
+ relateddata
+ valid
+ validuntil
+ }
+}`;
+
+exports.COMPLETE_SURVEY = `mutation COMPLETE_SURVEY($surveyId: uuid!, $survey: csi_set_input) {
+ update_csi(where: { id: { _eq: $surveyId } }, _set: $survey) {
+ affected_rows
+ }
+ }`;
\ No newline at end of file
diff --git a/server/routes/csiRoutes.js b/server/routes/csiRoutes.js
new file mode 100644
index 000000000..8f47a2b2d
--- /dev/null
+++ b/server/routes/csiRoutes.js
@@ -0,0 +1,8 @@
+const express = require("express");
+const router = express.Router();
+const { lookup, submit } = require("../csi/csi");
+
+router.post("/lookup", lookup);
+router.post("/submit", submit);
+
+module.exports = router;