{t('Common.No internet connection description')}
+ {t('Common.No internet connection description')} +
- {actionText} -
+ {actionText} +
{t('TopBar.Go to NethVoice CTI')}
- {label} -
{label}
{t('TopBar.Signed in as')}
+
+ {t('TopBar.Signed in as')} +
{truncate(account.data?.name, { length: 20 })}
{account.data?.endpoints.mainextension[0].id}
[{account.data?.default_device.type}]
- {t('TopBar.Shortcut title description')}{' '} -
+ {t('TopBar.Shortcut title description')}{' '} +
{t('TopBar.Shortcut subtitle description')}
+ {t('TopBar.Shortcut body description')} +
- {t('TopBar.Shortcut body description')} -
{callName} @@ -246,8 +252,12 @@ export function LastCall({
{t('Phonebook.Visibility')}
+ {t('Phonebook.Visibility')} +
{visibilityError}
+ {visibilityError} +
{t('Phonebook.Groups')}
+ {t('Phonebook.Groups')} +
{sharedGroupsError}
+ {sharedGroupsError} +
{t('Phonebook.Type')}
+ {t('Phonebook.Type')} +
{t('Phonebook.Add job title')}
{t('Phonebook.Add phone')}
{t('Phonebook.Add email')}
{t('Phonebook.Add field')}
{t('Common.Cancel')}
+ + {t('Common.Save')} {isLoading && ( - + )}
{t('Common.Save')}
{t('Phonebook.Details')}
- {t(`SpeedDial.${type}`)} -
+ {t(`SpeedDial.${type}`)} +
{t('SpeedDial.Speed dial delete message', { - deletingName: truncate(selectedSpeedDial?.name || '', 30) + deletingName: truncate(selectedSpeedDial?.name || '', 30), })}
+ + {selectedSpeedDial ? t('Common.Edit') : t('SpeedDial.Create')} {isLoading && ( )} diff --git a/src/renderer/src/components/Modules/NethVoice/Speeddials/SpeedDials/SpeedDialsBox.tsx b/src/renderer/src/components/Modules/NethVoice/Speeddials/SpeedDials/SpeedDialsBox.tsx index 896e3d3a..f9c89ee9 100644 --- a/src/renderer/src/components/Modules/NethVoice/Speeddials/SpeedDials/SpeedDialsBox.tsx +++ b/src/renderer/src/components/Modules/NethVoice/Speeddials/SpeedDials/SpeedDialsBox.tsx @@ -1,6 +1,6 @@ import { faCirclePlus as AddSpeedDialIcon, - faBolt as SpeedDialIcon + faBolt as SpeedDialIcon, } from '@fortawesome/free-solid-svg-icons' import { ContactType } from '@shared/types' import { t } from 'i18next' @@ -11,7 +11,10 @@ import { ModuleTitle } from '@renderer/components/ModuleTitle' import { ContactNumber } from '../shared/ContactNumber' import { EmptyList } from '@renderer/components/EmptyList' -export function SpeedDialsBox({ showSpeedDialForm, showDeleteSpeedDialDialog }): JSX.Element { +export function SpeedDialsBox({ + showSpeedDialForm, + showDeleteSpeedDialDialog, +}): JSX.Element { const speedDialModule = useSpeedDialsModule() const { speedDials } = speedDialModule const [, setSelectedSpeedDial] = speedDialModule.speedDialsState @@ -39,13 +42,16 @@ export function SpeedDialsBox({ showSpeedDialForm, showDeleteSpeedDialDialog }): actionIcon={AddSpeedDialIcon} actionText={t('SpeedDial.Create')} /> - + {speedDials ? ( speedDials.length > 0 ? ( speedDials?.map((e, idx) => { return ( - - + + @@ -54,7 +60,11 @@ export function SpeedDialsBox({ showSpeedDialForm, showDeleteSpeedDialDialog }): handleEditSpeedDial={handleEditSpeedDial} handleDeleteSpeedDial={handleDeleteSpeedDial} isFavouritePage={false} - isLastItem={speedDials.length === 1 ? false : idx === speedDials.length - 1} + isLastItem={ + speedDials.length === 1 + ? false + : idx === speedDials.length - 1 + } /> @@ -62,7 +72,10 @@ export function SpeedDialsBox({ showSpeedDialForm, showDeleteSpeedDialDialog }): ) }) ) : ( - + ) ) : ( Array(3) diff --git a/src/renderer/src/components/Modules/NethVoice/Speeddials/SpeedDials/SpeeddialsModule.tsx b/src/renderer/src/components/Modules/NethVoice/Speeddials/SpeedDials/SpeeddialsModule.tsx index 47c4e02c..f33692fc 100644 --- a/src/renderer/src/components/Modules/NethVoice/Speeddials/SpeedDials/SpeeddialsModule.tsx +++ b/src/renderer/src/components/Modules/NethVoice/Speeddials/SpeedDials/SpeeddialsModule.tsx @@ -1,41 +1,42 @@ -import { SpeedDialsBox } from "./SpeedDialsBox" -import { useEffect, useState } from "react" -import { SpeedDialFormBox } from "./SpeedDialFormBox" -import { SpeedDialDeleteDialog } from "./SpeedDialDeleteDialog" -import { useSpeedDialsModule } from "../hook/useSpeedDialsModule" - +import { SpeedDialsBox } from './SpeedDialsBox' +import { useEffect, useState } from 'react' +import { SpeedDialFormBox } from './SpeedDialFormBox' +import { SpeedDialDeleteDialog } from './SpeedDialDeleteDialog' +import { useSpeedDialsModule } from '../hook/useSpeedDialsModule' export const SpeeddialsModule = () => { - const speedDialModule = useSpeedDialsModule() const [, setSelectedSpeedDial] = speedDialModule.speedDialsState const [isSpeedDialFormOpen, setSpeedDialFormOpen] = useState(false) - const [isDeleteSpeedDialDialogOpen, setDeleteSpeedDialDialogOpen] = useState(false) + const [isDeleteSpeedDialDialogOpen, setDeleteSpeedDialDialogOpen] = + useState(false) return ( <> - {!(isSpeedDialFormOpen || isDeleteSpeedDialDialogOpen) && setSpeedDialFormOpen(true)} - showDeleteSpeedDialDialog={() => setDeleteSpeedDialDialogOpen(true)} - /> - } - - - {isSpeedDialFormOpen && { - setSelectedSpeedDial(undefined) - setSpeedDialFormOpen(false) - }} - /> - } - - {isDeleteSpeedDialDialogOpen && { - setSelectedSpeedDial(undefined) - setDeleteSpeedDialDialogOpen(false) - }} - />} - + {!(isSpeedDialFormOpen || isDeleteSpeedDialDialogOpen) && ( + setSpeedDialFormOpen(true)} + showDeleteSpeedDialDialog={() => setDeleteSpeedDialDialogOpen(true)} + /> + )} + + {isSpeedDialFormOpen && ( + { + setSelectedSpeedDial(undefined) + setSpeedDialFormOpen(false) + }} + /> + )} + + {isDeleteSpeedDialDialogOpen && ( + { + setSelectedSpeedDial(undefined) + setDeleteSpeedDialDialogOpen(false) + }} + /> + )} ) } diff --git a/src/renderer/src/components/Modules/NethVoice/Speeddials/hook/useFavouriteModule.ts b/src/renderer/src/components/Modules/NethVoice/Speeddials/hook/useFavouriteModule.ts index 8268bfc4..ebdd7ff5 100644 --- a/src/renderer/src/components/Modules/NethVoice/Speeddials/hook/useFavouriteModule.ts +++ b/src/renderer/src/components/Modules/NethVoice/Speeddials/hook/useFavouriteModule.ts @@ -1,43 +1,58 @@ -import { useNethlinkData } from "@renderer/store" -import { ContactType, SearchData } from "@shared/types" -import { useEffect, useState } from "react" -import { debouncer } from "@shared/utils/utils" -import { useLoggedNethVoiceAPI } from "@renderer/hooks/useLoggedNethVoiceAPI" -import { FilterTypes, SpeeddialTypes } from "@shared/constants" -import { Log } from "@shared/utils/logger" +import { useNethlinkData } from '@renderer/store' +import { ContactType, SearchData } from '@shared/types' +import { useEffect, useState } from 'react' +import { debouncer } from '@shared/utils/utils' +import { useLoggedNethVoiceAPI } from '@renderer/hooks/useLoggedNethVoiceAPI' +import { FilterTypes, SpeeddialTypes } from '@shared/constants' +import { Log } from '@shared/utils/logger' export const useFavouriteModule = () => { const [speeddialsModule] = useNethlinkData('speeddialsModule') const [rawSpeedDials, setRawSpeedDials] = useNethlinkData('speeddials') const [operators] = useNethlinkData('operators') - const [favourites, setFavourites] = useState(undefined) + const [favourites, setFavourites] = useState( + undefined, + ) const { NethVoiceAPI } = useLoggedNethVoiceAPI() const getUsernameFromContact = (contact: ContactType): string | undefined => { const extension = contact.speeddial_num || '' - const usernameFromExtension = extension ? operators?.extensions?.[extension]?.username : undefined + const usernameFromExtension = extension + ? operators?.extensions?.[extension]?.username + : undefined return usernameFromExtension || contact.name || undefined } useEffect(() => { - rawSpeedDials && filterFavourites(rawSpeedDials, speeddialsModule?.favouriteOrder || FilterTypes.AZ) + rawSpeedDials && + filterFavourites( + rawSpeedDials, + speeddialsModule?.favouriteOrder || FilterTypes.AZ, + ) }, [rawSpeedDials, speeddialsModule?.favouriteOrder, operators]) const getSorter = (order: FilterTypes) => { - let sorter: ((a: ContactType, b: ContactType) => number) | undefined = undefined + let sorter: ((a: ContactType, b: ContactType) => number) | undefined = + undefined switch (order) { case FilterTypes.ZA: - sorter = (a: ContactType, b: ContactType) => (a.name || '') < (b.name || '') ? 1 : -1 - break; + sorter = (a: ContactType, b: ContactType) => + (a.name || '') < (b.name || '') ? 1 : -1 + break case FilterTypes.EXT: - sorter = (a: ContactType, b: ContactType) => (a.speeddial_num || '') > (b.speeddial_num || '') ? 1 : -1 - break; + sorter = (a: ContactType, b: ContactType) => + (a.speeddial_num || '') > (b.speeddial_num || '') ? 1 : -1 + break default: - sorter = (a: ContactType, b: ContactType) => (a.name || '') > (b.name || '') ? 1 : -1 - break; + sorter = (a: ContactType, b: ContactType) => + (a.name || '') > (b.name || '') ? 1 : -1 + break } return sorter } - const filterFavourites = (rawSpeeddials: ContactType[], order: FilterTypes) => { + const filterFavourites = ( + rawSpeeddials: ContactType[], + order: FilterTypes, + ) => { const favourites = rawSpeeddials .filter(isFavourite) .filter(isActiveOperator) @@ -57,13 +72,15 @@ export const useFavouriteModule = () => { const username = getUsernameFromContact(contact) if (!username) return false // Check if the contact's username exists in any operator group - return Object.values(operators.groups).some(group => - group.users.includes(username) + return Object.values(operators.groups).some((group) => + group.users.includes(username), ) } const isSearchAlsoAFavourite = (contact: SearchData) => { - const foundedContact = favourites?.find((s) => s.speeddial_num === (contact.speeddial_num || contact.extension)) + const foundedContact = favourites?.find( + (s) => s.speeddial_num === (contact.speeddial_num || contact.extension), + ) if (foundedContact) { return isFavourite(foundedContact) } @@ -77,53 +94,63 @@ export const useFavouriteModule = () => { } function toggleFavourite(contact: ContactType) { - debouncer(`toggleFavourite-${contact.id}`, async () => { - const extension = contact.speeddial_num || '' - const favouriteSpeedDial = extension - ? favourites?.find((s) => s.speeddial_num === extension) - : favourites?.find((s) => s.id === contact.id) + debouncer( + `toggleFavourite-${contact.id}`, + async () => { + const extension = contact.speeddial_num || '' + const favouriteSpeedDial = extension + ? favourites?.find((s) => s.speeddial_num === extension) + : favourites?.find((s) => s.id === contact.id) - if (!favouriteSpeedDial) { - //if I am creating a favourite it means that I am from speeddial. in speeddial the username is saved in name - const username = getUsernameFromContact(contact) - const operator = username && operators?.operators[username] - if (operator) - await NethVoiceAPI.Phonebook.createFavourite(operator) - } else { - //if I am deleting favourite then I am in favourite, I can use the id directly - await NethVoiceAPI.Phonebook.deleteSpeeddial({ id: `${favouriteSpeedDial.id!}` }) - } - const updatedSpeedDials = await NethVoiceAPI.Phonebook.getSpeeddials() - setRawSpeedDials(() => updatedSpeedDials) - }, 100) + if (!favouriteSpeedDial) { + // if I am creating a favourite it means that I am from speeddial. in speeddial the username is saved in name + const username = getUsernameFromContact(contact) + const operator = username && operators?.operators[username] + if (operator) await NethVoiceAPI.Phonebook.createFavourite(operator) + } else { + // if I am deleting favourite then I am in favourite, I can use the id directly + await NethVoiceAPI.Phonebook.deleteSpeeddial({ + id: `${favouriteSpeedDial.id!}`, + }) + } + const updatedSpeedDials = await NethVoiceAPI.Phonebook.getSpeeddials() + setRawSpeedDials(() => updatedSpeedDials) + }, + 100, + ) } function toggleFavouriteFromSearch(contact: SearchData) { - debouncer(`toggleFavourite-${contact.id}`, async () => { - const speedDial = favourites?.find((s) => s.speeddial_num === (contact.speeddial_num || contact.extension)) - if (!speedDial) { - //I am creating the favourite from the search so I find the username directly in searchData - const username = contact.username - const operator = username && operators?.operators[username] - if (operator) - await NethVoiceAPI.Phonebook.createFavourite(operator) - } else { - await NethVoiceAPI.Phonebook.deleteSpeeddial({ id: `${speedDial.id!}` }) - } - const updatedSpeedDials = await NethVoiceAPI.Phonebook.getSpeeddials() - setRawSpeedDials(() => updatedSpeedDials) - }, 100) + debouncer( + `toggleFavourite-${contact.id}`, + async () => { + const speedDial = favourites?.find( + (s) => + s.speeddial_num === (contact.speeddial_num || contact.extension), + ) + if (!speedDial) { + // I am creating the favourite from the search so I find the username directly in searchData + const username = contact.username + const operator = username && operators?.operators[username] + if (operator) await NethVoiceAPI.Phonebook.createFavourite(operator) + } else { + await NethVoiceAPI.Phonebook.deleteSpeeddial({ + id: `${speedDial.id!}`, + }) + } + const updatedSpeedDials = await NethVoiceAPI.Phonebook.getSpeeddials() + setRawSpeedDials(() => updatedSpeedDials) + }, + 100, + ) } - return { favourites, toggleFavourite, isFavourite, isSpeedDialAlsoAFavourite, isSearchAlsoAFavourite, - toggleFavouriteFromSearch + toggleFavouriteFromSearch, } } - - diff --git a/src/renderer/src/components/Modules/NethVoice/Speeddials/hook/useSpeedDialsModule.ts b/src/renderer/src/components/Modules/NethVoice/Speeddials/hook/useSpeedDialsModule.ts index ad6919db..cb94f1b4 100644 --- a/src/renderer/src/components/Modules/NethVoice/Speeddials/hook/useSpeedDialsModule.ts +++ b/src/renderer/src/components/Modules/NethVoice/Speeddials/hook/useSpeedDialsModule.ts @@ -1,26 +1,37 @@ -import { useLoggedNethVoiceAPI } from "@renderer/hooks/useLoggedNethVoiceAPI" -import { useNethlinkData, useSharedState } from "@renderer/store" -import { SpeeddialTypes } from "@shared/constants" -import { ContactType, NewContactType, NewSpeedDialType, SpeedDialModuleData, StateType } from "@shared/types" -import { useEffect, useState } from "react" +import { useLoggedNethVoiceAPI } from '@renderer/hooks/useLoggedNethVoiceAPI' +import { useNethlinkData, useSharedState } from '@renderer/store' +import { SpeeddialTypes } from '@shared/constants' +import { + ContactType, + NewContactType, + NewSpeedDialType, + SpeedDialModuleData, + StateType, +} from '@shared/types' +import { useEffect, useState } from 'react' export const useSpeedDialsModule = (): { - speedDials: ContactType[] | undefined, - speedDialsState: StateType, - favouriteState: StateType, + speedDials: ContactType[] | undefined + speedDialsState: StateType + favouriteState: StateType deleteSpeedDial: (speedDial: ContactType) => Promise upsertSpeedDial(data: ContactType): Promise } => { - const [speeddialsModule, setSpeeddialsModule] = useNethlinkData('speeddialsModule') + const [speeddialsModule, setSpeeddialsModule] = + useNethlinkData('speeddialsModule') const [rawSpeedDials, setRawSpeedDials] = useNethlinkData('speeddials') - const [speedDials, setSpeedDials] = useState(undefined) + const [speedDials, setSpeedDials] = useState
{selectedSpeedDial ? t('Common.Edit') : t('SpeedDial.Create')}