Explorar o código

refactor ESLint

yuken %!s(int64=3) %!d(string=hai) anos
pai
achega
4c8c15c19f

+ 14 - 10
packages/app/src/components/PageAlert/PageAlerts.tsx

@@ -1,8 +1,12 @@
-import dynamic from 'next/dynamic'
-import { FixPageGrantAlert } from "./FixPageGrantAlert";
-import { PageGrantAlert } from "./PageGrantAlert";
-const TrashPageAlert = dynamic(() => import('./TrashPageAlert').then(mod => mod.TrashPageAlert), {ssr: false})
-import { PageStaleAlert } from "./PageStaleAlert";
+import React from 'react';
+
+import dynamic from 'next/dynamic';
+
+import { FixPageGrantAlert } from './FixPageGrantAlert';
+import { PageGrantAlert } from './PageGrantAlert';
+import { PageStaleAlert } from './PageStaleAlert';
+
+const TrashPageAlert = dynamic(() => import('./TrashPageAlert').then(mod => mod.TrashPageAlert), { ssr: false });
 
 export const PageAlerts = (): JSX.Element => {
 
@@ -11,11 +15,11 @@ export const PageAlerts = (): JSX.Element => {
     <div className="row d-edit-none">
       <div className="col-sm-12">
         {/* alerts */}
-        <FixPageGrantAlert/>
-        <PageGrantAlert/>
-        <TrashPageAlert/>
-        <PageStaleAlert/>
+        <FixPageGrantAlert />
+        <PageGrantAlert />
+        <TrashPageAlert />
+        <PageStaleAlert />
       </div>
     </div>
   );
-}
+};

+ 14 - 13
packages/app/src/components/PageAlert/TrashPageAlert.tsx

@@ -3,12 +3,14 @@ import React from 'react';
 import { UserPicture } from '@growi/ui';
 import { useTranslation } from 'react-i18next';
 
-import { useCurrentUpdatedAt, useIsTrashPage, useShareLinkId, useLastUpdateUsername, useDeletedAt, useRevisionId } from '~/stores/context';
+import {
+  useCurrentUpdatedAt, useIsTrashPage, useShareLinkId, useLastUpdateUsername, useDeletedAt, useRevisionId,
+} from '~/stores/context';
 import { usePageDeleteModal, usePutBackPageModal } from '~/stores/modal';
 import { useSWRxPageInfo, useSWRxCurrentPage } from '~/stores/page';
 import { useIsAbleToShowTrashPageManagementButtons } from '~/stores/ui';
 
-const onDeletedHandler = (pathOrPathsToDelete, isRecursively, isCompletely) => {
+const onDeletedHandler = (pathOrPathsToDelete) => {
   if (typeof pathOrPathsToDelete !== 'string') {
     return;
   }
@@ -16,7 +18,7 @@ const onDeletedHandler = (pathOrPathsToDelete, isRecursively, isCompletely) => {
   window.location.href = '/';
 };
 
-export const TrashPageAlert = () => {
+export const TrashPageAlert = (): JSX.Element => {
   const { t } = useTranslation();
 
   const { data: isAbleToShowTrashPageManagementButtons } = useIsAbleToShowTrashPageManagementButtons();
@@ -26,8 +28,8 @@ export const TrashPageAlert = () => {
   const { data: lastUpdateUserName } = useLastUpdateUsername();
   const { data: deletedAt } = useDeletedAt();
   const { data: revisionId } = useRevisionId();
-  const pageId  = pageData?._id;
-  const pagePath = pageData?.path
+  const pageId = pageData?._id;
+  const pagePath = pageData?.path;
   const { data: pageInfo } = useSWRxPageInfo(pageId ?? null, shareLinkId);
 
   const { data: updatedAt } = useCurrentUpdatedAt();
@@ -36,22 +38,22 @@ export const TrashPageAlert = () => {
   const { open: openPutBackPageModal } = usePutBackPageModal();
 
   if (!isTrashPage) {
-    return <></>
+    return <></>;
   }
 
   function openPutbackPageModalHandler() {
-    if ( pageId == undefined || pagePath == undefined ) {
-      return
+    if (pageId === undefined || pagePath === undefined) {
+      return;
     }
-    const putBackedHandler = (path) => {
+    const putBackedHandler = () => {
       window.location.reload();
     };
-    openPutBackPageModal({pageId, path: pagePath}, { onPutBacked: putBackedHandler });
+    openPutBackPageModal({ pageId, path: pagePath }, { onPutBacked: putBackedHandler });
   }
 
   function openPageDeleteModalHandler() {
-    if ( pageId == undefined || revisionId == undefined || pagePath == undefined ) {
-      return
+    if (pageId === undefined || revisionId === undefined || pagePath === undefined) {
+      return;
     }
     const pageToDelete = {
       data: {
@@ -105,4 +107,3 @@ export const TrashPageAlert = () => {
     </>
   );
 };
-

+ 13 - 13
packages/app/src/pages/[[...path]].page.tsx

@@ -1,6 +1,8 @@
 import React, { useEffect } from 'react';
 
 import { pagePathUtils } from '@growi/core';
+import { format } from 'date-fns';
+import { isValidObjectId } from 'mongoose';
 import {
   NextPage, GetServerSideProps, GetServerSidePropsContext,
 } from 'next';
@@ -16,11 +18,11 @@ import { CrowiRequest } from '~/interfaces/crowi-request';
 // import { useRendererSettings } from '~/stores/renderer';
 // import { EditorMode, useEditorMode, useIsMobile } from '~/stores/ui';
 import { IPageWithMeta } from '~/interfaces/page';
+import { PageModel } from '~/server/models/page';
 import { serializeUserSecurely } from '~/server/models/serializers/user-serializer';
+import Xss from '~/services/xss';
 import { useSWRxCurrentPage, useSWRxPage, useSWRxPageInfo } from '~/stores/page';
 import loggerFactory from '~/utils/logger';
-import Xss from '~/services/xss';
-import { format } from 'date-fns';
 
 // import { isUserPage, isTrashPage, isSharedPage } from '~/utils/path-utils';
 
@@ -40,14 +42,13 @@ import {
   useAppTitle, useSiteUrl, useConfidential, useIsEnabledStaleNotification,
   useIsSearchServiceConfigured, useIsSearchServiceReachable, useIsMailerSetup,
   useAclEnabled, useHasSlackConfig, useDrawioUri, useHackmdUri, useMathJax, useNoCdn, useEditorConfig, useCsrfToken,
-  useCurrentPageId, useLastUpdateUsername, useDeletedAt, useRevisionId
+  useCurrentPageId, useLastUpdateUsername, useDeletedAt, useRevisionId,
 } from '../stores/context';
-
-import { useXss } from '../stores/xss'
+import { useXss } from '../stores/xss';
 
 import { CommonProps, getServerSideCommonProps, useCustomTitle } from './commons';
-import { PageModel } from '~/server/models/page';
-import { isValidObjectId } from 'mongoose';
+
+
 // import { useCurrentPageSWR } from '../stores/page';
 
 
@@ -100,7 +101,7 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
   // commons
   useAppTitle(props.appTitle);
   useSiteUrl(props.siteUrl);
-  useXss(new Xss())
+  useXss(new Xss());
   // useEditorConfig(props.editorConfig);
   useConfidential(props.confidential);
   useCsrfToken(props.csrfToken);
@@ -143,7 +144,7 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
   if (props.pageWithMetaStr != null) {
     pageWithMeta = JSON.parse(props.pageWithMetaStr) as IPageWithMeta;
   }
-  useCurrentPageId(pageWithMeta?.data._id)
+  useCurrentPageId(pageWithMeta?.data._id);
   useSWRxCurrentPage(undefined, pageWithMeta?.data); // store initial data
   // useSWRxPage(pageWithMeta?.data._id);
   useSWRxPageInfo(pageWithMeta?.data._id, undefined, pageWithMeta?.meta); // store initial data
@@ -241,16 +242,15 @@ async function injectPageInformation(context: GetServerSidePropsContext, props:
   const { currentPathname } = props;
 
   // determine pageId
-  let pageId;
   const pageIdStr = currentPathname.substring(1);
-  pageId = isValidObjectId(pageIdStr) ? pageIdStr : null;
+  const pageId = isValidObjectId(pageIdStr) ? pageIdStr : null;
 
   const result: IPageWithMeta = await pageService.findPageAndMetaDataByViewer(pageId, currentPathname, user, true); // includeEmpty = true, isSharedPage = false
   const page = result.data;
 
 
   if (page == null) {
-    const count = pageId != null ?  await Page.count({ _id: pageId }) : await Page.count({ path: currentPathname }) ;
+    const count = pageId != null ? await Page.count({ _id: pageId }) : await Page.count({ path: currentPathname });
     // check the page is forbidden or just does not exist.
     props.isForbidden = count > 0;
     props.isNotFound = true;
@@ -261,7 +261,7 @@ async function injectPageInformation(context: GetServerSidePropsContext, props:
 
   const populatedPage = await (page as unknown as PageModel).populateDataToShowRevision();
   props.lastUpdateUserName = populatedPage.lastUpdateUser.name;
-  props.deletedAt = page.deletedAt ? format(page.deletedAt, 'yyyy/MM/dd HH:mm') : ''
+  props.deletedAt = page.deletedAt ? format(page.deletedAt, 'yyyy/MM/dd HH:mm') : '';
   props.revisionId = populatedPage.revision._id.toString();
 }