Merge branch 'run_page_ui_improvements' into 519/scoutsuite-integration

# Conflicts:
#	monkey/monkey_island/requirements.txt
This commit is contained in:
VakarisZ 2020-09-18 18:10:03 +03:00
commit 109b2cbcbb
5 changed files with 7 additions and 21 deletions

View File

@ -90,7 +90,7 @@ script:
- cd monkey_island/cc/ui
- npm ci # See https://docs.npmjs.com/cli/ci.html
- eslint ./src --quiet # Test for errors
- JS_WARNINGS_AMOUNT_UPPER_LIMIT=4
- JS_WARNINGS_AMOUNT_UPPER_LIMIT=8
- eslint ./src --max-warnings $JS_WARNINGS_AMOUNT_UPPER_LIMIT # Test for max warnings
# Build documentation

View File

@ -1,7 +1,5 @@
import React, {useEffect, useState} from 'react';
import NextSelectionButton from '../../ui-components/inline-selection/NextSelectionButton';
import React from 'react';
import InlineSelection from '../../ui-components/inline-selection/InlineSelection';
import CommandSection from '../../ui-components/inline-selection/CommandSection';
import LocalManualRunOptions from './LocalManualRunOptions';
function InterfaceSelection(props) {
@ -15,15 +13,4 @@ const getContents = (props) => {
return (<div>{ips}</div>);
}
const setCommandAsContent = (props) => {
let commandComponent = () => InlineSelection(CommandSection,
{
commands: win64commands,
setComponent: props.setComponent
},
LocalManualRunOptions
);
props.setComponent(commandComponent, props);
}
export default InterfaceSelection;

View File

@ -7,7 +7,6 @@ import GenerateLocalWindowsPowershell from './commands/local_windows_powershell'
import GenerateLocalLinuxWget from './commands/local_linux_wget';
import GenerateLocalLinuxCurl from './commands/local_linux_curl';
import CommandDisplay from './CommandDisplay';
import RunOptions from './RunOptions';
const LocalManualRunOptions = (props) => {

View File

@ -1,10 +1,10 @@
import React from 'react';
const Emoji = props => (
<span
className="emoji"
role="img"
aria-label={props.label ? props.label : ""}
aria-hidden={props.label ? "false" : "true"}
className='emoji'
role='img'
aria-label={props.label ? props.label : ''}
aria-hidden={props.label ? 'false' : 'true'}
>
{props.symbol}
</span>

View File

@ -4,7 +4,7 @@ Flask-Restful>=0.3.8
PyInstaller==3.6
awscli==1.18.131
boto3==1.14.54
botocore>=1.17.54,<1.18.0
botocore==1.17.54
cffi>=1.8,!=1.11.3
dpath>=2.0
flask>=1.1