-
+ {!loading && !uploaded && (
})
-
+ )}
+ {loading &&
);
}
diff --git a/client/src/components/document-editor/document-editor.container.jsx b/client/src/components/document-editor/document-editor.container.jsx
index 7e19b98d4..3819f27f8 100644
--- a/client/src/components/document-editor/document-editor.container.jsx
+++ b/client/src/components/document-editor/document-editor.container.jsx
@@ -1,29 +1,55 @@
import { useQuery } from "@apollo/client";
-import { Modal, Result } from "antd";
+import { Result } from "antd";
import queryString from "query-string";
-import React from "react";
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
import { useLocation } from "react-router";
+import { QUERY_BODYSHOP } from "../../graphql/bodyshop.queries";
import { GET_DOCUMENT_BY_PK } from "../../graphql/documents.queries";
+import { setBodyshop } from "../../redux/user/user.actions";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import DocumentEditor from "./document-editor.component";
-import { useTranslation } from "react-i18next";
-export default function DocumentEditorContainer() {
+const mapDispatchToProps = (dispatch) => ({
+ setBodyshop: (bs) => dispatch(setBodyshop(bs)),
+});
+
+export default connect(null, mapDispatchToProps)(DocumentEditorContainer);
+
+export function DocumentEditorContainer({ setBodyshop }) {
//Get the image details for the image to be saved.
//Get the document id from the search string.
const { documentId } = queryString.parse(useLocation().search);
const { t } = useTranslation();
+ const {
+ loading: loadingShop,
+ error: errorShop,
+ data: dataShop,
+ } = useQuery(QUERY_BODYSHOP, {
+ fetchPolicy: "network-only",
+ });
+
+ useEffect(() => {
+ if (dataShop) setBodyshop(dataShop.bodyshops[0]);
+ }, [dataShop, setBodyshop]);
const { loading, error, data } = useQuery(GET_DOCUMENT_BY_PK, {
variables: { documentId },
skip: !documentId,
});
- if (loading) return
diff --git a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
index ed27f08cb..c975388f2 100644
--- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
@@ -1,5 +1,5 @@
-import { FileExcelFilled } from "@ant-design/icons";
-import { Card, Col, Row, Space } from "antd";
+import { FileExcelFilled, EditFilled, SyncOutlined } from "@ant-design/icons";
+import { Card, Col, Row, Space, Button } from "antd";
import React, { useEffect, useState } from "react";
import Gallery from "react-grid-gallery";
import { useTranslation } from "react-i18next";
@@ -23,6 +23,25 @@ function JobsDocumentsComponent({
}) {
const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
const { t } = useTranslation();
+ const [index, setIndex] = useState(0);
+
+ const onCurrentImageChange = (index) => {
+ setIndex(index);
+ };
+
+ useEffect(() => {
+ console.log("Added event listening for reteching.");
+ window.addEventListener("storage", (ev) => {
+ if (ev.key === "refetch" && ev.newValue === true) {
+ refetch && refetch();
+ localStorage.setItem("refetch", false);
+ }
+ });
+
+ return () => {
+ window.removeEventListener("storage");
+ };
+ }, [refetch]);
useEffect(() => {
let documents = data.reduce(
@@ -101,6 +120,9 @@ function JobsDocumentsComponent({
+
{
+ console.log(`Clicked`);
+ const newWindow = window.open(
+ `${window.location.protocol}//${window.location.host}/edit?documentId=${galleryImages.images[index].id}`,
+ "_blank",
+ "noopener,noreferrer"
+ );
+ if (newWindow) newWindow.opener = null;
+ }}
+ >
+