feat: filter deps and criterias

taskany-inc · Dec 21, 2023 · 21cbf7f · 21cbf7f
1 parent 03cf34f
commit 21cbf7f
Show file tree

Hide file tree

Showing 13 changed files with 476 additions and 249 deletions.
diff --git a/cypress/fixtures/langs.json b/cypress/fixtures/langs.json
@@ -917,6 +917,12 @@
             "en": "Low"
         }
     },
+    "PrivateDepsWarning": {
+        "Goal has private dependencies": {
+            "ru": "",
+            "en": ""
+        }
+    },
     "ProjectAccessUser": {
         "Access": {
             "ru": "Доступ",

diff --git a/src/components/GoalHeader.tsx b/src/components/GoalHeader.tsx
@@ -89,6 +89,7 @@ export const GoalHeader: FC<GoalHeaderProps> = ({
                                 priority={g.priority?.title}
                                 achivedCriteriaWeight={g._hasAchievementCriteria ? g._achivedCriteriaWeight : undefined}
                                 comments={g._count?.comments ?? 0}
+                                hasPrivateDeps={g._hasPrivateDeps}
                                 onCommentsClick={onCommentsClick}
                                 updatedAt={date}
                             />

diff --git a/src/components/IssueStats/IssueStats.tsx b/src/components/IssueStats/IssueStats.tsx
@@ -11,6 +11,7 @@ import { getPriorityText } from '../PriorityText/PriorityText';
 import { UserGroup } from '../UserGroup';
 import { RelativeTime } from '../RelativeTime/RelativeTime';
 import { CommentsCountBadge } from '../CommentsCountBadge';
+import { PrivateDepsWarning } from '../PrivateDepsWarning/PrivateDepsWarning';
 
 interface IssueStatsProps {
     updatedAt: Date;
@@ -21,6 +22,7 @@ interface IssueStatsProps {
     estimateType?: DateType | null;
     priority?: string | null;
     achivedCriteriaWeight?: number | null;
+    hasPrivateDeps?: boolean;
     mode?: 'compact' | 'default';
     onCommentsClick?: () => void;
 }
@@ -57,6 +59,7 @@ export const IssueStats: React.FC<IssueStatsProps> = ({
     comments,
     achivedCriteriaWeight,
     updatedAt,
+    hasPrivateDeps,
     mode,
     onCommentsClick,
 }) => {
@@ -108,6 +111,12 @@ export const IssueStats: React.FC<IssueStatsProps> = ({
                     </Link>
                 </DotSep>
             ))}
+
+            {nullable(hasPrivateDeps, () => (
+                <DotSep>
+                    <PrivateDepsWarning />
+                </DotSep>
+            ))}
         </StyledIssueStats>
     );
 };
diff --git a/src/components/PrivateDepsWarning/PrivateDepsWarning.i18n/en.json b/src/components/PrivateDepsWarning/PrivateDepsWarning.i18n/en.json
@@ -0,0 +1,3 @@
+{
+    "Goal has private dependencies": "Goal has private dependencies"
+}
diff --git a/src/components/PrivateDepsWarning/PrivateDepsWarning.i18n/index.ts b/src/components/PrivateDepsWarning/PrivateDepsWarning.i18n/index.ts
@@ -0,0 +1,17 @@
+/* eslint-disable */
+// Do not edit, use generator to update
+import { i18n, fmt, I18nLangSet } from 'easy-typed-intl';
+import getLang from '../../../utils/getLang';
+
+import ru from './ru.json';
+import en from './en.json';
+
+export type I18nKey = keyof typeof ru & keyof typeof en;
+type I18nLang = 'ru' | 'en';
+
+const keyset: I18nLangSet<I18nKey> = {};
+
+keyset['ru'] = ru;
+keyset['en'] = en;
+
+export const tr = i18n<I18nLang, I18nKey>(keyset, fmt, getLang);
diff --git a/src/components/PrivateDepsWarning/PrivateDepsWarning.i18n/ru.json b/src/components/PrivateDepsWarning/PrivateDepsWarning.i18n/ru.json
@@ -0,0 +1,3 @@
+{
+    "Goal has private dependencies": "У цели есть приватные зависимости"
+}
diff --git a/src/components/PrivateDepsWarning/PrivateDepsWarning.tsx b/src/components/PrivateDepsWarning/PrivateDepsWarning.tsx
@@ -0,0 +1,16 @@
+import styled from 'styled-components';
+import { Popup } from '@taskany/bricks';
+import { IconExclamationCircleOutline } from '@taskany/icons';
+import { warn0 } from '@taskany/colors';
+
+import { tr } from './PrivateDepsWarning.i18n';
+
+const StyledWarningIcon = styled(IconExclamationCircleOutline)`
+    display: flex;
+`;
+
+export const PrivateDepsWarning = () => (
+    <Popup tooltip target={<StyledWarningIcon size="s" color={warn0} />} view="warning" placement="top">
+        {tr('Goal has private dependencies')}
+    </Popup>
+);
diff --git a/src/utils/db.ts b/src/utils/db.ts
@@ -4,7 +4,11 @@ import { GoalHistory, Comment, Activity, User, Goal, Role, Prisma, Reaction, Sta
 import { TRPCError } from '@trpc/server';
 
 import { GoalCommon, dependencyKind, exceptionsDependencyKind } from '../schema/goal';
-import { addCalculatedGoalsFields, addCommonCalculatedGoalFields } from '../../trpc/queries/goals';
+import {
+    addCalculatedGoalsFields,
+    addCommonCalculatedGoalFields,
+    nonArchievedGoalsPartialQuery,
+} from '../../trpc/queries/goals';
 import { HistoryRecordWithActivity, HistoryRecordSubject, castToSubject } from '../types/history';
 import { ReactionsMap } from '../types/reactions';
 import { getProjectSchema } from '../../trpc/queries/project';
@@ -164,6 +168,76 @@ export const createPersonalProject = async ({
     });
 };
 
+export const countPrivateDependencies = async ({
+    projectId,
+    scopeId,
+}: {
+    projectId: string;
+    scopeId: number;
+}): Promise<{
+    goalAchiveCriteria: number;
+    dependsOn: number;
+    relatedTo: number;
+    blocks: number;
+}> => {
+    const depsWhere = {
+        NOT: {
+            project: {
+                accessUsers: {
+                    none: {},
+                },
+            },
+        },
+        ...nonArchievedGoalsPartialQuery,
+    };
+
+    const data = await prisma.goal.findFirst({
+        where: {
+            projectId,
+            scopeId,
+            archived: false,
+        },
+        include: {
+            _count: {
+                select: {
+                    goalAchiveCriteria: {
+                        where: {
+                            criteriaGoal: {
+                                id: {},
+                            },
+                            NOT: {
+                                criteriaGoal: {
+                                    project: {
+                                        accessUsers: {
+                                            none: {},
+                                        },
+                                    },
+                                },
+                            },
+                            OR: [{ deleted: false }, { deleted: null }],
+                        },
+                    },
+                    dependsOn: {
+                        where: depsWhere,
+                    },
+                    relatedTo: {
+                        where: depsWhere,
+                    },
+                    blocks: {
+                        where: depsWhere,
+                    },
+                },
+            },
+        },
+    });
+
+    if (!data) {
+        throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message: 'Goal is absent' });
+    }
+
+    return data._count;
+};
+
 export const changeGoalProject = async (id: string, newProjectId: string) => {
     return prisma.$executeRaw`
         UPDATE "Goal"

diff --git a/trpc/queries/access.ts b/trpc/queries/access.ts
@@ -25,3 +25,18 @@ export const getProjectAccessFilter = (activityId: string, role: Role) => {
         },
     };
 };
+
+export const goalAchiveCriteriaFilter = (activityId: string, role: Role) => ({
+    OR: [
+        {
+            criteriaGoal: null,
+        },
+        {
+            criteriaGoal: {
+                project: {
+                    ...getProjectAccessFilter(activityId, role),
+                },
+            },
+        },
+    ],
+});