Skip to content

fix: default label color #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sriramveeraghanta merged 2 commits into from
Feb 17, 2023
Merged

fix: default label color #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e81fd5
fix: colors of old labels can now be changed
aaryan610 Feb 17, 2023
4c0cb80
fix: black color for labels with no color
aaryan610 Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions apps/app/components/issues/select/label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
<span
className="h-1.5 w-1.5 flex-shrink-0 rounded-full"
style={{
backgroundColor: label?.color ?? "green",
backgroundColor:
label.color && label.color !== "" ? label.color : "#000",
}}
/>
{label.name}
Expand All @@ -128,7 +129,7 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
<span
className="h-2 w-2 flex-shrink-0 rounded-full"
style={{
backgroundColor: child?.color ?? "green",
backgroundColor: child?.color ?? "black",
}}
/>
{child.name}
Expand Down
11 changes: 7 additions & 4 deletions apps/app/components/issues/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ export const IssueDetailsSidebar: React.FC<Props> = ({
>
<span
className="h-2 w-2 flex-shrink-0 rounded-full"
style={{ backgroundColor: label?.color ?? "green" }}
style={{ backgroundColor: label?.color ?? "black" }}
/>
{label.name}
<XMarkIcon className="h-2 w-2 group-hover:text-red-500" />
Expand Down Expand Up @@ -386,7 +386,10 @@ export const IssueDetailsSidebar: React.FC<Props> = ({
<span
className="h-2 w-2 flex-shrink-0 rounded-full"
style={{
backgroundColor: label?.color ?? "green",
backgroundColor:
label.color && label.color !== ""
? label.color
: "#000",
}}
/>
{label.name}
Expand All @@ -413,7 +416,7 @@ export const IssueDetailsSidebar: React.FC<Props> = ({
<span
className="h-2 w-2 flex-shrink-0 rounded-full"
style={{
backgroundColor: child?.color ?? "green",
backgroundColor: child?.color ?? "black",
}}
/>
{child.name}
Expand Down Expand Up @@ -472,7 +475,7 @@ export const IssueDetailsSidebar: React.FC<Props> = ({
<span
className="h-5 w-5 rounded"
style={{
backgroundColor: watch("color") ?? "green",
backgroundColor: watch("color") ?? "black",
}}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/labels/create-label-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export const CreateLabelModal: React.FC<Props> = ({ isOpen, projectId, handleClo
<span
className="ml-2 h-4 w-4 rounded"
style={{
backgroundColor: watch("color") ?? "green",
backgroundColor: watch("color") ?? "black",
}}
/>
)}
Expand Down
7 changes: 5 additions & 2 deletions apps/app/components/labels/create-update-label-inline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ export const CreateUpdateLabelInline: React.FC<Props> = ({
useEffect(() => {
if (!labelToUpdate) return;

setValue("color", labelToUpdate.color);
setValue(
"color",
labelToUpdate.color && labelToUpdate.color !== "" ? labelToUpdate.color : "#000"
);
setValue("name", labelToUpdate.name);
}, [labelToUpdate, setValue]);

Expand All @@ -123,7 +126,7 @@ export const CreateUpdateLabelInline: React.FC<Props> = ({
<span
className="h-4 w-4 rounded"
style={{
backgroundColor: watch("color") ?? "green",
backgroundColor: watch("color") ?? "#000",
}}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/labels/single-label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const SingleLabel: React.FC<Props> = ({
<span
className="h-3 w-3 flex-shrink-0 rounded-full"
style={{
backgroundColor: label.color,
backgroundColor: label.color && label.color !== "" ? label.color : "#000",
}}
/>
<h6 className="text-sm">{label.name}</h6>
Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/project/settings/single-label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const SingleLabel: React.FC<Props> = ({ label, issueLabels, editLabel, handleLab
<span
className="h-4 w-4 rounded"
style={{
backgroundColor: watch("color") ?? "green",
backgroundColor: watch("color") ?? "black",
}}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/states/create-state-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export const CreateStateModal: React.FC<Props> = ({ isOpen, projectId, handleClo
<span
className="ml-2 h-4 w-4 rounded"
style={{
backgroundColor: watch("color") ?? "green",
backgroundColor: watch("color") ?? "black",
}}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/states/create-update-state-inline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export const CreateUpdateStateInline: React.FC<Props> = ({ data, onClose, select
<span
className="h-4 w-4 rounded"
style={{
backgroundColor: watch("color") ?? "green",
backgroundColor: watch("color") ?? "black",
}}
/>
)}
Expand Down