Skip to content

Commit 5caa566

Browse files
JulusianJulusian
committed
chore: remove opPrefix prop
1 parent c68df43 commit 5caa566

File tree

12 files changed

+7
-105
lines changed

12 files changed

+7
-105
lines changed

‎packages/webui/src/client/lib/Components/LabelAndOverrides.tsx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export interface LabelAndOverridesProps<T extends object, TValue> {
1313
hint?: string
1414
item: WrappedOverridableItemNormal<T>
1515
itemKey: keyof ReadonlyDeep<T>
16-
opPrefix: string
1716
overrideHelper: OverrideOpHelperForItemContents
1817

1918
showClearButton?: boolean
@@ -32,24 +31,23 @@ export function LabelAndOverrides<T extends object, TValue = any>({
3231
hint,
3332
item,
3433
itemKey,
35-
opPrefix,
3634
overrideHelper,
3735
showClearButton,
3836
formatDefaultValue,
3937
}: Readonly<LabelAndOverridesProps<T, TValue>>): JSX.Element {
4038
const { t } = useTranslation()
4139

4240
const clearOverride = useCallback(() => {
43-
overrideHelper().clearItemOverrides(opPrefix, String(itemKey)).commit()
44-
}, [overrideHelper, opPrefix, itemKey])
41+
overrideHelper().clearItemOverrides(item.id, String(itemKey)).commit()
42+
}, [overrideHelper, item.id, itemKey])
4543
const setValue = useCallback(
4644
(newValue: any) => {
47-
overrideHelper().setItemValue(opPrefix, String(itemKey), newValue).commit()
45+
overrideHelper().setItemValue(item.id, String(itemKey), newValue).commit()
4846
},
49-
[overrideHelper, opPrefix, itemKey]
47+
[overrideHelper, item.id, itemKey]
5048
)
5149

52-
const isOverridden = hasOpWithPath(item.overrideOps, opPrefix, String(itemKey))
50+
const isOverridden = hasOpWithPath(item.overrideOps, item.id, String(itemKey))
5351

5452
let displayValue: JSX.Element | string | null = '""'
5553
if (item.defaults) {

‎packages/webui/src/client/lib/forms/SchemaFormWithOverrides.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ interface FormComponentProps {
4545
item: WrappedOverridableItemNormal<any>
4646
overrideHelper: OverrideOpHelperForItemContents
4747
itemKey: string
48-
opPrefix: string
4948

5049
/** Whether a clear button should be showed for fields not marked as "required" */
5150
showClearButton: boolean
@@ -68,7 +67,6 @@ function useChildPropsForFormComponent(props: Readonly<SchemaFormWithOverridesPr
6867
hint: description ? translateStringIfHasNamespaces(description, props.translationNamespaces) : undefined,
6968
item: props.item,
7069
itemKey: props.attr,
71-
opPrefix: props.item.id,
7270
overrideHelper: props.overrideHelper,
7371

7472
showClearButton: !!props.showClearButtonForNonRequiredFields && !props.isRequired,

‎packages/webui/src/client/ui/Settings/ShowStyle/OutputLayer.tsx‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,7 @@ function OutputLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
270270
<tr className="expando-details hl">
271271
<td colSpan={4}>
272272
<div className="properties-grid">
273-
<LabelAndOverrides
274-
label={t('Channel Name')}
275-
item={item}
276-
itemKey={'name'}
277-
opPrefix={item.id}
278-
overrideHelper={overrideHelper}
279-
>
273+
<LabelAndOverrides label={t('Channel Name')} item={item} itemKey={'name'} overrideHelper={overrideHelper}>
280274
{(value, handleUpdate) => (
281275
<TextInputControl
282276
modifiedClassName="bghl"
@@ -300,7 +294,6 @@ function OutputLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
300294
label={t('Is PGM Output')}
301295
item={item}
302296
itemKey={'isPGM'}
303-
opPrefix={item.id}
304297
overrideHelper={overrideHelper}
305298
>
306299
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -309,7 +302,6 @@ function OutputLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
309302
label={t('Display Rank')}
310303
item={item}
311304
itemKey={'_rank'}
312-
opPrefix={item.id}
313305
overrideHelper={overrideHelper}
314306
>
315307
{(value, handleUpdate) => (
@@ -325,7 +317,6 @@ function OutputLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
325317
label={t('Is collapsed by default')}
326318
item={item}
327319
itemKey={'isDefaultCollapsed'}
328-
opPrefix={item.id}
329320
overrideHelper={overrideHelper}
330321
>
331322
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -334,7 +325,6 @@ function OutputLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
334325
label={t('Is flattened')}
335326
item={item}
336327
itemKey={'isFlattened'}
337-
opPrefix={item.id}
338328
overrideHelper={overrideHelper}
339329
>
340330
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}

‎packages/webui/src/client/ui/Settings/ShowStyle/SourceLayer.tsx‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,7 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
295295
<tr className="expando-details hl">
296296
<td colSpan={4}>
297297
<div className="properties-grid">
298-
<LabelAndOverrides
299-
label={t('Source Name')}
300-
item={item}
301-
itemKey={'name'}
302-
opPrefix={item.id}
303-
overrideHelper={overrideHelper}
304-
>
298+
<LabelAndOverrides label={t('Source Name')} item={item} itemKey={'name'} overrideHelper={overrideHelper}>
305299
{(value, handleUpdate) => (
306300
<TextInputControl
307301
modifiedClassName="bghl"
@@ -315,7 +309,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
315309
label={t('Source Abbreviation')}
316310
item={item}
317311
itemKey={'abbreviation'}
318-
opPrefix={item.id}
319312
overrideHelper={overrideHelper}
320313
>
321314
{(value, handleUpdate) => (
@@ -341,7 +334,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
341334
label={t('Source Type')}
342335
item={item}
343336
itemKey={'type'}
344-
opPrefix={item.id}
345337
overrideHelper={overrideHelper}
346338
options={getDropdownInputOptions(SourceLayerType)}
347339
>
@@ -358,7 +350,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
358350
label={t('Is a Live Remote Input')}
359351
item={item}
360352
itemKey={'isRemoteInput'}
361-
opPrefix={item.id}
362353
overrideHelper={overrideHelper}
363354
>
364355
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -367,7 +358,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
367358
label={t('Is a Guest Input')}
368359
item={item}
369360
itemKey={'isGuestInput'}
370-
opPrefix={item.id}
371361
overrideHelper={overrideHelper}
372362
>
373363
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -376,7 +366,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
376366
label={t('Is hidden')}
377367
item={item}
378368
itemKey={'isHidden'}
379-
opPrefix={item.id}
380369
overrideHelper={overrideHelper}
381370
>
382371
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -385,7 +374,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
385374
label={t('Display Rank')}
386375
item={item}
387376
itemKey={'_rank'}
388-
opPrefix={item.id}
389377
overrideHelper={overrideHelper}
390378
>
391379
{(value, handleUpdate) => (
@@ -401,7 +389,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
401389
label={t('Treat as Main content')}
402390
item={item}
403391
itemKey={'onPresenterScreen'}
404-
opPrefix={item.id}
405392
overrideHelper={overrideHelper}
406393
hint="When set, Pieces on this Source Layer will be used to display summaries, thumbnails etc for the Part in GUIs. "
407394
>
@@ -411,7 +398,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
411398
label={t('Display in a column in List View')}
412399
item={item}
413400
itemKey={'onListViewColumn'}
414-
opPrefix={item.id}
415401
overrideHelper={overrideHelper}
416402
>
417403
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -420,7 +406,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
420406
label={t('Display AdLibs in a column in List View')}
421407
item={item}
422408
itemKey={'onListViewAdLibColumn'}
423-
opPrefix={item.id}
424409
overrideHelper={overrideHelper}
425410
>
426411
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -429,7 +414,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
429414
label={t('Pieces on this layer can be cleared')}
430415
item={item}
431416
itemKey={'isClearable'}
432-
opPrefix={item.id}
433417
overrideHelper={overrideHelper}
434418
>
435419
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -438,7 +422,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
438422
label={t('Pieces on this layer are sticky')}
439423
item={item}
440424
itemKey={'isSticky'}
441-
opPrefix={item.id}
442425
overrideHelper={overrideHelper}
443426
>
444427
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -447,7 +430,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
447430
label={t('Only Pieces present in rundown are sticky')}
448431
item={item}
449432
itemKey={'stickyOriginalOnly'}
450-
opPrefix={item.id}
451433
overrideHelper={overrideHelper}
452434
>
453435
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -456,7 +438,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
456438
label={t('Allow disabling of Pieces')}
457439
item={item}
458440
itemKey={'allowDisable'}
459-
opPrefix={item.id}
460441
overrideHelper={overrideHelper}
461442
>
462443
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -465,7 +446,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
465446
label={t('AdLibs on this layer can be queued')}
466447
item={item}
467448
itemKey={'isQueueable'}
468-
opPrefix={item.id}
469449
overrideHelper={overrideHelper}
470450
>
471451
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -474,7 +454,6 @@ function SourceLayerEntry({ item, isExpanded, toggleExpanded, overrideHelper }:
474454
label={t('Exclusivity group')}
475455
item={item}
476456
itemKey={'exclusiveGroup'}
477-
opPrefix={item.id}
478457
overrideHelper={overrideHelper}
479458
>
480459
{(value, handleUpdate) => (

‎packages/webui/src/client/ui/Settings/Studio/Devices/GenericSubDevices.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ function SubDeviceEditRow({
285285
label={t('Peripheral Device ID')}
286286
item={item}
287287
overrideHelper={overrideHelper}
288-
opPrefix={item.id}
289288
itemKey={'peripheralDeviceId'}
290289
options={peripheralDeviceOptions}
291290
>
@@ -379,7 +378,6 @@ function SubDeviceEditForm({ peripheralDevice, item, overrideHelper }: Readonly<
379378
label={t('Device Type')}
380379
item={item}
381380
overrideHelper={overrideHelper}
382-
opPrefix={item.id}
383381
itemKey={'options.type'}
384382
options={subdeviceTypeOptions}
385383
>

‎packages/webui/src/client/ui/Settings/Studio/Generic.tsx‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
217217
label={t('Frame Rate')}
218218
item={wrappedItem}
219219
itemKey={'frameRate'}
220-
opPrefix={wrappedItem.id}
221220
overrideHelper={overrideHelper}
222221
>
223222
{(value, handleUpdate) => (
@@ -234,7 +233,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
234233
label={t('Minimum Take Span')}
235234
item={wrappedItem}
236235
itemKey={'minimumTakeSpan'}
237-
opPrefix={wrappedItem.id}
238236
overrideHelper={overrideHelper}
239237
>
240238
{(value, handleUpdate) => (
@@ -251,7 +249,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
251249
label={t('Enable "Play from Anywhere"')}
252250
item={wrappedItem}
253251
itemKey={'enablePlayFromAnywhere'}
254-
opPrefix={wrappedItem.id}
255252
overrideHelper={overrideHelper}
256253
>
257254
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -261,7 +258,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
261258
label={t('Media Preview URL')}
262259
item={wrappedItem}
263260
itemKey={'mediaPreviewsUrl'}
264-
opPrefix={wrappedItem.id}
265261
overrideHelper={overrideHelper}
266262
>
267263
{(value, handleUpdate) => (
@@ -278,7 +274,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
278274
label={t('Slack Webhook URLs')}
279275
item={wrappedItem}
280276
itemKey={'slackEvaluationUrls'}
281-
opPrefix={wrappedItem.id}
282277
overrideHelper={overrideHelper}
283278
>
284279
{(value, handleUpdate) => (
@@ -295,7 +290,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
295290
label={t('Supported Media Formats')}
296291
item={wrappedItem}
297292
itemKey={'supportedMediaFormats'}
298-
opPrefix={wrappedItem.id}
299293
overrideHelper={overrideHelper}
300294
>
301295
{(value, handleUpdate) => (
@@ -312,7 +306,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
312306
label={t('Supported Audio Formats')}
313307
item={wrappedItem}
314308
itemKey={'supportedAudioStreams'}
315-
opPrefix={wrappedItem.id}
316309
overrideHelper={overrideHelper}
317310
>
318311
{(value, handleUpdate) => (
@@ -329,7 +322,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
329322
label={t('Force the Multi-gateway-mode')}
330323
item={wrappedItem}
331324
itemKey={'forceMultiGatewayMode'}
332-
opPrefix={wrappedItem.id}
333325
overrideHelper={overrideHelper}
334326
>
335327
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -339,7 +331,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
339331
label={t('Multi-gateway-mode delay time')}
340332
item={wrappedItem}
341333
itemKey={'multiGatewayNowSafeLatency'}
342-
opPrefix={wrappedItem.id}
343334
overrideHelper={overrideHelper}
344335
>
345336
{(value, handleUpdate) => (
@@ -356,7 +347,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
356347
label={t('Allow Rundowns to be reset while on-air')}
357348
item={wrappedItem}
358349
itemKey={'allowRundownResetOnAir'}
359-
opPrefix={wrappedItem.id}
360350
overrideHelper={overrideHelper}
361351
>
362352
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -366,7 +356,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
366356
label={t('Preserve position of segments when unsynced relative to other segments')}
367357
item={wrappedItem}
368358
itemKey={'preserveOrphanedSegmentPositionInRundown'}
369-
opPrefix={wrappedItem.id}
370359
overrideHelper={overrideHelper}
371360
hint={t('This has only been tested for the iNews gateway')}
372361
>
@@ -377,7 +366,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
377366
label={t('Allow AdlibTesting (rehearsal) mode, for testing adlibs before taking the first Part')}
378367
item={wrappedItem}
379368
itemKey={'allowAdlibTestingSegment'}
380-
opPrefix={wrappedItem.id}
381369
overrideHelper={overrideHelper}
382370
>
383371
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -387,7 +375,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
387375
label={t('Enable QuickLoop')}
388376
item={wrappedItem}
389377
itemKey={'enableQuickLoop'}
390-
opPrefix={wrappedItem.id}
391378
overrideHelper={overrideHelper}
392379
>
393380
{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
@@ -397,7 +384,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
397384
label={t('Source Type')}
398385
item={wrappedItem}
399386
itemKey={'forceQuickLoopAutoNext'}
400-
opPrefix={wrappedItem.id}
401387
overrideHelper={overrideHelper}
402388
options={autoNextOptions}
403389
>
@@ -415,7 +401,6 @@ function StudioSettings({ studio }: { studio: DBStudio }): JSX.Element {
415401
label={t('QuickLoop Fallback Part Duration')}
416402
item={wrappedItem}
417403
itemKey={'fallbackPartDuration'}
418-
opPrefix={wrappedItem.id}
419404
overrideHelper={overrideHelper}
420405
>
421406
{(value, handleUpdate) => (

0 commit comments

Comments
 (0)