diff --git a/src/components/SettingsHeader.tsx b/src/components/SettingsHeader.tsx index fea40c8..e5f7be7 100644 --- a/src/components/SettingsHeader.tsx +++ b/src/components/SettingsHeader.tsx @@ -178,7 +178,7 @@ export function SettingsHeader({ ) } /> - {setSortBy !== undefined && ( + {setSortBy !== undefined && !disabled && ( @@ -271,7 +271,7 @@ export function SettingsHeader({ )} )} - {setDragging && ( + {setDragging && sortBy === 'Custom' && ( a.clientName .toLowerCase() @@ -57,7 +57,7 @@ export function GuacamoleClients() { .toLowerCase() .includes((debouncedSearch as string).toLowerCase()), ) - .sort((a: GuacamoleClient, b: GuacamoleClient) => { + ?.sort((a: GuacamoleClient, b: GuacamoleClient) => { switch (settings.guacamoleClientsSettingsSort) { case 'A>Z': return a.clientName.toLocaleLowerCase() > b.clientName.toLocaleLowerCase() diff --git a/src/pages/settings/components/Search/SearchProviders.tsx b/src/pages/settings/components/Search/SearchProviders.tsx index 607f2dc..7f74d59 100644 --- a/src/pages/settings/components/Search/SearchProviders.tsx +++ b/src/pages/settings/components/Search/SearchProviders.tsx @@ -63,13 +63,13 @@ export function SearchProviders() { const [debouncedSearch] = useDebouncedValue(searchValue, 500); const providers: Provider[] = providerData - .filter( + ?.filter( (a: Provider) => a.name.toLowerCase().includes((debouncedSearch as string).toLowerCase()) || a.url.toLowerCase().includes((debouncedSearch as string).toLowerCase()) || a.prefix.toLowerCase().includes((debouncedSearch as string).toLowerCase()), ) - .sort((a: Provider, b: Provider) => { + ?.sort((a: Provider, b: Provider) => { switch (settings.providerSettingsSort) { case 'A>Z': return a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase() ? 1 : -1; diff --git a/src/pages/settings/components/WoL/WolClients.tsx b/src/pages/settings/components/WoL/WolClients.tsx index 1131bc7..cd37f70 100644 --- a/src/pages/settings/components/WoL/WolClients.tsx +++ b/src/pages/settings/components/WoL/WolClients.tsx @@ -43,12 +43,12 @@ export function WolClients() { const [debouncedSearch] = useDebouncedValue(searchValue, 500); const wolClients: WolClient[] = wolClientsData - .filter( + ?.filter( (a: WolClient) => a.hostname.toLowerCase().includes((debouncedSearch as string).toLowerCase()) || a.macAddress.toLowerCase().includes((debouncedSearch as string).toLowerCase()), ) - .sort((a: WolClient, b: WolClient) => { + ?.sort((a: WolClient, b: WolClient) => { switch (settings.wolClientsSettingsSort) { case 'A>Z': return a.hostname.toLocaleLowerCase() > b.hostname.toLocaleLowerCase()