Skip to content

Commit cdfdc5e

Browse files
authored
Merge pull request #11 from oslabs-beta/feature-testing
Made some small last minute bug fixes
2 parents 4dfdbb8 + 9bbe19e commit cdfdc5e

File tree

6 files changed

+25
-14
lines changed

6 files changed

+25
-14
lines changed

demo-app/src/client/Components/Row.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const Row = (props: RowProps): JSX.Element => {
1313
for (let i = 0; i < 3; i++) {
1414
boxes.push(
1515
<Box
16-
key={i}
16+
key={`r${props.row + 1}-b${i + 1}`}
1717
row={props.row}
1818
column={i}
1919
handleBoxClick={props.handleBoxClick}
@@ -22,7 +22,11 @@ const Row = (props: RowProps): JSX.Element => {
2222
);
2323
}
2424

25-
return <><div className='row'>{boxes}</div></>;
25+
return (
26+
<>
27+
<div className='row'>{boxes}</div>
28+
</>
29+
);
2630
};
2731

2832
export default Row;

src/app/__tests__/ErrorContainer.test.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ describe('unit testing for ErrorContainer.tsx', () => {
3535

3636
test('Reactime website shows as expected', () => {
3737
render(<ErrorContainer />);
38-
expect(
39-
screen.getByText('Please visit the Reactime website for more info.'),
40-
).toBeInTheDocument();
38+
expect(screen.getByText('Please visit the Reactime Github for more info.')).toBeInTheDocument();
4139
});
4240

4341
describe('Loading Checks show up as expected', () => {

src/app/components/FrontendTypes.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ export interface TreeProps {
3232
state?: string | object;
3333
stateSnaphot?: object;
3434
children?: any[];
35-
snapshots?:[];
36-
currLocation?:object;
37-
38-
3935
};
36+
snapshots?:[];
37+
currLocation?:object;
4038
}
4139

4240
export interface BarStackProp {

src/app/components/StateRoute/Tree.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const getItemString = (type, data: { state?: object | string; name: string; chil
3535

3636
const Tree = (props: TreeProps) => {
3737
const { snapshot, snapshots, currLocation } = props;
38+
// @ts-ignore
3839
const [store, dispatch] = useStoreContext();
3940

4041
useEffect(() => {
@@ -44,7 +45,9 @@ const Tree = (props: TreeProps) => {
4445
return (
4546
<>
4647
{snapshot && (
48+
// @ts-ignore
4749
<JSONTree
50+
// @ts-ignore
4851
data={snapshots[currLocation.index] || snapshot}
4952
theme={{ extend: colors, tree: () => ({ className: 'json-tree' }) }}
5053
shouldExpandNode={() => true}

src/app/containers/ErrorContainer.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Loader from '../components/Loader';
55
import ErrorMsg from '../components/ErrorMsg';
66
import { useStoreContext } from '../store';
77

8-
function ErrorContainer(): JSX.Element {
8+
function ErrorContainer(): JSX.Element {
99
const [store, dispatch] = useStoreContext();
1010
const { tabs, currentTitle, currentTab } = store;
1111
// hooks for error checks
@@ -94,8 +94,12 @@ function ErrorContainer(): JSX.Element {
9494
<ErrorMsg loadingArray={loadingArray} status={status} launchContent={launch} />
9595
</div>
9696
<br />
97-
<a href='https://www.reacti.me/' target='_blank' rel='noopener noreferrer'>
98-
Please visit the Reactime website for more info.
97+
<a
98+
href='https://github.com/open-source-labs/reactime'
99+
target='_blank'
100+
rel='noopener noreferrer'
101+
>
102+
Please visit the Reactime Github for more info.
99103
</a>
100104
</div>
101105
);

src/app/styles/components/_performanceVisx.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@
3737
text-align: left;
3838
}
3939

40+
.saveSeriesContainer {
41+
#routes-select, #snapshot-select {
42+
background-color: #ff6569 !important;
43+
}
44+
}
45+
4046
#routes-select, #snapshot-select{
4147
color: white !important;
42-
background-color: #ff6569 !important;
4348
font: 400 14px 'Roboto', sans-serif;
4449
text-align: left;
4550
width: 120px;
@@ -48,7 +53,6 @@
4853
text-align: center;
4954
}
5055

51-
5256
#seriesname {
5357
float: right;
5458
width: 220px;

0 commit comments

Comments
 (0)