diff --git a/packages/client/src/ActionsAndReducers/dbWargames/wargames_Reducer.ts b/packages/client/src/ActionsAndReducers/dbWargames/wargames_Reducer.ts index 9469eae27a..684cf79951 100644 --- a/packages/client/src/ActionsAndReducers/dbWargames/wargames_Reducer.ts +++ b/packages/client/src/ActionsAndReducers/dbWargames/wargames_Reducer.ts @@ -38,7 +38,7 @@ export const wargamesReducer = (state = initialState, action: WargameActionTypes switch (action.type) { case ActionConstant.ALL_WARGAME_NAMES_SAVED: const originalList = action.payload || [] - const anyList = originalList as any[] || [] + const anyList = originalList as any[] // NOTE: we don't know why, but some SQLite files // can get corrupted, and are empty. Filter them // out, since they're of no values diff --git a/packages/client/src/Components/jsonSchemaEditor/json-schema-editor/editor.js b/packages/client/src/Components/jsonSchemaEditor/json-schema-editor/editor.js index 992cddc1af..e142efe59d 100644 --- a/packages/client/src/Components/jsonSchemaEditor/json-schema-editor/editor.js +++ b/packages/client/src/Components/jsonSchemaEditor/json-schema-editor/editor.js @@ -151,7 +151,7 @@ SchemaEditor.prototype.updateSchema = function (schema) { var minMaxConsistenceValidator = function (schema, value, path) { var errors = [] if (value !== null && (value.type === 'integer' || value.type === 'number')) { - if (typeof value.minimum !== 'undefined' && typeof value.minimum !== 'undefined' && value.minimum > value.maximum) { + if (typeof value.minimum !== 'undefined' && typeof value.maximum !== 'undefined' && value.minimum > value.maximum) { errors.push({ path: path, property: 'maximum', diff --git a/packages/client/src/Components/jsonSchemaEditor/metaSchema.js b/packages/client/src/Components/jsonSchemaEditor/metaSchema.js index 69f5ea91e7..f984604778 100644 --- a/packages/client/src/Components/jsonSchemaEditor/metaSchema.js +++ b/packages/client/src/Components/jsonSchemaEditor/metaSchema.js @@ -23,7 +23,7 @@ class MetaSchema extends Component { this.setEditorValue(JSON.stringify(this.props.value, null, 2)) } - componentWillRecivedProps ({ value }) { + componentWillReceiveProps ({ value }) { this.setEditorValue(JSON.stringify(value, null, 2)) } diff --git a/packages/client/src/Tests/ActionsAndReducers/dbMessageTypes/dbMessageTypes.test.js b/packages/client/src/Tests/ActionsAndReducers/dbMessageTypes/dbMessageTypes.test.js index 305233cf67..d3f961c56b 100644 --- a/packages/client/src/Tests/ActionsAndReducers/dbMessageTypes/dbMessageTypes.test.js +++ b/packages/client/src/Tests/ActionsAndReducers/dbMessageTypes/dbMessageTypes.test.js @@ -6,7 +6,7 @@ import * as messageTypesApi from '../../../api/messageTypes_api' import { messageTypesReducer } from '../../../ActionsAndReducers/dbMessageTypes/messageTypes_Reducer' import machineryFailure from '../../../Schemas/machinery_failure.json' import * as ActionConstant from '@serge/config' -import { ADMIN_ROUTE, MESSAGE_TEMPLATE_ROUTE } from '../../../consts' +import { MESSAGE_TEMPLATE_ROUTE } from '../../../consts' const mockStore = configureStore([thunk]) diff --git a/packages/client/src/Views/ExportPrint.jsx b/packages/client/src/Views/ExportPrint.jsx index 661e42c229..212a3aa487 100644 --- a/packages/client/src/Views/ExportPrint.jsx +++ b/packages/client/src/Views/ExportPrint.jsx @@ -6,6 +6,7 @@ import { setCurrentViewFromURI } from '../ActionsAndReducers/setCurrentViewFromU const ExportPrint = ({ exportItem, notFound }) => { if (!exportItem) { notFound() + return } return ( @@ -16,7 +17,7 @@ const ExportPrint = ({ exportItem, notFound }) => {

Wargame: {exportItem.wargame}

Type: {exportItem.type}

- {exportItem.data.map((data, pageIndex) => ( + { exportItem.data.map((data, pageIndex) => (

{exportItem.wargame}

{data.title}

diff --git a/packages/components/src/local/atoms/custom-dialog/index.tsx b/packages/components/src/local/atoms/custom-dialog/index.tsx index ada3b27b4a..781a38185c 100644 --- a/packages/components/src/local/atoms/custom-dialog/index.tsx +++ b/packages/components/src/local/atoms/custom-dialog/index.tsx @@ -4,7 +4,7 @@ import Modal from 'react-modal' import localStyles from './styles.module.scss' import { Props } from './types/props' -/* Render component */ +/* Render component (dummy change) */ export const CustomDialog: React.FC = (props) => { const { isOpen, diff --git a/packages/components/src/local/hex-grid/index.tsx b/packages/components/src/local/hex-grid/index.tsx index 6f2fa183b5..1f3681b5d1 100644 --- a/packages/components/src/local/hex-grid/index.tsx +++ b/packages/components/src/local/hex-grid/index.tsx @@ -763,7 +763,7 @@ export const HexGrid: React.FC<{}> = () => { return <> { /* - show number of visible cells */} - { viewport && + {/* { viewport && = () => { iconSize: [30, 20] })} /> - } + } */} { /* POLY BINS */} { /* {viewport && polyBins3 && polyBins3.map((bin: PolyBin3, index: number) => ( diff --git a/packages/components/src/local/mapping/index.tsx b/packages/components/src/local/mapping/index.tsx index 7b56242b43..267bc8b1d3 100644 --- a/packages/components/src/local/mapping/index.tsx +++ b/packages/components/src/local/mapping/index.tsx @@ -130,7 +130,7 @@ export const Mapping: React.FC = ({ const [atlanticCells, setAtlanticCells] = useState() const [lastAtlanticCells, setLastAtlanticCells] = useState() const [polygonAreas, setPolygonAreas] = useState | undefined>(undefined) - const [cellLabelStyle, setCellLabelStyle] = useState(CellLabelStyle.H3_LABELS) + const [cellLabelStyle, setCellLabelStyle] = useState(CellLabelStyle.CTR_LABELS) const [mappingConstraintState, setMappingConstraintState] = useState(mappingConstraints) const [viewAsUmpire, setViewAsUmpire] = useState(isUmpire) diff --git a/packages/components/src/local/molecules/channel-message-detail/index.tsx b/packages/components/src/local/molecules/channel-message-detail/index.tsx index bb08528179..80d8c20943 100644 --- a/packages/components/src/local/molecules/channel-message-detail/index.tsx +++ b/packages/components/src/local/molecules/channel-message-detail/index.tsx @@ -78,9 +78,9 @@ const deconstructArr = (pair: Array): React.ReactFragment => {

{pair[1].map((item: Record, key: number) => { return ( -

+ {deconstructObj(item)} -

+ ) })}

diff --git a/packages/e2e/temp/jest.config.js b/packages/e2e/temp/jest.config.js index 745558ae06..7b914cb802 100644 --- a/packages/e2e/temp/jest.config.js +++ b/packages/e2e/temp/jest.config.js @@ -1,3 +1,3 @@ -{ - "preset": "jest-puppeteer" +module.exports = { + "preset" : "jest-puppeteer" } diff --git a/packages/e2e/temp/playerUi.test.js b/packages/e2e/temp/playerUi.test.js index 5415990864..cba6af5b47 100644 --- a/packages/e2e/temp/playerUi.test.js +++ b/packages/e2e/temp/playerUi.test.js @@ -1,5 +1,4 @@ import puppeteer from 'puppeteer' -import { DEFAULT_SERVER } from '../consts' let browser let page @@ -11,12 +10,6 @@ let pageRedRecon let pageBlueCo let pageBlueArtillery -const backspace = async (qty) => { - for (let i = 0; i < qty; i++) { - await page.keyboard.press('Backspace') - } -} - beforeAll(async () => { // launch browser browser = await puppeteer.launch({ diff --git a/packages/e2e/temp/welcomeScreen.test.js b/packages/e2e/temp/welcomeScreen.test.js index ec185072fd..2ea1956a30 100644 --- a/packages/e2e/temp/welcomeScreen.test.js +++ b/packages/e2e/temp/welcomeScreen.test.js @@ -4,12 +4,6 @@ import { DEFAULT_SERVER } from '../consts' let browser let page -const backspace = async (qty) => { - for (let i = 0; i < qty; i++) { - await page.keyboard.press('Backspace') - } -} - beforeAll(async () => { // launch browser browser = await puppeteer.launch({