Skip to content

Commit 0d585e5

Browse files
committed
refactor: rename itemId to itemKey
1 parent cfb47db commit 0d585e5

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/library-authoring/generic/history-log/HistoryLog.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const HistoryComponentLog = ({ componentId }: { componentId: string; }) =
4949
<div className="history-log">
5050
{draftHistory && draftHistory.length !== 0 && (
5151
<HistoryDraftLogGroup
52-
itemId={componentId}
52+
itemKey={componentId}
5353
displayName={componentMetadata?.displayName || ''}
5454
entries={draftHistory}
5555
/>
@@ -151,7 +151,7 @@ export const HistoryContainerLog = ({ containerId }: { containerId: string; }) =
151151
<div className="history-log">
152152
{draftHistory && draftHistory.length !== 0 && (
153153
<HistoryDraftLogGroup
154-
itemId={containerId}
154+
itemKey={containerId}
155155
displayName={container?.displayName ?? ''}
156156
entries={draftHistory}
157157
/>

src/library-authoring/generic/history-log/HistoryLogGroup.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('<HistoryLogGroup />', () => {
3232

3333
render(
3434
<HistoryDraftLogGroup
35-
itemId={mockLibraryBlockDraftHistory.usageKey}
35+
itemKey={mockLibraryBlockDraftHistory.usageKey}
3636
displayName="Test Component"
3737
entries={draftEntries}
3838
/>,
@@ -76,7 +76,7 @@ describe('<HistoryLogGroup />', () => {
7676

7777
render(
7878
<HistoryDraftLogGroup
79-
itemId={mockLibraryContainerDraftHistory.containerKey}
79+
itemKey={mockLibraryContainerDraftHistory.containerKey}
8080
displayName="Intro Unit"
8181
entries={containerDraftEntries}
8282
/>,

src/library-authoring/generic/history-log/HistoryLogGroup.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface HistoryCreatedLogGroupProps {
3030
}
3131

3232
export interface HistoryDraftLogGroupProps {
33-
itemId: string;
33+
itemKey: string;
3434
displayName: string;
3535
entries: LibraryHistoryEntry[];
3636
}
@@ -98,7 +98,7 @@ export const HistoryCreatedLogGroup = ({
9898
};
9999

100100
export const HistoryDraftLogGroup = ({
101-
itemId,
101+
itemKey,
102102
displayName,
103103
entries,
104104
}: HistoryDraftLogGroupProps) => {
@@ -125,7 +125,7 @@ export const HistoryDraftLogGroup = ({
125125
/>
126126
</Collapsible.Trigger>
127127
<Collapsible.Body>
128-
<HistoryLogGroupEntries itemId={itemId} entries={entries} />
128+
<HistoryLogGroupEntries itemKey={itemKey} entries={entries} />
129129
</Collapsible.Body>
130130
</Collapsible.Advanced>
131131
<div className="history-log-vert" />
@@ -186,7 +186,7 @@ export const HistoryPublishLogGroup = ({
186186
</div>
187187
</>
188188
) :
189-
<HistoryLogGroupEntries entries={entries ?? []} itemId={itemId} />}
189+
<HistoryLogGroupEntries entries={entries ?? []} itemKey={itemId} />}
190190
</Collapsible.Body>
191191
</Collapsible.Advanced>
192192
) :

src/library-authoring/generic/history-log/HistoryLogGroupEntries.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import { useToggleWithValue } from '@src/hooks';
1111
import HistoryCompareChangesModal from '@src/library-authoring/generic/history-log/HistoryCompareChangesModal';
1212

1313
export interface HistoryLogGroupEntriesProps {
14-
itemId: string;
14+
itemKey: string;
1515
entries: LibraryHistoryEntry[];
1616
}
1717

1818
export const HistoryLogGroupEntries = ({
19-
itemId,
19+
itemKey,
2020
entries,
2121
}: HistoryLogGroupEntriesProps) => {
2222
const intl = useIntl();
@@ -69,11 +69,11 @@ export const HistoryLogGroupEntries = ({
6969
{moment(entry.changedAt).fromNow()}
7070
</span>
7171
</Stack>
72-
{!isContainerUsageKey(itemId) &&
72+
{!isContainerUsageKey(itemKey) &&
7373
(
7474
<Dropdown>
7575
<Dropdown.Toggle
76-
id={`dropdown-toggle-${itemId}-${entry.changedAt}-${index}`}
76+
id={`dropdown-toggle-${itemKey}-${entry.changedAt}-${index}`}
7777
as={IconButton}
7878
src={MoreVert}
7979
iconAs={Icon}
@@ -97,7 +97,7 @@ export const HistoryLogGroupEntries = ({
9797
<HistoryCompareChangesModal
9898
isOpen={isChangeModalOpen}
9999
onClose={closeChangeModal}
100-
usageKey={itemId}
100+
usageKey={itemKey}
101101
oldTitle={changeModalData.title}
102102
oldVersion={changeModalData.oldVersion}
103103
newVersion={changeModalData.newVersion || 'published'}

0 commit comments

Comments
 (0)