maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: App Install Dropdown Sort Properly [CAL-2285] (#10672) 

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
This commit is contained in:
Joe Au-Yeung 2023-08-12 17:30:15 -04:00 committed by GitHub
parent 26149e2b04
commit cfef92a7bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/components/apps/InstallAppButtonChild.tsx
View File

@ -112,7 +112,7 @@ export const InstallAppButtonChild = ({
);
}}>
<p>
{team.name} {isInstalled && `(${t("installed")})`}
{t(team.name)} {isInstalled && `(${t("installed")})`}
</p>
</DropdownItem>
);

1
apps/web/public/static/locales/en/common.json
View File

@ -1997,6 +1997,7 @@
"attendee_last_name_variable": "Attendee last name",
"attendee_first_name_info": "The person booking's first name",
"attendee_last_name_info": "The person booking's last name",
"me": "Me",
"verify_team_tooltip": "Verify your team to enable sending messages to attendees",
"ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
}

5
packages/features/ee/teams/lib/getUserAdminTeams.ts
View File

@ -58,6 +58,9 @@ const getUserAdminTeams = async ({
},
}),
},
orderBy: {
orgUsers: { _count: "desc" },
},
});
if (teams.length && getUserInfo) {
@ -76,7 +79,7 @@ const getUserAdminTeams = async ({
if (user) {
const userObject = {
id: user.id,
name: user.name || "Nameless",
name: user.name || "me",
logo: user?.avatar === "" ? null : user?.avatar,
isUser: true,
...(includeCredentials && { credentials: user.credentials }),

2
packages/ui/components/apps/AppCard.tsx
View File

@ -265,7 +265,7 @@ const InstallAppButtonChild = ({
);
}}>
<p className="text-left">
{team.name} {isInstalledTeamOrUser && `(${t("installed")})`}
{t(team.name)} {isInstalledTeamOrUser && `(${t("installed")})`}
</p>
</DropdownItem>
);