From 72c7a4d65685987ddd231e4f8ff6370167ab53cc Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Tue, 24 May 2022 13:11:04 +0200 Subject: [PATCH] add missing activities (#57) --- .../web/app/src/components/v2/activities.tsx | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/packages/web/app/src/components/v2/activities.tsx b/packages/web/app/src/components/v2/activities.tsx index 3e0c2e153..b978379f2 100644 --- a/packages/web/app/src/components/v2/activities.tsx +++ b/packages/web/app/src/components/v2/activities.tsx @@ -4,26 +4,20 @@ import { useQuery } from 'urql'; import { ActivityNode } from '@/components/common/activities/common'; import { Heading, Link, Skeleton, TimeAgo } from '@/components/v2'; -import { - ArrowDownIcon, - EditIcon, - PlusIcon, - TrashIcon, - UserPlusMinusIcon, -} from '@/components/v2/icon'; +import { ArrowDownIcon, EditIcon, PlusIcon, TrashIcon, UserPlusMinusIcon } from '@/components/v2/icon'; import { MemberDeletedActivity, OrganizationActivitiesDocument, OrganizationIdUpdatedActivity, OrganizationNameUpdatedActivity, + OrganizationPlanChangeActivity, ProjectDeletedActivity, + ProjectIdUpdatedActivity, } from '@/graphql'; import { fixDuplicatedFragments } from '@/lib/graphql'; import { useRouteSelector } from '@/lib/hooks/use-route-selector'; -const organizationActivitiesDocument = fixDuplicatedFragments( - OrganizationActivitiesDocument -); +const organizationActivitiesDocument = fixDuplicatedFragments(OrganizationActivitiesDocument); export const getActivity = ( activity: ActivityNode @@ -88,9 +82,17 @@ export const getActivity = ( content: ( <> {user.displayName} changed organization id to{' '} - - {(activity as OrganizationIdUpdatedActivity).value} - + {(activity as OrganizationIdUpdatedActivity).value} + + ), + icon: , + }; + case 'OrganizationPlanChangeActivity': + return { + content: ( + <> + {user.displayName} changed organization plan to{' '} + {(activity as OrganizationPlanChangeActivity).newPlan} ), icon: , @@ -147,7 +149,12 @@ export const getActivity = ( }; case 'ProjectIdUpdatedActivity': return { - content: '', + content: ( + <> + {user.displayName} changed project id to{' '} + {(activity as ProjectIdUpdatedActivity).value} + + ), icon: , }; /* Target */ @@ -187,7 +194,11 @@ export const getActivity = ( }; case 'TargetIdUpdatedActivity': return { - content: '', + content: ( + <> + {user.displayName} changed target id to {activity.value} + + ), icon: , }; default: @@ -217,10 +228,7 @@ export const Activities = (props): ReactElement => { Recent Activity {(!activities || activities.total !== 0) && (
    - {(activities - ? activities.nodes - : Array.from({ length: 3 }, (_, id) => ({ id })) - ).map((activity) => { + {(activities ? activities.nodes : Array.from({ length: 3 }, (_, id) => ({ id }))).map(activity => { const { content, icon } = getActivity(activity); return ( @@ -255,28 +263,19 @@ export const Activities = (props): ReactElement => {
    {'project' in activity && (

    - - {activity.project.name} - + {activity.project.name} {'target' in activity && ( <> - - {activity.target.name} - + {activity.target.name} )}

    )}
    - - {content} - + {content}   - +