Răsfoiți Sursa

Change to PascalCase

Shun Miyazawa 3 ani în urmă
părinte
comite
a0af5b45e6

+ 4 - 4
packages/app/src/components/CompleteUserRegistrationForm.tsx

@@ -3,14 +3,14 @@ import React, { useState, useEffect, useCallback } from 'react';
 import { useTranslation } from 'next-i18next';
 
 import { apiv3Get, apiv3Post } from '~/client/util/apiv3-client';
-import { userActivationErrorCode } from '~/interfaces/errors/user-activation';
+import { UserActivationErrorCode } from '~/interfaces/errors/user-activation';
 
 import { toastSuccess, toastError } from '../client/util/apiNotification';
 
 interface Props {
   email: string,
   token: string,
-  errorCode?: userActivationErrorCode,
+  errorCode?: UserActivationErrorCode,
   isEmailAuthenticationEnabled: boolean,
 }
 
@@ -70,13 +70,13 @@ const CompleteUserRegistrationForm: React.FC<Props> = (props: Props) => {
         <div className="row mx-0">
           <div className="col-12">
 
-            { (errorCode != null && errorCode === userActivationErrorCode.TOKEN_NOT_FOUND) && (
+            { (errorCode != null && errorCode === UserActivationErrorCode.TOKEN_NOT_FOUND) && (
               <p className="alert alert-danger">
                 <span>Token not found</span>
               </p>
             )}
 
-            { (errorCode != null && errorCode === userActivationErrorCode.USER_REGISTRATION_ORDER_IS_NOT_APPROPRIATE) && (
+            { (errorCode != null && errorCode === UserActivationErrorCode.USER_REGISTRATION_ORDER_IS_NOT_APPROPRIATE) && (
               <p className="alert alert-danger">
                 <span>{t('message.incorrect_token_or_expired_url')}</span>
               </p>

+ 2 - 2
packages/app/src/interfaces/errors/user-activation.ts

@@ -1,6 +1,6 @@
-export const userActivationErrorCode = {
+export const UserActivationErrorCode = {
   TOKEN_NOT_FOUND: 'token-not-found',
   USER_REGISTRATION_ORDER_IS_NOT_APPROPRIATE: 'user-registration-order-is-not-appropriate',
 } as const;
 
-export type userActivationErrorCode = typeof userActivationErrorCode[keyof typeof userActivationErrorCode];
+export type UserActivationErrorCode = typeof UserActivationErrorCode[keyof typeof UserActivationErrorCode];

+ 3 - 3
packages/app/src/pages/user-activation.page.tsx

@@ -4,7 +4,7 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import CompleteUserRegistrationForm from '~/components/CompleteUserRegistrationForm';
 import { NoLoginLayout } from '~/components/Layout/NoLoginLayout';
 import type { CrowiRequest } from '~/interfaces/crowi-request';
-import { userActivationErrorCode } from '~/interfaces/errors/user-activation';
+import type { UserActivationErrorCode } from '~/interfaces/errors/user-activation';
 import { IUserRegistrationOrder } from '~/server/models/user-registration-order';
 
 import {
@@ -14,7 +14,7 @@ import {
 type Props = CommonProps & {
   token: string
   email: string
-  errorCode?: userActivationErrorCode
+  errorCode?: UserActivationErrorCode
   isEmailAuthenticationEnabled: boolean
 }
 
@@ -61,7 +61,7 @@ export const getServerSideProps: GetServerSideProps = async(context: GetServerSi
   }
 
   if (typeof context.query.errorCode === 'string') {
-    props.errorCode = context.query.errorCode as userActivationErrorCode;
+    props.errorCode = context.query.errorCode as UserActivationErrorCode;
   }
 
   props.isEmailAuthenticationEnabled = req.crowi.configManager.getConfig('crowi', 'security:passport-local:isEmailAuthenticationEnabled');

+ 2 - 2
packages/app/src/server/routes/user-activation.ts

@@ -1,6 +1,6 @@
 import { Response, NextFunction } from 'express';
 
-import { userActivationErrorCode } from '~/interfaces/errors/user-activation';
+import type { UserActivationErrorCode } from '~/interfaces/errors/user-activation';
 import { ReqWithUserRegistrationOrder } from '~/server/middlewares/inject-user-registration-order-by-token-middleware';
 
 type Crowi = {
@@ -24,7 +24,7 @@ export const renderUserActivationPage = (crowi: Crowi) => {
 
 // middleware to handle error
 export const tokenErrorHandlerMiddeware = (crowi: Crowi) => {
-  return (error: Error & { code: userActivationErrorCode, statusCode: number }, req: CrowiReq, res: Response, next: NextFunction): void => {
+  return (error: Error & { code: UserActivationErrorCode, statusCode: number }, req: CrowiReq, res: Response, next: NextFunction): void => {
     if (error != null) {
       const { nextApp } = crowi;
       req.crowi = crowi;