updated storage account stuff to take auth id

2022-08-26 15:19:34 +01:00
parent 671d49c394
commit 862a953aae
18 changed files with 346 additions and 133 deletions
@@ -1255,6 +1255,7 @@ export function FileUploadField(props) {
                hint={props.hint}
                fileList={props.fileList}
                setFilesForAppeal={props.setFilesForAppeal}
+                containerID={props.containerID}
            />
        </>
    );
@@ -1459,15 +1460,18 @@ const RenderFileUpload = (field) => {
        containerName,
        blobName,
        deleteblobhash,
-        getblobshash
+        getblobshash,
+        casefolderID
    ) => {
        //console.log(containerName, blobName, deleteblobhash);
-        deleteBlob(containerName, blobName, deleteblobhash)
+        deleteBlob(containerName, blobName, deleteblobhash, casefolderID)
            .then((data) => data)
            .then(() => {
-                getFilesFromBlobHashed(containerName, getblobshash).then(
-                    (newfilelist) => field.setFilesForAppeal(newfilelist)
-                );
+                getFilesFromBlobHashed(
+                    containerName,
+                    getblobshash,
+                    casefolderID
+                ).then((newfilelist) => field.setFilesForAppeal(newfilelist));
            });
    };

@@ -1543,10 +1547,11 @@ const RenderFileUpload = (field) => {
                            className="govuk-summary-list__actionLink watched_link govuk-!-margin-right-5 govuk-!-text-align-left"
                            onClick={() => {
                                deleteThisBlob(
-                                    field.ticketnumber,
+                                    field.containerID,
                                    blob.name,
                                    blob.hasheddeletepath,
-                                    blob.hashgetblobs
+                                    blob.hashgetblobs,
+                                    field.ticketnumber
                                );
                            }}
                            title="Remove this file"
@@ -1565,7 +1570,9 @@ const RenderFileUpload = (field) => {
                        scroll={false}
                        href={
                            "/api/file/downloadblob?container=" +
-                            field.ticketnumber.toLowerCase() +
+                            field.containerID +
+                            "&casefolderID=" +
+                            field.ticketnumber +
                            "&blobname=" +
                            blob.name +
                            blob.hashedfilepath