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

Fix merge conflicts

Browse Source
This commit is contained in:
Tuan Dang
2023-08-08 22:07:22 +07:00
parent 7ae859e9ae ff6e07bdcf
commit 58854e6b81
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx
+5 -4
View File
@@ -8,7 +8,8 @@ import {
DatePicker,
FormControl,
Select,
SelectItem} from "@app/components/v2";
SelectItem
} from "@app/components/v2";
import { useWorkspace } from "@app/context";
import { useGetAuditLogActorFilterOpts } from "@app/hooks/api";
import { eventToNameMap, userAgentTTypeoNameMap } from "@app/hooks/api/auditLogs/constants";
@@ -77,7 +78,7 @@ export const LogsFilter = ({
// {...(field.value ? { value: field.value } : { placeholder: "Select" })}
{...field}
onValueChange={(e) => onChange(e)}
className="w-full"
className="w-full bg-mineshaft-700 border border-mineshaft-500 text-mineshaft-100"
>
{eventTypes.map(({ label, value }) => (
<SelectItem value={String(value || "")} key={label}>
@@ -103,7 +104,7 @@ export const LogsFilter = ({
{...(field.value ? { value: field.value } : { placeholder: "Select" })}
{...field}
onValueChange={(e) => onChange(e)}
className="w-full"
className="w-full bg-mineshaft-700 border border-mineshaft-500 text-mineshaft-100"
>
{data.map((actor) => renderActorSelectItem(actor))}
</Select>
@@ -125,7 +126,7 @@ export const LogsFilter = ({
{...(field.value ? { value: field.value } : { placeholder: "Select" })}
{...field}
onValueChange={(e) => onChange(e)}
className="w-full"
className="w-full bg-mineshaft-700 border border-mineshaft-500 text-mineshaft-100"
>
{userAgentTypes.map(({ label, value }) => (
<SelectItem value={String(value || "")} key={label}>
frontend/src/views/Project/AuditLogsPage/components/LogsTableRow.tsx
+1 -1
View File
@@ -305,7 +305,7 @@ export const LogsTableRow = ({
}
return (
<Tr className={`log-${auditLog._id} h-10`}>
<Tr className={`log-${auditLog._id} h-10 border-b border-x-0 border-t-0`}>
<Td>{formatDate(auditLog.createdAt)}</Td>
<Td>{`${eventToNameMap[auditLog.event.type]}`}</Td>
{renderActor(auditLog.actor)}