chore: 修一些 constants 或是參數 (#1430)

goodjoblife · Dec 6, 2024 · 8d21f23 · 8d21f23
1 parent c03a911
commit 8d21f23
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 56 deletions.
diff --git a/src/components/CompanyAndJobTitle/IndexPage/index.js b/src/components/CompanyAndJobTitle/IndexPage/index.js
@@ -9,14 +9,13 @@ import {
   pageTypeTranslation,
   generatePageURL,
   generateIndexURL,
+  PAGE_SIZE,
 } from 'constants/companyJobTitle';
 import styles from './CompanyAndJobTitleIndex.module.css';
 import { isFetched } from 'utils/fetchBox';
 import { formatTitle, formatCanonicalPath } from 'utils/helmetHelper';
 import { SITE_NAME } from 'constants/helmetData';
 
-const PAGE_SIZE = 10;
-
 const IndexHelmet = ({ pageType, page }) => {
   const title = `所有${pageTypeTranslation[pageType]}資料 - 第${page}頁`;
 

diff --git a/src/components/CompanyAndJobTitle/Overview/Overview.js b/src/components/CompanyAndJobTitle/Overview/Overview.js
@@ -100,16 +100,16 @@ const Overview = ({
 
 Overview.propTypes = {
   averageWeekWorkTime: PropTypes.number.isRequired,
-  interviewExperiences: PropTypes.arrayOf(PropTypes.object),
+  interviewExperiences: PropTypes.arrayOf(PropTypes.object).isRequired,
   interviewExperiencesCount: PropTypes.number.isRequired,
   jobAverageSalaries: PropTypes.array,
   overtimeFrequencyCount: PropTypes.object.isRequired,
   pageName: PropTypes.string.isRequired,
   pageType: PropTypes.string.isRequired,
   salaryDistribution: PropTypes.array,
-  salaryWorkTimes: PropTypes.arrayOf(PropTypes.object),
+  salaryWorkTimes: PropTypes.arrayOf(PropTypes.object).isRequired,
   salaryWorkTimesCount: PropTypes.number.isRequired,
-  workExperiences: PropTypes.arrayOf(PropTypes.object),
+  workExperiences: PropTypes.arrayOf(PropTypes.object).isRequired,
   workExperiencesCount: PropTypes.number.isRequired,
 };
 

diff --git a/src/components/CompanyAndJobTitle/Overview/index.js b/src/components/CompanyAndJobTitle/Overview/index.js
@@ -5,7 +5,7 @@ import { BoxStatusRenderer } from '../StatusRenderer';
 import OverviewSection from './Overview';
 import Helmet from './Helmet';
 
-const Overview = ({ pageType, pageName, tabType, overviewBox, page }) => (
+const Overview = ({ pageType, pageName, tabType, overviewBox }) => (
   <CompanyAndJobTitleWrapper
     pageType={pageType}
     pageName={pageName}
@@ -40,7 +40,6 @@ const Overview = ({ pageType, pageName, tabType, overviewBox, page }) => (
               jobAverageSalaries={data.jobAverageSalaries}
               averageWeekWorkTime={data.averageWeekWorkTime}
               overtimeFrequencyCount={data.overtimeFrequencyCount}
-              page={page}
             />
           </Fragment>
         );
@@ -66,7 +65,6 @@ Overview.propTypes = {
     error: PropTypes.any,
     status: PropTypes.string.isRequired,
   }).isRequired,
-  page: PropTypes.number.isRequired,
   pageName: PropTypes.string.isRequired,
   pageType: PropTypes.string.isRequired,
   tabType: PropTypes.string.isRequired,

diff --git a/src/components/CompanyAndJobTitle/TimeAndSalary/index.js b/src/components/CompanyAndJobTitle/TimeAndSalary/index.js
@@ -43,7 +43,6 @@ const TimeAndSalary = ({
               pageName={pageName}
               tabType={tabType}
               salaryWorkTimes={salaryWorkTimes}
-              salaryWorkTimeStatistics={salaryWorkTimeStatistics}
               page={page}
               pageSize={pageSize}
               totalCount={totalCount}
@@ -57,12 +56,12 @@ const TimeAndSalary = ({
 
 TimeAndSalary.propTypes = {
   page: PropTypes.number.isRequired,
-  pageName: PropTypes.string,
+  pageName: PropTypes.string.isRequired,
   pageSize: PropTypes.number.isRequired,
-  pageType: PropTypes.string,
+  pageType: PropTypes.string.isRequired,
   salaryWorkTimeStatistics: PropTypes.object.isRequired,
   salaryWorkTimes: PropTypes.array,
-  tabType: PropTypes.string,
+  tabType: PropTypes.string.isRequired,
   totalCount: PropTypes.number.isRequired,
 };
 

diff --git a/src/constants/companyJobTitle.js b/src/constants/companyJobTitle.js
@@ -61,3 +61,5 @@ export const generateIndexURL = ({ pageType }) =>
   generatePath('/:pageTypeURL', {
     pageTypeURL: pageTypeURLMap[pageType],
   });
+
+export const PAGE_SIZE = 10;
diff --git a/src/pages/Company/CompanyIndexProvider.js b/src/pages/Company/CompanyIndexProvider.js
@@ -4,15 +4,13 @@ import { querySelector } from 'common/routing/selectors';
 import { pageFromQuerySelector } from 'selectors/routing/page';
 import CompanyAndJobTitleIndexPage from 'components/CompanyAndJobTitle/IndexPage';
 import usePagination from 'components/CompanyAndJobTitle/IndexPage/usePagination';
-import { pageType } from 'constants/companyJobTitle';
+import { pageType as PAGE_TYPE, PAGE_SIZE } from 'constants/companyJobTitle';
 import { fetchCompanyNames } from 'actions/company';
 import {
   companyIndexesBoxSelectorAtPage,
   companiesCountSelector,
 } from 'selectors/companyAndJobTitle';
 
-const PAGE_SIZE = 10;
-
 const CompanyIndexProvider = () => {
   const [page, getPageLink] = usePagination();
   const selector = useMemo(() => companyIndexesBoxSelectorAtPage(page), [page]);
@@ -27,8 +25,7 @@ const CompanyIndexProvider = () => {
   return (
     <CompanyAndJobTitleIndexPage
       totalCount={totalCount}
-      pageType={pageType.COMPANY}
-      status={companyIndexesBox.status}
+      pageType={PAGE_TYPE.COMPANY}
       indexesBox={companyIndexesBox}
       page={page}
       getPageLink={getPageLink}

diff --git a/src/pages/Company/CompanyInterviewExperiencesProvider.js b/src/pages/Company/CompanyInterviewExperiencesProvider.js
@@ -4,7 +4,11 @@ import InterviewExperiences from 'components/CompanyAndJobTitle/InterviewExperie
 import { paramsSelector, querySelector } from 'common/routing/selectors';
 import usePermission from 'hooks/usePermission';
 import { usePage } from 'hooks/routing/page';
-import { tabType, pageType as PAGE_TYPE } from 'constants/companyJobTitle';
+import {
+  tabType as TAB_TYPE,
+  pageType as PAGE_TYPE,
+  PAGE_SIZE,
+} from 'constants/companyJobTitle';
 import {
   queryCompanyInterviewExperiences,
   queryRatingStatistics,
@@ -39,8 +43,6 @@ const useInterviewExperiencesBox = pageName => {
   return useSelector(selector);
 };
 
-const PAGE_SIZE = 10;
-
 const CompanyInterviewExperiencesProvider = () => {
   const dispatch = useDispatch();
   const pageType = PAGE_TYPE.COMPANY;
@@ -83,7 +85,7 @@ const CompanyInterviewExperiencesProvider = () => {
       page={page}
       pageSize={PAGE_SIZE}
       totalCount={interviewExperiencesCount}
-      tabType={tabType.INTERVIEW_EXPERIENCE}
+      tabType={TAB_TYPE.INTERVIEW_EXPERIENCE}
       status={status}
       interviewExperiences={interviewExperiences}
     />

diff --git a/src/pages/Company/CompanyOverviewProvider.js b/src/pages/Company/CompanyOverviewProvider.js
@@ -2,8 +2,10 @@ import React, { useCallback, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import Overview from 'components/CompanyAndJobTitle/Overview';
 import usePermission from 'hooks/usePermission';
-import { usePage } from 'hooks/routing/page';
-import { tabType, pageType as PAGE_TYPE } from 'constants/companyJobTitle';
+import {
+  tabType as TAB_TYPE,
+  pageType as PAGE_TYPE,
+} from 'constants/companyJobTitle';
 import { queryCompanyOverview, queryRatingStatistics } from 'actions/company';
 import {
   jobAverageSalaries,
@@ -42,7 +44,6 @@ const CompanyOverviewProvider = () => {
   const dispatch = useDispatch();
   const pageType = PAGE_TYPE.COMPANY;
   const pageName = usePageName();
-  const page = usePage();
 
   useEffect(() => {
     dispatch(queryRatingStatistics(pageName));
@@ -63,9 +64,8 @@ const CompanyOverviewProvider = () => {
     <Overview
       pageType={pageType}
       pageName={pageName}
-      tabType={tabType.OVERVIEW}
+      tabType={TAB_TYPE.OVERVIEW}
       overviewBox={overviewBox}
-      page={page}
     />
   );
 };

diff --git a/src/pages/Company/CompanyTimeAndSalaryProvider.js b/src/pages/Company/CompanyTimeAndSalaryProvider.js
@@ -3,7 +3,11 @@ import { useSelector, useDispatch } from 'react-redux';
 import TimeAndSalary from 'components/CompanyAndJobTitle/TimeAndSalary';
 import usePermission from 'hooks/usePermission';
 import { usePage } from 'hooks/routing/page';
-import { tabType, pageType as PAGE_TYPE } from 'constants/companyJobTitle';
+import {
+  tabType as TAB_TYPE,
+  pageType as PAGE_TYPE,
+  PAGE_SIZE,
+} from 'constants/companyJobTitle';
 import {
   queryCompanyTimeAndSalary,
   queryCompanyTimeAndSalaryStatistics,
@@ -52,8 +56,6 @@ const useTimeAndSalaryBox = pageName => {
   return useSelector(selector);
 };
 
-const PAGE_SIZE = 10;
-
 const CompanyTimeAndSalaryProvider = () => {
   const dispatch = useDispatch();
   const pageType = PAGE_TYPE.COMPANY;
@@ -104,7 +106,7 @@ const CompanyTimeAndSalaryProvider = () => {
       page={page}
       pageSize={PAGE_SIZE}
       totalCount={salaryWorkTimesCount}
-      tabType={tabType.TIME_AND_SALARY}
+      tabType={TAB_TYPE.TIME_AND_SALARY}
       status={status}
       salaryWorkTimes={salaryWorkTimes}
       salaryWorkTimeStatistics={salaryWorkTimeStatistics}

diff --git a/src/pages/Company/CompanyWorkExperiencesProvider.js b/src/pages/Company/CompanyWorkExperiencesProvider.js
@@ -3,7 +3,11 @@ import { useSelector, useDispatch } from 'react-redux';
 import WorkExperiences from 'components/CompanyAndJobTitle/WorkExperiences';
 import usePermission from 'hooks/usePermission';
 import { usePage } from 'hooks/routing/page';
-import { tabType, pageType as PAGE_TYPE } from 'constants/companyJobTitle';
+import {
+  tabType as TAB_TYPE,
+  pageType as PAGE_TYPE,
+  PAGE_SIZE,
+} from 'constants/companyJobTitle';
 import {
   queryCompanyWorkExperiences,
   queryRatingStatistics,
@@ -38,8 +42,6 @@ const useWorkExperiencesBox = pageName => {
   return useSelector(selector);
 };
 
-const PAGE_SIZE = 10;
-
 const CompanyWorkExperiencesProvider = () => {
   const dispatch = useDispatch();
   const pageType = PAGE_TYPE.COMPANY;
@@ -82,7 +84,7 @@ const CompanyWorkExperiencesProvider = () => {
       page={page}
       pageSize={PAGE_SIZE}
       totalCount={workExperiencesCount}
-      tabType={tabType.WORK_EXPERIENCE}
+      tabType={TAB_TYPE.WORK_EXPERIENCE}
       status={status}
       workExperiences={workExperiences}
     />

diff --git a/src/pages/JobTitle/JobTitleIndexProvider.js b/src/pages/JobTitle/JobTitleIndexProvider.js
@@ -4,15 +4,13 @@ import { querySelector } from 'common/routing/selectors';
 import { pageFromQuerySelector } from 'selectors/routing/page';
 import CompanyAndJobTitleIndexPage from 'components/CompanyAndJobTitle/IndexPage';
 import usePagination from 'components/CompanyAndJobTitle/IndexPage/usePagination';
-import { pageType } from 'constants/companyJobTitle';
+import { pageType as PAGE_TYPE, PAGE_SIZE } from 'constants/companyJobTitle';
 import { fetchJobTitles } from 'actions/jobTitle';
 import {
   jobTitleIndexesBoxSelectorAtPage,
   jobTitlesCountSelector,
 } from 'selectors/companyAndJobTitle';
 
-const PAGE_SIZE = 10;
-
 const JobTitleIndexProvider = () => {
   const [page, getPageLink] = usePagination();
   const selector = useMemo(() => jobTitleIndexesBoxSelectorAtPage(page), [
@@ -29,8 +27,7 @@ const JobTitleIndexProvider = () => {
   return (
     <CompanyAndJobTitleIndexPage
       totalCount={totalCount}
-      pageType={pageType.JOB_TITLE}
-      status={jobTitleIndexesBox.status}
+      pageType={PAGE_TYPE.JOB_TITLE}
       indexesBox={jobTitleIndexesBox}
       page={page}
       getPageLink={getPageLink}

diff --git a/src/pages/JobTitle/JobTitleInterviewExperiencesProvider.js b/src/pages/JobTitle/JobTitleInterviewExperiencesProvider.js
@@ -3,7 +3,11 @@ import { useSelector, useDispatch } from 'react-redux';
 import InterviewExperiences from 'components/CompanyAndJobTitle/InterviewExperiences';
 import usePermission from 'hooks/usePermission';
 import { usePage } from 'hooks/routing/page';
-import { tabType, pageType as PAGE_TYPE } from 'constants/companyJobTitle';
+import {
+  tabType as TAB_TYPE,
+  pageType as PAGE_TYPE,
+  PAGE_SIZE,
+} from 'constants/companyJobTitle';
 import { queryJobTitleInterviewExperiences } from 'actions/jobTitle';
 import {
   interviewExperiences as interviewExperiencesSelector,
@@ -37,8 +41,6 @@ const useInterviewExperiencesBox = pageName => {
   return useSelector(selector);
 };
 
-const PAGE_SIZE = 10;
-
 const JobTitleTimeAndSalaryProvider = () => {
   const dispatch = useDispatch();
   const pageType = PAGE_TYPE.JOB_TITLE;
@@ -77,7 +79,7 @@ const JobTitleTimeAndSalaryProvider = () => {
       page={page}
       pageSize={PAGE_SIZE}
       totalCount={interviewExperiencesCount}
-      tabType={tabType.INTERVIEW_EXPERIENCE}
+      tabType={TAB_TYPE.INTERVIEW_EXPERIENCE}
       status={status}
       interviewExperiences={interviewExperiences}
     />

diff --git a/src/pages/JobTitle/JobTitleOverviewProvider.js b/src/pages/JobTitle/JobTitleOverviewProvider.js
@@ -2,8 +2,10 @@ import React, { useCallback, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import Overview from 'components/CompanyAndJobTitle/Overview';
 import usePermission from 'hooks/usePermission';
-import { usePage } from 'hooks/routing/page';
-import { tabType, pageType as PAGE_TYPE } from 'constants/companyJobTitle';
+import {
+  tabType as TAB_TYPE,
+  pageType as PAGE_TYPE,
+} from 'constants/companyJobTitle';
 import { queryJobTitleOverview } from 'actions/jobTitle';
 import {
   salaryDistribution,
@@ -42,7 +44,6 @@ const JobTitleOverviewProvider = () => {
   const dispatch = useDispatch();
   const pageType = PAGE_TYPE.JOB_TITLE;
   const pageName = usePageName();
-  const page = usePage();
 
   useEffect(() => {
     dispatch(queryJobTitleOverview(pageName));
@@ -59,9 +60,8 @@ const JobTitleOverviewProvider = () => {
     <Overview
       pageType={pageType}
       pageName={pageName}
-      tabType={tabType.OVERVIEW}
+      tabType={TAB_TYPE.OVERVIEW}
       overviewBox={overviewBox}
-      page={page}
     />
   );
 };

diff --git a/src/pages/JobTitle/JobTitleTimeAndSalaryProvider.js b/src/pages/JobTitle/JobTitleTimeAndSalaryProvider.js
@@ -3,7 +3,11 @@ import { useSelector, useDispatch } from 'react-redux';
 import TimeAndSalary from 'components/CompanyAndJobTitle/TimeAndSalary';
 import usePermission from 'hooks/usePermission';
 import { usePage } from 'hooks/routing/page';
-import { tabType, pageType as PAGE_TYPE } from 'constants/companyJobTitle';
+import {
+  tabType as TAB_TYPE,
+  pageType as PAGE_TYPE,
+  PAGE_SIZE,
+} from 'constants/companyJobTitle';
 import {
   queryJobTitleTimeAndSalary,
   queryJobTitleTimeAndSalaryStatistics,
@@ -54,8 +58,6 @@ const useTimeAndSalaryBox = pageName => {
   return useSelector(selector);
 };
 
-const PAGE_SIZE = 10;
-
 const JobTitleTimeAndSalaryProvider = () => {
   const dispatch = useDispatch();
   const pageType = PAGE_TYPE.JOB_TITLE;
@@ -102,7 +104,7 @@ const JobTitleTimeAndSalaryProvider = () => {
       page={page}
       pageSize={PAGE_SIZE}
       totalCount={salaryWorkTimesCount}
-      tabType={tabType.TIME_AND_SALARY}
+      tabType={TAB_TYPE.TIME_AND_SALARY}
       status={status}
       salaryWorkTimes={salaryWorkTimes}
       salaryWorkTimeStatistics={salaryWorkTimeStatistics}

diff --git a/src/pages/JobTitle/JobTitleWorkExperiencesProvider.js b/src/pages/JobTitle/JobTitleWorkExperiencesProvider.js
@@ -3,7 +3,11 @@ import { useSelector, useDispatch } from 'react-redux';
 import WorkExperiences from 'components/CompanyAndJobTitle/WorkExperiences';
 import usePermission from 'hooks/usePermission';
 import { usePage } from 'hooks/routing/page';
-import { tabType, pageType as PAGE_TYPE } from 'constants/companyJobTitle';
+import {
+  tabType as TAB_TYPE,
+  pageType as PAGE_TYPE,
+  PAGE_SIZE,
+} from 'constants/companyJobTitle';
 import { queryJobTitleWorkExperiences } from 'actions/jobTitle';
 import {
   workExperiences as workExperiencesSelector,
@@ -35,8 +39,6 @@ const useWorkExperiencesBox = pageName => {
   return useSelector(selector);
 };
 
-const PAGE_SIZE = 10;
-
 const JobTitleWorkExperiencesProvider = () => {
   const dispatch = useDispatch();
   const pageType = PAGE_TYPE.JOB_TITLE;
@@ -75,7 +77,7 @@ const JobTitleWorkExperiencesProvider = () => {
       page={page}
       pageSize={PAGE_SIZE}
       totalCount={workExperiencesCount}
-      tabType={tabType.WORK_EXPERIENCE}
+      tabType={TAB_TYPE.WORK_EXPERIENCE}
       status={status}
       workExperiences={workExperiences}
     />