Change tag color assignments and sorting

This commit is contained in:
Daniel Inge
2023-08-15 18:39:15 -04:00
parent 3825269cbb
commit b000a78f74
@@ -110,6 +110,11 @@ export const SecretInputRow = memo(
append append
} = useFieldArray({ control, name: `secrets.${index}.tags` }); } = useFieldArray({ control, name: `secrets.${index}.tags` });
const colorByTagId = new Map((wsTags || []).map((wsTag, i) => [wsTag._id, tagColors[i % tagColors.length]]))
// display the tags in alphabetical order
secretTags.sort((a, b) => a.name.localeCompare(b.name))
// to get details on a secret // to get details on a secret
const overrideAction = useWatch({ const overrideAction = useWatch({
control, control,
@@ -321,19 +326,22 @@ export const SecretInputRow = memo(
</td> </td>
<td className="min-w-sm flex"> <td className="min-w-sm flex">
<div className="flex h-8 items-center pl-2"> <div className="flex h-8 items-center pl-2">
{secretTags.map(({ id, slug }, i) => ( {secretTags.map(({ id, _id, slug }, i) => {
// This map lookup shouldn't ever fail, but if it does we default to the first color
const tagColor = colorByTagId.get(_id) || tagColors[0]
return (
<Tag <Tag
className={cx( className={cx(
tagColors[i % tagColors.length].bg, tagColor.bg,
tagColors[i % tagColors.length].text tagColor.text
)} )}
isDisabled={isReadOnly || isAddOnly || isRollbackMode} isDisabled={isReadOnly || isAddOnly || isRollbackMode}
onClose={() => remove(i)} onClose={() => remove(i)}
key={id} key={id}
> >
{slug} {slug}
</Tag> </Tag>)
))} })}
<div className="w-0 overflow-hidden group-hover:w-6"> <div className="w-0 overflow-hidden group-hover:w-6">
<Tooltip content="Copy value"> <Tooltip content="Copy value">
<IconButton <IconButton