Skip to content

Commit

Permalink
Remove Recording Feature Menu Item when unsupported (#7604)
Browse files Browse the repository at this point in the history
  • Loading branch information
kmcgrady committed Oct 26, 2023
1 parent 25e53c1 commit 07d8ea2
Show file tree
Hide file tree
Showing 16 changed files with 43 additions and 101 deletions.
76 changes: 0 additions & 76 deletions e2e/specs/st_main_menu.spec.js

This file was deleted.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
24 changes: 24 additions & 0 deletions e2e_playwright/main_menu_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from playwright.sync_api import Page, expect

from e2e_playwright.conftest import ImageCompareFunction


def test_main_menu_images(themed_app: Page, assert_snapshot: ImageCompareFunction):
themed_app.get_by_test_id("stMainMenu").click()

element = themed_app.get_by_test_id("stMainMenuPopover")
assert_snapshot(element, name="main_menu")
22 changes: 4 additions & 18 deletions frontend/app/src/components/MainMenu/MainMenu.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ describe("MainMenu", () => {
"Rerun",
"Settings",
"Print",
"Record a screencast",
"View app source",
"Report bug with app",
"About",
Expand All @@ -136,7 +135,6 @@ describe("MainMenu", () => {
"Rerun",
"Settings",
"Print",
"Record a screencast",
"About",
"Developer options",
"Clear cache",
Expand All @@ -161,15 +159,9 @@ describe("MainMenu", () => {
const coreMenu = screen.getAllByTestId("main-menu-list")[0]

const coreMenuOptions = within(coreMenu).getAllByRole("option")
expect(coreMenuOptions).toHaveLength(5)
expect(coreMenuOptions).toHaveLength(4)

const expectedLabels = [
"Rerun",
"Settings",
"Print",
"Record a screencast",
"About",
]
const expectedLabels = ["Rerun", "Settings", "Print", "About"]
coreMenuOptions.forEach((option, index) => {
expect(option).toHaveTextContent(expectedLabels[index])
})
Expand Down Expand Up @@ -218,15 +210,9 @@ describe("MainMenu", () => {
expect(subMenus).toHaveLength(1)

const coreMenuOptions = within(subMenus[0]).getAllByRole("option")
expect(coreMenuOptions).toHaveLength(5)
expect(coreMenuOptions).toHaveLength(4)

const expectedLabels = [
"Rerun",
"Settings",
"Print",
"Record a screencast",
"About",
]
const expectedLabels = ["Rerun", "Settings", "Print", "About"]
coreMenuOptions.forEach((option, index) => {
expect(option).toHaveTextContent(expectedLabels[index])
})
Expand Down
5 changes: 4 additions & 1 deletion frontend/app/src/components/MainMenu/MainMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
Config,
PageConfig,
} from "@streamlit/lib"
import ScreenCastRecorder from "@streamlit/app/src/util/ScreenCastRecorder"
import { SegmentMetricsManager } from "@streamlit/app/src/SegmentMetricsManager"

import {
Expand Down Expand Up @@ -310,7 +311,9 @@ function getPreferredMenuOrder(
coreMenuItems.settings,
coreMenuItems.DIVIDER,
coreMenuItems.print,
coreMenuItems.recordScreencast,
...(ScreenCastRecorder.isSupportedBrowser()
? [coreMenuItems.recordScreencast]
: []),
coreMenuItems.DIVIDER,
coreMenuItems.report,
coreMenuItems.community,
Expand Down
17 changes: 11 additions & 6 deletions frontend/app/src/util/ScreenCastRecorder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,17 @@ class ScreenCastRecorder {

/** True if the current browser likely supports screencasts. */
public static isSupportedBrowser(): boolean {
return (
navigator.mediaDevices != null &&
navigator.mediaDevices.getUserMedia != null &&
navigator.mediaDevices.getDisplayMedia != null &&
MediaRecorder.isTypeSupported(BLOB_TYPE)
)
try {
return (
navigator.mediaDevices != null &&
navigator.mediaDevices.getUserMedia != null &&
navigator.mediaDevices.getDisplayMedia != null &&
MediaRecorder.isTypeSupported(BLOB_TYPE)
)
} catch (e) {
// In the event of an error, assume it won't support screencasts
return false
}
}

constructor({ recordAudio, onErrorOrStop }: ScreenCastRecorderOptions) {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 07d8ea2

Please sign in to comment.