Skip to content

Commit 84dce78

Browse files
committed
fix: tests for SelecedElementsContext updated and type fixed
1 parent 2b8209b commit 84dce78

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

packages/webui/src/client/ui/RundownView/SelectedElementsContext.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ interface SelectionContextType {
4343
clearAndSetSelection: (element: SelectedElement) => void
4444
toggleSelection: (element: SelectedElement) => void
4545
addSelection: (element: SelectedElement) => void
46-
removeSelection: (elementId: string) => void
46+
removeSelection: (elementId: ElementId) => void
4747
clearSelections: () => void
4848
getSelectedCount: () => number
4949
}
@@ -159,7 +159,7 @@ export const useElementSelection = (element: SelectedElement): { isSelected: boo
159159
const { isSelected, toggleSelection } = useSelection()
160160

161161
return {
162-
isSelected: React.useMemo(() => isSelected(element.id), [isSelected, element.id]),
162+
isSelected: React.useMemo(() => isSelected(element.elementId), [isSelected, element.elementId]),
163163
toggleSelection: React.useCallback(() => toggleSelection(element), [toggleSelection, element]),
164164
}
165165
}

packages/webui/src/client/ui/RundownView/__tests__/selectedElementsContext.test.tsx

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,16 @@ import { RundownId, SegmentId, PartInstanceId } from '@sofie-automation/corelib/
88
describe('SelectedElementProvider', () => {
99
const createRundownElement = (id: string) => ({
1010
type: 'rundown' as const,
11-
id,
1211
elementId: protectString<RundownId>(id),
1312
})
1413

1514
const createSegmentElement = (id: string) => ({
1615
type: 'segment' as const,
17-
id,
1816
elementId: protectString<SegmentId>(id),
1917
})
2018

2119
const createPartInstanceElement = (id: string) => ({
2220
type: 'partInstance' as const,
23-
id,
2421
elementId: protectString<PartInstanceId>(id),
2522
})
2623

@@ -32,7 +29,7 @@ describe('SelectedElementProvider', () => {
3229
test('init with no selections', () => {
3330
const { result } = renderHook(() => useSelection(), { wrapper })
3431

35-
expect(result.current.selectedElements.size).toBe(0)
32+
expect(result.current.listSelectedElements.length).toBe(0)
3633
expect(result.current.getSelectedCount()).toBe(0)
3734
})
3835

@@ -44,15 +41,15 @@ describe('SelectedElementProvider', () => {
4441
act(() => {
4542
result.current.clearAndSetSelection(element1)
4643
})
47-
expect(result.current.selectedElements.size).toBe(1)
48-
expect(result.current.isSelected(element1.id)).toBe(true)
44+
expect(result.current.listSelectedElements.length).toBe(1)
45+
expect(result.current.isSelected(element1.elementId)).toBe(true)
4946

5047
act(() => {
5148
result.current.clearAndSetSelection(element2)
5249
})
53-
expect(result.current.selectedElements.size).toBe(1)
54-
expect(result.current.isSelected(element1.id)).toBe(false)
55-
expect(result.current.isSelected(element2.id)).toBe(true)
50+
expect(result.current.listSelectedElements.length).toBe(1)
51+
expect(result.current.isSelected(element1.elementId)).toBe(false)
52+
expect(result.current.isSelected(element2.elementId)).toBe(true)
5653
})
5754

5855
test('toggleSelection', () => {
@@ -62,12 +59,12 @@ describe('SelectedElementProvider', () => {
6259
act(() => {
6360
result.current.toggleSelection(element)
6461
})
65-
expect(result.current.isSelected(element.id)).toBe(true)
62+
expect(result.current.isSelected(element.elementId)).toBe(true)
6663

6764
act(() => {
6865
result.current.toggleSelection(element)
6966
})
70-
expect(result.current.isSelected(element.id)).toBe(false)
67+
expect(result.current.isSelected(element.elementId)).toBe(false)
7168
})
7269

7370
test('respect maxSelections limit', () => {
@@ -89,9 +86,9 @@ describe('SelectedElementProvider', () => {
8986
})
9087

9188
expect(result.current.getSelectedCount()).toBe(2)
92-
expect(result.current.isSelected(elements[0].id)).toBe(true)
93-
expect(result.current.isSelected(elements[1].id)).toBe(true)
94-
expect(result.current.isSelected(elements[2].id)).toBe(false)
89+
expect(result.current.isSelected(elements[0].elementId)).toBe(true)
90+
expect(result.current.isSelected(elements[1].elementId)).toBe(true)
91+
expect(result.current.isSelected(elements[2].elementId)).toBe(false)
9592
})
9693

9794
test('clearSelections removes all selections', () => {

0 commit comments

Comments
 (0)