Skip to content
Open
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
10 changes: 10 additions & 0 deletions apps/app/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ module.exports = {
'src/client/components/*.jsx',
'src/client/components/*.ts',
'src/client/components/*.js',
'src/client/components/Admin/*.ts',
'src/client/components/Admin/*.tsx',
'src/client/components/Admin/*.scss',
'src/client/components/Admin/AdminHome/**',
'src/client/components/Admin/Common/**',
'src/client/components/Admin/ElasticsearchManagement/**',
'src/client/components/Admin/ExportArchiveData/**',
'src/client/components/Admin/ImportData/**',
'src/client/components/Admin/LegacySlackIntegration/**',
'src/client/components/Admin/MarkdownSetting/**',
'src/client/components/Admin/App/**',
'src/client/components/Admin/SlackIntegration/**',
'src/client/components/Admin/Users/**',
Expand Down
86 changes: 57 additions & 29 deletions apps/app/src/client/components/Admin/AdminHome/AdminHome.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useEffect, useCallback } from 'react';

import React, { useCallback, useEffect } from 'react';
import { useTranslation } from 'next-i18next';
import PropTypes from 'prop-types';
import { CopyToClipboard } from 'react-copy-to-clipboard';
Expand All @@ -10,26 +9,21 @@ import { toastError } from '~/client/util/toastr';
import { useSWRxV5MigrationStatus } from '~/stores/page-listing';
import loggerFactory from '~/utils/logger';


import { withUnstatedContainers } from '../../UnstatedUtils';


import { EnvVarsTable } from './EnvVarsTable';
import SystemInfomationTable from './SystemInfomationTable';


const logger = loggerFactory('growi:admin');

const AdminHome = (props) => {
const { adminHomeContainer } = props;
const { t } = useTranslation();
const { data: migrationStatus } = useSWRxV5MigrationStatus();

const fetchAdminHomeData = useCallback(async() => {
const fetchAdminHomeData = useCallback(async () => {
try {
await adminHomeContainer.retrieveAdminHomeData();
}
catch (err) {
} catch (err) {
toastError(err);
logger.error(err);
}
Expand All @@ -48,25 +42,36 @@ const AdminHome = (props) => {
<h3 className="alert-heading">
{t('admin:maintenance_mode.maintenance_mode')}
</h3>
<p>
{t('admin:maintenance_mode.description')}
</p>
<p>{t('admin:maintenance_mode.description')}</p>
<hr />
<a className="btn-link" href="/admin/app" rel="noopener noreferrer">
<span className="material-symbols-outlined ms-1" aria-hidden="true">link</span>
<strong>{t('admin:maintenance_mode.end_maintenance_mode')}</strong>
<span
className="material-symbols-outlined ms-1"
aria-hidden="true"
>
link
</span>
<strong>
{t('admin:maintenance_mode.end_maintenance_mode')}
</strong>
</a>
</div>
)
}
{
// Alert message will be displayed in case that V5 migration has not been compleated
(migrationStatus != null && !migrationStatus.isV5Compatible)
&& (
<div className={`alert ${migrationStatus.isV5Compatible == null ? 'alert-warning' : 'alert-info'}`}>
migrationStatus != null && !migrationStatus.isV5Compatible && (
<div
className={`alert ${migrationStatus.isV5Compatible == null ? 'alert-warning' : 'alert-info'}`}
>
{t('admin:v5_page_migration.migration_desc')}
<a className="btn-link" href="/admin/app" rel="noopener noreferrer">
<span className="material-symbols-outlined ms-1" aria-hidden="true">link</span>
<span
className="material-symbols-outlined ms-1"
aria-hidden="true"
>
link
</span>
<strong>{t('admin:v5_page_migration.upgrade_to_v5')}</strong>
</a>
</div>
Expand All @@ -80,52 +85,75 @@ const AdminHome = (props) => {

<div className="row mb-5">
<div className="col-lg-12">
<h2 className="admin-setting-header">{t('admin:admin_top.system_information')}</h2>
<h2 className="admin-setting-header">
{t('admin:admin_top.system_information')}
</h2>
<SystemInfomationTable />
</div>
</div>

<div className="row mb-5">
<div className="col-md-12">
<h2 className="admin-setting-header">{t('admin:admin_top.list_of_env_vars')}</h2>
<h2 className="admin-setting-header">
{t('admin:admin_top.list_of_env_vars')}
</h2>
<p>{t('admin:admin_top.env_var_priority')}</p>
{/* eslint-disable-next-line react/no-danger */}
<p dangerouslySetInnerHTML={{ __html: t('admin:admin_top.about_security') }} />
<p
// biome-ignore lint/security/noDangerouslySetInnerHtml: ignore
dangerouslySetInnerHTML={{
__html: t('admin:admin_top.about_security'),
}}
/>
<EnvVarsTable envVars={adminHomeContainer.state.envVars} />
</div>
</div>

<div className="row mb-5">
<div className="col-md-12">
<h2 className="admin-setting-header">{t('admin:admin_top.bug_report')}</h2>
<h2 className="admin-setting-header">
{t('admin:admin_top.bug_report')}
</h2>
<div className="d-flex align-items-center">
<CopyToClipboard
text={adminHomeContainer.generatePrefilledHostInformationMarkdown()}
onCopy={() => adminHomeContainer.onCopyPrefilledHostInformation()}
>
<button id="prefilledHostInformationButton" type="button" className="btn btn-primary">
<button
id="prefilledHostInformationButton"
type="button"
className="btn btn-primary"
>
{t('admin:admin_top:copy_prefilled_host_information:default')}
</button>
</CopyToClipboard>
<Tooltip
placement="bottom"
isOpen={adminHomeContainer.state.copyState === adminHomeContainer.copyStateValues.DONE}
isOpen={
adminHomeContainer.state.copyState ===
adminHomeContainer.copyStateValues.DONE
}
target="prefilledHostInformationButton"
fade={false}
>
{t('admin:admin_top:copy_prefilled_host_information:done')}
</Tooltip>
{/* eslint-disable-next-line react/no-danger */}
<span className="ms-2" dangerouslySetInnerHTML={{ __html: t('admin:admin_top:submit_bug_report') }} />
<span
className="ms-2"
// biome-ignore lint/security/noDangerouslySetInnerHtml: ignore
dangerouslySetInnerHTML={{
__html: t('admin:admin_top:submit_bug_report'),
}}
/>
</div>
</div>
</div>
</div>
);
};


const AdminHomeWrapper = withUnstatedContainers(AdminHome, [AdminHomeContainer]);
const AdminHomeWrapper = withUnstatedContainers(AdminHome, [
AdminHomeContainer,
]);

AdminHome.propTypes = {
adminHomeContainer: PropTypes.instanceOf(AdminHomeContainer).isRequired,
Expand Down
16 changes: 8 additions & 8 deletions apps/app/src/client/components/Admin/AdminHome/EnvVarsTable.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React, { type JSX } from 'react';

import type React from 'react';
import type { JSX } from 'react';
import { LoadingSpinner } from '@growi/ui/dist/components';

type EnvVarsTableProps = {
envVars?: Record<string, string | number | boolean>,
}
envVars?: Record<string, string | number | boolean>;
};

export const EnvVarsTable: React.FC<EnvVarsTableProps> = (props: EnvVarsTableProps) => {
export const EnvVarsTable: React.FC<EnvVarsTableProps> = (
props: EnvVarsTableProps,
) => {
const { envVars } = props;
if (envVars == null) {
return <LoadingSpinner />;
Expand All @@ -27,9 +29,7 @@ export const EnvVarsTable: React.FC<EnvVarsTableProps> = (props: EnvVarsTablePro

return (
<table className="table table-bordered">
<tbody>
{envVarRows}
</tbody>
<tbody>{envVarRows}</tbody>
</table>
);
};
Original file line number Diff line number Diff line change
@@ -1,55 +1,62 @@
import React from 'react';

import { LoadingSpinner } from '@growi/ui/dist/components';

import AdminHomeContainer from '~/client/services/AdminHomeContainer';

import { withUnstatedContainers } from '../../UnstatedUtils';


type Props = {
adminHomeContainer: AdminHomeContainer,
}
adminHomeContainer: AdminHomeContainer;
};

const SystemInformationTable = (props: Props) => {
const { adminHomeContainer } = props;

const {
growiVersion, nodeVersion, npmVersion, pnpmVersion,
} = adminHomeContainer.state;
const { growiVersion, nodeVersion, npmVersion, pnpmVersion } =
adminHomeContainer.state;

if (growiVersion == null || nodeVersion == null || npmVersion == null || pnpmVersion == null) {
if (
growiVersion == null ||
nodeVersion == null ||
npmVersion == null ||
pnpmVersion == null
) {
return <LoadingSpinner />;
}

return (
<table data-testid="admin-system-information-table" className="table table-bordered">
<table
data-testid="admin-system-information-table"
className="table table-bordered"
>
<tbody>
<tr>
<th>GROWI</th>
<td data-vrt-blackout>{ growiVersion }</td>
<td data-vrt-blackout>{growiVersion}</td>
</tr>
<tr>
<th>node.js</th>
<td>{ nodeVersion }</td>
<td>{nodeVersion}</td>
</tr>
<tr>
<th>npm</th>
<td>{ npmVersion }</td>
<td>{npmVersion}</td>
</tr>
<tr>
<th>pnpm</th>
<td>{ pnpmVersion }</td>
<td>{pnpmVersion}</td>
</tr>
</tbody>
</table>
);

};

/**
* Wrapper component for using unstated
*/
const SystemInformationTableWrapper = withUnstatedContainers(SystemInformationTable, [AdminHomeContainer]);
const SystemInformationTableWrapper = withUnstatedContainers(
SystemInformationTable,
[AdminHomeContainer],
);

export default SystemInformationTableWrapper;
Loading