Skip to content

Commit fca16a8

Browse files
committed
chore: fix webui build
1 parent 9ebd8b2 commit fca16a8

File tree

5 files changed

+25
-6
lines changed

5 files changed

+25
-6
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/dist/index.d.ts b/dist/index.d.ts
2+
index d5722b1ac530aac3965f1e77e4673e3b4a7e2b1b..1745642ed6b36ad1d4c9a4dfb70e6068402ba86d 100644
3+
--- a/dist/index.d.ts
4+
+++ b/dist/index.d.ts
5+
@@ -1,6 +1,6 @@
6+
type Note = string[];
7+
type ComboChord = Note[];
8+
-interface EnchancedKeyboardEvent extends KeyboardEvent {
9+
+export interface EnchancedKeyboardEvent extends KeyboardEvent {
10+
comboChordCodes: ComboChord;
11+
comboCodes: Note;
12+
tag: any | undefined;

packages/webui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@sofie-automation/corelib": "1.52.0-in-development",
4646
"@sofie-automation/meteor-lib": "1.52.0-in-development",
4747
"@sofie-automation/shared-lib": "1.52.0-in-development",
48-
"@sofie-automation/sorensen": "^1.5.8",
48+
"@sofie-automation/sorensen": "patch:@sofie-automation/sorensen@npm%3A1.5.8#~/.yarn/patches/@sofie-automation-sorensen-npm-1.5.8-7b99076666.patch",
4949
"@testing-library/user-event": "^14.6.1",
5050
"@types/sinon": "^10.0.20",
5151
"classnames": "^2.5.1",

packages/webui/src/client/lib/clientUserAction.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export function doUserAction<Result>(
180180
} else {
181181
try {
182182
timeoutMessage.drop()
183-
} catch (e) {
183+
} catch (_e) {
184184
// message was already dropped, that's fine
185185
}
186186
}
@@ -202,7 +202,7 @@ export function doUserAction<Result>(
202202
undefined,
203203
NoticeLevel.CRITICAL,
204204
t('Action {{actionName}} failed: {{error}}', {
205-
error: translateMessage(res.error.message || res.error, t),
205+
error: translateMessage(res.error.userMessage || res.error, t),
206206
actionName: actionName,
207207
}),
208208
'userAction'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ const RundownHeader = withTranslation()(
624624
'The rundown "{{rundownName}}" will need to be deactivated in order to activate this one.\n\nAre you sure you want to activate this one anyway?',
625625
{
626626
// TODO: this is a bit of a hack, could a better string sent from the server instead?
627-
rundownName: err.message.args?.names ?? '',
627+
rundownName: err.userMessage.args?.names ?? '',
628628
}
629629
),
630630
yes: t('Activate Anyway (Rehearsal)'),

packages/yarn.lock

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6109,13 +6109,20 @@ __metadata:
61096109
languageName: unknown
61106110
linkType: soft
61116111

6112-
"@sofie-automation/sorensen@npm:^1.5.8":
6112+
"@sofie-automation/sorensen@npm:1.5.8":
61136113
version: 1.5.8
61146114
resolution: "@sofie-automation/sorensen@npm:1.5.8"
61156115
checksum: 10c0/cc0bcf1c82f58e59f8c8325bfc9653f57ecd84327f68994c4449c546160492316725fb4040a2fbb9c6e56bbb6598c4fa2e05b69fc413444bd318699f4f179f85
61166116
languageName: node
61176117
linkType: hard
61186118

6119+
"@sofie-automation/sorensen@patch:@sofie-automation/sorensen@npm%3A1.5.8#~/.yarn/patches/@sofie-automation-sorensen-npm-1.5.8-7b99076666.patch":
6120+
version: 1.5.8
6121+
resolution: "@sofie-automation/sorensen@patch:@sofie-automation/sorensen@npm%3A1.5.8#~/.yarn/patches/@sofie-automation-sorensen-npm-1.5.8-7b99076666.patch::version=1.5.8&hash=ca3d17"
6122+
checksum: 10c0/f9d612f13004c68675b50ac2e9dceb8da33df21be44e2547700a382879f40642a8f20426fa05f82f94c6329e7a43f57cce122326c106b8466ff159daa4e23d58
6123+
languageName: node
6124+
linkType: hard
6125+
61196126
"@sofie-automation/webui@workspace:webui":
61206127
version: 0.0.0-use.local
61216128
resolution: "@sofie-automation/webui@workspace:webui"
@@ -6133,7 +6140,7 @@ __metadata:
61336140
"@sofie-automation/corelib": "npm:1.52.0-in-development"
61346141
"@sofie-automation/meteor-lib": "npm:1.52.0-in-development"
61356142
"@sofie-automation/shared-lib": "npm:1.52.0-in-development"
6136-
"@sofie-automation/sorensen": "npm:^1.5.8"
6143+
"@sofie-automation/sorensen": "patch:@sofie-automation/sorensen@npm%3A1.5.8#~/.yarn/patches/@sofie-automation-sorensen-npm-1.5.8-7b99076666.patch"
61376144
"@testing-library/dom": "npm:^10.4.0"
61386145
"@testing-library/jest-dom": "npm:^6.6.3"
61396146
"@testing-library/react": "npm:^16.2.0"

0 commit comments

Comments
 (0)