diff --git a/resources/scripts/components/elements/activity/ActivityLogEntry.tsx b/resources/scripts/components/elements/activity/ActivityLogEntry.tsx index cded98ba7..8c3359585 100644 --- a/resources/scripts/components/elements/activity/ActivityLogEntry.tsx +++ b/resources/scripts/components/elements/activity/ActivityLogEntry.tsx @@ -7,6 +7,8 @@ import { formatDistanceToNowStrict } from 'date-fns'; import { Link } from 'react-router-dom'; import ActivityLogMetaButton from '@/components/elements/activity/ActivityLogMetaButton'; +import FolderIcon from '@/components/elements/hugeicons/Folder'; +import TerminalIcon from '@/components/elements/hugeicons/Terminal'; import useLocationHash from '@/plugins/useLocationHash'; @@ -61,22 +63,15 @@ export default ({ activity, children }: Props) => {  —  {activity.event}
- {activity.isApi && ( - // - // -
terminal icon
- //
- )} + {activity.isApi && } {activity.event.startsWith('server:sftp.') && ( // - // -
folder open icon
- //
+ )} {children}
diff --git a/resources/scripts/components/elements/hugeicons/Terminal.tsx b/resources/scripts/components/elements/hugeicons/Terminal.tsx new file mode 100644 index 000000000..b28ac96cc --- /dev/null +++ b/resources/scripts/components/elements/hugeicons/Terminal.tsx @@ -0,0 +1,25 @@ +import { HugeIconProps } from './props'; + +const HugeIconsTerminal = (props: HugeIconProps) => { + return ( + + + + + + ); +}; + +export default HugeIconsTerminal; diff --git a/resources/scripts/components/server/ServerActivityLogContainer.tsx b/resources/scripts/components/server/ServerActivityLogContainer.tsx index 774fbe7d1..dcb63fdf7 100644 --- a/resources/scripts/components/server/ServerActivityLogContainer.tsx +++ b/resources/scripts/components/server/ServerActivityLogContainer.tsx @@ -3,6 +3,7 @@ import { useEffect, useState } from 'react'; import { Link } from 'react-router-dom'; import FlashMessageRender from '@/components/FlashMessageRender'; +import ContentBox from '@/components/elements/ContentBox'; import ServerContentBlock from '@/components/elements/ServerContentBlock'; import Spinner from '@/components/elements/Spinner'; import ActivityLogEntry from '@/components/elements/activity/ActivityLogEntry'; @@ -37,37 +38,39 @@ export default () => { return ( - {(filters.filters?.event || filters.filters?.ip) && ( -
- setFilters((value) => ({ ...value, filters: {} }))} - > - Clear Filters - {/* FIXME: X icon */} - -
- )} - {!data && isValidating ? ( - - ) : !data?.items.length ? ( -

No activity logs available for this server.

- ) : ( -
- {data?.items.map((activity) => ( - - - - ))} -
- )} - {data && ( - setFilters((value) => ({ ...value, page }))} - /> - )} + + {(filters.filters?.event || filters.filters?.ip) && ( +
+ setFilters((value) => ({ ...value, filters: {} }))} + > + Clear Filters + {/* FIXME: X icon */} + +
+ )} + {!data && isValidating ? ( + + ) : !data?.items.length ? ( +

No activity logs available for this server.

+ ) : ( +
+ {data?.items.map((activity) => ( + + + + ))} +
+ )} + {data && ( + setFilters((value) => ({ ...value, page }))} + /> + )} +
); };