Skip to content

Commit 75c4e2d

Browse files
kishanprmrkishanprmr
committed
Merge remote-tracking branch 'origin/main' into pr/krushnarout/7930
2 parents 5c2ecbc + d1197ee commit 75c4e2d

15 files changed

Lines changed: 144 additions & 159 deletions

File tree

‎.all-contributorsrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,6 +1823,15 @@
18231823
"contributions": [
18241824
"plugin"
18251825
]
1826+
},
1827+
{
1828+
"login": "jadhavharshh",
1829+
"name": "Harsh Jadhav",
1830+
"avatar_url": "https://avatars.githubusercontent.com/u/182950168?v=4",
1831+
"profile": "https://github.com/jadhavharshh",
1832+
"contributions": [
1833+
"code"
1834+
]
18261835
}
18271836
],
18281837
"commitType": "docs"

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ Not into coding but still interested in contributing? Come join our [Discord](ht
413413
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Ani-4x"><img src="https://avatars.githubusercontent.com/u/174266491?v=4?s=100" width="100px;" alt="Animesh"/><br /><sub><b>Animesh</b></sub></a><br /><a href="#plugin-Ani-4x" title="Plugin/utility libraries">🔌</a></td>
414414
<td align="center" valign="top" width="14.28%"><a href="https://tarvent.com"><img src="https://avatars.githubusercontent.com/u/13419128?v=4?s=100" width="100px;" alt="Derek Johnson"/><br /><sub><b>Derek Johnson</b></sub></a><br /><a href="#plugin-DerekJDev" title="Plugin/utility libraries">🔌</a></td>
415415
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mamiefurax"><img src="https://avatars.githubusercontent.com/u/3955802?v=4?s=100" width="100px;" alt="MamieFurax"/><br /><sub><b>MamieFurax</b></sub></a><br /><a href="#plugin-mamiefurax" title="Plugin/utility libraries">🔌</a></td>
416+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jadhavharshh"><img src="https://avatars.githubusercontent.com/u/182950168?v=4?s=100" width="100px;" alt="Harsh Jadhav"/><br /><sub><b>Harsh Jadhav</b></sub></a><br /><a href="https://github.com/activepieces/activepieces/commits?author=jadhavharshh" title="Code">💻</a></td>
416417
</tr>
417418
</tbody>
418419
</table>

‎package-lock.json‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
"axios-retry": "4.4.1",
122122
"basic-ftp": "5.0.5",
123123
"bcrypt": "5.1.1",
124+
"boring-avatars": "1.11.2",
124125
"buffer": "6.0.3",
125126
"bullmq": "5.28.1",
126127
"cheerio": "1.0.0-rc.12",

packages/react-ui/src/app/builder/builder-header.tsx renamed to packages/react-ui/src/app/builder/builder-header/builder-header.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {
2323
TooltipProvider,
2424
TooltipTrigger,
2525
} from '@/components/ui/tooltip';
26-
import { UserAvatar } from '@/components/ui/user-avatar';
2726
import { foldersHooks } from '@/features/folders/lib/folders-hooks';
2827
import { useAuthorization } from '@/hooks/authorization-hooks';
2928
import { flagsHooks } from '@/hooks/flags-hooks';
@@ -38,9 +37,10 @@ import {
3837
supportUrl,
3938
} from '@activepieces/shared';
4039

41-
import FlowActionMenu from '../components/flow-actions-menu';
40+
import FlowActionMenu from '../../components/flow-actions-menu';
41+
import { BuilderFlowStatusSection } from '../builder-flow-status-section';
4242

43-
import { BuilderFlowStatusSection } from './builder-flow-status-section';
43+
import { UserAvatarMenu } from './user-avatar-menu';
4444

4545
export const BuilderHeader = () => {
4646
const [queryParams] = useSearchParams();
@@ -211,7 +211,7 @@ export const BuilderHeader = () => {
211211
)}
212212

213213
<BuilderFlowStatusSection></BuilderFlowStatusSection>
214-
<UserAvatar></UserAvatar>
214+
<UserAvatarMenu></UserAvatarMenu>
215215
</div>
216216
</div>
217217
</div>

‎packages/react-ui/src/app/builder/builder-header/user-avatar-menu.tsx‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import { useQueryClient } from '@tanstack/react-query';
2+
import { t } from 'i18next';
3+
import { LogOut } from 'lucide-react';
4+
5+
import { useEmbedding } from '@/components/embed-provider';
6+
import { useTelemetry } from '@/components/telemetry-provider';
7+
import { UserAvatar } from '@/components/ui/user-avatar';
8+
import { userHooks } from '@/hooks/user-hooks';
9+
import { authenticationSession } from '@/lib/authentication-session';
10+
11+
import {
12+
DropdownMenu,
13+
DropdownMenuContent,
14+
DropdownMenuTrigger,
15+
DropdownMenuLabel,
16+
DropdownMenuItem,
17+
} from '../../../components/ui/dropdown-menu';
18+
import { TextWithIcon } from '../../../components/ui/text-with-icon';
19+
20+
export function UserAvatarMenu() {
21+
const { reset } = useTelemetry();
22+
const { embedState } = useEmbedding();
23+
const { data: user } = userHooks.useCurrentUser();
24+
const queryClient = useQueryClient();
25+
if (!user || embedState.isEmbedded) {
26+
return null;
27+
}
28+
29+
return (
30+
<DropdownMenu>
31+
<DropdownMenuTrigger>
32+
<UserAvatar
33+
disableTooltip={true}
34+
name={user.firstName + ' ' + user.lastName}
35+
email={user.email}
36+
size={28}
37+
></UserAvatar>
38+
</DropdownMenuTrigger>
39+
<DropdownMenuContent align="end" className="w-[220px]">
40+
<DropdownMenuLabel>
41+
<div className="flex">
42+
<div className="flex-grow flex-shrink truncate">{user.email}</div>
43+
</div>
44+
</DropdownMenuLabel>
45+
<DropdownMenuItem
46+
onClick={() => {
47+
userHooks.invalidateCurrentUser(queryClient);
48+
authenticationSession.logOut();
49+
reset();
50+
}}
51+
className="cursor-pointer"
52+
>
53+
<TextWithIcon
54+
icon={<LogOut size={18} className="text-destructive" />}
55+
text={<span className="text-destructive">{t('Logout')}</span>}
56+
className="cursor-pointer"
57+
/>
58+
</DropdownMenuItem>
59+
</DropdownMenuContent>
60+
</DropdownMenu>
61+
);
62+
}

‎packages/react-ui/src/app/builder/flow-versions/flow-versions-card.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
LeftSideBarType,
99
useBuilderStateContext,
1010
} from '@/app/builder/builder-hooks';
11-
import { AvatarLetter } from '@/components/ui/avatar-letter';
1211
import { Button } from '@/components/ui/button';
1312
import { CardListItem } from '@/components/ui/card-list';
1413
import {
@@ -35,6 +34,7 @@ import {
3534
TooltipTrigger,
3635
} from '@/components/ui/tooltip';
3736
import { INTERNAL_ERROR_TOAST, toast } from '@/components/ui/use-toast';
37+
import { UserAvatar } from '@/components/ui/user-avatar';
3838
import { FlowVersionStateDot } from '@/features/flows/components/flow-version-state-dot';
3939
import { flowsApi } from '@/features/flows/lib/flows-api';
4040
import { useAuthorization } from '@/hooks/authorization-hooks';
@@ -178,7 +178,8 @@ const FlowVersionDetailsCard = React.memo(
178178
return (
179179
<CardListItem interactive={false}>
180180
{flowVersion.updatedByUser && (
181-
<AvatarLetter
181+
<UserAvatar
182+
size={24}
182183
name={
183184
flowVersion.updatedByUser.firstName +
184185
' ' +

‎packages/react-ui/src/app/builder/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333

3434
import { cn, useElementSize } from '../../lib/utils';
3535

36-
import { BuilderHeader } from './builder-header';
36+
import { BuilderHeader } from './builder-header/builder-header';
3737
import { CopilotSidebar } from './copilot';
3838
import { FlowCanvas } from './flow-canvas';
3939
import { FlowVersionsList } from './flow-versions';

‎packages/react-ui/src/app/components/dashboard-container.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ import { ListTodo, Package, Table2, Workflow } from 'lucide-react';
33
import { createContext, useState } from 'react';
44
import { Navigate } from 'react-router-dom';
55

6+
import mcp from '@/assets/img/custom/mcp.svg';
67
import { useEmbedding } from '@/components/embed-provider';
78
import { useAuthorization } from '@/hooks/authorization-hooks';
89
import { platformHooks } from '@/hooks/platform-hooks';
910
import { projectHooks } from '@/hooks/project-hooks';
1011
import { isNil, Permission } from '@activepieces/shared';
11-
import mcp from '@/assets/img/custom/mcp.svg';
12+
1213
import { authenticationSession } from '../../lib/authentication-session';
1314

1415
import { SidebarComponent, SidebarItem, SidebarLink } from './sidebar';

‎packages/react-ui/src/app/components/sidebar/sidebar-user.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import { LogOut } from 'lucide-react';
44

55
import { useEmbedding } from '@/components/embed-provider';
66
import { useTelemetry } from '@/components/telemetry-provider';
7-
import { Avatar, AvatarFallback } from '@/components/ui/avatar';
87
import { Button } from '@/components/ui/button';
98
import { SidebarMenu, SidebarMenuItem } from '@/components/ui/sidebar-shadcn';
109
import {
1110
Tooltip,
1211
TooltipContent,
1312
TooltipTrigger,
1413
} from '@/components/ui/tooltip';
14+
import { UserAvatar } from '@/components/ui/user-avatar';
1515
import { userHooks } from '@/hooks/user-hooks';
1616
import { authenticationSession } from '@/lib/authentication-session';
1717

@@ -27,11 +27,11 @@ export function SidebarUser() {
2727
<SidebarMenu>
2828
<SidebarMenuItem className="flex items-center justify-between w-full">
2929
<div className="flex items-center">
30-
<Avatar className="h-8 w-8 rounded-lg">
31-
<AvatarFallback className="rounded-lg bg-gray-200">
32-
{user.firstName.charAt(0)}
33-
</AvatarFallback>
34-
</Avatar>
30+
<UserAvatar
31+
name={user.firstName + ' ' + user.lastName}
32+
email={user.email}
33+
size={28}
34+
/>
3535
<div className="grid flex-1 text-left text-sm leading-tight ml-2">
3636
<span className="truncate font-semibold">{user.firstName}</span>
3737
<span className="truncate text-xs">{user.email}</span>

0 commit comments

Comments
 (0)