Merge pull request #564 from Studio-Yandex-Practicum/feature/issue-56…

…2/hide&show-volunteers-button-settings

Feature/issue 562/hide&show volunteers button settings

src/components/history-page/title/history-title.tsx

@@ -13,12 +13,13 @@ import style from './history-title.module.css';
 interface IHistoryTitle {
   data: Festival
   currentYear: number
+  showVolunteers: boolean
 }
 
 // TODO: TT заменить на локальное изображение
 const imageUrl = 'https://s1.hostingkartinok.com/uploads/images/2021/12/fb0c8e1baf21b0ca306ee98a6678c0d8.png';
 
-export const HistoryTitle: React.FC<IHistoryTitle> = ({ data, currentYear }) => {
+export const HistoryTitle: React.FC<IHistoryTitle> = ({ data, currentYear, showVolunteers }) => {
   const {
     plays_count,
     selected_plays_count,
@@ -33,7 +34,6 @@ export const HistoryTitle: React.FC<IHistoryTitle> = ({ data, currentYear }) =>
     additional_links,
     description
   } = data;
-
   const formatDate = (date: string) => new Date(date).toLocaleDateString('ru-Ru', {
     timeZone: 'Europe/Moscow',
     month: 'long',
@@ -61,15 +61,15 @@ export const HistoryTitle: React.FC<IHistoryTitle> = ({ data, currentYear }) =>
     volunteers_count: {
       count: volunteers_count,
       title: 'волонтёров работали на фестивале',
-      buttonProps: {
+      buttonProps: showVolunteers ? {
         href: urlVolonters,
         iconPosition: 'right',
         icon: <Icon
           glyph="arrow-right"
           width="100%"
           height="100%"
         />
-      }
+      } : undefined
     },
     events_count: {
       count: events_count,

src/pages/about-us/sponsors/index.tsx

@@ -17,7 +17,7 @@ const Sponsors = (props: InferGetServerSidePropsType<typeof getServerSideProps>)
   const permissions = settings?.permissions;
 
   const router = useRouter();
-  if (permissions && !permissions.sponsors) {
+  if (permissions && !permissions.show_sponsors) {
     router.replace('/about-us/404');
   }
 

src/pages/about-us/team/index.tsx

@@ -20,7 +20,7 @@ const Team = (props: InferGetServerSidePropsType<typeof getServerSideProps>) =>
   const permissions = settings?.permissions;
 
   const router = useRouter();
-  if (permissions && !permissions.team) {
+  if (permissions && !permissions.show_team) {
     router.replace('/about-us/404');
   }
 

src/pages/history/[year].tsx

@@ -5,6 +5,7 @@ import { HistoryItself } from 'components/history-page/itself';
 import { HistoryTitle } from 'components/history-page/title';
 import { SEO } from 'components/seo';
 import { Menu } from 'components/ui/menu';
+import { fetchSettings } from 'services/api/settings-adapter';
 import { fetcher } from 'services/fetcher';
 import { notFoundResult } from 'shared/constants/server-side-props';
 import { InternalServerError } from 'shared/helpers/internal-server-error';
@@ -17,7 +18,8 @@ const History = (props: InferGetServerSidePropsType<typeof getServerSideProps>)
   const {
     years,
     festival,
-    defaultYear
+    defaultYear,
+    showVolunteers,
   } = props;
 
   const menuRef = useHorizontalScroll<HTMLUListElement>();
@@ -43,6 +45,7 @@ const History = (props: InferGetServerSidePropsType<typeof getServerSideProps>)
         <HistoryTitle
           data={festival}
           currentYear={defaultYear}
+          showVolunteers={showVolunteers} 
         />
         <HistoryItself data={itselfData}/>
       </AppLayout>
@@ -68,7 +71,8 @@ export const getServerSideProps = async ({ params }: GetServerSidePropsContext<R
       ? Number(params.year)
       : years[0];
 
-    festival = await fetcher<Festival>(`/info/festivals/${defaultYear}/`);
+    festival = await fetcher<Festival>(`/info/festivals/${defaultYear}/`);   
+
   } catch ({ statusCode }) {
     switch (statusCode) {
     case 404:
@@ -77,12 +81,15 @@ export const getServerSideProps = async ({ params }: GetServerSidePropsContext<R
       throw new InternalServerError();
     }
   }
-
+  const settings = await fetchSettings(); // Semicolon added
+  const showVolunteers = settings.permissions.show_volunteers;
+
   return {
     props: {
       festival,
       years,
       defaultYear,
+      showVolunteers,
     },
   };
 };

src/services/api/settings-adapter.ts

@@ -35,8 +35,9 @@ const mapDTOToSettings = (dto: SettingsDTO): Settings => ({
     title: project.title,
   })),
   permissions: {
-    team: dto.show_team,
-    sponsors: dto.show_sponsors,
+    show_team: dto.show_team,
+    show_volunteers: dto.show_volunteers,
+    show_sponsors: dto.show_sponsors,
     mission: true,
     'about-us': true,
   }