Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions apps/app/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ module.exports = {
'src/client/components/*.ts',
'src/client/components/*.js',
'src/client/components/Admin/App/**',
'src/client/components/Admin/AuditLog/**',
'src/client/components/Admin/Customize/**',
'src/client/components/Admin/Notification/**',
'src/client/components/Admin/Security/**',
'src/client/components/Admin/SlackIntegration/**',
'src/client/components/Admin/Users/**',
'src/client/components/Admin/UserGroup/**',
Expand Down
45 changes: 32 additions & 13 deletions apps/app/src/client/components/Admin/AuditLog/ActivityTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { FC } from 'react';
import React, { useState, useCallback } from 'react';

import React, { useCallback, useState } from 'react';
import { isPopulated } from '@growi/core';
import { pagePathUtils } from '@growi/core/dist/utils';
import { UserPicture } from '@growi/ui/dist/components';
Expand All @@ -11,19 +10,18 @@ import { Tooltip } from 'reactstrap';

import type { IActivityHasId } from '~/interfaces/activity';

type Props = {
activityList: IActivityHasId[]
}
type Props = {
activityList: IActivityHasId[];
};

const formatDate = (date: Date): string => {
return format(new Date(date), 'yyyy/MM/dd HH:mm:ss');
};

export const ActivityTable : FC<Props> = (props: Props) => {
export const ActivityTable: FC<Props> = (props: Props) => {
const { t } = useTranslation();
const [activeTooltipId, setActiveTooltipId] = useState<string | null>(null);


const showToolTip = useCallback((id: string) => {
setActiveTooltipId(id);
setTimeout(() => {
Expand All @@ -48,12 +46,16 @@ export const ActivityTable : FC<Props> = (props: Props) => {
return (
<tr data-testid="activity-table" key={activity._id}>
<td>
{ activity.user != null && (
{activity.user != null && (
<>
<UserPicture user={activity.user} />
<a
className="ms-2"
href={isPopulated(activity.user) ? pagePathUtils.userHomepagePath(activity.user) : undefined}
href={
isPopulated(activity.user)
? pagePathUtils.userHomepagePath(activity.user)
: undefined
}
>
{activity.snapshot?.username}
</a>
Expand All @@ -68,12 +70,29 @@ export const ActivityTable : FC<Props> = (props: Props) => {
<span className="flex-grow-1 text-truncate">
{activity.endpoint}
</span>
<CopyToClipboard text={activity.endpoint} onCopy={() => showToolTip(activity._id)}>
<button type="button" className="btn btn-outline-secondary border-0 ms-2" id={`tooltipTarget-${activity._id}`}>
<span className="material-symbols-outlined" aria-hidden="true">content_paste</span>
<CopyToClipboard
text={activity.endpoint}
onCopy={() => showToolTip(activity._id)}
>
<button
type="button"
className="btn btn-outline-secondary border-0 ms-2"
id={`tooltipTarget-${activity._id}`}
>
<span
className="material-symbols-outlined"
aria-hidden="true"
>
content_paste
</span>
</button>
</CopyToClipboard>
<Tooltip placement="top" isOpen={activeTooltipId === activity._id} fade={false} target={`tooltipTarget-${activity._id}`}>
<Tooltip
placement="top"
isOpen={activeTooltipId === activity._id}
fade={false}
target={`tooltipTarget-${activity._id}`}
>
copied!
</Tooltip>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { FC } from 'react';
import React from 'react';

import { useTranslation } from 'react-i18next';

export const AuditLogDisableMode: FC = () => {
Expand All @@ -13,11 +12,18 @@ export const AuditLogDisableMode: FC = () => {
<div className="col-md-6 mt-5">
<div className="text-center">
{/* error icon large */}
<h1><span className="material-symbols-outlined">error</span></h1>
<h1 className="text-center">{t('audit_log_management.audit_log')}</h1>
<h1>
<span className="material-symbols-outlined">error</span>
</h1>
<h1 className="text-center">
{t('audit_log_management.audit_log')}
</h1>
<h3
// eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={{ __html: t('audit_log_management.disable_mode_explanation') }}
// biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
dangerouslySetInnerHTML={{
__html: t('audit_log_management.disable_mode_explanation'),
}}
/>
</div>
</div>
Expand Down
52 changes: 38 additions & 14 deletions apps/app/src/client/components/Admin/AuditLog/AuditLogSettings.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,45 @@
import type { FC } from 'react';
import React, { useState } from 'react';

import { useAtomValue } from 'jotai';
import { useTranslation } from 'react-i18next';
import { Collapse } from 'reactstrap';

import { AllSupportedActions } from '~/interfaces/activity';
import { activityExpirationSecondsAtom, auditLogAvailableActionsAtom } from '~/states/server-configurations';
import {
activityExpirationSecondsAtom,
auditLogAvailableActionsAtom,
} from '~/states/server-configurations';

export const AuditLogSettings: FC = () => {
const { t } = useTranslation();

const [isExpandActionList, setIsExpandActionList] = useState(false);

const activityExpirationSeconds = useAtomValue(activityExpirationSecondsAtom) || 2592000;
const activityExpirationSeconds =
useAtomValue(activityExpirationSecondsAtom) || 2592000;

const availableActions = useAtomValue(auditLogAvailableActionsAtom);

return (
<>
<h4 className="mt-4">{t('admin:audit_log_management.activity_expiration_date')}</h4>
<h4 className="mt-4">
{t('admin:audit_log_management.activity_expiration_date')}
</h4>
<p className="form-text text-muted">
{t('admin:audit_log_management.activity_expiration_date_explanation')}
</p>
<p className="alert alert-warning col-6">
<span className="material-symbols-outlined">error</span>
<b>FIXED</b><br />
<b>FIXED</b>
<br />
<b
// eslint-disable-next-line react/no-danger
// biome-ignore lint/security/noDangerouslySetInnerHtml: trusted translation markup
dangerouslySetInnerHTML={{
__html: t('admin:audit_log_management.fixed_by_env_var',
{ key: 'ACTIVITY_EXPIRATION_SECONDS', value: activityExpirationSeconds }),
__html: t('admin:audit_log_management.fixed_by_env_var', {
key: 'ACTIVITY_EXPIRATION_SECONDS',
value: activityExpirationSeconds,
}),
}}
/>
</p>
Expand All @@ -45,24 +54,39 @@ export const AuditLogSettings: FC = () => {
href={t('admin:audit_log_management.docs_url.log_type')}
target="_blank"
rel="noopener noreferrer"
aria-label="Help"
>
<span className="material-symbols-outlined" aria-hidden="true">help</span>
<span className="material-symbols-outlined" aria-hidden="true">
help
</span>
<span className="visually-hidden">Help</span>
</a>
</h4>
<p className="form-text text-muted">
{t('admin:audit_log_management.available_action_list_explanation')}
</p>
<p className="mt-1">
<button type="button" className="btn btn-link p-0" aria-expanded="false" onClick={() => setIsExpandActionList(!isExpandActionList)}>
<span className={`material-symbols-outlined me-1 ${isExpandActionList ? 'rotate-90' : ''}`}>navigate_next</span>
{ t('admin:audit_log_management.action_list') }
<button
type="button"
className="btn btn-link p-0"
aria-expanded="false"
onClick={() => setIsExpandActionList(!isExpandActionList)}
>
<span
className={`material-symbols-outlined me-1 ${isExpandActionList ? 'rotate-90' : ''}`}
>
navigate_next
</span>
{t('admin:audit_log_management.action_list')}
</button>
</p>
<Collapse isOpen={isExpandActionList}>
<ul className="list-group">
{ availableActions.map(action => (
<li key={action} className="list-group-item">{t(`admin:audit_log_action.${action}`)}</li>
)) }
{availableActions.map((action) => (
<li key={action} className="list-group-item">
{t(`admin:audit_log_action.${action}`)}
</li>
))}
</ul>
</Collapse>
</>
Expand Down
93 changes: 49 additions & 44 deletions apps/app/src/client/components/Admin/AuditLog/DateRangePicker.tsx
Original file line number Diff line number Diff line change
@@ -1,64 +1,69 @@
import type { FC } from 'react';
import React, { forwardRef, useCallback } from 'react';

import { addDays, format } from 'date-fns';
import DatePicker from 'react-datepicker';
import 'react-datepicker/dist/react-datepicker.css';


type CustomInputProps = {
value?: string
onChange?: () => void
onFocus?: () => void
}
value?: string;
onChange?: () => void;
onFocus?: () => void;
};

const CustomInput = forwardRef<HTMLInputElement, CustomInputProps>((props: CustomInputProps, ref) => {
const dateFormat = 'MM/dd/yyyy';
const date = new Date();
const placeholder = `${format(date, dateFormat)} - ${format(addDays(date, 1), dateFormat)}`;
const CustomInput = forwardRef<HTMLInputElement, CustomInputProps>(
(props: CustomInputProps, ref) => {
const dateFormat = 'MM/dd/yyyy';
const date = new Date();
const placeholder = `${format(date, dateFormat)} - ${format(addDays(date, 1), dateFormat)}`;

return (
<div className="input-group admin-audit-log">
<span className="input-group-text">
<span className="material-symbols-outlined me-1">calendar_month</span>
</span>
<input
ref={ref}
type="text"
value={props?.value}
onFocus={props?.onFocus}
onChange={props?.onChange}
placeholder={placeholder}
className="form-control date-range-picker"
aria-describedby="basic-addon1"
/>
</div>
);
});
return (
<div className="input-group admin-audit-log">
<span className="input-group-text">
<span className="material-symbols-outlined me-1">calendar_month</span>
</span>
<input
ref={ref}
type="text"
value={props?.value}
onFocus={props?.onFocus}
onChange={props?.onChange}
placeholder={placeholder}
className="form-control date-range-picker"
aria-describedby="basic-addon1"
/>
</div>
);
},
);

CustomInput.displayName = 'CustomInput';

type DateRangePickerProps = {
startDate: Date | null
endDate: Date | null
onChange: (dateList: Date[] | null[]) => void
}
startDate: Date | null;
endDate: Date | null;
onChange: (dateList: Date[] | null[]) => void;
};

export const DateRangePicker: FC<DateRangePickerProps> = (props: DateRangePickerProps) => {
export const DateRangePicker: FC<DateRangePickerProps> = (
props: DateRangePickerProps,
) => {
const { startDate, endDate, onChange } = props;

const changeHandler = useCallback((dateList: Date[] | null[]) => {
if (onChange != null) {
const [start, end] = dateList;
const isSameTime = (start != null && end != null) && (start.getTime() === end.getTime());
if (isSameTime) {
onChange([null, null]);
const changeHandler = useCallback(
(dateList: Date[] | null[]) => {
if (onChange != null) {
const [start, end] = dateList;
const isSameTime =
start != null && end != null && start.getTime() === end.getTime();
if (isSameTime) {
onChange([null, null]);
} else {
onChange(dateList);
}
}
else {
onChange(dateList);
}
}
}, [onChange]);
},
[onChange],
);

return (
<div className="me-2">
Expand Down
Loading
Loading