Fix task evidence no linked
Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
@@ -1071,15 +1071,13 @@ function MeasureViewContent({
|
|||||||
// Get the evidence connection ID for this task
|
// Get the evidence connection ID for this task
|
||||||
const evidenceConnectionId = getEvidenceConnectionId(taskForEvidence.id);
|
const evidenceConnectionId = getEvidenceConnectionId(taskForEvidence.id);
|
||||||
|
|
||||||
uploadMeasureEvidence({
|
uploadTaskEvidence({
|
||||||
variables: {
|
variables: {
|
||||||
input: {
|
input: {
|
||||||
measureId: measureId,
|
taskId: taskForEvidence.id,
|
||||||
file: null,
|
file: null,
|
||||||
},
|
},
|
||||||
connections: getMeasureEvidenceConnectionId()
|
connections: evidenceConnectionId ? [evidenceConnectionId] : [],
|
||||||
? [getMeasureEvidenceConnectionId()!]
|
|
||||||
: [],
|
|
||||||
},
|
},
|
||||||
uploadables: {
|
uploadables: {
|
||||||
"input.file": file,
|
"input.file": file,
|
||||||
@@ -1138,46 +1136,84 @@ function MeasureViewContent({
|
|||||||
variant: "default",
|
variant: "default",
|
||||||
});
|
});
|
||||||
|
|
||||||
// Use the measure evidence connection ID
|
if (taskForEvidence) {
|
||||||
const evidenceConnectionId = getMeasureEvidenceConnectionId();
|
// This is a task-specific evidence
|
||||||
console.log("Evidence connection ID:", evidenceConnectionId);
|
const evidenceConnectionId = getEvidenceConnectionId(taskForEvidence.id);
|
||||||
|
|
||||||
// Upload the URI file as evidence
|
// Upload the URI file as task evidence
|
||||||
uploadMeasureEvidence({
|
uploadTaskEvidence({
|
||||||
variables: {
|
variables: {
|
||||||
input: {
|
input: {
|
||||||
measureId: measureId,
|
taskId: taskForEvidence.id,
|
||||||
file: null,
|
file: null,
|
||||||
|
},
|
||||||
|
connections: evidenceConnectionId ? [evidenceConnectionId] : [],
|
||||||
},
|
},
|
||||||
connections: evidenceConnectionId ? [evidenceConnectionId] : [],
|
uploadables: {
|
||||||
},
|
"input.file": file,
|
||||||
uploadables: {
|
},
|
||||||
"input.file": file,
|
onCompleted: () => {
|
||||||
},
|
setTaskForEvidence(null);
|
||||||
onCompleted: (response) => {
|
setEvidenceDialogOpen(false);
|
||||||
console.log("Upload completed:", response);
|
// Reset form fields
|
||||||
setTaskForEvidence(null);
|
setLinkEvidenceName("");
|
||||||
setEvidenceDialogOpen(false);
|
setLinkEvidenceUrl("");
|
||||||
// Reset form fields
|
setLinkEvidenceDescription("");
|
||||||
setLinkEvidenceName("");
|
|
||||||
setLinkEvidenceUrl("");
|
|
||||||
setLinkEvidenceDescription("");
|
|
||||||
|
|
||||||
toast({
|
toast({
|
||||||
title: "Link evidence added",
|
title: "Link evidence added",
|
||||||
description: "Link evidence has been added successfully.",
|
description: "Link evidence has been added successfully.",
|
||||||
variant: "default",
|
variant: "default",
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
onError: (error) => {
|
onError: (error) => {
|
||||||
console.error("Error uploading URI file:", error);
|
console.error("Error uploading URI file:", error);
|
||||||
toast({
|
toast({
|
||||||
title: "Error adding link evidence",
|
title: "Error adding link evidence",
|
||||||
description: error.message || "Unknown error occurred",
|
description: error.message || "Unknown error occurred",
|
||||||
variant: "destructive",
|
variant: "destructive",
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
// This is a measure-level evidence
|
||||||
|
const evidenceConnectionId = getMeasureEvidenceConnectionId();
|
||||||
|
|
||||||
|
// Upload the URI file as measure evidence
|
||||||
|
uploadMeasureEvidence({
|
||||||
|
variables: {
|
||||||
|
input: {
|
||||||
|
measureId: measureId,
|
||||||
|
file: null,
|
||||||
|
},
|
||||||
|
connections: evidenceConnectionId ? [evidenceConnectionId] : [],
|
||||||
|
},
|
||||||
|
uploadables: {
|
||||||
|
"input.file": file,
|
||||||
|
},
|
||||||
|
onCompleted: () => {
|
||||||
|
setEvidenceDialogOpen(false);
|
||||||
|
// Reset form fields
|
||||||
|
setLinkEvidenceName("");
|
||||||
|
setLinkEvidenceUrl("");
|
||||||
|
setLinkEvidenceDescription("");
|
||||||
|
|
||||||
|
toast({
|
||||||
|
title: "Link evidence added",
|
||||||
|
description: "Link evidence has been added successfully.",
|
||||||
|
variant: "default",
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onError: (error) => {
|
||||||
|
console.error("Error uploading URI file:", error);
|
||||||
|
toast({
|
||||||
|
title: "Error adding link evidence",
|
||||||
|
description: error.message || "Unknown error occurred",
|
||||||
|
variant: "destructive",
|
||||||
|
});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error in handleLinkEvidenceSubmit:", error);
|
console.error("Error in handleLinkEvidenceSubmit:", error);
|
||||||
toast({
|
toast({
|
||||||
@@ -1222,16 +1258,16 @@ function MeasureViewContent({
|
|||||||
variant: "default",
|
variant: "default",
|
||||||
});
|
});
|
||||||
|
|
||||||
// Instead of using task-specific upload, use measure-level evidence
|
// Get the evidence connection ID for this task
|
||||||
uploadMeasureEvidence({
|
const evidenceConnectionId = getEvidenceConnectionId(taskId);
|
||||||
|
|
||||||
|
uploadTaskEvidence({
|
||||||
variables: {
|
variables: {
|
||||||
input: {
|
input: {
|
||||||
measureId: measureId,
|
taskId: taskId,
|
||||||
file: null,
|
file: null,
|
||||||
},
|
},
|
||||||
connections: getMeasureEvidenceConnectionId()
|
connections: evidenceConnectionId ? [evidenceConnectionId] : [],
|
||||||
? [getMeasureEvidenceConnectionId()!]
|
|
||||||
: [],
|
|
||||||
},
|
},
|
||||||
uploadables: {
|
uploadables: {
|
||||||
"input.file": file,
|
"input.file": file,
|
||||||
@@ -2184,12 +2220,11 @@ function MeasureViewContent({
|
|||||||
<TabsTrigger value="evidence" className="flex items-center gap-2">
|
<TabsTrigger value="evidence" className="flex items-center gap-2">
|
||||||
<FileText className="w-4 h-4" />
|
<FileText className="w-4 h-4" />
|
||||||
Evidence
|
Evidence
|
||||||
{tasks.some(
|
{((measureWithEvidences.evidences?.edges && measureWithEvidences.evidences.edges.length > 0) ||
|
||||||
(task) =>
|
tasks.some((task) => task.evidences?.edges && task.evidences.edges.length > 0)) && (
|
||||||
task.evidences?.edges && task.evidences.edges.length > 0,
|
|
||||||
) && (
|
|
||||||
<span className="ml-1.5 bg-blue-100 text-blue-800 rounded-full text-xs px-2 py-0.5">
|
<span className="ml-1.5 bg-blue-100 text-blue-800 rounded-full text-xs px-2 py-0.5">
|
||||||
{tasks.reduce(
|
{(measureWithEvidences.evidences?.edges?.length || 0) +
|
||||||
|
tasks.reduce(
|
||||||
(count, task) => count + (task.evidences?.edges?.length || 0),
|
(count, task) => count + (task.evidences?.edges?.length || 0),
|
||||||
0,
|
0,
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user