keigo-h 3 лет назад
Родитель
Сommit
89a4a4ba22
1 измененных файлов с 2 добавлено и 32 удалено
  1. 2 32
      packages/app/src/pages/tags.page.tsx

+ 2 - 32
packages/app/src/pages/tags.page.tsx

@@ -1,32 +1,26 @@
 import React, { useState, useCallback } from 'react';
 import React, { useState, useCallback } from 'react';
 
 
-
 import {
 import {
   IUser, IUserHasId,
   IUser, IUserHasId,
 } from '@growi/core';
 } from '@growi/core';
 import { NextPage, GetServerSideProps, GetServerSidePropsContext } from 'next';
 import { NextPage, GetServerSideProps, GetServerSidePropsContext } from 'next';
 import { useTranslation } from 'next-i18next';
 import { useTranslation } from 'next-i18next';
-import dynamic from 'next/dynamic';
 import Head from 'next/head';
 import Head from 'next/head';
 
 
-
-import GrowiContextualSubNavigation from '~/components/Navbar/GrowiContextualSubNavigation';
 import TagCloudBox from '~/components/TagCloudBox';
 import TagCloudBox from '~/components/TagCloudBox';
 import TagList from '~/components/TagList';
 import TagList from '~/components/TagList';
 import { CrowiRequest } from '~/interfaces/crowi-request';
 import { CrowiRequest } from '~/interfaces/crowi-request';
 import { IDataTagCount } from '~/interfaces/tag';
 import { IDataTagCount } from '~/interfaces/tag';
 import { IUserUISettings } from '~/interfaces/user-ui-settings';
 import { IUserUISettings } from '~/interfaces/user-ui-settings';
 import UserUISettings from '~/server/models/user-ui-settings';
 import UserUISettings from '~/server/models/user-ui-settings';
-import Xss from '~/services/xss';
 import { useSWRxTagsList } from '~/stores/tag';
 import { useSWRxTagsList } from '~/stores/tag';
 
 
 import { BasicLayout } from '../components/Layout/BasicLayout';
 import { BasicLayout } from '../components/Layout/BasicLayout';
 import {
 import {
   useCurrentUser,
   useCurrentUser,
   useIsSearchServiceConfigured, useIsSearchServiceReachable,
   useIsSearchServiceConfigured, useIsSearchServiceReachable,
-  useCsrfToken, useIsSearchScopeChildrenAsDefault,
+  useIsSearchScopeChildrenAsDefault,
 } from '../stores/context';
 } from '../stores/context';
-import { useXss } from '../stores/xss';
 
 
 import {
 import {
   CommonProps, getServerSideCommonProps, useCustomTitle,
   CommonProps, getServerSideCommonProps, useCustomTitle,
@@ -36,17 +30,9 @@ const PAGING_LIMIT = 10;
 
 
 type Props = CommonProps & {
 type Props = CommonProps & {
   currentUser: IUser,
   currentUser: IUser,
-
-  isLatestRevision?: boolean,
-
-  isIdenticalPathPage?: boolean,
-
   isSearchServiceConfigured: boolean,
   isSearchServiceConfigured: boolean,
   isSearchServiceReachable: boolean,
   isSearchServiceReachable: boolean,
   isSearchScopeChildrenAsDefault: boolean,
   isSearchScopeChildrenAsDefault: boolean,
-
-  disableLinkSharing: boolean,
-
   userUISettings?: IUserUISettings
   userUISettings?: IUserUISettings
 };
 };
 
 
@@ -54,8 +40,6 @@ const TagPage: NextPage<CommonProps> = (props: Props) => {
   const [activePage, setActivePage] = useState<number>(1);
   const [activePage, setActivePage] = useState<number>(1);
   const [offset, setOffset] = useState<number>(0);
   const [offset, setOffset] = useState<number>(0);
 
 
-  const GrowiSubNavigationSwitcher = dynamic(() => import('../components/Navbar/GrowiSubNavigationSwitcher'), { ssr: false });
-
   useCurrentUser(props.currentUser ?? null);
   useCurrentUser(props.currentUser ?? null);
 
 
   const { data: tagDataList, error } = useSWRxTagsList(PAGING_LIMIT, offset);
   const { data: tagDataList, error } = useSWRxTagsList(PAGING_LIMIT, offset);
@@ -65,10 +49,6 @@ const TagPage: NextPage<CommonProps> = (props: Props) => {
 
 
   const { t } = useTranslation('');
   const { t } = useTranslation('');
 
 
-  useXss(new Xss());
-
-  useCsrfToken(props.csrfToken);
-
   useIsSearchServiceConfigured(props.isSearchServiceConfigured);
   useIsSearchServiceConfigured(props.isSearchServiceConfigured);
   useIsSearchServiceReachable(props.isSearchServiceReachable);
   useIsSearchServiceReachable(props.isSearchServiceReachable);
   useIsSearchScopeChildrenAsDefault(props.isSearchScopeChildrenAsDefault);
   useIsSearchScopeChildrenAsDefault(props.isSearchScopeChildrenAsDefault);
@@ -85,14 +65,6 @@ const TagPage: NextPage<CommonProps> = (props: Props) => {
       <Head>
       <Head>
       </Head>
       </Head>
       <BasicLayout title={useCustomTitle(props, 'GROWI')} className={classNames.join(' ')}>
       <BasicLayout title={useCustomTitle(props, 'GROWI')} className={classNames.join(' ')}>
-        <header className="py-0">
-          <GrowiContextualSubNavigation isLinkSharingDisabled={props.disableLinkSharing} />
-        </header>
-        <div className="d-edit-none">
-          <GrowiSubNavigationSwitcher />
-        </div>
-        <div id="grw-subnav-sticky-trigger" className="sticky-top"></div>
-        <div id="grw-fav-sticky-trigger" className="sticky-top"></div>
         <div className="grw-container-convertible mb-5 pb-5">
         <div className="grw-container-convertible mb-5 pb-5">
           <h2 className="my-3">{`${t('Tags')}(${totalCount})`}</h2>
           <h2 className="my-3">{`${t('Tags')}(${totalCount})`}</h2>
           <div className="px-3 mb-5 text-center">
           <div className="px-3 mb-5 text-center">
@@ -125,8 +97,8 @@ const TagPage: NextPage<CommonProps> = (props: Props) => {
 async function injectUserUISettings(context: GetServerSidePropsContext, props: Props): Promise<void> {
 async function injectUserUISettings(context: GetServerSidePropsContext, props: Props): Promise<void> {
   const req = context.req as CrowiRequest<IUserHasId & any>;
   const req = context.req as CrowiRequest<IUserHasId & any>;
   const { user } = req;
   const { user } = req;
-
   const userUISettings = user == null ? null : await UserUISettings.findOne({ user: user._id }).exec();
   const userUISettings = user == null ? null : await UserUISettings.findOne({ user: user._id }).exec();
+
   if (userUISettings != null) {
   if (userUISettings != null) {
     props.userUISettings = userUISettings.toObject();
     props.userUISettings = userUISettings.toObject();
   }
   }
@@ -147,13 +119,11 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
 export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
 export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
   const req = context.req as CrowiRequest<IUserHasId & any>;
   const req = context.req as CrowiRequest<IUserHasId & any>;
   const { user } = req;
   const { user } = req;
-
   const result = await getServerSideCommonProps(context);
   const result = await getServerSideCommonProps(context);
 
 
   if (!('props' in result)) {
   if (!('props' in result)) {
     throw new Error('invalid getSSP result');
     throw new Error('invalid getSSP result');
   }
   }
-
   const props: Props = result.props as Props;
   const props: Props = result.props as Props;
 
 
   if (user != null) {
   if (user != null) {