From bc0199572618f781957aad363af1ae7283aa0c03 Mon Sep 17 00:00:00 2001 From: Andy Pols Date: Mon, 3 Nov 2025 12:10:01 +0000 Subject: [PATCH 1/4] chore: replace anchors to user with UserLink so in one place --- src/routes.tsx | 6 ++---- src/ui/components/UserLink/UserLink.tsx | 13 +++++++++++++ src/ui/views/PushDetails/PushDetails.tsx | 15 ++++++--------- src/ui/views/RepoDetails/RepoDetails.tsx | 5 +++-- 4 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 src/ui/components/UserLink/UserLink.tsx diff --git a/src/routes.tsx b/src/routes.tsx index 43a2ac41c..5c1df4e25 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -90,12 +90,10 @@ const dashboardRoutes: Route[] = [ visible: true, }, { - path: '/admin/user/:id', + path: '/user/:id', name: 'User', icon: Person, - component: (props) => ( - - ), + component: (props) => , layout: '/dashboard', visible: false, }, diff --git a/src/ui/components/UserLink/UserLink.tsx b/src/ui/components/UserLink/UserLink.tsx new file mode 100644 index 000000000..5a4a355f4 --- /dev/null +++ b/src/ui/components/UserLink/UserLink.tsx @@ -0,0 +1,13 @@ +import React from 'react'; +import { Link } from 'react-router-dom'; + +interface UserLinkProps { + username: string; + children?: React.ReactNode; +} + +const UserLink: React.FC = ({ username, children }) => { + return {children || username}; +}; + +export default UserLink; diff --git a/src/ui/views/PushDetails/PushDetails.tsx b/src/ui/views/PushDetails/PushDetails.tsx index 32fa31610..054d8d1f7 100644 --- a/src/ui/views/PushDetails/PushDetails.tsx +++ b/src/ui/views/PushDetails/PushDetails.tsx @@ -25,6 +25,7 @@ import Tooltip from '@material-ui/core/Tooltip'; import { PushData } from '../../../types/models'; import { trimPrefixRefsHeads, trimTrailingDotGit } from '../../../db/helper'; import { generateEmailLink, getGitProvider } from '../../utils'; +import UserLink from '../../components/UserLink/UserLink'; const Dashboard: React.FC = () => { const { id } = useParams<{ id: string }>(); @@ -198,25 +199,21 @@ const Dashboard: React.FC = () => { ) : ( <> {isGitHub && ( - + - + )}

{isGitHub && ( - + {data.attestation.reviewer.gitAccount} - + )} - {!isGitHub && ( - - {data.attestation.reviewer.username} - - )}{' '} + {!isGitHub && }{' '} approved this contribution

diff --git a/src/ui/views/RepoDetails/RepoDetails.tsx b/src/ui/views/RepoDetails/RepoDetails.tsx index cb62e8008..1145aa55c 100644 --- a/src/ui/views/RepoDetails/RepoDetails.tsx +++ b/src/ui/views/RepoDetails/RepoDetails.tsx @@ -23,6 +23,7 @@ import CodeActionButton from '../../components/CustomButtons/CodeActionButton'; import { trimTrailingDotGit } from '../../../db/helper'; import { fetchRemoteRepositoryData } from '../../utils'; import { SCMRepositoryMetadata } from '../../../types/models'; +import UserLink from '../../components/UserLink/UserLink'; interface RepoData { _id: string; @@ -200,7 +201,7 @@ const RepoDetails: React.FC = () => { {data.users.canAuthorise.map((row) => ( - {row} + {user.admin && ( @@ -243,7 +244,7 @@ const RepoDetails: React.FC = () => { {data.users.canPush.map((row) => ( - {row} + {user.admin && ( From 28beb872c5c20fd89e36bc2166eacba840616cd4 Mon Sep 17 00:00:00 2001 From: Andy Pols Date: Mon, 3 Nov 2025 14:51:47 +0000 Subject: [PATCH 2/4] chore: keep layout --- src/routes.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes.tsx b/src/routes.tsx index 5c1df4e25..7a2db106e 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -28,7 +28,7 @@ import RepoList from './ui/views/RepoList/RepoList'; import SettingsView from './ui/views/Settings/Settings'; import { RepoIcon } from '@primer/octicons-react'; -import { Group, AccountCircle, Dashboard, Settings } from '@material-ui/icons'; +import { AccountCircle, Dashboard, Group, Settings } from '@material-ui/icons'; import { Route } from './types/models'; From cf89076e11cfbdfafbdd88d5553c95b7b6a045b0 Mon Sep 17 00:00:00 2001 From: Juan Escalada Date: Tue, 4 Nov 2025 18:40:08 +0900 Subject: [PATCH 3/4] fix: UserList and AttestationView user links --- .../views/PushDetails/components/AttestationView.tsx | 10 ++++------ src/ui/views/UserList/Components/UserList.tsx | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/ui/views/PushDetails/components/AttestationView.tsx b/src/ui/views/PushDetails/components/AttestationView.tsx index 60f348a1c..3b510adb0 100644 --- a/src/ui/views/PushDetails/components/AttestationView.tsx +++ b/src/ui/views/PushDetails/components/AttestationView.tsx @@ -70,17 +70,15 @@ const AttestationView: React.FC = ({ attestation, setAttes

Prior to making this code contribution publicly accessible via GitHub, this code contribution was reviewed and approved by{' '} - {data.reviewer.gitAccount} - . As a reviewer, it was their responsibility to confirm that open sourcing this - contribution followed the requirements of the company open source contribution policy. + {data.reviewer.gitAccount}. As a + reviewer, it was their responsibility to confirm that open sourcing this contribution + followed the requirements of the company open source contribution policy.

- - {data.reviewer.gitAccount} - {' '} + {data.reviewer.gitAccount}{' '} approved this contribution{' '} { const itemsPerPage = 5; const [searchQuery, setSearchQuery] = useState(''); - const openUser = (username: string) => - navigate(`/dashboard/admin/user/${username}`, { replace: true }); + const openUser = (username: string) => navigate(`/dashboard/user/${username}`, { replace: true }); useEffect(() => { getUsers(setIsLoading, setData, setAuth, setErrorMessage); From c4452661ff0cf4082c3b484fe5c041238769df83 Mon Sep 17 00:00:00 2001 From: Juan Escalada Date: Tue, 4 Nov 2025 18:48:19 +0900 Subject: [PATCH 4/4] fix: replace AttestationView a tags with UserLink components --- src/ui/views/PushDetails/components/AttestationView.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ui/views/PushDetails/components/AttestationView.tsx b/src/ui/views/PushDetails/components/AttestationView.tsx index 3b510adb0..f563209b1 100644 --- a/src/ui/views/PushDetails/components/AttestationView.tsx +++ b/src/ui/views/PushDetails/components/AttestationView.tsx @@ -12,6 +12,7 @@ import { withStyles } from '@material-ui/core/styles'; import { green } from '@material-ui/core/colors'; import { setURLShortenerData } from '../../../services/config'; import { AttestationViewProps } from '../attestation.types'; +import UserLink from '../../../components/UserLink/UserLink'; const StyledFormControlLabel = withStyles({ root: { @@ -70,7 +71,7 @@ const AttestationView: React.FC = ({ attestation, setAttes

Prior to making this code contribution publicly accessible via GitHub, this code contribution was reviewed and approved by{' '} - {data.reviewer.gitAccount}. As a + {data.reviewer.gitAccount}. As a reviewer, it was their responsibility to confirm that open sourcing this contribution followed the requirements of the company open source contribution policy.

@@ -78,7 +79,7 @@ const AttestationView: React.FC = ({ attestation, setAttes

- {data.reviewer.gitAccount}{' '} + {data.reviewer.gitAccount}{' '} approved this contribution{' '}