awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-16 08:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(infisical-pg): fixing minor compatiability issues with frontend and backend on identity

Browse Source
This commit is contained in:
Akhil Mohan
2024-01-27 12:38:23 +05:30
parent d154f68a59
commit a6a60b7bbb
59 changed files with 1714 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
+2 -2
View File
@@ -233,7 +233,7 @@ export const ActionBar = ({
</DropdownSubMenuTrigger>
<DropdownSubMenuContent className="rounded-l-none">
<DropdownMenuLabel>Apply tags to filter secrets</DropdownMenuLabel>
{tags.map(({ id, name, tagColor }) => (
{tags.map(({ id, name, color }) => (
<DropdownMenuItem
onClick={(evt) => {
evt.preventDefault();
@@ -246,7 +246,7 @@ export const ActionBar = ({
<div className="flex items-center">
<div
className="mr-2 h-2 w-2 rounded-full"
style={{ background: tagColor || "#bec2c8" }}
style={{ background: color || "#bec2c8" }}
/>
{name}
</div>
frontend/src/views/SecretMainPage/components/SecretListView/SecretDetaiSidebar.tsx
+2 -2
View File
@@ -269,7 +269,7 @@ export const SecretDetailSidebar = ({
<DropdownMenuContent align="end" className="z-[100]">
<DropdownMenuLabel>Apply tags to this secrets</DropdownMenuLabel>
{tags.map((tag) => {
const { id: tagId, name, tagColor } = tag;
const { id: tagId, name, color } = tag;
const isSelected = selectedTagsGroupById?.[tagId];
return (
@@ -282,7 +282,7 @@ export const SecretDetailSidebar = ({
<div className="flex items-center">
<div
className="mr-2 h-2 w-2 rounded-full"
style={{ background: tagColor || "#bec2c8" }}
style={{ background: color || "#bec2c8" }}
/>
{name}
</div>
frontend/src/views/SecretMainPage/components/SecretListView/SecretItem.tsx
+2 -2
View File
@@ -319,7 +319,7 @@ export const SecretItem = memo(
<DropdownMenuContent align="end">
<DropdownMenuLabel>Apply tags to this secrets</DropdownMenuLabel>
{tags.map((tag) => {
const { id: tagId, name, tagColor } = tag;
const { id: tagId, name, color } = tag;
const isTagSelected = selectedTagsGroupById?.[tagId];
return (
@@ -332,7 +332,7 @@ export const SecretItem = memo(
<div className="flex items-center">
<div
className="mr-2 h-2 w-2 rounded-full"
style={{ background: tagColor || "#bec2c8" }}
style={{ background: color || "#bec2c8" }}
/>
{name}
</div>
frontend/src/views/SecretMainPage/components/SnapshotView/SecretItem.tsx
+4 -4
View File
@@ -151,14 +151,14 @@ export const SecretItem = ({ mode, preSecret, postSecret }: Props) => {
<Td className="border-r border-mineshaft-600">Tags</Td>
{isModified && (
<Td className="border-r border-mineshaft-600">
{preSecret?.tags?.map(({ name, id: tagId, tagColor }) => (
{preSecret?.tags?.map(({ name, id: tagId, color }) => (
<Tag
className="flex w-min items-center space-x-2"
key={`${preSecret.id}-${tagId}`}
>
<div
className="h-3 w-3 rounded-full"
style={{ backgroundColor: tagColor || "#bec2c8" }}
style={{ backgroundColor: color || "#bec2c8" }}
/>
<div className="text-sm">{name}</div>
</Tag>
@@ -166,14 +166,14 @@ export const SecretItem = ({ mode, preSecret, postSecret }: Props) => {
</Td>
)}
<Td>
{postSecret?.tags?.map(({ name, id: tagId, tagColor }) => (
{postSecret?.tags?.map(({ name, id: tagId, color }) => (
<Tag
className="flex w-min items-center space-x-2"
key={`${postSecret.id}-${tagId}`}
>
<div
className="h-3 w-3 rounded-full"
style={{ backgroundColor: tagColor || "#bec2c8" }}
style={{ backgroundColor: color || "#bec2c8" }}
/>
<div className="text-sm">{name}</div>
</Tag>