-
-
Notifications
You must be signed in to change notification settings - Fork 836
Added some parts that have not yet been internationalized #1817
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
4,157 changes: 2,083 additions & 2,074 deletions
4,157
packages/selenium-ide/src/browser/enums/I18N.ts
Large diffs are not rendered by default.
Oops, something went wrong.
244 changes: 135 additions & 109 deletions
244
packages/selenium-ide/src/browser/windows/ProjectEditor/tabs/Project/DriverSelect.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,125 +1,151 @@ | ||
| import { Typography } from '@mui/material' | ||
| import {Typography} from '@mui/material' | ||
| import FormControl from '@mui/material/FormControl' | ||
| import InputLabel from '@mui/material/InputLabel' | ||
| import MenuItem from '@mui/material/MenuItem' | ||
| import Select, { SelectChangeEvent } from '@mui/material/Select' | ||
| import { Browser } from '@seleniumhq/get-driver' | ||
| import { VerboseBoolean } from '@seleniumhq/side-api' | ||
| import { BrowserInfo, BrowsersInfo } from 'main/types' | ||
| import React, { useEffect, useState } from 'react' | ||
| import Select, {SelectChangeEvent} from '@mui/material/Select' | ||
| import {Browser} from '@seleniumhq/get-driver' | ||
| import {VerboseBoolean} from '@seleniumhq/side-api' | ||
| import {BrowserInfo, BrowsersInfo} from 'main/types' | ||
| import React, {useEffect, useState} from 'react' | ||
| import Button from "@mui/material/Button"; | ||
|
|
||
| /****************以下为我新增*****************/ | ||
| const ElectronVersion = require('electron/package.json').version | ||
| const ourElectronBrowserInfo: BrowserInfo = { | ||
| browser: 'electron', | ||
| useBidi: false, | ||
| version: ElectronVersion, | ||
| } | ||
| /****************以上为我新增*****************/ | ||
|
|
||
|
|
||
| const browserToString = (browser: BrowserInfo): string => | ||
| `${browser.browser}|${browser.version}` | ||
| `${browser.browser}|${browser.version}` | ||
|
|
||
| const browserFromString = (browserString: string): BrowserInfo => { | ||
| const [browser, version] = browserString.split('|') | ||
| return { browser: browser as Browser, version } | ||
| const [browser, version] = browserString.split('|') | ||
| return {browser: browser as Browser, version} | ||
| } | ||
|
|
||
| const DriverSelector = () => { | ||
| const [browserInfo, setBrowserInfo] = useState<BrowsersInfo>({ | ||
| browsers: [], | ||
| selected: { browser: 'chrome', useBidi: false, version: '' }, | ||
| }) | ||
| const [languageMap, setLanguageMap] = useState<any>({ | ||
| systemConfig: { | ||
| bidi: 'Use Bidi', | ||
| bidiHelper: 'Bidi settings (Experimental / Non working)', | ||
| playbackBrowser: 'Selected Playback Browser', | ||
| }, | ||
| }) | ||
|
|
||
| useEffect(() => { | ||
| window.sideAPI.driver.listBrowsers().then(async (info) => { | ||
| setBrowserInfo(info) | ||
| const [browserInfo, setBrowserInfo] = useState<BrowsersInfo>({ | ||
| browsers: [], | ||
| selected: {browser: 'chrome', useBidi: false, version: ''}, | ||
| }) | ||
| window.sideAPI.system.getLanguageMap().then((result) => { | ||
| setLanguageMap(result) | ||
| const [languageMap, setLanguageMap] = useState<any>({ | ||
| systemConfig: { | ||
| bidi: 'Use Bidi', | ||
| bidiHelper: 'Bidi settings (Experimental / Non working)', | ||
| playbackBrowser: 'Selected Playback Browser', | ||
| restartDriver:'restart driver' | ||
| }, | ||
| }) | ||
| }, []) | ||
| const processBrowserSelection = async (browser: BrowserInfo) => { | ||
| console.log('Setting browser', browser) | ||
| setBrowserInfo((info) => ({ browsers: info!.browsers, selected: null })) | ||
| await window.sideAPI.driver.download(browser) | ||
| await window.sideAPI.driver.stopProcess() | ||
| await window.sideAPI.driver.startProcess(browser) | ||
| await window.sideAPI.driver.selectBrowser(browser) | ||
| setBrowserInfo((info) => ({ | ||
| browsers: info!.browsers, | ||
| selected: browser, | ||
| })) | ||
| } | ||
| const processBidiSelection = async (useBidi: boolean) => { | ||
| const browser = { | ||
| ...browserInfo.selected!, | ||
| useBidi, | ||
|
|
||
| useEffect(() => { | ||
| window.sideAPI.driver.listBrowsers().then(async (info) => { | ||
| setBrowserInfo(info) | ||
| }) | ||
| window.sideAPI.system.getLanguageMap().then((result) => { | ||
| setLanguageMap(result) | ||
| }) | ||
| }, []) | ||
| const processBrowserSelection = async (browser: BrowserInfo) => { | ||
| /****************以下为我新增*****************/ | ||
| browser = browser.useBidi ? browser : ourElectronBrowserInfo | ||
| /****************以上为我新增*****************/ | ||
| console.log('Setting browser', browser) | ||
| setBrowserInfo((info) => ({browsers: info!.browsers, selected: null})) | ||
| await window.sideAPI.driver.download(browser) | ||
| await window.sideAPI.driver.stopProcess() | ||
| await window.sideAPI.driver.startProcess(browser) | ||
| await window.sideAPI.driver.selectBrowser(browser) | ||
| setBrowserInfo((info) => ({ | ||
| browsers: info!.browsers, | ||
| selected: browser, | ||
| })) | ||
| } | ||
| const processBidiSelection = async (useBidi: boolean) => { | ||
| const browser = { | ||
| ...browserInfo.selected!, | ||
| useBidi, | ||
| } | ||
| processBrowserSelection(browser) | ||
| } | ||
| processBrowserSelection(browser) | ||
| } | ||
| const selectBrowser = async (e: SelectChangeEvent<string>) => { | ||
| const browser = { | ||
| ...browserFromString(e.target.value as string), | ||
| useBidi: Boolean(browserInfo?.selected?.useBidi ?? false), | ||
| const selectBrowser = async (e: SelectChangeEvent<string>) => { | ||
| const browser = { | ||
| ...browserFromString(e.target.value as string), | ||
| useBidi: Boolean(browserInfo?.selected?.useBidi ?? false), | ||
| } | ||
| processBrowserSelection(browser) | ||
| } | ||
| processBrowserSelection(browser) | ||
| } | ||
| return ( | ||
| <> | ||
| <Typography variant="caption"> | ||
| {languageMap.systemConfig.bidiHelper} | ||
| </Typography> | ||
| <FormControl> | ||
| <InputLabel id="useBidi">{languageMap.systemConfig.bidi}</InputLabel> | ||
| <Select | ||
| id="useBidi" | ||
| label={languageMap.systemConfig.bidi} | ||
| name="useBidi" | ||
| value={browserInfo.selected?.useBidi ? 'Yes' : 'No'} | ||
| onChange={(e) => { | ||
| const value = e.target.value as VerboseBoolean | ||
| const bool = value === 'Yes' | ||
| processBidiSelection(bool) | ||
| }} | ||
| > | ||
| <MenuItem value="Yes">Yes</MenuItem> | ||
| <MenuItem value="No">No</MenuItem> | ||
| </Select> | ||
| </FormControl> | ||
| <FormControl> | ||
| <InputLabel id="browser-label"> | ||
| {languageMap.systemConfig.playbackBrowser} | ||
| </InputLabel> | ||
| {browserInfo.selected ? ( | ||
| <Select | ||
| disabled={!browserInfo.selected?.useBidi} | ||
| label="Selected Playback Browser" | ||
| labelId="browser-label" | ||
| onChange={selectBrowser} | ||
| placeholder="Please select a browser" | ||
| value={browserToString(browserInfo.selected)} | ||
| > | ||
| {browserInfo.browsers.map((browser, index) => ( | ||
| <MenuItem key={index} value={browserToString(browser)}> | ||
| {browser.browser} - {browser.version} | ||
| </MenuItem> | ||
| ))} | ||
| </Select> | ||
| ) : ( | ||
| <Select | ||
| disabled | ||
| label="Selected Playback Browser" | ||
| labelId="browser-label" | ||
| onChange={selectBrowser} | ||
| placeholder="Please select a browser" | ||
| value="" | ||
| > | ||
| <MenuItem value=""> | ||
| <em>Loading...</em> | ||
| </MenuItem> | ||
| </Select> | ||
| )} | ||
| </FormControl> | ||
| </> | ||
| ) | ||
| return ( | ||
| <> | ||
| <Typography variant="caption"> | ||
| {languageMap.systemConfig.bidiHelper} | ||
| </Typography> | ||
| <FormControl> | ||
| <InputLabel id="useBidi">{languageMap.systemConfig.bidi}</InputLabel> | ||
| <Select | ||
| id="useBidi" | ||
| label={languageMap.systemConfig.bidi} | ||
| name="useBidi" | ||
| value={browserInfo.selected?.useBidi ? 'Yes' : 'No'} | ||
| onChange={(e) => { | ||
| const value = e.target.value as VerboseBoolean | ||
| const bool = value === 'Yes' | ||
| processBidiSelection(bool) | ||
| }} | ||
| > | ||
| <MenuItem value="Yes">Yes</MenuItem> | ||
| <MenuItem value="No">No</MenuItem> | ||
| </Select> | ||
| </FormControl> | ||
| <FormControl> | ||
| <InputLabel id="browser-label"> | ||
| {languageMap.systemConfig.playbackBrowser} | ||
| </InputLabel> | ||
| {browserInfo.selected ? ( | ||
| <Select | ||
| disabled={!browserInfo.selected?.useBidi} | ||
| label="Selected Playback Browser" | ||
| labelId="browser-label" | ||
| onChange={selectBrowser} | ||
| placeholder="Please select a browser" | ||
| value={!browserInfo.selected?.useBidi || browserInfo.selected?.browser === 'electron' ? browserToString(ourElectronBrowserInfo) : browserToString(browserInfo.selected)} | ||
| > | ||
| {browserInfo.browsers.map((browser, index) => ( | ||
| <MenuItem key={index} value={browserToString(browser)}> | ||
| {browser.browser} - {browser.version} | ||
| </MenuItem> | ||
| ))} | ||
| </Select> | ||
| ) : ( | ||
| <Select | ||
| disabled | ||
| label="Selected Playback Browser" | ||
| labelId="browser-label" | ||
| onChange={selectBrowser} | ||
| placeholder="Please select a browser" | ||
| value={browserToString(ourElectronBrowserInfo)} | ||
| > | ||
| <MenuItem value=""> | ||
| <em>Loading...</em> | ||
| </MenuItem> | ||
| </Select> | ||
| )} | ||
| </FormControl> | ||
| <Button | ||
| color="secondary" | ||
| size="small" | ||
| onClick={()=>{ | ||
| processBrowserSelection(browserInfo.selected!) | ||
| } | ||
| } | ||
| > | ||
| {languageMap.systemConfig.restartDriver} | ||
| </Button> | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
| export default DriverSelector | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is so smart!