From 808b3318c0ec5c59f0842eff4342eb5c9936261b Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Wed, 29 Jan 2025 21:51:40 -0500 Subject: [PATCH 1/4] feat: avatar length handling Signed-off-by: Adam Setch --- .../components/avatars/AvatarWithFallback.tsx | 10 +- src/renderer/routes/Accounts.tsx | 177 +++++++++--------- 2 files changed, 94 insertions(+), 93 deletions(-) diff --git a/src/renderer/components/avatars/AvatarWithFallback.tsx b/src/renderer/components/avatars/AvatarWithFallback.tsx index a2f6149a3..05df46b3d 100644 --- a/src/renderer/components/avatars/AvatarWithFallback.tsx +++ b/src/renderer/components/avatars/AvatarWithFallback.tsx @@ -2,7 +2,7 @@ import type React from 'react'; import { useState } from 'react'; import { FeedPersonIcon, MarkGithubIcon } from '@primer/octicons-react'; -import { Avatar, Stack, Text } from '@primer/react'; +import { Avatar, Stack, Truncate } from '@primer/react'; import { type Link, Size } from '../../types'; import type { UserType } from '../../typesGitHub'; @@ -52,10 +52,10 @@ export const AvatarWithFallback: React.FC = ({ /> )} {name && ( - // TODO add truncation logic for long names - - {name} - + + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun + piunaspiufnpiuadspdsfainfdsai + )} ); diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx index c6afe1abd..a6077378d 100644 --- a/src/renderer/routes/Accounts.tsx +++ b/src/renderer/routes/Accounts.tsx @@ -123,13 +123,8 @@ export const AccountsRoute: FC = () => { key={accountUUID} className="rounded-md p-2 mb-4 bg-gitify-accounts" > - - + + - - - + + + + - openHost(account.hostname)} - className="cursor-pointer" - data-testid="account-host" - > - openHost(account.hostname)} + className="cursor-pointer" + data-testid="account-host" > - - {account.hostname} - - + + + {account.hostname} + + - openDeveloperSettings(account)} - className="cursor-pointer" - data-testid="account-developer-settings" - > - openDeveloperSettings(account)} + className="cursor-pointer" + data-testid="account-developer-settings" > - - {account.method} - - - - - + + + {account.method} + + + + - - openDeveloperSettings(account)} - size="small" - data-testid="account-missing-scopes" - className={ - account.hasRequiredScopes ? 'invisible' : 'visible' - } - /> + + openDeveloperSettings(account)} + size="small" + data-testid="account-missing-scopes" + className={ + account.hasRequiredScopes ? 'invisible' : 'visible' + } + /> - setAsPrimaryAccount(account)} - size="small" - data-testid="account-set-primary" - /> + setAsPrimaryAccount(account)} + size="small" + data-testid="account-set-primary" + /> - handleRefresh(account)} - size="small" - loading={loadingStates[accountUUID] || false} - data-testid="account-refresh" - /> + handleRefresh(account)} + size="small" + loading={loadingStates[accountUUID] || false} + data-testid="account-refresh" + /> - logoutAccount(account)} - size="small" - data-testid="account-logout" - /> + logoutAccount(account)} + size="small" + data-testid="account-logout" + /> + + From 5ea227b4cb569142bf54f32890dd5202c6be0b7a Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Wed, 29 Jan 2025 21:52:30 -0500 Subject: [PATCH 2/4] feat: avatar length handling Signed-off-by: Adam Setch --- .../AvatarWithFallback.test.tsx.snap | 100 +- .../AccountNotifications.test.tsx.snap | 150 +- .../NotificationHeader.test.tsx.snap | 60 +- .../NotificationRow.test.tsx.snap | 20 +- .../RepositoryNotifications.test.tsx.snap | 70 +- .../__snapshots__/Accounts.test.tsx.snap | 5273 +++++++++-------- 6 files changed, 2917 insertions(+), 2756 deletions(-) diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap index ad94442ee..47be53f32 100644 --- a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap +++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap @@ -31,11 +31,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + , @@ -66,11 +68,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + , "debug": [Function], @@ -158,11 +162,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + , @@ -193,11 +199,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + , "debug": [Function], @@ -275,11 +283,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback sx="[object Object]" width="16" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + `; @@ -304,11 +314,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback sx="[object Object]" width="16" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + `; @@ -337,11 +349,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar sx="[object Object]" width="16" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + , @@ -366,11 +380,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar sx="[object Object]" width="16" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + , "debug": [Function], @@ -452,11 +468,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar sx="[object Object]" width="16" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + , @@ -481,11 +499,13 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar sx="[object Object]" width="16" /> - - @gitify-app - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + , "debug": [Function], diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap index 1d30107d3..7cae8f7d3 100644 --- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap +++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap @@ -55,11 +55,13 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende sx="[object Object]" width="16" /> - - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + - - gitify-app/notifications-test - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - - Mona Lisa Octocat - + + + Mona Lisa Octocat + +
-
-
- -
+
+
+
- github.com - + + + Personal Access Token + +
+ +
+ + + +
-
- - Personal Access Token - -
+
-
- - -
- - - - -
- + class="Tooltip__StyledTooltip-sc-e45c7z-0 eELanX" + data-direction="s" + id=":r34:" + popover="auto" + > + Logout octocat + +
- - - @@ -455,18 +464,16 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA >
- - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
+
+
+
+
+ + + Mona Lisa Octocat + +
+
+
+
+ + + github.gitify.io + +
+
+
+
+ + + OAuth App + +
+
+
+
+ + + +
-
- - Mona Lisa Octocat - -
+
- -
+ + +
+ Logout octocat +
-
- - - - -
- -
- - - -
- - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - - Mona Lisa Octocat - + + + Mona Lisa Octocat + +
-
-
- -
+
+
+
- github.com - + + + GitHub App + +
+
+
+ + + +
-
- - GitHub App - -
+
+ + +
-
- - - - -
- -
- - - -
@@ -1330,18 +1357,16 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as >
- - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
+
+
+
+
+ + + Mona Lisa Octocat + +
+
+
+
+ + + github.com + +
+
+
+
+ + + Personal Access Token + +
+
+
+
+ + + +
-
- - Mona Lisa Octocat - -
+
- +
+
+ + +
+
+
+ +
+
+
+
+
+ + + Mona Lisa Octocat + +
+
+
+
+ + + github.gitify.io + +
+
+
+
- github.com - + + + OAuth App + +
+
+
+ + + +
-
- - Personal Access Token - -
+
-
-
-
-
- - - - -
- + class="Tooltip__StyledTooltip-sc-e45c7z-0 eELanX" + data-direction="s" + id=":r4c:" + popover="auto" + > + Logout octocat + +
- - -
@@ -1692,24 +2099,22 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as >
- - - Mona Lisa Octocat - + + + Mona Lisa Octocat + +
-
-
- -
+
+
+
- github.gitify.io - + + + GitHub App + +
+ +
+ + + +
-
- - OAuth App - -
+
+ + +
-
+
+ + + +`; + +exports[`renderer/routes/Accounts.tsx General should render itself & its children 1`] = ` +
+
+
+ + +
- -
- - - +

+ Accounts +

+
-
+
+ +
- - - Mona Lisa Octocat - + + + Mona Lisa Octocat + +
-
-
- -
+
+
+
- github.com - + + + Personal Access Token + +
+
+
+ + + +
-
- - GitHub App - -
+
+ + +
+ + +
+
- - - -
- -
- - - -
-
-
- - - -`; - -exports[`renderer/routes/Accounts.tsx General should render itself & its children 1`] = ` -
-
-
- - -
-
- -

- Accounts -

-
-
-
-
-
-
-
-
-
- -
-
-
-
- - - Mona Lisa Octocat - -
-
-
-
- - - github.com - -
-
-
-
- - - Personal Access Token - -
-
-
-
-
-
- - - - -
- -
- - - -
-
-
-
-
-
-
- - - Mona Lisa Octocat - + + + Mona Lisa Octocat + +
-
-
- - - github.gitify.io - + + + github.gitify.io + +
-
-
- - - OAuth App - + + + OAuth App + +
-
- -
- - - - -
- + + + +
+ +
+ + + +
- - - @@ -3291,18 +3363,16 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre >
- - @octocat - + asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai +
- - - Mona Lisa Octocat - + + + Mona Lisa Octocat + +
-
-
- -
+
+
+
- github.com - + + + GitHub App + +
+ +
+ + + +
-
- - GitHub App - -
+
-
- - -
- - - - -
- + class="Tooltip__StyledTooltip-sc-e45c7z-0 eELanX" + data-direction="s" + id=":rq:" + popover="auto" + > + Logout octocat + +
- - - From f53ec79a8140a0fe63eac7e1b910d1cd9b391264 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Wed, 29 Jan 2025 22:02:13 -0500 Subject: [PATCH 3/4] feat: avatar length handling Signed-off-by: Adam Setch --- .../components/avatars/AvatarWithFallback.tsx | 4 +- .../AvatarWithFallback.test.tsx.snap | 20 +- .../AccountNotifications.test.tsx.snap | 30 +- .../NotificationHeader.test.tsx.snap | 12 +- .../NotificationRow.test.tsx.snap | 4 +- .../RepositoryNotifications.test.tsx.snap | 14 +- src/renderer/routes/Accounts.tsx | 178 +- .../__snapshots__/Accounts.test.tsx.snap | 4458 ++++++++--------- 8 files changed, 2359 insertions(+), 2361 deletions(-) diff --git a/src/renderer/components/avatars/AvatarWithFallback.tsx b/src/renderer/components/avatars/AvatarWithFallback.tsx index 05df46b3d..476d71d74 100644 --- a/src/renderer/components/avatars/AvatarWithFallback.tsx +++ b/src/renderer/components/avatars/AvatarWithFallback.tsx @@ -34,7 +34,6 @@ export const AvatarWithFallback: React.FC = ({ align="center" gap="condensed" data-testid="avatar" - className="truncate" > {!src || isBroken ? ( isNonHuman ? ( @@ -53,8 +52,7 @@ export const AvatarWithFallback: React.FC = ({ )} {name && ( - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun - piunaspiufnpiuadspdsfainfdsai + {name} )} diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap index 47be53f32..c763d44ba 100644 --- a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap +++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap @@ -36,7 +36,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app @@ -73,7 +73,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app , @@ -167,7 +167,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app @@ -204,7 +204,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app , @@ -288,7 +288,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app `; @@ -319,7 +319,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app `; @@ -354,7 +354,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app @@ -385,7 +385,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app , @@ -473,7 +473,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app @@ -504,7 +504,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar maxwidth="280" title="@gitify-app" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @gitify-app , diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap index 7cae8f7d3..6489dfd59 100644 --- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap +++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap @@ -60,7 +60,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -299,7 +299,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -595,7 +595,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -817,7 +817,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -1176,7 +1176,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -1428,7 +1428,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -1650,7 +1650,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -2009,7 +2009,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -2318,7 +2318,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -2511,7 +2511,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -2761,7 +2761,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -2995,7 +2995,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -3286,7 +3286,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -3475,7 +3475,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat @@ -3668,7 +3668,7 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl maxwidth="280" title="@octocat" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat diff --git a/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap index 816f6e10d..1d2d09ffb 100644 --- a/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap +++ b/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap @@ -47,7 +47,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -101,7 +101,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -212,7 +212,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -266,7 +266,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -377,7 +377,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -431,7 +431,7 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap index bc089f87c..7e814826c 100644 --- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap +++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap @@ -95,7 +95,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -457,7 +457,7 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap index 1d13512fe..1f2ab87db 100644 --- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap +++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap @@ -60,7 +60,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -253,7 +253,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -509,7 +509,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -701,7 +701,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -900,7 +900,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -1156,7 +1156,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test @@ -1355,7 +1355,7 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us maxwidth="280" title="gitify-app/notifications-test" > - asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + gitify-app/notifications-test diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx index a6077378d..125f362d1 100644 --- a/src/renderer/routes/Accounts.tsx +++ b/src/renderer/routes/Accounts.tsx @@ -121,10 +121,10 @@ export const AccountsRoute: FC = () => { return ( - - + + + - - - - - - openHost(account.hostname)} - className="cursor-pointer" - data-testid="account-host" + + + + + + {account.user?.name} + + - openDeveloperSettings(account)} - className="cursor-pointer" - data-testid="account-developer-settings" + openHost(account.hostname)} + className="cursor-pointer" + data-testid="account-host" + > + - - - {account.method} - - - - + + {account.hostname} + + - - openDeveloperSettings(account)} - size="small" - data-testid="account-missing-scopes" - className={ - account.hasRequiredScopes ? 'invisible' : 'visible' - } - /> + className="cursor-pointer" + data-testid="account-developer-settings" + > + + + {account.method} + + + + - setAsPrimaryAccount(account)} - size="small" - data-testid="account-set-primary" - /> + + openDeveloperSettings(account)} + size="small" + data-testid="account-missing-scopes" + className={ + account.hasRequiredScopes ? 'invisible' : 'visible' + } + /> - handleRefresh(account)} - size="small" - loading={loadingStates[accountUUID] || false} - data-testid="account-refresh" - /> + setAsPrimaryAccount(account)} + size="small" + data-testid="account-set-primary" + /> - logoutAccount(account)} - size="small" - data-testid="account-logout" - /> - + handleRefresh(account)} + size="small" + loading={loadingStates[accountUUID] || false} + data-testid="account-refresh" + /> + + logoutAccount(account)} + size="small" + data-testid="account-logout" + /> diff --git a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap index 0547ecc7f..50db57dfc 100644 --- a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap +++ b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap @@ -89,20 +89,20 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA class="Box-sc-g0xbh4-0 grow overflow-x-auto px-8 pb-2 mb-12 " >
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
- -
-
-
+ + - - - github.com - -
+ Mona Lisa Octocat +
+
+
- + + + + github.com +
-
-
- - - -
- + + Personal Access Token + +
- +
+
+ + + + +
-
+ + +
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
- -
-
-
+ + - - - github.gitify.io - -
+ Mona Lisa Octocat +
+
+
- + + + + github.gitify.io +
-
-
- - - -
- + + OAuth App + +
- +
+
+ + + + +
-
+ + +
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
- + + + + Mona Lisa Octocat +
+
+
- + + + + github.com +
+
+
- + + + + GitHub App +
+
+
+ + + +
- + + -
- - - -
+ class="octicon octicon-sign-out" + display="inline-block" + fill="currentColor" + focusable="false" + height="16" + overflow="visible" + style="vertical-align: text-bottom;" + viewBox="0 0 16 16" + width="16" + > + + + +
@@ -1353,20 +1353,20 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as class="Box-sc-g0xbh4-0 grow overflow-x-auto px-8 pb-2 mb-12 " >
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
- -
-
-
+ + - - - github.com - -
+ Mona Lisa Octocat +
+
+
- + + + + github.com +
-
-
- - - -
- + + Personal Access Token + +
- +
+
+ + + + +
-
-
-
- - -
- +
+ + +
+
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
- -
-
-
+ + - - - github.gitify.io - -
+ Mona Lisa Octocat +
+
+
- + + + + github.gitify.io +
-
-
- - - -
- + + OAuth App + +
- +
+
+ + + + +
-
+ + +
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
-
- - - Mona Lisa Octocat - -
-
-
- -
-
-
+ + - - - GitHub App - -
+ Mona Lisa Octocat +
-
-
- - - - + + + github.com + +
+
- + + GitHub App + +
- + +
+ + + + +
-
+ + +
@@ -2617,20 +2617,20 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre class="Box-sc-g0xbh4-0 grow overflow-x-auto px-8 pb-2 mb-12 " >
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
- -
-
-
+ + - - - github.com - -
+ Mona Lisa Octocat +
+
+
- + + + + github.com +
-
-
- - - -
- + + Personal Access Token + +
- +
+
+ + + + +
-
+ + +
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
-
-
-
-
- - - Mona Lisa Octocat - -
-
-
-
- - - github.gitify.io - -
-
-
-
- - - OAuth App - -
-
-
-
- - -
+
+
- - - + + + github.gitify.io + +
+
- + + OAuth App + +
- + +
+ + + + +
-
+ + +
- asdokmdasoimdasoisadoindsviunafjhnfpuinfdsapiujndfp iun piunaspiufnpiuadspdsfainfdsai + @octocat
+
+
- -
-
-
+ + - - - github.com - -
+ Mona Lisa Octocat +
+
+
- + + + + github.com +
-
-
- - - -
- + + GitHub App + +
- +
+
+ + + + +
-
+ + +
From 9a4b94ff6a77350741c8144a89f8d1f760d58a8b Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Wed, 29 Jan 2025 22:03:59 -0500 Subject: [PATCH 4/4] feat: avatar length handling Signed-off-by: Adam Setch --- .../AvatarWithFallback.test.tsx.snap | 20 +++++----- .../AccountNotifications.test.tsx.snap | 38 +++++++++---------- .../NotificationFooter.test.tsx.snap | 20 +++++----- .../NotificationHeader.test.tsx.snap | 12 +++--- .../NotificationRow.test.tsx.snap | 16 ++++---- .../RepositoryNotifications.test.tsx.snap | 14 +++---- .../__snapshots__/Accounts.test.tsx.snap | 18 ++++----- 7 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap index c763d44ba..9fa484539 100644 --- a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap +++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap @@ -6,7 +6,7 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback "baseElement":
, "container":
, "container":
, "container":
, "container":