diff options
| author |  Kristóf Marussy <kristof@marussy.com> | 2022-08-25 01:25:40 +0200 |
|---|---|---|
| committer | Kristóf Marussy <kristof@marussy.com> | 2022-08-25 16:44:01 +0200 |
| commit | f6de69943df6c669c81b10279bbfaf3158f1fd61 (patch) | |
| tree | e19465fd9ae4dc6905ad1aa1f8dbbc92ae43ea62 /subprojects/frontend/src/xtext/xtextServiceResults.ts | |
| parent | refactor(frontend): xtext update improvements (diff) | |
| download | refinery-f6de69943df6c669c81b10279bbfaf3158f1fd61.tar.gz refinery-f6de69943df6c669c81b10279bbfaf3158f1fd61.tar.zst refinery-f6de69943df6c669c81b10279bbfaf3158f1fd61.zip | |
fix(frontend): UpdateService synchronization
Also bumps frontend dependencies
Diffstat (limited to 'subprojects/frontend/src/xtext/xtextServiceResults.ts')
| -rw-r--r-- | subprojects/frontend/src/xtext/xtextServiceResults.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/subprojects/frontend/src/xtext/xtextServiceResults.ts b/subprojects/frontend/src/xtext/xtextServiceResults.ts index 4cfb9c33..e93c6714 100644 --- a/subprojects/frontend/src/xtext/xtextServiceResults.ts +++ b/subprojects/frontend/src/xtext/xtextServiceResults.ts | |||
| @@ -26,12 +26,13 @@ export type ServiceConflictResult = z.infer<typeof ServiceConflictResult>; | |||
| 26 | 26 | ||
| 27 | export function isConflictResult( | 27 | export function isConflictResult( |
| 28 | result: unknown, | 28 | result: unknown, |
| 29 | conflictType: Conflict, | 29 | conflictType?: Conflict | undefined, |
| 30 | ): boolean { | 30 | ): boolean { |
| 31 | const parsedConflictResult = ServiceConflictResult.safeParse(result); | 31 | const parsedConflictResult = ServiceConflictResult.safeParse(result); |
| 32 | return ( | 32 | return ( |
| 33 | parsedConflictResult.success && | 33 | parsedConflictResult.success && |
| 34 | parsedConflictResult.data.conflict === conflictType | 34 | (conflictType === undefined || |
| 35 | parsedConflictResult.data.conflict === conflictType) | ||
| 35 | ); | 36 | ); |
| 36 | } | 37 | } |
| 37 | 38 | ||