TT#74610 Conferencing: As a Customer, I want to see an info text whether the RTCEngine is disabled or not

Change-Id: I8d91d9c879d51f53cd2ce48ae3b55e2cb16ffcca
changes/17/37017/1
Hans-Peter Herzog 6 years ago
parent df1943c466
commit ab05c70bcf

@ -34,6 +34,7 @@
:is-media-enabled="isMediaEnabled" :is-media-enabled="isMediaEnabled"
:is-joining="isJoining" :is-joining="isJoining"
:is-joined="isJoined" :is-joined="isJoined"
:has-rtc-engine-capability-enabled="hasRtcEngineCapabilityEnabled"
@join="join" @join="join"
/> />
<csc-conference-joined <csc-conference-joined
@ -86,7 +87,7 @@
icon="mic" icon="mic"
round round
@click="toggleMicrophone()" @click="toggleMicrophone()"
:disable="!hasConferenceId || isJoining" :disable="!hasConferenceId || isJoining || !hasRtcEngineCapabilityEnabled"
/> />
<q-btn <q-btn
class="csc-conf-button" class="csc-conf-button"
@ -94,7 +95,7 @@
icon="videocam" icon="videocam"
round round
@click="toggleCamera()" @click="toggleCamera()"
:disable="!hasConferenceId || isJoining" :disable="!hasConferenceId || isJoining || !hasRtcEngineCapabilityEnabled"
/> />
<q-btn <q-btn
class="csc-conf-button" class="csc-conf-button"
@ -102,7 +103,7 @@
icon="computer" icon="computer"
round round
@click="toggleScreen()" @click="toggleScreen()"
:disable="!hasConferenceId || isJoining" :disable="!hasConferenceId || isJoining || !hasRtcEngineCapabilityEnabled"
/> />
<q-btn <q-btn
v-if="isJoined" v-if="isJoined"
@ -110,7 +111,7 @@
:color="screenButtonColor" :color="screenButtonColor"
icon="more_vert" icon="more_vert"
round round
:disable="!hasConferenceId || isJoining" :disable="!hasConferenceId || isJoining || !hasRtcEngineCapabilityEnabled"
> >
<q-popover <q-popover
ref="popover" ref="popover"
@ -163,7 +164,8 @@
QPopover, QPopover,
QList, QList,
QItem, QItem,
QItemMain QItemMain,
QAlert
} from 'quasar-framework' } from 'quasar-framework'
import CscConfirmDialog from "../CscConfirmationDialog"; import CscConfirmDialog from "../CscConfirmationDialog";
export default { export default {
@ -191,9 +193,13 @@
QPopover, QPopover,
QList, QList,
QItem, QItem,
QItemMain QItemMain,
QAlert
}, },
computed: { computed: {
...mapGetters('call', [
'hasRtcEngineCapabilityEnabled'
]),
...mapState('conference',[ ...mapState('conference',[
'selectedParticipant' 'selectedParticipant'
]), ]),

@ -6,6 +6,15 @@
id="csc-conf-join-content" id="csc-conf-join-content"
:class="contentClasses" :class="contentClasses"
> >
<q-alert
v-if="!hasRtcEngineCapabilityEnabled"
class="csc-inline-alert csc-conf-alert"
appear
icon="info"
color="info"
>
{{ $t('call.rtcEngineNotEnabledConferencing') }}
</q-alert>
<p <p
id="csc-conf-join-text" id="csc-conf-join-text"
>{{ $t('conferencing.joinText') }}</p> >{{ $t('conferencing.joinText') }}</p>
@ -17,10 +26,10 @@
:placeholder="$t('conferencing.idPlaceholder')" :placeholder="$t('conferencing.idPlaceholder')"
align="left" align="left"
@change="conferenceIdChanged" @change="conferenceIdChanged"
:disable="isJoining" :disable="isJoining || !hasRtcEngineCapabilityEnabled"
> >
<q-btn <q-btn
:disable="!hasConferenceId || isJoining" :disable="!hasConferenceId || isJoining || !hasRtcEngineCapabilityEnabled"
:color="shareButtonColor" :color="shareButtonColor"
flat flat
icon="link" icon="link"
@ -30,7 +39,7 @@
<q-btn <q-btn
class="csc-button" class="csc-button"
:color="joinButtonColor" :color="joinButtonColor"
:disable="!hasConferenceId || isJoining" :disable="!hasConferenceId || isJoining || !hasRtcEngineCapabilityEnableds"
icon="call" icon="call"
round round
@click="join" @click="join"
@ -53,7 +62,8 @@
} from '../../../helpers/math-helper' } from '../../../helpers/math-helper'
import { import {
QBtn, QBtn,
QInput QInput,
QAlert
} from 'quasar-framework' } from 'quasar-framework'
import CscShareConferenceDialog from "./CscShareConferenceDialog"; import CscShareConferenceDialog from "./CscShareConferenceDialog";
import CscObjectSpinner from "../../CscObjectSpinner"; import CscObjectSpinner from "../../CscObjectSpinner";
@ -73,14 +83,16 @@
'isCameraEnabled', 'isCameraEnabled',
'isScreenEnabled', 'isScreenEnabled',
'isJoining', 'isJoining',
'isJoined' 'isJoined',
'hasRtcEngineCapabilityEnabled'
], ],
components: { components: {
CscObjectSpinner, CscObjectSpinner,
CscShareConferenceDialog, CscShareConferenceDialog,
QBtn, QBtn,
QInput, QInput,
CscMedia CscMedia,
QAlert
}, },
mounted() { mounted() {
if(!this.conferenceId){ if(!this.conferenceId){
@ -148,6 +160,8 @@
<style lang="stylus" rel="stylesheet/stylus"> <style lang="stylus" rel="stylesheet/stylus">
@import '../../../themes/app.common.styl' @import '../../../themes/app.common.styl'
.csc-conf-alert
margin-bottom $flex-gutter-md
#csc-conf-link-input #csc-conf-link-input
margin-bottom $flex-gutter-md margin-bottom $flex-gutter-md
#csc-conf-join-text #csc-conf-join-text

@ -350,7 +350,8 @@
"notificationFailed": "Could not enable incoming call notifications.", "notificationFailed": "Could not enable incoming call notifications.",
"notificationNotSupported": "Incoming call notifications are not supported.", "notificationNotSupported": "Incoming call notifications are not supported.",
"desktopSharingNotInstalled": "Desktop sharing extension for chrome is not installed.", "desktopSharingNotInstalled": "Desktop sharing extension for chrome is not installed.",
"rtcEngineNotEnabled": "You can neither make a call nor receive one because the RTC:engine is not active. If you operate a C5 CE then first upgrade to a C5 PRO to be able to use the RTC:engine." "rtcEngineNotEnabled": "You can neither make a call nor receive one, since the RTC:engine is not active. If you operate a C5 CE then first upgrade to a C5 PRO to be able to use the RTC:engine.",
"rtcEngineNotEnabledConferencing": "You can not join a conference, since the RTC:engine is not active. If you operate a C5 CE then first upgrade to a C5 PRO to be able to use the RTC:engine."
}, },
"pbxConfig": { "pbxConfig": {
"seat": "Seat", "seat": "Seat",

Loading…
Cancel
Save