Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fixed call after chat stucking (and vice versa) [WTEL-4027] #70

Merged
merged 1 commit into from
Nov 7, 2023
Merged

fix: fixed call after chat stucking (and vice versa) [WTEL-4027] #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"portal-vue": "^1.5.1",
"uuid": "^8.3.2",
"vue": "^2.7.11",
"vue-fragment": "^1.6.0",
"vue-i18n": "^8.24.4",
"vue-tel-input": "^5.12.0",
"vue-transition-expand": "^0.1.0",
Expand Down
8 changes: 8 additions & 0 deletions src/app/components/wt-omni-widget.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
]"
>
<transition name="widget-appearance-transition">
<!--
I don't remember why there's a keep-alive,
but researching through https://my.webitel.com/browse/WTEL-4027,
i discovered, that, at least, keep-alive prevents chat components from creating new ws connections
(you can see this as: messages that are duplicated as many times as connection is reinitialized)

can't say for sure, if this keep-alive is a mistake, or not :(
-->
<keep-alive>
<wt-omni-widget-buttons-menu
v-if="!activeChannel"
Expand Down
10 changes: 6 additions & 4 deletions src/modules/call/components/wt-omni-widget-call-wrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<template>
<fragment>
<!--
why there's d: contents; and this weird wrapper?
see https://my.webitel.com/browse/WTEL-4027
-->
<div style="display: contents;">
<content-wrapper>
<component
:is="callView"
Expand All @@ -8,12 +12,11 @@
</content-wrapper>
<footer-wrapper>
</footer-wrapper>
</fragment>
</div>
</template>

<script>
import getNamespacedState from '@webitel/ui-sdk/src/store/helpers/getNamespacedState';
import { Fragment } from 'vue-fragment';
import { mapState } from 'vuex';
import SessionState from '../enums/SessionState.enum';
import ContentWrapper
Expand All @@ -27,7 +30,6 @@ import CallActive from './wt-omni-widget-call-active.vue';
export default {
name: 'wt-omni-widget-call-wrapper',
components: {
Fragment,
ContentWrapper,
FooterWrapper,
CallStart,
Expand Down
10 changes: 6 additions & 4 deletions src/modules/chat/components/wt-omni-widget-chat-wrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
<template>
<fragment>
<!--
why there's d: contents; and this weird wrapper?
see https://my.webitel.com/browse/WTEL-4027
-->
<div style="display: contents;">
<content-wrapper>
<chat-content :namespace="namespace"></chat-content>
</content-wrapper>
<footer-wrapper>
<chat-footer :namespace="namespace"></chat-footer>
</footer-wrapper>
</fragment>
</div>
</template>

<script>
import eventBus from '@webitel/ui-sdk/src/scripts/eventBus';
import { mapActions } from 'vuex';
import { Fragment } from 'vue-fragment';
import ContentWrapper
from '../../../app/components/wt-omni-widget-window/wt-omni-widget-window-content-wrapper/wt-omni-widget-window-content-wrapper.vue';
import FooterWrapper
Expand All @@ -30,7 +33,6 @@ export default {
FooterWrapper,
ChatContent,
ChatFooter,
Fragment,
},
props: {
namespace: {
Expand Down