feat(PageTitle): show preset author

taskany-inc · Jun 1, 2023 · 2f2ed41 · 2f2ed41
1 parent cbe298b
commit 2f2ed41
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 11 deletions.
diff --git a/src/components/GoalsPage/GoalsPage.i18n/en.json b/src/components/GoalsPage/GoalsPage.i18n/en.json
@@ -2,5 +2,6 @@
     "title": "Taskany — Goals — Dashboard",
     "Dashboard": "Dashboard",
     "This is your personal goals bundle": "This is your personal goals bundle. Created, owned, watching projects and goals are here.",
-    "Reset": "Reset"
+    "Reset": "Reset",
+    "created by": "created by"
 }
diff --git a/src/components/GoalsPage/GoalsPage.i18n/ru.json b/src/components/GoalsPage/GoalsPage.i18n/ru.json
@@ -2,5 +2,6 @@
     "title": "Taskany — Цели — Рабочий стол",
     "Dashboard": "Рабочий стол",
     "This is your personal goals bundle": "Здесь будут все созданные вами, назначенные на вас, а также цели и проекты, за которыми вы следите.",
-    "Reset": "Сбросить"
+    "Reset": "Сбросить",
+    "created by": "автор"
 }
diff --git a/src/components/GoalsPage/GoalsPage.tsx b/src/components/GoalsPage/GoalsPage.tsx
@@ -155,13 +155,26 @@ export const GoalsPage = ({ user, ssrTime, locale }: ExternalPageProps) => {
     );
 
     const defaultTitle = <PageTitle title={tr('Dashboard')} />;
-    const presetTitle = <PageTitle title={tr('Dashboard')} subtitle={currentPreset?.title} />;
+    const presetInfo =
+        user.activityId === currentPreset?.activityId
+            ? `${tr('created by')} ${currentPreset?.activity?.user?.name}`
+            : undefined;
+    const presetTitle = <PageTitle title={tr('Dashboard')} subtitle={currentPreset?.title} info={presetInfo} />;
 
     const onShadowPresetTitleClick = useCallback(() => {
         if (shadowPreset) setPreset(shadowPreset.id);
     }, [setPreset, shadowPreset]);
+    const shadowPresetInfo =
+        user.activityId !== shadowPreset?.activityId
+            ? `${tr('created by')} ${shadowPreset?.activity?.user?.name}`
+            : undefined;
     const shadowPresetTitle = (
-        <PageTitle title={tr('Dashboard')} subtitle={shadowPreset?.title} onClick={onShadowPresetTitleClick} />
+        <PageTitle
+            title={tr('Dashboard')}
+            subtitle={shadowPreset?.title}
+            info={shadowPresetInfo}
+            onClick={onShadowPresetTitleClick}
+        />
     );
     // eslint-disable-next-line no-nested-ternary
     const title = currentPreset ? presetTitle : shadowPreset ? shadowPresetTitle : defaultTitle;

diff --git a/src/components/PageTitle.tsx b/src/components/PageTitle.tsx
@@ -1,14 +1,18 @@
 import { Text } from '@taskany/bricks';
-import { gray4, gray7 } from '@taskany/colors';
+import { gapS, gray4, gray6, gray7 } from '@taskany/colors';
 import styled from 'styled-components';
 
 interface PageTitleProps {
     title?: string;
     subtitle?: string;
+    info?: string;
+
     onClick?: () => void;
 }
 
 const StyledText = styled(Text)`
+    padding-left: ${gapS};
+
     transition: color 200ms ease-in-out;
 
     ${({ onClick }) =>
@@ -21,16 +25,24 @@ const StyledText = styled(Text)`
             }
     `}
 `;
-export const PageTitle: React.FC<PageTitleProps> = ({ title, subtitle, onClick }) => (
+
+export const PageTitle: React.FC<PageTitleProps> = ({ title, subtitle, info, onClick }) => (
     <>
         {title}
+
         {subtitle && (
             <>
-                :{' '}
+                {':'}
                 <StyledText as="span" size="xxl" weight="bolder" color={onClick ? gray4 : gray7} onClick={onClick}>
                     {subtitle}
                 </StyledText>
             </>
         )}
+
+        {info && (
+            <StyledText as="span" size="s" weight="bold" color={gray6}>
+                {info}
+            </StyledText>
+        )}
     </>
 );
diff --git a/src/components/ProjectPage/ProjectPage.i18n/en.json b/src/components/ProjectPage/ProjectPage.i18n/en.json
@@ -1,4 +1,5 @@
 {
     "title": "Taskany — {project}",
-    "Reset": "Reset"
+    "Reset": "Reset",
+    "created by": "created by"
 }
diff --git a/src/components/ProjectPage/ProjectPage.i18n/ru.json b/src/components/ProjectPage/ProjectPage.i18n/ru.json
@@ -1,4 +1,5 @@
 {
     "title": "Taskany — {project}",
-    "Reset": "Сбросить"
+    "Reset": "Сбросить",
+    "created by": "автор"
 }
diff --git a/src/components/ProjectPage/ProjectPage.tsx b/src/components/ProjectPage/ProjectPage.tsx
@@ -185,13 +185,26 @@ export const ProjectPage = ({ user, locale, ssrTime, params: { id } }: ExternalP
         .join('');
 
     const defaultTitle = <PageTitle title={project.data?.title} />;
-    const presetTitle = <PageTitle title={project.data?.title} subtitle={currentPreset?.title} />;
+    const presetInfo =
+        user.activityId !== currentPreset?.activityId
+            ? `${tr('created by')} ${currentPreset?.activity?.user?.name}`
+            : undefined;
+    const presetTitle = <PageTitle title={project.data?.title} subtitle={currentPreset?.title} info={presetInfo} />;
 
     const onShadowPresetTitleClick = useCallback(() => {
         if (shadowPreset) setPreset(shadowPreset.id);
     }, [setPreset, shadowPreset]);
+    const shadowPresetInfo =
+        user.activityId !== shadowPreset?.activityId
+            ? `${tr('created by')} ${shadowPreset?.activity?.user?.name}`
+            : undefined;
     const shadowPresetTitle = (
-        <PageTitle title={project.data?.title} subtitle={shadowPreset?.title} onClick={onShadowPresetTitleClick} />
+        <PageTitle
+            title={project.data?.title}
+            subtitle={shadowPreset?.title}
+            info={shadowPresetInfo}
+            onClick={onShadowPresetTitleClick}
+        />
     );
     // eslint-disable-next-line no-nested-ternary
     const title = currentPreset ? presetTitle : shadowPreset ? shadowPresetTitle : defaultTitle;

diff --git a/trpc/router/filter.ts b/trpc/router/filter.ts
@@ -15,6 +15,12 @@ export const filter = router({
             },
             include: {
                 stargizers: true,
+                activity: {
+                    include: {
+                        user: true,
+                        ghost: true,
+                    },
+                },
             },
         });
 
@@ -44,6 +50,14 @@ export const filter = router({
                     },
                 ],
             },
+            include: {
+                activity: {
+                    include: {
+                        user: true,
+                        ghost: true,
+                    },
+                },
+            },
         });
     }),
     create: protectedProcedure.input(createFilterSchema).mutation(({ ctx, input }) => {