Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

協賛活動フィルターに関するバグ修正 #836

Merged
merged 3 commits into from
Jul 8, 2024
Merged

協賛活動フィルターに関するバグ修正 #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4962666
バグ修正
Kubosaka Jul 7, 2024
c20af22
[fix]ローディング追加
Kubosaka Jul 8, 2024
3b82e25
docker-compose.ymlを間違えて修正したため戻す
Kubosaka Jul 8, 2024
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
2 changes: 1 addition & 1 deletion view/next-project/src/components/sponsoractivities/FilterModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const FilterModal: FC<ModalProps> = (props) => {
</div>
</div>
</div>
<p className='col-span-2 text-black-600'>回収有無</p>
<p className='col-span-2 text-black-600'>協賛金回収状況</p>
<div className='col-span-2 w-full'>
<Select
defaultValue={draftFilterData.isDone}
Expand Down
34 changes: 29 additions & 5 deletions view/next-project/src/pages/sponsoractivities/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useState, useEffect, useMemo } from 'react';

import { MdFilterList, MdCircle } from 'react-icons/md';
import { RiExternalLinkLine } from 'react-icons/ri';
import { Loading } from '@/components/common';
import PrimaryButton from '@/components/common/OutlinePrimaryButton/OutlinePrimaryButton';
import {
OpenAddModalButton,
Expand Down Expand Up @@ -83,6 +84,7 @@ export default function SponsorActivities(props: Props) {
const [sponsorActivitiesItem, setSponsorActivitiesViewItem] = useState<SponsorActivityView>();
const [isOpen, setIsOpen] = useState<boolean>(false);
const [isFilerOpen, setIsFilerOpen] = useState<boolean>(false);
const [isLoading, setIsLoading] = useState<boolean>(false);
const [filterData, setFilterData] = useState<SponsorFilterType>({
styleIds: sponsorStyles.map((style) => style?.id || 0),
isDone: 'all',
Expand All @@ -103,6 +105,27 @@ export default function SponsorActivities(props: Props) {
};

const getSponsorActivities = async () => {
setIsLoading(true);
if (isFiltered) {
const getSponsorActivitiesViewUrlByYear =
process.env.CSR_API_URI + '/activities/filtered_details/' + selectedYear;
const getFilterSponsorActivitiesByYears = await getByFiler(
getSponsorActivitiesViewUrlByYear,
filterData.isDone,
filterData.styleIds,
filterData.keyword,
sponsorStyles.length,
);
setSponsorActivities(getFilterSponsorActivitiesByYears);
setIsLoading(false);
} else {
const getSponsorActivitiesViewUrlByYear =
process.env.CSR_API_URI + '/activities/details/' + selectedYear;
const getSponsorActivitiesByYears = await get(getSponsorActivitiesViewUrlByYear);
setSponsorActivities(getSponsorActivitiesByYears);
setIsLoading(false);
}

const getSponsorActivitiesViewUrlByYear =
process.env.CSR_API_URI + '/activities/filtered_details/' + selectedYear;
const getFilterSponsorActivitiesByYears = await getByFiler(
Expand Down Expand Up @@ -207,10 +230,6 @@ export default function SponsorActivities(props: Props) {
return totalFee;
}, [sortedSponsorActivitiesViews]);

useEffect(() => {
getSponsorActivities();
}, [filterData, selectedYear]);

const isFiltered = useMemo(() => {
const isStyleFilter = sponsorStyles.length !== filterData.styleIds.length;
const isDonefilter = filterData.isDone !== 'all';
Expand All @@ -219,12 +238,17 @@ export default function SponsorActivities(props: Props) {
return isStyleFilter || isDonefilter || isKeywordFilter || isSorted;
}, [filterData]);

useEffect(() => {
getSponsorActivities();
}, [filterData, selectedYear]);

return (
<MainLayout>
<Head>
<title>協賛活動一覧</title>
<meta name='viewpoinst' content='initial-scale=1.0, width=device-width' />
</Head>
{isLoading && <Loading />}
<Card w='w-full'>
<div className='mx-6 mt-10 md:mx-5'>
<div className='gap-4 md:flex'>
Expand Down Expand Up @@ -256,7 +280,7 @@ export default function SponsorActivities(props: Props) {
<MdFilterList size='22' color='#666666' />
</button>
{isFiltered && (
<div className='fixed -mt-5 ml-6'>
<div className='absolute -mt-5 ml-6'>
<MdCircle color='rgb(4 102 140)' size={6} />
</div>
)}
Expand Down
Loading