Selectively show the additional metadata if it isn't in the display string at all
This commit is contained in:
parent
88987fb6c7
commit
68a654f9e8
5 changed files with 33 additions and 7 deletions
|
@ -25,6 +25,7 @@ interface ActivityLog extends Model<'actor'> {
|
|||
ip: string;
|
||||
description: string | null;
|
||||
properties: Record<string, string | unknown>;
|
||||
hasAdditionalMetadata: boolean;
|
||||
timestamp: Date;
|
||||
relationships: {
|
||||
actor: User | null;
|
||||
|
|
|
@ -36,6 +36,7 @@ export default class Transformers {
|
|||
ip: attributes.ip,
|
||||
description: attributes.description,
|
||||
properties: attributes.properties,
|
||||
hasAdditionalMetadata: attributes.has_additional_metadata ?? false,
|
||||
timestamp: new Date(attributes.timestamp),
|
||||
relationships: {
|
||||
actor: transform(actor as FractalResponseData, this.toUser, null),
|
||||
|
|
|
@ -73,7 +73,7 @@ export default ({ activity, children }: Props) => {
|
|||
</Tooltip>
|
||||
</div>
|
||||
</div>
|
||||
<ActivityLogMetaButton meta={activity.properties}/>
|
||||
{activity.hasAdditionalMetadata && <ActivityLogMetaButton meta={activity.properties}/>}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
import React, { useState } from 'react';
|
||||
import { isEmptyObject } from '@/helpers';
|
||||
import { ClipboardListIcon } from '@heroicons/react/outline';
|
||||
import { Dialog } from '@/components/elements/dialog';
|
||||
import { Button } from '@/components/elements/button/index';
|
||||
|
@ -7,10 +6,6 @@ import { Button } from '@/components/elements/button/index';
|
|||
export default ({ meta }: { meta: Record<string, unknown> }) => {
|
||||
const [ open, setOpen ] = useState(false);
|
||||
|
||||
if (isEmptyObject(meta)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={'self-center mx-4'}>
|
||||
<Dialog
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue