OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛Fixed primary_name crashing Settings history (#19550)

Browse Source 
fixes
https://linear.app/tryghost/issue/PROD-329/history-modal-crashes-the-app

- Added optional chaining operator to avoid null or undefined crashes
when the condition doesn't meet and should rather just move on.
- It now aligns with the other conditions where chaining is used.
This commit is contained in:
Ronald Langeveld 2024-01-23 10:05:12 +00:00 committed by GitHub
parent 363fbd1d9b
commit db5d2d0329
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/admin-x-settings/src/components/settings/advanced/HistoryModal.tsx
View File

@ -127,7 +127,7 @@ const HistoryActionDescription: React.FC<{action: Action}> = ({action}) => {
{group.slice(0, 1).toUpperCase()}{group.slice(1)}
{group !== key && <span className='text-xs'> <code className='mb-1 bg-white text-grey-800 dark:bg-grey-900 dark:text-white'>({key})</code></span>}
</>;
} else if (action.resource?.title || action.resource?.name || action.context.primary_name) {
} else if (action.resource?.title || action.resource?.name || action.context?.primary_name) {
const linkTarget = getLinkTarget(action);
if (linkTarget) {
@ -136,7 +136,7 @@ const HistoryActionDescription: React.FC<{action: Action}> = ({action}) => {
updateRoute(linkTarget);
}}>{action.resource?.title || action.resource?.name}</a>;
} else {
return <>{action.resource?.title || action.resource?.name || action.context.primary_name}</>;
return <>{action.resource?.title || action.resource?.name || action.context?.primary_name}</>;
}
} else {
return <span className='text-grey-500'>(unknown)</span>;