From 495ccc7af4fa78e87c3cef40d910cbc3eab58e9f Mon Sep 17 00:00:00 2001 From: Lars Berger Date: Sat, 28 Sep 2024 21:34:41 +0800 Subject: [PATCH] fix: minor enum mismatch with rust types --- packages/client-api/src/desktop/windows.ts | 6 ++-- .../network/network-provider-types.ts | 35 +++++++++---------- .../weather/weather-provider-types.ts | 27 +++++++------- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/packages/client-api/src/desktop/windows.ts b/packages/client-api/src/desktop/windows.ts index 259c5893..75c72218 100644 --- a/packages/client-api/src/desktop/windows.ts +++ b/packages/client-api/src/desktop/windows.ts @@ -2,7 +2,7 @@ import { getCurrentWindow } from '@tauri-apps/api/window'; import { desktopCommands } from './desktop-commands'; -export type ZOrder = 'always_on_bottom' | 'always_on_top' | 'normal'; +export type ZOrder = 'bottom_most' | 'top_most' | 'normal'; export interface Window { /** @@ -29,9 +29,9 @@ export function currentWindow(): Window { } async function setZOrder(zOrder: ZOrder) { - if (zOrder === 'always_on_bottom') { + if (zOrder === 'bottom_most') { await getCurrentWindow().setAlwaysOnBottom(true); - } else if (zOrder === 'always_on_top') { + } else if (zOrder === 'top_most') { await desktopCommands.setAlwaysOnTop(); } else { await getCurrentWindow().setAlwaysOnTop(false); diff --git a/packages/client-api/src/providers/network/network-provider-types.ts b/packages/client-api/src/providers/network/network-provider-types.ts index 443e0034..85365117 100644 --- a/packages/client-api/src/providers/network/network-provider-types.ts +++ b/packages/client-api/src/providers/network/network-provider-types.ts @@ -43,24 +43,23 @@ export interface NetworkGateway { signalStrength: number | null; } -export enum InterfaceType { - UNKNOWN = 'unknown', - ETHERNET = 'ethernet', - TOKEN_RING = 'token_ring', - FDDI = 'fddi', - PPP = 'ppp', - LOOPBACK = 'loopback', - SLIP = 'slip', - ATM = 'atm', - GENERIC_MODEM = 'generic_modem', - ISDN = 'isdn', - WIFI = 'wifi', - DSL = 'dsl', - TUNNEL = 'tunnel', - HIGH_PERFORMANCE_SERIAL_BUS = 'high_performance_serial_bus', - MOBILE_BROADBAND = 'mobile_broadband', - BRIDGE = 'bridge', -} +export type InterfaceType = + | 'unknown' + | 'ethernet' + | 'token_ring' + | 'fddi' + | 'ppp' + | 'loopback' + | 'slip' + | 'atm' + | 'generic_modem' + | 'isdn' + | 'wifi' + | 'dsl' + | 'tunnel' + | 'high_performance_serial_bus' + | 'mobile_broadband' + | 'bridge'; export interface NetworkTraffic { received: NetworkTrafficMeasure; diff --git a/packages/client-api/src/providers/weather/weather-provider-types.ts b/packages/client-api/src/providers/weather/weather-provider-types.ts index d58bfe36..b472a61f 100644 --- a/packages/client-api/src/providers/weather/weather-provider-types.ts +++ b/packages/client-api/src/providers/weather/weather-provider-types.ts @@ -34,17 +34,16 @@ export interface WeatherOutput { windSpeed: number; } -export enum WeatherStatus { - CLEAR_DAY = 'clear_day', - CLEAR_NIGHT = 'clear_night', - CLOUDY_DAY = 'cloudy_day', - CLOUDY_NIGHT = 'cloudy_night', - LIGHT_RAIN_DAY = 'light_rain_day', - LIGHT_RAIN_NIGHT = 'light_rain_night', - HEAVY_RAIN_DAY = 'heavy_rain_day', - HEAVY_RAIN_NIGHT = 'heavy_rain_night', - SNOW_DAY = 'snow_day', - SNOW_NIGHT = 'snow_night', - THUNDER_DAY = 'thunder_day', - THUNDER_NIGHT = 'thunder_night', -} +export type WeatherStatus = + | 'clear_day' + | 'clear_night' + | 'cloudy_day' + | 'cloudy_night' + | 'light_rain_day' + | 'light_rain_night' + | 'heavy_rain_day' + | 'heavy_rain_night' + | 'snow_day' + | 'snow_night' + | 'thunder_day' + | 'thunder_night';