upload fies to storage account for appeal
This commit is contained in:
+14
-6
@@ -1,5 +1,3 @@
|
|||||||
|
|
||||||
|
|
||||||
ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
|
ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
|
||||||
//ESNR Tenant
|
//ESNR Tenant
|
||||||
TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
|
TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
|
||||||
@@ -45,10 +43,10 @@ RELAYPATH = "dev-pedw-hc"
|
|||||||
|
|
||||||
|
|
||||||
GOOGLE_TAG_MANAGER = GTM-T78CBC3
|
GOOGLE_TAG_MANAGER = GTM-T78CBC3
|
||||||
SHOWLOGIN = "false"
|
SHOWLOGIN = "true"
|
||||||
SHOWREPRESENTATIONS = "false"
|
SHOWREPRESENTATIONS = false
|
||||||
SHOWFILEUPLOAD = "false"
|
SHOWFILEUPLOAD = "true"
|
||||||
SHOWMAPS = "false"
|
SHOWMAPS = "true"
|
||||||
//BASIC_AUTH_CREDENTIALS = pinswg:password|pinswg2:password2
|
//BASIC_AUTH_CREDENTIALS = pinswg:password|pinswg2:password2
|
||||||
|
|
||||||
|
|
||||||
@@ -89,3 +87,13 @@ NEXTAUTH_URL=http://localhost:3000
|
|||||||
NEXTAUTH_URL_INTERNAL=http://localhost:3000
|
NEXTAUTH_URL_INTERNAL=http://localhost:3000
|
||||||
DATABASE_URL=mysql://nextAuthAdmin:!Sky9fish1972@77.68.17.157:3306/nextauthDB?synchronise=true
|
DATABASE_URL=mysql://nextAuthAdmin:!Sky9fish1972@77.68.17.157:3306/nextauthDB?synchronise=true
|
||||||
SECRET=SuperSecret
|
SECRET=SuperSecret
|
||||||
|
|
||||||
|
|
||||||
|
//Azure Storage Account
|
||||||
|
|
||||||
|
AZURE_CLIENT_ID = $CLIENT_ID
|
||||||
|
AZURE_TENANT_ID = $TENANT
|
||||||
|
AZURE_CLIENT_SECRET = $CLIENT_SECRET
|
||||||
|
|
||||||
|
AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
|
||||||
|
AZURE_PEDW_CONTAINER = "pedwapplications"
|
||||||
@@ -0,0 +1,196 @@
|
|||||||
|
import { v4 as uuidv4 } from "uuid";
|
||||||
|
import { BlobServiceClient, ContainerClient } from "@azure/storage-blob";
|
||||||
|
import {
|
||||||
|
DefaultAzureCredential,
|
||||||
|
InteractiveBrowserCredential,
|
||||||
|
EnvironmentCredential,
|
||||||
|
ClientSecretCredential,
|
||||||
|
} from "@azure/identity";
|
||||||
|
import { hashAPIPath } from ".";
|
||||||
|
|
||||||
|
const STORAGE_PATH = process.env.AZURE_PEDW_STORAGE_ENDPOINT;
|
||||||
|
const STORAGE_CONTAINER = process.env.AZURE_PEDW_CONTAINER;
|
||||||
|
|
||||||
|
export const createContainer = async (containerName) => {
|
||||||
|
const creds = new DefaultAzureCredential();
|
||||||
|
|
||||||
|
containerName = containerName.toLowerCase();
|
||||||
|
|
||||||
|
// console.log(
|
||||||
|
// "container name:",
|
||||||
|
// containerName,
|
||||||
|
// STORAGE_PATH + "/" + containerName
|
||||||
|
// );
|
||||||
|
|
||||||
|
const containerClient = new ContainerClient(
|
||||||
|
`${STORAGE_PATH}/${containerName}`,
|
||||||
|
creds
|
||||||
|
);
|
||||||
|
|
||||||
|
const blobServiceClient = new BlobServiceClient(`${STORAGE_PATH}`, creds);
|
||||||
|
|
||||||
|
const createContainerResponse = await containerClient.createIfNotExists();
|
||||||
|
// console.log(
|
||||||
|
// `Created container ${containerName} successfully`,
|
||||||
|
// createContainerResponse.requestId
|
||||||
|
// );
|
||||||
|
|
||||||
|
// console.log("Containers:");
|
||||||
|
// for await (const container of blobServiceClient.listContainers()) {
|
||||||
|
// console.log(`- ${container.name}`);
|
||||||
|
// }
|
||||||
|
|
||||||
|
return containerName;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getContainers = async () => {
|
||||||
|
const creds = new DefaultAzureCredential();
|
||||||
|
const blobServiceClient = new BlobServiceClient(`${STORAGE_PATH}`, creds);
|
||||||
|
|
||||||
|
console.log("Containers:");
|
||||||
|
for await (const container of blobServiceClient.listContainers()) {
|
||||||
|
console.log(`- ${container.name}`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getBlobs = async (containerName) => {
|
||||||
|
const creds = new DefaultAzureCredential();
|
||||||
|
|
||||||
|
const containerClient = new ContainerClient(
|
||||||
|
`${STORAGE_PATH}/${containerName}`,
|
||||||
|
creds
|
||||||
|
);
|
||||||
|
|
||||||
|
containerClient.createIfNotExists();
|
||||||
|
|
||||||
|
const blobObj = [];
|
||||||
|
for await (const blob of containerClient.listBlobsFlat({
|
||||||
|
prefix: "files/",
|
||||||
|
})) {
|
||||||
|
let blobDocumentType = blob.name
|
||||||
|
.split("/")[1]
|
||||||
|
.slice(0, blob.name.split("/")[1].indexOf("_"));
|
||||||
|
|
||||||
|
blobObj.push({
|
||||||
|
"name": blob.name.split("/")[1],
|
||||||
|
"path": blob.name,
|
||||||
|
"documentType": blobDocumentType,
|
||||||
|
"versionId": blob.versionId,
|
||||||
|
"isCurrentVersion": blob.isCurrentVersion,
|
||||||
|
"contentLength": blob.properties.contentLength,
|
||||||
|
"contentType": blob.contentType,
|
||||||
|
"hashedfilepath": hashAPIPath(
|
||||||
|
"/api/file/downloadblob?container=" +
|
||||||
|
containerName.toLowerCase() +
|
||||||
|
"&blobname=" +
|
||||||
|
blob.name.split("/")[1]
|
||||||
|
),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return blobObj;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const createBlob = async (formContent, containerName) => {
|
||||||
|
const creds = new DefaultAzureCredential();
|
||||||
|
|
||||||
|
const containerClient = new ContainerClient(
|
||||||
|
`${STORAGE_PATH}/${containerName}`,
|
||||||
|
creds
|
||||||
|
);
|
||||||
|
|
||||||
|
const content = JSON.stringify(formContent);
|
||||||
|
const blobName =
|
||||||
|
formContent.pinswg_name + "_" + new Date().getTime() + ".json";
|
||||||
|
const blockBlobClient = containerClient.getBlockBlobClient(blobName);
|
||||||
|
|
||||||
|
const uploadBlobResponse = await blockBlobClient.upload(
|
||||||
|
content,
|
||||||
|
Buffer.byteLength(content)
|
||||||
|
);
|
||||||
|
|
||||||
|
// console.log("Blobs:");
|
||||||
|
// for await (const blob of containerClient.listBlobsByHierarchy("/")) {
|
||||||
|
// console.log(`- ${blob.name}`);
|
||||||
|
// }
|
||||||
|
|
||||||
|
return formContent.pinswg_name;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const deleteBlob = async (containerName, blobName) => {
|
||||||
|
const creds = new DefaultAzureCredential();
|
||||||
|
|
||||||
|
const options = {
|
||||||
|
deleteSnapshots: "include", // or 'only'
|
||||||
|
};
|
||||||
|
|
||||||
|
const containerClient = new ContainerClient(
|
||||||
|
`${STORAGE_PATH}/${containerName.toLowerCase()}`,
|
||||||
|
creds
|
||||||
|
);
|
||||||
|
|
||||||
|
const blockBlobClient = containerClient.getBlockBlobClient(blobName);
|
||||||
|
|
||||||
|
await blockBlobClient.deleteIfExists(options);
|
||||||
|
|
||||||
|
console.log(`deleted blob ${blobName}`);
|
||||||
|
|
||||||
|
return { "deleted": blobName };
|
||||||
|
};
|
||||||
|
|
||||||
|
export const uploadFile = async (formContent, containerName, foldername) => {
|
||||||
|
const creds = new DefaultAzureCredential();
|
||||||
|
|
||||||
|
const containerClient = new ContainerClient(
|
||||||
|
`${STORAGE_PATH}/${containerName}`,
|
||||||
|
creds
|
||||||
|
);
|
||||||
|
|
||||||
|
const files = formContent;
|
||||||
|
|
||||||
|
//console.log(...formContent);
|
||||||
|
//console.log("files...", files, files.length);
|
||||||
|
|
||||||
|
for (const prop in files) {
|
||||||
|
//console.log(`files[${prop}] = ${files[prop][0].size}`);
|
||||||
|
const blobName = "files/" + files[prop][0].fieldName;
|
||||||
|
const blockBlobClient = containerClient.getBlockBlobClient(blobName);
|
||||||
|
const uploadBlobResponse = await blockBlobClient.uploadFile(
|
||||||
|
files[prop][0].path,
|
||||||
|
files[prop].size
|
||||||
|
);
|
||||||
|
console.log(
|
||||||
|
`Uploaded block blob ${files[prop][0].fieldName} successfully`,
|
||||||
|
uploadBlobResponse.requestId
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const downloadFile = async (containerName, blobName) => {
|
||||||
|
//console.log.apply(containerName, blobName);
|
||||||
|
const creds = new DefaultAzureCredential();
|
||||||
|
|
||||||
|
const containerClient = new ContainerClient(
|
||||||
|
`${STORAGE_PATH}/${containerName}`,
|
||||||
|
creds
|
||||||
|
);
|
||||||
|
|
||||||
|
const blobClient = containerClient.getBlobClient("files/" + blobName);
|
||||||
|
const downloadedBlob = await blobClient.download(0);
|
||||||
|
|
||||||
|
const downloaded = await streamToBuffer(downloadedBlob.readableStreamBody);
|
||||||
|
return downloaded;
|
||||||
|
};
|
||||||
|
|
||||||
|
const streamToBuffer = async (readableStream) => {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const chunks = [];
|
||||||
|
readableStream.on("data", (data) => {
|
||||||
|
chunks.push(data instanceof Buffer ? data : Buffer.from(data));
|
||||||
|
});
|
||||||
|
readableStream.on("end", () => {
|
||||||
|
resolve(Buffer.concat(chunks));
|
||||||
|
});
|
||||||
|
readableStream.on("error", reject);
|
||||||
|
});
|
||||||
|
};
|
||||||
+81
-26
@@ -3,7 +3,7 @@ import https from "https";
|
|||||||
import CryptoJS from "crypto-js";
|
import CryptoJS from "crypto-js";
|
||||||
import HmacSHA256 from "crypto-js/hmac-sha256";
|
import HmacSHA256 from "crypto-js/hmac-sha256";
|
||||||
import { getFormCollection } from "../components/utils";
|
import { getFormCollection } from "../components/utils";
|
||||||
|
import { downloadFile } from "./azurestorage";
|
||||||
let BASE_URL;
|
let BASE_URL;
|
||||||
const port = parseInt(process.env.PORT, 10) || 3000;
|
const port = parseInt(process.env.PORT, 10) || 3000;
|
||||||
|
|
||||||
@@ -24,10 +24,6 @@ const WEBAPI_URL =
|
|||||||
process.env.RELAY_ROOT ||
|
process.env.RELAY_ROOT ||
|
||||||
"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
|
"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
|
||||||
|
|
||||||
const agent = new https.Agent({
|
|
||||||
rejectUnauthorized: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
export const getToken = () => {
|
export const getToken = () => {
|
||||||
return axios
|
return axios
|
||||||
.post(
|
.post(
|
||||||
@@ -125,7 +121,6 @@ export const hashAPIPath = (queryPath) => {
|
|||||||
CryptoJS.enc.Hex.parse(WORDKEY)
|
CryptoJS.enc.Hex.parse(WORDKEY)
|
||||||
);
|
);
|
||||||
hashlink = hashlink.toString(CryptoJS.enc.Hex);
|
hashlink = hashlink.toString(CryptoJS.enc.Hex);
|
||||||
|
|
||||||
return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
|
return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1029,35 +1024,95 @@ export const createAccount = (formValues) => {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const uploadFiles = (formValues) => {
|
export const uploadFiles = async (formValues, filesObj) => {
|
||||||
var data = formValues;
|
let files = filesObj;
|
||||||
var queryUrl = "/api/uploads";
|
|
||||||
var config = {
|
console.log(formValues);
|
||||||
|
var formData = new FormData();
|
||||||
|
formData.append("appealData", JSON.stringify(formValues));
|
||||||
|
|
||||||
|
// files.forEach((file) => formData.append("files", file));
|
||||||
|
|
||||||
|
for (let i = 0; i < files.length; i++) {
|
||||||
|
for (let j = 0; j < files[i].length; j++) {
|
||||||
|
console.log(files[i][j].name);
|
||||||
|
formData.append(files[i][j].name, files[i][j]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(formData);
|
||||||
|
|
||||||
|
var queryUrl = "/api/file/upload";
|
||||||
|
|
||||||
|
const config = {
|
||||||
method: "post",
|
method: "post",
|
||||||
url: queryUrl,
|
url: queryUrl,
|
||||||
data: data,
|
data: formData,
|
||||||
|
headers: { "content-type": "multipart/form-data" },
|
||||||
};
|
};
|
||||||
|
|
||||||
// const config = {
|
|
||||||
// method: "post",
|
|
||||||
// url: queryUrl,
|
|
||||||
// data: data,
|
|
||||||
// headers: { "content-type": "multipart/form-data" },
|
|
||||||
// onUploadProgress: (event) => {
|
|
||||||
// //console.log(
|
|
||||||
// `Current progress:`,
|
|
||||||
// Math.round((event.loaded * 100) / event.total)
|
|
||||||
// );
|
|
||||||
// },
|
|
||||||
// };
|
|
||||||
|
|
||||||
//console.log(config);
|
//console.log(config);
|
||||||
return axios(config)
|
try {
|
||||||
|
const res = await axios(config);
|
||||||
|
return res.data;
|
||||||
|
} catch (error) {
|
||||||
|
console.log("this serror", error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getFilesFromBlob = (containerName) => {
|
||||||
|
return axios
|
||||||
|
.get(
|
||||||
|
BASE_URL +
|
||||||
|
"/api/file/getbloblist?container=" +
|
||||||
|
containerName.toLowerCase()
|
||||||
|
)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
//console.log("posted ", res.data);
|
console.log("//////////----", res.data);
|
||||||
return res.data;
|
return res.data;
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.log("this serror", error);
|
console.log("this serror", error);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const deleteBlob = async (containerName, blobName) => {
|
||||||
|
try {
|
||||||
|
const res = await axios.get(
|
||||||
|
BASE_URL +
|
||||||
|
"/api/file/deleteblob?container=" +
|
||||||
|
containerName.toLowerCase() +
|
||||||
|
"&blobname=" +
|
||||||
|
blobName
|
||||||
|
);
|
||||||
|
return res.data;
|
||||||
|
} catch (error) {
|
||||||
|
console.log("this serror", error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const downloadBlob = (containerName, blobName) => {
|
||||||
|
return axios
|
||||||
|
.get(
|
||||||
|
BASE_URL +
|
||||||
|
"/api/file/downloadblob?container=" +
|
||||||
|
containerName.toLowerCase() +
|
||||||
|
"&blobname=" +
|
||||||
|
blobName,
|
||||||
|
{ responseType: "blob" }
|
||||||
|
)
|
||||||
|
.then((response) => {
|
||||||
|
console.log("Downloaded blob content:www");
|
||||||
|
|
||||||
|
res.setHeader(
|
||||||
|
"content-disposition",
|
||||||
|
"attachment; filename=" + blobName
|
||||||
|
);
|
||||||
|
console.log("has downloaded");
|
||||||
|
|
||||||
|
return res.status(200).send(response.data);
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.log("this serror", error);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
+119
-107
@@ -14,6 +14,14 @@ import FileUpload from "../newappeal/fileupload";
|
|||||||
import Dropzone, { useDropzone } from "react-dropzone";
|
import Dropzone, { useDropzone } from "react-dropzone";
|
||||||
import _ from "lodash";
|
import _ from "lodash";
|
||||||
import { connect, useDispatch } from "react-redux";
|
import { connect, useDispatch } from "react-redux";
|
||||||
|
import {
|
||||||
|
getFilesFromBlob,
|
||||||
|
deleteBlob,
|
||||||
|
downloadBlob,
|
||||||
|
hashAPIPath,
|
||||||
|
} from "../../actions";
|
||||||
|
import { setFilesForAppeal } from "../../store/appealType/action";
|
||||||
|
import Link from "next/link";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
addYears,
|
addYears,
|
||||||
@@ -1246,6 +1254,8 @@ export function FileUploadField(props) {
|
|||||||
ticketnumber={props.ticketnumber}
|
ticketnumber={props.ticketnumber}
|
||||||
documentTypeCode={props.documentTypeCode}
|
documentTypeCode={props.documentTypeCode}
|
||||||
hint={props.hint}
|
hint={props.hint}
|
||||||
|
fileList={props.fileList}
|
||||||
|
setFilesForAppeal={props.setFilesForAppeal}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@@ -1277,104 +1287,6 @@ const rejectStyle = {
|
|||||||
borderColor: "#ff1744",
|
borderColor: "#ff1744",
|
||||||
};
|
};
|
||||||
|
|
||||||
// const RenderFileUpload2 = ({
|
|
||||||
// id,
|
|
||||||
// className,
|
|
||||||
// rows,
|
|
||||||
// datafieldname,
|
|
||||||
// name,
|
|
||||||
// label,
|
|
||||||
// input,
|
|
||||||
// errorMsg,
|
|
||||||
// meta: { touched, errorStr },
|
|
||||||
// ...custom
|
|
||||||
// }) => {
|
|
||||||
// const [files, setFiles] = useState([]);
|
|
||||||
|
|
||||||
// const onDrop = useCallback((acceptedFiles, fileRejections, event) => {
|
|
||||||
// setFiles(
|
|
||||||
// acceptedFiles.map((file) =>
|
|
||||||
// Object.assign(file, {
|
|
||||||
// preview: URL.createObjectURL(file),
|
|
||||||
// })
|
|
||||||
// )
|
|
||||||
// );
|
|
||||||
// console.log(acceptedFiles);
|
|
||||||
// event.target[acceptedFiles];
|
|
||||||
// console.log(event.target.files);
|
|
||||||
// }, []);
|
|
||||||
|
|
||||||
// const onChange = useCallback((acceptedFiles, fileRejections, event) => {
|
|
||||||
// setFiles(
|
|
||||||
// acceptedFiles.map((file) =>
|
|
||||||
// Object.assign(file, {
|
|
||||||
// preview: URL.createObjectURL(file),
|
|
||||||
// })
|
|
||||||
// )
|
|
||||||
// );
|
|
||||||
// event.target.files[acceptedFiles];
|
|
||||||
// console.log(event.target.files);
|
|
||||||
// }, []);
|
|
||||||
|
|
||||||
// const {
|
|
||||||
// getRootProps,
|
|
||||||
// getInputProps,
|
|
||||||
// isDragActive,
|
|
||||||
// isDragAccept,
|
|
||||||
// isDragReject,
|
|
||||||
// } = useDropzone({
|
|
||||||
// onDrop,
|
|
||||||
// onChange,
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const style = useMemo(
|
|
||||||
// () => ({
|
|
||||||
// ...baseStyle,
|
|
||||||
// ...(isDragActive ? activeStyle : {}),
|
|
||||||
// ...(isDragAccept ? acceptStyle : {}),
|
|
||||||
// ...(isDragReject ? rejectStyle : {}),
|
|
||||||
// }),
|
|
||||||
// [isDragActive, isDragReject, isDragAccept]
|
|
||||||
// );
|
|
||||||
|
|
||||||
// const thumbs = files.map((file) => (
|
|
||||||
// <div key={file.name} className="govuk-!-margin-bottom-5 fileThumb">
|
|
||||||
// <img src={file.preview} alt={file.name} width="50" /> -{" "}
|
|
||||||
// <span className="govuk-body">
|
|
||||||
// {file.name} ({file.size / 1024}kb)
|
|
||||||
// </span>
|
|
||||||
// </div>
|
|
||||||
// ));
|
|
||||||
|
|
||||||
// // clean up
|
|
||||||
// useEffect(
|
|
||||||
// () => () => {
|
|
||||||
// files.forEach((file) => URL.revokeObjectURL(file.preview));
|
|
||||||
// },
|
|
||||||
// [files]
|
|
||||||
// );
|
|
||||||
|
|
||||||
// const onChangeFile = (e) => {
|
|
||||||
// const {
|
|
||||||
// input: { onChange },
|
|
||||||
// } = props;
|
|
||||||
// onChange(e.target.files[0]);
|
|
||||||
// };
|
|
||||||
// return (
|
|
||||||
// <div className="govuk-grid-row">
|
|
||||||
// <div className="govuk-form-group"></div>
|
|
||||||
// <section className="container">
|
|
||||||
// <div {...getRootProps({ style })}>
|
|
||||||
// <input {...getInputProps()} />
|
|
||||||
// <div>Drag and drop your images here.</div>
|
|
||||||
// </div>
|
|
||||||
// </section>{" "}
|
|
||||||
// <aside>{thumbs}</aside>
|
|
||||||
// {touched && errorStr && <span>{errorStr}</span>}
|
|
||||||
// </div>
|
|
||||||
// );
|
|
||||||
// };
|
|
||||||
|
|
||||||
const RenderFileUpload = (field) => {
|
const RenderFileUpload = (field) => {
|
||||||
const files = field.input.value;
|
const files = field.input.value;
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
@@ -1437,11 +1349,54 @@ const RenderFileUpload = (field) => {
|
|||||||
case "image/png":
|
case "image/png":
|
||||||
return URL.createObjectURL(fileObj);
|
return URL.createObjectURL(fileObj);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
return "/assets/images/documenttypes/txt.png";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getThumbnailIconByExtension = (blobName) => {
|
||||||
|
let fileType = blobName.slice(blobName.lastIndexOf(".") + 1);
|
||||||
|
|
||||||
|
switch (fileType) {
|
||||||
|
case "html":
|
||||||
|
return "/assets/images/documenttypes/html.png";
|
||||||
|
break;
|
||||||
|
case "txt":
|
||||||
|
return "/assets/images/documenttypes/txt.png";
|
||||||
|
break;
|
||||||
|
case "doc":
|
||||||
|
return "/assets/images/documenttypes/doc.png";
|
||||||
|
break;
|
||||||
|
case "pdf":
|
||||||
|
return "/assets/images/documenttypes/pdf.png";
|
||||||
|
break;
|
||||||
|
case "docx":
|
||||||
|
return "/assets/images/documenttypes/docx.png";
|
||||||
|
break;
|
||||||
|
case "csv":
|
||||||
|
return "/assets/images/documenttypes/csv.png";
|
||||||
|
break;
|
||||||
|
case "xlsx":
|
||||||
|
return "/assets/images/documenttypes/xlsx.png";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case "zip":
|
||||||
|
return "/assets/images/documenttypes/zip.png";
|
||||||
|
break;
|
||||||
|
case "jpeg":
|
||||||
|
case "jpg":
|
||||||
|
return "/assets/images/documenttypes/jpg.png";
|
||||||
|
case "png":
|
||||||
|
return "/assets/images/documenttypes/png.png";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return "/assets/images/documenttypes/txt.png";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const getDocumentType = (docCode) => {
|
const getDocumentType = (docCode) => {
|
||||||
console.log(docCode);
|
|
||||||
switch (docCode) {
|
switch (docCode) {
|
||||||
case "000001":
|
case "000001":
|
||||||
return "000001";
|
return "000001";
|
||||||
@@ -1493,6 +1448,25 @@ const RenderFileUpload = (field) => {
|
|||||||
return "000000";
|
return "000000";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const filelistObj = field.fileList || {};
|
||||||
|
|
||||||
|
const blobList = jsonpath.query(
|
||||||
|
filelistObj,
|
||||||
|
"$..[?(@.documentType=='" + field.documentTypeCode + "')]"
|
||||||
|
);
|
||||||
|
|
||||||
|
const deleteThisBlob = async (containerName, blobName) => {
|
||||||
|
console.log(containerName, blobName);
|
||||||
|
deleteBlob(containerName, blobName)
|
||||||
|
.then((data) => data)
|
||||||
|
.then(() => {
|
||||||
|
getFilesFromBlob(containerName).then((newfilelist) =>
|
||||||
|
field.setFilesForAppeal(newfilelist)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Dropzone
|
<Dropzone
|
||||||
@@ -1501,14 +1475,13 @@ const RenderFileUpload = (field) => {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
onDrop={(filesToUpload, e) => {
|
onDrop={(filesToUpload, e) => {
|
||||||
console.log(field.ticketnumber, field.documentTypeCode);
|
|
||||||
const renamedAcceptedFiles = filesToUpload.map(
|
const renamedAcceptedFiles = filesToUpload.map(
|
||||||
(file) =>
|
(file) =>
|
||||||
new File(
|
new File(
|
||||||
[file],
|
[file],
|
||||||
`${field.ticketnumber}_${getDocumentType(
|
`${getDocumentType(field.documentTypeCode)}_${
|
||||||
field.documentTypeCode
|
file.name
|
||||||
)}_${file.name}`,
|
}`,
|
||||||
{
|
{
|
||||||
type: file.type,
|
type: file.type,
|
||||||
}
|
}
|
||||||
@@ -1519,14 +1492,14 @@ const RenderFileUpload = (field) => {
|
|||||||
>
|
>
|
||||||
{({ getRootProps, getInputProps }) => (
|
{({ getRootProps, getInputProps }) => (
|
||||||
<>
|
<>
|
||||||
{field.hint != false && (
|
{/* {field.hint != false && (
|
||||||
<div className="govuk-hint">{t(field.hint)}</div>
|
<div className="govuk-hint">ss{t(field.hint)}</div>
|
||||||
)}
|
)}
|
||||||
<div className="govuk-form-group"></div>
|
<div className="govuk-form-group"></div> */}
|
||||||
<section className="container">
|
<section className="container">
|
||||||
<div {...getRootProps({ style })}>
|
<div {...getRootProps({ style })}>
|
||||||
{" "}
|
{" "}
|
||||||
<input {...getInputProps()} />
|
<input id={field.id} {...getInputProps()} />
|
||||||
<div>Drag and drop your files here.</div>
|
<div>Drag and drop your files here.</div>
|
||||||
</div>
|
</div>
|
||||||
<aside>{thumbs}</aside>
|
<aside>{thumbs}</aside>
|
||||||
@@ -1556,6 +1529,45 @@ const RenderFileUpload = (field) => {
|
|||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
)}
|
)}
|
||||||
|
{blobList.map((blob, i) => (
|
||||||
|
<div
|
||||||
|
key={blob.name + "_" + i}
|
||||||
|
className="govuk-!-margin-bottom-5 fileThumb govuk-!-margin-top-5"
|
||||||
|
>
|
||||||
|
<div className="">
|
||||||
|
<span
|
||||||
|
className="govuk-summary-list__actionLink watched_link govuk-!-margin-right-5 govuk-!-text-align-left"
|
||||||
|
onClick={() => {
|
||||||
|
deleteThisBlob(field.ticketnumber, blob.name);
|
||||||
|
}}
|
||||||
|
title="Remove this file"
|
||||||
|
>
|
||||||
|
−
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<img
|
||||||
|
src={getThumbnailIconByExtension(blob.name)}
|
||||||
|
alt={blob.name}
|
||||||
|
width="50"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Link
|
||||||
|
key={i}
|
||||||
|
scroll={false}
|
||||||
|
href={
|
||||||
|
"/api/file/downloadblob?container=" +
|
||||||
|
field.ticketnumber.toLowerCase() +
|
||||||
|
"&blobname=" +
|
||||||
|
blob.name +
|
||||||
|
blob.hashedfilepath
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<a className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link">
|
||||||
|
{blob.name} ({bytesToSize(blob.contentLength)})
|
||||||
|
</a>
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
))}{" "}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { Field, reduxForm } from "redux-form";
|
|||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
import Dropzone, { useDropzone } from "react-dropzone";
|
import Dropzone, { useDropzone } from "react-dropzone";
|
||||||
import { uploadFiles } from "../../actions";
|
import { uploadFiles } from "../../actions";
|
||||||
|
import { getContainers } from "../../actions/azurestorage";
|
||||||
|
|
||||||
const required = (errorMsg) => (value) =>
|
const required = (errorMsg) => (value) =>
|
||||||
value || typeof value === "number" ? undefined : errorMsg;
|
value || typeof value === "number" ? undefined : errorMsg;
|
||||||
@@ -158,6 +159,60 @@ const RenderFileUpload = (field) => {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getDocumentType = (docCode) => {
|
||||||
|
switch (docCode) {
|
||||||
|
case "000001":
|
||||||
|
return "000001";
|
||||||
|
break;
|
||||||
|
case "000002":
|
||||||
|
return "000002";
|
||||||
|
break;
|
||||||
|
case "000003":
|
||||||
|
return "000003";
|
||||||
|
break;
|
||||||
|
case "000004":
|
||||||
|
return "000004";
|
||||||
|
break;
|
||||||
|
case "000005":
|
||||||
|
return "000005";
|
||||||
|
break;
|
||||||
|
case "000006":
|
||||||
|
return "000006";
|
||||||
|
break;
|
||||||
|
case "000007":
|
||||||
|
return "000007";
|
||||||
|
break;
|
||||||
|
case "000008":
|
||||||
|
return "000008";
|
||||||
|
break;
|
||||||
|
case "000009":
|
||||||
|
return "000009";
|
||||||
|
break;
|
||||||
|
case "000010":
|
||||||
|
return "000010";
|
||||||
|
break;
|
||||||
|
case "000011":
|
||||||
|
return "000011";
|
||||||
|
break;
|
||||||
|
case "000012":
|
||||||
|
return "000012";
|
||||||
|
break;
|
||||||
|
case "000013":
|
||||||
|
return "000013";
|
||||||
|
break;
|
||||||
|
case "000014":
|
||||||
|
return "000014";
|
||||||
|
break;
|
||||||
|
case "000015":
|
||||||
|
return "000015";
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return "000000";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Dropzone
|
<Dropzone
|
||||||
@@ -166,14 +221,20 @@ const RenderFileUpload = (field) => {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
onDrop={(filesToUpload, e) => {
|
onDrop={(filesToUpload, e) => {
|
||||||
|
console.log(field.ticketnumber, field.documentTypeCode);
|
||||||
const renamedAcceptedFiles = filesToUpload.map(
|
const renamedAcceptedFiles = filesToUpload.map(
|
||||||
(file) =>
|
(file) =>
|
||||||
new File([file], `${file.name}_${+new Date()}`, {
|
new File(
|
||||||
type: file.type,
|
[file],
|
||||||
})
|
`${field.ticketnumber}_${getDocumentType(
|
||||||
|
field.documentTypeCode
|
||||||
|
)}_${file.name}`,
|
||||||
|
{
|
||||||
|
type: file.type,
|
||||||
|
}
|
||||||
|
)
|
||||||
);
|
);
|
||||||
field.input.onChange(renamedAcceptedFiles);
|
field.input.onChange(renamedAcceptedFiles);
|
||||||
console.log(renamedAcceptedFiles);
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{({ getRootProps, getInputProps }) => (
|
{({ getRootProps, getInputProps }) => (
|
||||||
@@ -221,7 +282,7 @@ const RenderFileUpload = (field) => {
|
|||||||
let UploadFile = (props) => {
|
let UploadFile = (props) => {
|
||||||
let { t } = useTranslation();
|
let { t } = useTranslation();
|
||||||
//const [showSpinnerState, setShowSpinnerState] = useState(false);
|
//const [showSpinnerState, setShowSpinnerState] = useState(false);
|
||||||
const { handleSubmit, pristine, reset, submitting } = props;
|
const { handleSubmit, pristine, reset, submitting, formContent } = props;
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { locale } = router;
|
const { locale } = router;
|
||||||
@@ -229,8 +290,19 @@ let UploadFile = (props) => {
|
|||||||
const onHandleSubmit = async (values) => {
|
const onHandleSubmit = async (values) => {
|
||||||
//spinnerState();
|
//spinnerState();
|
||||||
console.log(values);
|
console.log(values);
|
||||||
|
console.log(formContent);
|
||||||
|
// getContainers();
|
||||||
|
|
||||||
const uploadAction = await uploadFiles(values);
|
var dataObj = Object.assign(values, formContent);
|
||||||
|
var fileObj = dataObj.fileList;
|
||||||
|
|
||||||
|
delete dataObj.fileList;
|
||||||
|
|
||||||
|
const uploadAction = await uploadFiles(dataObj, fileObj).then(
|
||||||
|
(data) => {
|
||||||
|
console.log("hello", data);
|
||||||
|
}
|
||||||
|
);
|
||||||
// router.push({
|
// router.push({
|
||||||
// pathname:
|
// pathname:
|
||||||
// router.locale == "cy"
|
// router.locale == "cy"
|
||||||
@@ -270,6 +342,7 @@ let UploadFile = (props) => {
|
|||||||
type="text"
|
type="text"
|
||||||
aria-describedby="caseReference-hint"
|
aria-describedby="caseReference-hint"
|
||||||
hint1="Case Reference"
|
hint1="Case Reference"
|
||||||
|
value="CAS-00764-L0Q9W2"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="govuk-grid-row">
|
<div className="govuk-grid-row">
|
||||||
@@ -281,6 +354,7 @@ let UploadFile = (props) => {
|
|||||||
//validate={[required]}
|
//validate={[required]}
|
||||||
label={props.label}
|
label={props.label}
|
||||||
errorMsg="Is required"
|
errorMsg="Is required"
|
||||||
|
ticketnumber="CAS-00764-L0Q9W2"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="govuk-form-group">
|
<div className="govuk-form-group">
|
||||||
@@ -306,6 +380,69 @@ const mapStateToProps = (state) => {
|
|||||||
watchedCases: state.watchedCases,
|
watchedCases: state.watchedCases,
|
||||||
myRepresentations: state.myRepresentations,
|
myRepresentations: state.myRepresentations,
|
||||||
awaitingSubmission: state.awaitingSubmission,
|
awaitingSubmission: state.awaitingSubmission,
|
||||||
|
formContent: {
|
||||||
|
"pinswg_caserecovered": "No",
|
||||||
|
"pinswg_siteaddresspostcode": "Site Address Postcode",
|
||||||
|
"pinswg_inspectorneededonsite": "Yes",
|
||||||
|
"pinswg_sitewithingreenbelt": "No",
|
||||||
|
"pinswg_siteaddressline2": "Site Address Line 2",
|
||||||
|
"pinswg_siteaddressline1": "Site Address Line 1",
|
||||||
|
"pinswg_s106unilateralsubmitted": "No",
|
||||||
|
"modifiedon": "2022-06-28T13:11:34Z",
|
||||||
|
"pinswg_developmentaffectsettingofalisted": "No",
|
||||||
|
"pinswg_planningappeals78id":
|
||||||
|
"57b533aa-43f1-ec11-aade-00224800be9c",
|
||||||
|
"pinswg_name": "CAS-00764-L0Q9W2",
|
||||||
|
"pinswg_whyisinspectorneededonsite": "to be nosey",
|
||||||
|
"pinswg_sitewithinsssi": "No",
|
||||||
|
"pinswg_healthandsafetyissuesonsite": "No",
|
||||||
|
"pinswg_developmentdescriptionchanged": "Yes",
|
||||||
|
"_stageid_value": "126e9c46-d51c-4623-aabf-aa30b34bfa54",
|
||||||
|
"traversedpath": "126e9c46-d51c-4623-aabf-aa30b34bfa54",
|
||||||
|
"createdon": "2022-06-21T09:22:29Z",
|
||||||
|
"timezoneruleversionnumber": 0,
|
||||||
|
"processid": "e4f065a6-157e-42f9-963a-9292d5041509",
|
||||||
|
"pinswg_priornotificationpriorapproval": "No",
|
||||||
|
"pinswg_predeterminedindicator": "No",
|
||||||
|
"pinswg_protectedspecies": "No",
|
||||||
|
"versionnumber": 912609,
|
||||||
|
"pinswg_siteaddresscounty": "Site Address County",
|
||||||
|
"pinswg_procedure": 846040000,
|
||||||
|
"pinswg_dateoflpadecision": "2022-06-22T23:00:00Z",
|
||||||
|
"pinswg_eiarequired": "No",
|
||||||
|
"pinswg_costappliedforindicator": "No",
|
||||||
|
"pinswg_areaofsiteinhectaresdec": 22,
|
||||||
|
"pinswg_detailedeiascreeningrequired": "No",
|
||||||
|
"pinswg_casepublishflag": "No",
|
||||||
|
"pinswg_siteaddresstown": "Site Address Town",
|
||||||
|
"utcconversiontimezonecode": 85,
|
||||||
|
"pinswg_caseworkreason": 846040005,
|
||||||
|
"pinswg_ownershipcertificate": 846040002,
|
||||||
|
"pinswg_lpadecisiononapplicationmade": "Yes",
|
||||||
|
"pinswg_floorspaceinsquaremeters": 111,
|
||||||
|
"_modifiedby_value": "149b3e11-5206-ec11-aac8-00224800be9c",
|
||||||
|
"pinswg_dateofapplication": "2022-06-20T23:00:00Z",
|
||||||
|
"pinswg_incarelatestoca": "No",
|
||||||
|
"_createdby_value": "149b3e11-5206-ec11-aac8-00224800be9c",
|
||||||
|
"pinswg_additionalappealsmade": "No",
|
||||||
|
"statuscode": 1,
|
||||||
|
"pinswg_siteviewablefromroad": "Yes",
|
||||||
|
"_pinswg_localplanningauthority_value":
|
||||||
|
"744c69f4-48da-eb11-aac5-00224800be9c",
|
||||||
|
"pinswg_lpaapplicationreference": "11111weweqweqwe",
|
||||||
|
"pinswg_recovered": "No",
|
||||||
|
"statecode": 0,
|
||||||
|
"pinswg_isfloodingandissue": "No",
|
||||||
|
"pinswg_isthesitewithinanaonb": "No",
|
||||||
|
"_organizationid_value": "01191a4d-105f-eb11-aaba-00224800be9c",
|
||||||
|
"pinswg_developmentdescription": "something to go here",
|
||||||
|
"pinswg_agriculturalholding": 846040000,
|
||||||
|
"_pinswg_planningappeals78ids_value":
|
||||||
|
"50b533aa-43f1-ec11-aade-00224800be9c",
|
||||||
|
},
|
||||||
|
initialValues: {
|
||||||
|
caseReference: "CAS-00764-L0Q9W2",
|
||||||
|
},
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -320,5 +457,6 @@ export default connect(
|
|||||||
reduxForm({
|
reduxForm({
|
||||||
form: "uploadFileForm",
|
form: "uploadFileForm",
|
||||||
destroyOnUnmount: false,
|
destroyOnUnmount: false,
|
||||||
|
enableReinitialize: true, // this is needed!!
|
||||||
})(UploadFile)
|
})(UploadFile)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export default function BuildField(props) {
|
|||||||
case "{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}":
|
case "{07FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}":
|
||||||
return <>{fieldValue}</>;
|
return <>{fieldValue}</>;
|
||||||
break;
|
break;
|
||||||
case "{ 4273EDBD-AC1D-40d3-9FB2-095C621B552D}":
|
case "{4273EDBD-AC1D-40d3-9FB2-095C621B552D}":
|
||||||
return <>{fieldValue}</>;
|
return <>{fieldValue}</>;
|
||||||
break;
|
break;
|
||||||
case "{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}":
|
case "{5B773807-9FB2-42db-97C3-7A91EFF8ADFF}":
|
||||||
@@ -58,8 +58,12 @@ export default function BuildField(props) {
|
|||||||
case "{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}":
|
case "{C3EFE0C3-0EC6-42be-8349-CBD9079DFD8E}":
|
||||||
return <>{fieldValue}</>;
|
return <>{fieldValue}</>;
|
||||||
break;
|
break;
|
||||||
|
case "{16D63FD6-119B-4353-BDCA-18358721C3FE}":
|
||||||
|
return <> docs {fieldValue}</>;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return <>{fieldValue}</>;
|
return <>ss{fieldValue}</>;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,14 @@ let BuildCheckSection = (props) => {
|
|||||||
// /searchresults
|
// /searchresults
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onHandleSubmit = (values) => {
|
||||||
|
//alert(1);
|
||||||
|
//updateCaseProgress(values);
|
||||||
|
// setCurrentSection(9999);
|
||||||
|
|
||||||
|
alert(1);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="govuk-grid-row" key={1222}>
|
<div className="govuk-grid-row" key={1222}>
|
||||||
<div className="govuk-grid-column-full">
|
<div className="govuk-grid-column-full">
|
||||||
@@ -83,12 +91,21 @@ let BuildCheckSection = (props) => {
|
|||||||
<dl className="govuk-summary-list govuk-!-margin-bottom-9 at-summary-list"></dl>
|
<dl className="govuk-summary-list govuk-!-margin-bottom-9 at-summary-list"></dl>
|
||||||
</div>
|
</div>
|
||||||
<div className="govuk-button-group">
|
<div className="govuk-button-group">
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
onClick={() => {
|
||||||
|
console.log(props.props.form.appealForm.values);
|
||||||
|
}}
|
||||||
|
className="govuk-button"
|
||||||
|
>
|
||||||
|
{t("newappeal:submit-appeal-button")}
|
||||||
|
</button>
|
||||||
<a
|
<a
|
||||||
className="govuk-button"
|
className="govuk-button"
|
||||||
data-module="govuk-button"
|
data-module="govuk-button"
|
||||||
onClick={() => setCurrentSection(9999)}
|
onClick={() => setCurrentSection(9999)}
|
||||||
>
|
>
|
||||||
{t("newappeal:submit-appeal-button")}
|
sss{t("newappeal:submit-appeal-button")}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -183,6 +183,12 @@ export default function BuildField(props) {
|
|||||||
}
|
}
|
||||||
documentTypeCode={props.documentTypeCode}
|
documentTypeCode={props.documentTypeCode}
|
||||||
hint={props.hint}
|
hint={props.hint}
|
||||||
|
fileList={
|
||||||
|
props.props.props.props.appealType.fileList
|
||||||
|
}
|
||||||
|
setFilesForAppeal={
|
||||||
|
props.props.props.setFilesForAppeal
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -157,6 +157,9 @@ export default function BuildRow(props) {
|
|||||||
props.props.appealType.documentList
|
props.props.appealType.documentList
|
||||||
}
|
}
|
||||||
documentTypeCode={documentTypeCode}
|
documentTypeCode={documentTypeCode}
|
||||||
|
setFilesForAppeal={
|
||||||
|
props.props.setFilesForAppeal
|
||||||
|
}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
// } else {
|
// } else {
|
||||||
|
|||||||
@@ -11,9 +11,10 @@ import {
|
|||||||
setCaseReference,
|
setCaseReference,
|
||||||
setCurrentSection,
|
setCurrentSection,
|
||||||
setDocumentsList,
|
setDocumentsList,
|
||||||
|
setFilesForAppeal,
|
||||||
} from "../../store/appealType/action";
|
} from "../../store/appealType/action";
|
||||||
import { getFormCollectionByID } from "../utils";
|
import { getFormCollectionByID } from "../utils";
|
||||||
import { updateCase, patchCase } from "../../actions";
|
import { updateCase, patchCase, uploadFiles } from "../../actions";
|
||||||
|
|
||||||
import { FieldsTranslations } from "../elements";
|
import { FieldsTranslations } from "../elements";
|
||||||
import jsonpath from "jsonpath";
|
import jsonpath from "jsonpath";
|
||||||
@@ -69,10 +70,33 @@ let BuildSection = (props) => {
|
|||||||
|
|
||||||
const handleParam = (setValue) => (e) => setValue(e.target.value);
|
const handleParam = (setValue) => (e) => setValue(e.target.value);
|
||||||
|
|
||||||
|
const uploadAppealFiles = (values) => {
|
||||||
|
// get filelists from values object
|
||||||
|
let fileListObj = _.filter(values, function (v, key) {
|
||||||
|
return _.includes(key, "pinswg_fileUpload");
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(fileListObj);
|
||||||
|
|
||||||
|
var dataObj = values;
|
||||||
|
|
||||||
|
for (let key in dataObj) {
|
||||||
|
_.includes(key, "pinswg_fileUpload") == true && delete dataObj[key];
|
||||||
|
}
|
||||||
|
|
||||||
|
uploadFiles(dataObj, fileListObj).then((data) => {
|
||||||
|
console.log("hello", data);
|
||||||
|
|
||||||
|
return data;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
const updateCaseProgress = (values) => {
|
const updateCaseProgress = (values) => {
|
||||||
let incidentId = props.appealType.caseReference.incidentid;
|
let incidentId = props.appealType.caseReference.incidentid;
|
||||||
let updateBody = values || {};
|
let updateBody = values || {};
|
||||||
|
|
||||||
|
uploadAppealFiles(values);
|
||||||
|
|
||||||
let appTypeCollection = getFormCollectionByID(
|
let appTypeCollection = getFormCollectionByID(
|
||||||
props.appealType.appealTypeID
|
props.appealType.appealTypeID
|
||||||
);
|
);
|
||||||
@@ -402,6 +426,9 @@ const mapDispatchToProps = (dispatch) => {
|
|||||||
setDocumentsList: (documentList) => {
|
setDocumentsList: (documentList) => {
|
||||||
dispatch(setDocumentsList(documentList));
|
dispatch(setDocumentsList(documentList));
|
||||||
},
|
},
|
||||||
|
setFilesForAppeal: (blobList) => {
|
||||||
|
dispatch(setFilesForAppeal(blobList));
|
||||||
|
},
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
import Link from "next/link";
|
|
||||||
import { useRouter } from "next/router";
|
|
||||||
import useTranslation from "next-translate/useTranslation";
|
|
||||||
|
|
||||||
export default function MakeEnforcementNotice() {
|
|
||||||
let { t } = useTranslation();
|
|
||||||
|
|
||||||
const router = useRouter();
|
|
||||||
const { locale } = router;
|
|
||||||
return (
|
|
||||||
<div className="card" id="casescomment-card">
|
|
||||||
<div className="card-body appealModule">
|
|
||||||
<p className="govuk-body-s">
|
|
||||||
Including an enforcement listed building notice.
|
|
||||||
</p>
|
|
||||||
<div className="appealCTA">
|
|
||||||
<Link href="/newappeal/selectappeal">
|
|
||||||
<a className="govuk-button">A enforcement notice</a>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -9,6 +9,8 @@
|
|||||||
"start": "node_modules/next/dist/bin/next start"
|
"start": "node_modules/next/dist/bin/next start"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@azure/identity": "^2.0.5",
|
||||||
|
"@azure/storage-blob": "^12.10.0",
|
||||||
"@googlemaps/react-wrapper": "^1.1.24",
|
"@googlemaps/react-wrapper": "^1.1.24",
|
||||||
"@magic-sdk/admin": "^1.4.0",
|
"@magic-sdk/admin": "^1.4.0",
|
||||||
"@next-auth/prisma-adapter": "^1.0.3",
|
"@next-auth/prisma-adapter": "^1.0.3",
|
||||||
@@ -24,6 +26,7 @@
|
|||||||
"dom": "^0.0.3",
|
"dom": "^0.0.3",
|
||||||
"dynamics-web-api": "^1.7.4",
|
"dynamics-web-api": "^1.7.4",
|
||||||
"express": "^4.17.2",
|
"express": "^4.17.2",
|
||||||
|
"formidable": "^2.0.1",
|
||||||
"fs": "^0.0.1-security",
|
"fs": "^0.0.1-security",
|
||||||
"google-map-react": "^2.1.10",
|
"google-map-react": "^2.1.10",
|
||||||
"govuk-frontend": "3.13.0",
|
"govuk-frontend": "3.13.0",
|
||||||
@@ -37,6 +40,7 @@
|
|||||||
"magic-sdk": "^8.1.0",
|
"magic-sdk": "^8.1.0",
|
||||||
"moment": "^2.29.1",
|
"moment": "^2.29.1",
|
||||||
"multer": "^1.4.4",
|
"multer": "^1.4.4",
|
||||||
|
"multiparty": "^4.2.3",
|
||||||
"mysql": "^2.18.1",
|
"mysql": "^2.18.1",
|
||||||
"nanoid": "^3.2.0",
|
"nanoid": "^3.2.0",
|
||||||
"next": "^12.0.8",
|
"next": "^12.0.8",
|
||||||
@@ -69,6 +73,7 @@
|
|||||||
"sass-loader": "^12.4.0",
|
"sass-loader": "^12.4.0",
|
||||||
"swr": "^1.1.2",
|
"swr": "^1.1.2",
|
||||||
"typeorm": "^0.3.5",
|
"typeorm": "^0.3.5",
|
||||||
|
"uuid": "^8.3.2",
|
||||||
"webpack": "^5.66.0",
|
"webpack": "^5.66.0",
|
||||||
"xml2js": "^0.4.23",
|
"xml2js": "^0.4.23",
|
||||||
"xmldom": "^0.6.0",
|
"xmldom": "^0.6.0",
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
loggedInUserId +
|
loggedInUserId +
|
||||||
" and servicestage eq 1 and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
|
" and servicestage eq 1 and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
|
||||||
|
|
||||||
console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
|
//console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
|
||||||
return axios
|
return axios
|
||||||
.get(
|
.get(
|
||||||
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
|
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
searchString +
|
searchString +
|
||||||
"')) and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
|
"')) and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
|
||||||
|
|
||||||
console.log("basic search ", queryUrl);
|
//console.log("basic search ", queryUrl);
|
||||||
|
|
||||||
var apiResponse = _.isEmpty(req.query)
|
var apiResponse = _.isEmpty(req.query)
|
||||||
? res.status(400).json()
|
? res.status(400).json()
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
var queryUrl =
|
var queryUrl =
|
||||||
"accounts?$count=true&$filter=pinswg_isalocalplanningauthorityaccount eq 846040000&$select=name&$orderby=name asc";
|
"accounts?$count=true&$filter=pinswg_isalocalplanningauthorityaccount eq 846040000&$select=name&$orderby=name asc";
|
||||||
|
|
||||||
|
console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
|
||||||
return axios
|
return axios
|
||||||
.get(
|
.get(
|
||||||
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
|
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
|
||||||
@@ -35,6 +36,7 @@ export default async function ApiProxy(req, res) {
|
|||||||
res.status(200).json(data);
|
res.status(200).json(data);
|
||||||
})
|
})
|
||||||
.catch(({ err }) => {
|
.catch(({ err }) => {
|
||||||
|
console.log(err);
|
||||||
res.status(400).json(err);
|
res.status(400).json(err);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import {
|
||||||
|
createContainer,
|
||||||
|
getContainers,
|
||||||
|
getBlobs,
|
||||||
|
createBlob,
|
||||||
|
uploadFile,
|
||||||
|
deleteBlob,
|
||||||
|
} from "../../../actions/azurestorage";
|
||||||
|
|
||||||
|
import middleware from "../middleware/middleware";
|
||||||
|
import nextConnect from "next-connect";
|
||||||
|
|
||||||
|
const ApiProxy = nextConnect();
|
||||||
|
ApiProxy.use(middleware);
|
||||||
|
|
||||||
|
ApiProxy.get(async (req, res) => {
|
||||||
|
var containerName = req.query.container;
|
||||||
|
var blobName = req.query.blobname;
|
||||||
|
console.log(containerName, blobName);
|
||||||
|
|
||||||
|
await deleteBlob(containerName, "files/" + blobName).then((data) => {
|
||||||
|
return res.status(200).json({ data: data });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
export const config = {
|
||||||
|
api: {
|
||||||
|
bodyParser: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ApiProxy;
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
import {
|
||||||
|
createContainer,
|
||||||
|
getContainers,
|
||||||
|
getBlobs,
|
||||||
|
createBlob,
|
||||||
|
uploadFile,
|
||||||
|
deleteBlob,
|
||||||
|
downloadFile,
|
||||||
|
} from "../../../actions/azurestorage";
|
||||||
|
import { BlobServiceClient, ContainerClient } from "@azure/storage-blob";
|
||||||
|
import {
|
||||||
|
DefaultAzureCredential,
|
||||||
|
InteractiveBrowserCredential,
|
||||||
|
EnvironmentCredential,
|
||||||
|
ClientSecretCredential,
|
||||||
|
} from "@azure/identity";
|
||||||
|
|
||||||
|
import middleware from "../middleware/middleware";
|
||||||
|
import nextConnect from "next-connect";
|
||||||
|
import CryptoJS from "crypto-js";
|
||||||
|
import { hashAPIPath } from "../../../actions";
|
||||||
|
|
||||||
|
const WORDKEY = process.env.HASHKEY;
|
||||||
|
|
||||||
|
const ApiProxy = nextConnect();
|
||||||
|
|
||||||
|
ApiProxy.use(middleware);
|
||||||
|
|
||||||
|
ApiProxy.get(async (req, res) => {
|
||||||
|
var containerName = req.query.container;
|
||||||
|
var blobName = req.query.blobname;
|
||||||
|
var checkHash = req.query.hash;
|
||||||
|
|
||||||
|
var checkquerypath =
|
||||||
|
"/api/file/downloadblob?container=" +
|
||||||
|
containerName +
|
||||||
|
"&blobname=" +
|
||||||
|
blobName;
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
"containerName " +
|
||||||
|
containerName +
|
||||||
|
`\n` +
|
||||||
|
blobName +
|
||||||
|
`\n` +
|
||||||
|
checkHash +
|
||||||
|
`\n` +
|
||||||
|
checkquerypath
|
||||||
|
);
|
||||||
|
console.log(hashAPIPath(checkquerypath), checkHash);
|
||||||
|
console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash);
|
||||||
|
if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) {
|
||||||
|
const downloaded = await downloadFile(containerName, blobName);
|
||||||
|
|
||||||
|
res.setHeader(
|
||||||
|
"content-disposition",
|
||||||
|
"attachment; filename=" + blobName
|
||||||
|
);
|
||||||
|
return res.status(200).send(downloaded);
|
||||||
|
} else {
|
||||||
|
return res.status(400).json();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
async function streamToBuffer(readableStream) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const chunks = [];
|
||||||
|
readableStream.on("data", (data) => {
|
||||||
|
chunks.push(data instanceof Buffer ? data : Buffer.from(data));
|
||||||
|
});
|
||||||
|
readableStream.on("end", () => {
|
||||||
|
resolve(Buffer.concat(chunks));
|
||||||
|
});
|
||||||
|
readableStream.on("error", reject);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export const config = {
|
||||||
|
api: {
|
||||||
|
bodyParser: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ApiProxy;
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import {
|
||||||
|
createContainer,
|
||||||
|
getContainers,
|
||||||
|
getBlobs,
|
||||||
|
createBlob,
|
||||||
|
uploadFile,
|
||||||
|
} from "../../../actions/azurestorage";
|
||||||
|
|
||||||
|
import middleware from "../middleware/middleware";
|
||||||
|
import nextConnect from "next-connect";
|
||||||
|
|
||||||
|
const ApiProxy = nextConnect();
|
||||||
|
ApiProxy.use(middleware);
|
||||||
|
|
||||||
|
ApiProxy.get(async (req, res) => {
|
||||||
|
var containerName = req.query.container;
|
||||||
|
console.log(containerName);
|
||||||
|
await getBlobs(containerName).then((data) => {
|
||||||
|
return res.status(200).json({ files: data });
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
export const config = {
|
||||||
|
api: {
|
||||||
|
bodyParser: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ApiProxy;
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import {
|
||||||
|
createContainer,
|
||||||
|
getContainers,
|
||||||
|
getBlobs,
|
||||||
|
createBlob,
|
||||||
|
uploadFile,
|
||||||
|
} from "../../../actions/azurestorage";
|
||||||
|
|
||||||
|
import middleware from "../middleware/middleware";
|
||||||
|
import nextConnect from "next-connect";
|
||||||
|
|
||||||
|
const ApiProxy = nextConnect();
|
||||||
|
ApiProxy.use(middleware);
|
||||||
|
|
||||||
|
ApiProxy.post(async (req, res) => {
|
||||||
|
console.log(JSON.parse(req.body.appealData));
|
||||||
|
console.log(req.files);
|
||||||
|
|
||||||
|
const appealData = JSON.parse(req.body.appealData);
|
||||||
|
|
||||||
|
createContainer(appealData.pinswg_name.trim()).then((containerName) => {
|
||||||
|
createBlob(appealData, containerName).then((data) => {
|
||||||
|
uploadFile(req.files, containerName, data);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
return res.status(200).json({ data: "success" });
|
||||||
|
});
|
||||||
|
|
||||||
|
export const config = {
|
||||||
|
api: {
|
||||||
|
bodyParser: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export default ApiProxy;
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import nextConnect from "next-connect";
|
||||||
|
import multiparty from "multiparty";
|
||||||
|
|
||||||
|
const middleware = nextConnect();
|
||||||
|
|
||||||
|
middleware.use(async (req, res, next) => {
|
||||||
|
const form = new multiparty.Form();
|
||||||
|
|
||||||
|
await form.parse(req, function (err, fields, files) {
|
||||||
|
req.body = fields;
|
||||||
|
req.files = files;
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
export default middleware;
|
||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
getMandatoryFields,
|
getMandatoryFields,
|
||||||
getPickLists,
|
getPickLists,
|
||||||
getPartSavedAppeal,
|
getPartSavedAppeal,
|
||||||
|
getFilesFromBlob,
|
||||||
} from "../../actions";
|
} from "../../actions";
|
||||||
import { getProviderConfig } from "../../actions/govgateway";
|
import { getProviderConfig } from "../../actions/govgateway";
|
||||||
import Breadcrumbs from "../../components/breadcrumbs";
|
import Breadcrumbs from "../../components/breadcrumbs";
|
||||||
@@ -29,6 +30,7 @@ import {
|
|||||||
setAppealTypeID,
|
setAppealTypeID,
|
||||||
setAppealTypeTitle,
|
setAppealTypeTitle,
|
||||||
setCaseReference,
|
setCaseReference,
|
||||||
|
setFilesForAppeal,
|
||||||
} from "../../store/appealType/action";
|
} from "../../store/appealType/action";
|
||||||
import { setForm } from "../../store/formData/action";
|
import { setForm } from "../../store/formData/action";
|
||||||
import { getGovGatewayConfig } from "../../store/govgateway/action";
|
import { getGovGatewayConfig } from "../../store/govgateway/action";
|
||||||
@@ -213,11 +215,12 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
console.log("the query", query.appealtypes);
|
console.log("the query", query.appealtypes);
|
||||||
let loggedInUser = cookies.pinsUser;
|
let loggedInUser = cookies.pinsUser;
|
||||||
|
|
||||||
const [appealTypeData, mandatoryFieldsData, pickListData] =
|
const [appealTypeData, mandatoryFieldsData, pickListData, blobList] =
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
await getAppealsTypes(),
|
await getAppealsTypes(),
|
||||||
await getMandatoryFields(query.appealtypes),
|
await getMandatoryFields(query.appealtypes),
|
||||||
await getPickLists(query.appealtypes),
|
await getPickLists(query.appealtypes),
|
||||||
|
await getFilesFromBlob(query.casereference),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let searchResultsObj = await getPartSavedAppeal(query.casereference);
|
let searchResultsObj = await getPartSavedAppeal(query.casereference);
|
||||||
@@ -232,7 +235,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log("appeal:", searchDetailsObj);
|
//console.log("appeal:", searchDetailsObj);
|
||||||
|
|
||||||
searchDetailsObj = JSON.stringify(searchDetailsObj);
|
searchDetailsObj = JSON.stringify(searchDetailsObj);
|
||||||
searchDetailsObj = searchDetailsObj.replace(/:true/gm, `:"Yes"`);
|
searchDetailsObj = searchDetailsObj.replace(/:true/gm, `:"Yes"`);
|
||||||
@@ -265,6 +268,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
store.dispatch(setCaseReference(caseReference));
|
store.dispatch(setCaseReference(caseReference));
|
||||||
store.dispatch(setForm(xmlStr, mandatoryFieldsData, pickListData));
|
store.dispatch(setForm(xmlStr, mandatoryFieldsData, pickListData));
|
||||||
store.dispatch(setAppealType(appealTypeData));
|
store.dispatch(setAppealType(appealTypeData));
|
||||||
|
store.dispatch(setFilesForAppeal(blobList));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -290,6 +294,9 @@ const mapDispatchToProps = (dispatch) => {
|
|||||||
setCaseReference: (refno) => {
|
setCaseReference: (refno) => {
|
||||||
dispatch(setCaseReference(refno));
|
dispatch(setCaseReference(refno));
|
||||||
},
|
},
|
||||||
|
setFilesForAppeal: (blobList) => {
|
||||||
|
dispatch(setFilesForAppeal(blobList));
|
||||||
|
},
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -229,7 +229,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
);
|
);
|
||||||
|
|
||||||
const getDetails = (resultsObj, detailsType) => {
|
const getDetails = (resultsObj, detailsType) => {
|
||||||
console.log(detailsType);
|
//console.log(detailsType);
|
||||||
let detailsArr = [];
|
let detailsArr = [];
|
||||||
resultsObj = resultsObj.value;
|
resultsObj = resultsObj.value;
|
||||||
const detailsObj = resultsObj.map((searchDetail, index) => {
|
const detailsObj = resultsObj.map((searchDetail, index) => {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import {
|
|||||||
getAppealsTypes,
|
getAppealsTypes,
|
||||||
getMandatoryFields,
|
getMandatoryFields,
|
||||||
getPickLists,
|
getPickLists,
|
||||||
|
getFilesFromBlobs,
|
||||||
} from "../../actions";
|
} from "../../actions";
|
||||||
import { getProviderConfig } from "../../actions/govgateway";
|
import { getProviderConfig } from "../../actions/govgateway";
|
||||||
import Breadcrumbs from "../../components/breadcrumbs";
|
import Breadcrumbs from "../../components/breadcrumbs";
|
||||||
@@ -30,6 +31,7 @@ import {
|
|||||||
setAppealTypeID,
|
setAppealTypeID,
|
||||||
setAppealTypeTitle,
|
setAppealTypeTitle,
|
||||||
setCaseReference,
|
setCaseReference,
|
||||||
|
setFilesForAppeal,
|
||||||
} from "../../store/appealType/action";
|
} from "../../store/appealType/action";
|
||||||
import { setForm } from "../../store/formData/action";
|
import { setForm } from "../../store/formData/action";
|
||||||
import { getGovGatewayConfig } from "../../store/govgateway/action";
|
import { getGovGatewayConfig } from "../../store/govgateway/action";
|
||||||
@@ -220,11 +222,13 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
appealTypeData,
|
appealTypeData,
|
||||||
mandatoryFieldsData,
|
mandatoryFieldsData,
|
||||||
pickListData,
|
pickListData,
|
||||||
|
blobList,
|
||||||
] = await Promise.all([
|
] = await Promise.all([
|
||||||
await getCase(query.id),
|
await getCase(query.id),
|
||||||
await getAppealsTypes(),
|
await getAppealsTypes(),
|
||||||
await getMandatoryFields(query.appealtypes),
|
await getMandatoryFields(query.appealtypes),
|
||||||
await getPickLists(query.appealtypes),
|
await getPickLists(query.appealtypes),
|
||||||
|
await getFilesFromBlob(query.casereference),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
console.log("anything here", loggedInUser, query.id, caseReferenceData);
|
console.log("anything here", loggedInUser, query.id, caseReferenceData);
|
||||||
@@ -251,6 +255,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
|||||||
store.dispatch(setCaseReference(caseReference));
|
store.dispatch(setCaseReference(caseReference));
|
||||||
store.dispatch(setForm(xmlStr, mandatoryFieldsData, pickListData));
|
store.dispatch(setForm(xmlStr, mandatoryFieldsData, pickListData));
|
||||||
store.dispatch(setAppealType(appealTypeData));
|
store.dispatch(setAppealType(appealTypeData));
|
||||||
|
store.dispatch(setFilesForAppeal(blobList));
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import { v4 as uuidv4 } from "uuid";
|
||||||
|
import { BlobServiceClient, ContainerClient } from "@azure/storage-blob";
|
||||||
|
import {
|
||||||
|
DefaultAzureCredential,
|
||||||
|
InteractiveBrowserCredential,
|
||||||
|
EnvironmentCredential,
|
||||||
|
ClientSecretCredential,
|
||||||
|
} from "@azure/identity";
|
||||||
|
import { wrapper } from "../store/store";
|
||||||
|
|
||||||
|
import Head from "next/head";
|
||||||
|
|
||||||
|
const ShowStorage = (props) => {
|
||||||
|
const { container } = props;
|
||||||
|
// console.log("Containers:");
|
||||||
|
// // for await (const container of blobServiceClient.listContainers()) {
|
||||||
|
// // console.log(`- ${container.name}`);
|
||||||
|
// // }
|
||||||
|
|
||||||
|
console.log(container);
|
||||||
|
|
||||||
|
return <div>hello</div>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getServerSideProps = wrapper.getServerSideProps(
|
||||||
|
(store) => async (ctx) => {
|
||||||
|
const { query, req, res } = ctx;
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
"have therese?:",
|
||||||
|
process.env.AZURE_TENANT_ID,
|
||||||
|
process.env.AZURE_CLIENT_ID,
|
||||||
|
process.env.AZURE_CLIENT_SECRET
|
||||||
|
);
|
||||||
|
|
||||||
|
const creds = new DefaultAzureCredential();
|
||||||
|
|
||||||
|
const blobServiceClient = new BlobServiceClient(
|
||||||
|
`https://pedwdev.blob.core.windows.net`,
|
||||||
|
creds
|
||||||
|
);
|
||||||
|
|
||||||
|
const containerName = `CAS-999999-22222`;
|
||||||
|
|
||||||
|
const containerClient = new ContainerClient(
|
||||||
|
`https://pedwdev.blob.core.windows.net/${containerName}`,
|
||||||
|
creds
|
||||||
|
);
|
||||||
|
|
||||||
|
// const createContainerResponse = await containerClient.create();
|
||||||
|
// console.log(
|
||||||
|
// `Created container ${containerName} successfully`,
|
||||||
|
// createContainerResponse.requestId
|
||||||
|
// );
|
||||||
|
|
||||||
|
console.log("Containers:");
|
||||||
|
for await (const container of blobServiceClient.listContainers()) {
|
||||||
|
console.log(`- ${container.name}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const appealID = uuidv4();
|
||||||
|
const uploadOptions = {
|
||||||
|
metadata: { reviewer: "john", reviewDate: "2022-04-01" },
|
||||||
|
tags: { owner: appealID },
|
||||||
|
};
|
||||||
|
// for (let index = 0; index < 7; index++) {
|
||||||
|
// // Create a blob
|
||||||
|
// const content = "hello";
|
||||||
|
// const blobName = appealID + "/BOBnewblob" + new Date().getTime();
|
||||||
|
// const blockBlobClient =
|
||||||
|
// containerClient.getBlockBlobClient(blobName);
|
||||||
|
|
||||||
|
// // const uploadBlobResponse = await blockBlobClient.upload(
|
||||||
|
// // content,
|
||||||
|
// // Buffer.byteLength(content),
|
||||||
|
// // uploadOptions
|
||||||
|
// // );
|
||||||
|
|
||||||
|
// const uploadBlobResponse = await blockBlobClient.uploadFile(
|
||||||
|
// "public/assets/images/HM-Govt-Supplier-to-Govt.jpg"
|
||||||
|
// // uploadOptions
|
||||||
|
// );
|
||||||
|
|
||||||
|
// const tags = {
|
||||||
|
// owner: appealID,
|
||||||
|
// };
|
||||||
|
|
||||||
|
// //console.log(tags);
|
||||||
|
// //await blockBlobClient.setTags(tags);
|
||||||
|
|
||||||
|
// // console.log(
|
||||||
|
// // `Uploaded block blob ${blobName} successfully`,
|
||||||
|
// // uploadBlobResponse.requestId
|
||||||
|
// // );
|
||||||
|
// }
|
||||||
|
|
||||||
|
console.log("Blobs:");
|
||||||
|
for await (const blob of containerClient.listBlobsFlat()) {
|
||||||
|
console.log(`- ${blob.name}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
export default ShowStorage;
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 964 B |
Binary file not shown.
|
After Width: | Height: | Size: 1017 B |
@@ -9,6 +9,7 @@ export const appealTypeDataActionTypes = {
|
|||||||
SETCASEREFERENCE: "SETCASEREFERENCE",
|
SETCASEREFERENCE: "SETCASEREFERENCE",
|
||||||
SETFORMCOMPLETE: "SETFORMCOMPLETE",
|
SETFORMCOMPLETE: "SETFORMCOMPLETE",
|
||||||
SETDOCUMENTLIST: "SETDOCUMENTLIST",
|
SETDOCUMENTLIST: "SETDOCUMENTLIST",
|
||||||
|
SETFILELIST: "SETFILELIST",
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getAppealTypeObj = () => (dispatch) => {
|
export const getAppealTypeObj = () => (dispatch) => {
|
||||||
@@ -70,3 +71,11 @@ export const setDocumentsList = (documentList) => (dispatch) => {
|
|||||||
documentList: documentList,
|
documentList: documentList,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const setFilesForAppeal = (fileList) => (dispatch) => {
|
||||||
|
console.log("have got here");
|
||||||
|
return dispatch({
|
||||||
|
type: appealTypeDataActionTypes.SETFILELIST,
|
||||||
|
fileList: fileList,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ const appealTypeDataInitialState = {
|
|||||||
caseReference: {},
|
caseReference: {},
|
||||||
formComplete: "false",
|
formComplete: "false",
|
||||||
documentList: {},
|
documentList: {},
|
||||||
|
fileList: {},
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function reducer(state = appealTypeDataInitialState, action) {
|
export default function reducer(state = appealTypeDataInitialState, action) {
|
||||||
@@ -53,6 +54,11 @@ export default function reducer(state = appealTypeDataInitialState, action) {
|
|||||||
...state,
|
...state,
|
||||||
documentList: action.documentList,
|
documentList: action.documentList,
|
||||||
};
|
};
|
||||||
|
case appealTypeDataActionTypes.SETFILELIST:
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
fileList: action.fileList,
|
||||||
|
};
|
||||||
default:
|
default:
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user