Skip to content

Commit 57af8b3

Browse files
authored
Merge pull request buerokratt#733 from baha-a/fix-new-findings-3
Fixes and enhancements in the header part
2 parents 58121fa + e6df40c commit 57af8b3

File tree

8 files changed

+7
-25
lines changed

8 files changed

+7
-25
lines changed

GUI/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prettier": "prettier --write \"{,!(node_modules)/**/}*.{ts,tsx,js,json,css,less,scss}\""
1212
},
1313
"dependencies": {
14-
"@buerokratt-ria/header": "^0.1.6",
14+
"@buerokratt-ria/header": "^0.1.9",
1515
"@buerokratt-ria/menu": "^0.1.16",
1616
"@buerokratt-ria/styles": "^0.0.1",
1717
"@fontsource/roboto": "^4.5.8",

GUI/src/components/Chat/index.tsx

+1-16
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { AUTHOR_ROLES, MESSAGE_FILE_SIZE_LIMIT, ROLES } from 'utils/constants';
1818
import { AxiosError } from 'axios';
1919
import { useToast } from 'hooks/useToast';
2020
import useStore from 'store';
21-
import useHeaderStore from '@buerokratt-ria/header/src/header/store/store';
21+
import { userStore as useHeaderStore } from '@buerokratt-ria/header';
2222
import sse from '../../services/sse-service';
2323
import { useNavigate } from 'react-router-dom';
2424
import PreviewMessage from './PreviewMessage';
@@ -76,24 +76,9 @@ const Chat: FC<ChatProps> = ({
7676
const [previewTypingMessage, setPreviewTypingMessage] = useState<Message>();
7777

7878
useEffect(() => {
79-
getCsaStatus();
8079
getMessages();
8180
}, []);
8281

83-
const getCsaStatus = async () => {
84-
const { data: res } = await apiDev.post(
85-
'accounts/customer-support-activity-by-id',
86-
{
87-
customerSupportId: userInfo?.idCode ?? '',
88-
}
89-
);
90-
useHeaderStore
91-
.getState()
92-
.setChatCsaActive(
93-
res.response.status === 'online' || res.response.status === 'idle'
94-
);
95-
};
96-
9782
useEffect(() => {
9883
const onMessage = async (res: any) => {
9984
if (res === 'preview') {

GUI/src/hooks/useAudio.tsx

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ export const useAudio = (audiosrc: string) => {
99
useEffect(() => {
1010
const howl = new Howl({
1111
src: audiosrc,
12-
onloaderror: (soundId, error) => console.error(soundId, error),
13-
onplayerror: (soundId, error) => {
14-
console.error(soundId, error);
15-
howl.once('unlock', () => howl.play());
16-
},
1712
});
1813

1914
setAudio(howl);

GUI/src/pages/Chat/ChatActive/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useQuery } from '@tanstack/react-query';
55
import { Chat, Dialog, Button, FormRadios, Track } from 'components';
66
import { Chat as ChatType, CHAT_EVENTS, CHAT_STATUS } from 'types/chat';
77
import useStore from 'store';
8-
import useHeaderStore from '@buerokratt-ria/header/src/header/store/store';
8+
import { userStore as useHeaderStore } from '@buerokratt-ria/header';
99
import { User } from 'types/user';
1010
import { useToast } from 'hooks/useToast';
1111
import apiDev from 'services/api-dev';

GUI/src/pages/Chat/ChatPending/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import ForwardToEstablishmentModal from '../ForwardToEstablishmentModal';
1515
import sse from 'services/sse-service';
1616
import { v4 as uuidv4 } from 'uuid';
1717
import './ChatPending.scss';
18-
import useHeaderStore from '@buerokratt-ria/header/src/header/store/store';
18+
import { userStore as useHeaderStore } from '@buerokratt-ria/header';
1919
import useStore from 'store';
2020
import withAuthorization from 'hoc/with-authorization';
2121
import { ROLES } from 'utils/constants';

GUI/src/pages/Chat/ChatUnanswered/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useQuery } from '@tanstack/react-query';
55

66
import { Chat, Dialog, Button, FormRadios } from 'components';
77
import { CHAT_EVENTS, CHAT_STATUS, Chat as ChatType } from 'types/chat';
8-
import useHeaderStore from '@buerokratt-ria/header/src/header/store/store';
8+
import { userStore as useHeaderStore } from '@buerokratt-ria/header';
99
import useStore from 'store';
1010
import { User } from 'types/user';
1111
import { useToast } from 'hooks/useToast';

GUI/translations/en/common.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"search": "Search",
1414
"notification": "Notification",
1515
"notificationError": "Error",
16+
"notificationErrorMsg": "An error occurred",
1617
"active": "Active",
1718
"activate": "Activate",
1819
"deactivate": "Deactivate",

GUI/translations/et/common.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"search": "Otsi",
1414
"notification": "Teade",
1515
"notificationError": "Veateade",
16+
"notificationErrorMsg": "Midagi läks valesti",
1617
"active": "Aktiivne",
1718
"activate": "Aktiveeri",
1819
"deactivate": "Deaktiveeri",

0 commit comments

Comments
 (0)