Revert "Restore BBB free conference banner but change copy" fixes VICE-818
This reverts commit 6134d5d225.
Test Plan
1. Open Canvas
2. Navigate to a source with conferencing enabled (Only works with free tier)
Expected: Should not see the BBB banner
Actual: Sees the BBB banner before this change
Change-Id: I60f8a12755cf023fb91e5726d1abf92bd708fec9
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/248303
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
This commit is contained in:
Jeffrey Johnson
parent
205267f296
commit
fb4e54ffb6
|
|
@ -295,8 +295,7 @@ class ConferencesController < ApplicationController
|
|||
conference_type_details: conference_types_json(WebConference.conference_types(@context)),
|
||||
users: @users.map { |u| {:id => u.id, :name => u.last_name_first} },
|
||||
can_create_conferences: @context.grants_right?(@current_user, session, :create_conferences),
|
||||
render_alternatives: @render_alternatives,
|
||||
current_account_name: @context.root_account.name
|
||||
render_alternatives: @render_alternatives
|
||||
)
|
||||
set_tutorial_js_env
|
||||
flash[:error] = t('Some conferences on this page are hidden because of errors while retrieving their status') if @errors
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ import Conference from 'compiled/models/Conference'
|
|||
import ConferenceView from 'compiled/views/conferences/ConferenceView'
|
||||
import ConcludedConferenceView from 'compiled/views/conferences/ConcludedConferenceView'
|
||||
import EditConferenceView from 'compiled/views/conferences/EditConferenceView'
|
||||
import renderBigBlueButtonAlert from '../conferences/renderBigBlueButtonAlert'
|
||||
import 'jquery.ajaxJSON'
|
||||
import 'jquery.instructure_forms'
|
||||
import 'jqueryui/dialog'
|
||||
|
|
@ -38,12 +37,9 @@ import 'jquery.templateData'
|
|||
import 'jquery.instructure_date_and_time'
|
||||
import renderConferenceAlternatives from '../conferences/renderAlternatives'
|
||||
|
||||
const bbbSettings = ENV.conference_type_details.find(d => d.type === 'BigBlueButton')
|
||||
if (ENV.can_create_conferences) {
|
||||
if (ENV.render_alternatives) {
|
||||
renderConferenceAlternatives()
|
||||
} else if (bbbSettings?.free_trial) {
|
||||
renderBigBlueButtonAlert()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2020 - present Instructure, Inc.
|
||||
*
|
||||
* This file is part of Canvas.
|
||||
*
|
||||
* Canvas is free software: you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Affero General Public License as published by the Free
|
||||
* Software Foundation, version 3 of the License.
|
||||
*
|
||||
* Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
* A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License along
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import React from 'react'
|
||||
import {render} from 'react-dom'
|
||||
import {Alert} from '@instructure/ui-alerts'
|
||||
import {View} from '@instructure/ui-view'
|
||||
import {ApplyTheme} from '@instructure/ui-themeable'
|
||||
import I18n from 'i18n!conferences_renderBigBlueButton'
|
||||
|
||||
const theme = {
|
||||
[Alert.theme]: {
|
||||
boxShadow: 'none'
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
[Account name] is using a free version of BigBlueButton that provides 10 concurrent video conferences, each with 1 host and up to 24 attendees. Recordings are stored for 7 days.
|
||||
|
||||
Dramatic increases in usage of free BigBlueButton may cause performance issues.
|
||||
|
||||
A premium version of BigBlueButton is available that offers concurrent conferences based on purchased amount (each with 1 host and up to 99 attendees), no recorded storage limitations, and dedicated infrastructure for better performance.
|
||||
|
||||
In the event that BigBlueButton is unable to meet your current or future needs, Canvas also partners with Zoom, Google Meet, Microsoft Teams, as well as other video conferencing tools.
|
||||
|
||||
Please contact your LMS Administrator for more details.
|
||||
*/
|
||||
|
||||
function BigBlueButtonAlert() {
|
||||
return (
|
||||
<ApplyTheme theme={theme}>
|
||||
<Alert margin="none none medium none" renderCloseButtonLabel={I18n.t('Close')} variant="info">
|
||||
<View as="div">
|
||||
{ENV.current_account_name +
|
||||
I18n.t(
|
||||
' is using a free version of BigBlueButton that provides 10 concurrent video conferences, each with 1 host and up to 24 attendees. Recordings are stored for 7 days.'
|
||||
)}
|
||||
</View>
|
||||
<View as="div" padding="small none none none">
|
||||
{I18n.t(
|
||||
'Dramatic increases in usage of free BigBlueButton may cause performance issues.'
|
||||
)}
|
||||
</View>
|
||||
<View as="div" padding="small none none none">
|
||||
{I18n.t(
|
||||
'A premium version of BigBlueButton is available that offers concurrent conferences based on purchased amount (each with 1 host and up to 99 attendees), no recorded storage limitations, and dedicated infrastructure for better performance.'
|
||||
)}
|
||||
</View>
|
||||
<View as="div" padding="small none none none">
|
||||
{I18n.t(
|
||||
'In the event that BigBlueButton is unable to meet your current or future needs, Canvas also partners with Zoom, Google Meet, Microsoft Teams, as well as other video conferencing tools.'
|
||||
)}
|
||||
</View>
|
||||
<View as="div" padding="small none none none">
|
||||
{I18n.t('Please contact your LMS Administrator for more details.')}
|
||||
</View>
|
||||
</Alert>
|
||||
</ApplyTheme>
|
||||
)
|
||||
}
|
||||
|
||||
export default function renderBigBlueButtonAlert() {
|
||||
const $container = document.getElementById('big-blue-button-message-container')
|
||||
render(<BigBlueButtonAlert />, $container)
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2020 - present Instructure, Inc.
|
||||
*
|
||||
* This file is part of Canvas.
|
||||
*
|
||||
* Canvas is free software: you can redistribute it and/or modify it under
|
||||
* the terms of the GNU Affero General Public License as published by the Free
|
||||
* Software Foundation, version 3 of the License.
|
||||
*
|
||||
* Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
* A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License along
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import renderBigBlueButtonAlert from 'jsx/conferences/renderBigBlueButtonAlert'
|
||||
|
||||
QUnit.module('Conferences > .renderBigBlueButtonAlert()', () => {
|
||||
test('renders the alert into the container', () => {
|
||||
const $container = document.body.appendChild(document.createElement('div'))
|
||||
$container.id = 'big-blue-button-message-container'
|
||||
renderBigBlueButtonAlert()
|
||||
strictEqual($container.children.length, 1)
|
||||
})
|
||||
})
|
||||
Loading…
Reference in New Issue