thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

fix: issue activity (#645)

Browse Source 
- fix: set and remove activity logs are showing problems
- fix: removing due date is showing static value of 1 Jan.
- fix:  old labels to have black color.
- fix:  word 'Description' should be bold
This commit is contained in:
Saheb Giri 2023-03-31 14:46:17 +05:30 committed by GitHub
parent ed60707bae
commit 09d73c5e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/app/components/issues/activity.tsx
View File

@ -145,9 +145,9 @@ export const IssueActivitySection: React.FC<Props> = () => {
if (!issueLabels) return; if (!issueLabels) return;
const label = issueLabels.find((label) => label.id === labelId); const label = issueLabels.find((label) => label.id === labelId);
if (typeof label !== "undefined") { if (typeof label !== "undefined") {
return label.color; return label.color !== "" ? label.color : "#000000";
} }
return "#64748b"; return "#000000";
}; };
if (!issueActivities) { if (!issueActivities) {
@ -171,7 +171,7 @@ export const IssueActivitySection: React.FC<Props> = () => {
return ( return (
<div className="flow-root"> <div className="flow-root">
<ul role="list" className="-mb-8"> <ul role="list" className="-mb-4">
{issueActivities.map((activityItem, activityItemIdx) => { {issueActivities.map((activityItem, activityItemIdx) => {
// determines what type of action is performed // determines what type of action is performed
let action = activityDetails[activityItem.field as keyof typeof activityDetails]?.message; let action = activityDetails[activityItem.field as keyof typeof activityDetails]?.message;
@ -192,6 +192,18 @@ export const IssueActivitySection: React.FC<Props> = () => {
activityItem.new_value && activityItem.new_value !== "" activityItem.new_value && activityItem.new_value !== ""
? "set the due date to" ? "set the due date to"
: "removed the due date"; : "removed the due date";
} else if (activityItem.field === "parent") {
action =
activityItem.new_value && activityItem.new_value !== ""
? "set the parent to"
: "removed the parent";
} else if (activityItem.field === "priority") {
action =
activityItem.new_value && activityItem.new_value !== ""
? "set the priority to"
: "removed the priority";
} else if (activityItem.field === "description") {
action = "updated the";
} }
// for values that are after the action clause // for values that are after the action clause
let value: any = activityItem.new_value ? activityItem.new_value : activityItem.old_value; let value: any = activityItem.new_value ? activityItem.new_value : activityItem.old_value;
@ -204,8 +216,8 @@ export const IssueActivitySection: React.FC<Props> = () => {
} else if (activityItem.field === "state") { } else if (activityItem.field === "state") {
value = activityItem.new_value ? addSpaceIfCamelCase(activityItem.new_value) : "None"; value = activityItem.new_value ? addSpaceIfCamelCase(activityItem.new_value) : "None";
} else if (activityItem.field === "labels") { } else if (activityItem.field === "labels") {
let name, let name;
id = "#64748b"; let id = "#000000";
if (activityItem.new_value !== "") { if (activityItem.new_value !== "") {
name = activityItem.new_value; name = activityItem.new_value;
id = activityItem.new_identifier ? activityItem.new_identifier : id; id = activityItem.new_identifier ? activityItem.new_identifier : id;
@ -231,9 +243,13 @@ export const IssueActivitySection: React.FC<Props> = () => {
} else if (activityItem.field === "assignees") { } else if (activityItem.field === "assignees") {
value = activityItem.new_value; value = activityItem.new_value;
} else if (activityItem.field === "target_date") { } else if (activityItem.field === "target_date") {
value = renderShortNumericDateFormat(activityItem.new_value as string); const date =
activityItem.new_value && activityItem.new_value !== ""
? activityItem.new_value
: activityItem.old_value;
value = renderShortNumericDateFormat(date as string);
} else if (activityItem.field === "description") { } else if (activityItem.field === "description") {
value = ""; value = "description";
} }
if ("field" in activityItem && activityItem.field !== "updated_by") { if ("field" in activityItem && activityItem.field !== "updated_by") {