Skip to content

Commit 38c2157

Browse files
Merge branch 'dev' into click-tab/ragad
2 parents 61cbc29 + 958140a commit 38c2157

31 files changed

+393
-2057
lines changed

src/app/components/Buttons/Tutorial.tsx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -195,12 +195,6 @@ export default class Tutorial extends Component<TutorialProps, TutorialState> {
195195
'<ul><li>Here we can analyze the render times of our app</li> <li>This is the current series of state changes within our app</li> <li>Mouse over the bargraph elements for details on each specific component</li></ul>',
196196
position: 'top',
197197
},
198-
{
199-
title: 'Saving Series & Actions',
200-
element: '.save-series-button',
201-
intro: '<ul><li>Click here to save your current series data</li></ul>',
202-
position: 'top',
203-
},
204198
{
205199
title: 'Saving Series & Actions',
206200
element: '#seriesname',
@@ -214,13 +208,7 @@ export default class Tutorial extends Component<TutorialProps, TutorialState> {
214208
'<ul><li>If we wish to save a specific action to compare later, give it a name here</li></ul>',
215209
position: 'top',
216210
},
217-
{
218-
title: 'Saving Series & Actions',
219-
element: '.save-series-button',
220-
intro:
221-
'<ul><li>Press save series again.</li> <li>Your series and actions are now saved!</li></ul>',
222-
position: 'top',
223-
},
211+
224212
{
225213
title: 'Comparison Tab',
226214
element: '#router-link-performance-comparison',

src/app/components/DiffRoute/Diff.tsx

Lines changed: 0 additions & 114 deletions
This file was deleted.

src/app/components/DiffRoute/DiffRoute.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/app/components/StateRoute/AxMap/Ax.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default function AxTree(props) {
7777

7878
const [orientation, setOrientation] = useState('horizontal');
7979
const [linkType, setLinkType] = useState('diagonal');
80-
const [stepPercent, setStepPercent] = useState(0.5);
80+
const [stepPercent, setStepPercent] = useState(0.0);
8181

8282
const innerWidth: number = totalWidth - margin.left - margin.right;
8383
const innerHeight: number = totalHeight - margin.top - margin.bottom - 60;

src/app/components/StateRoute/ComponentMap/ComponentMap.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ export default function ComponentMap({
5858
currentSnapshot, // from 'tabs[currentTab].stateSnapshot object in 'MainContainer'
5959
}: LinkTypesProps): JSX.Element {
6060
const [orientation, setOrientation] = useState('vertical'); // We create a local state "orientation" and set it to a string 'vertical'.
61-
const [linkType, setLinkType] = useState('diagonal'); // We create a local state "linkType" and set it to a string 'diagonal'.
62-
const [stepPercent, setStepPercent] = useState(0.5); // We create a local state "stepPercent" and set it to a number '0.5'. This will be used to scale the Map component's link: Step to 50%
61+
const [linkType, setLinkType] = useState('step'); // We create a local state "linkType" and set it to a string 'step'.
62+
const [stepPercent, setStepPercent] = useState(0.0); // We create a local state "stepPercent" and set it to a number '0.0'. This will be used to scale the Map component's link: Step to 0%
6363
const [selectedNode, setSelectedNode] = useState('root'); // We create a local state "selectedNode" and set it to a string 'root'.
6464
const dispatch = useDispatch();
6565

@@ -82,7 +82,6 @@ export default function ComponentMap({
8282
The default view sets the root nodes location either in the left middle *or top middle of the browser window relative to the size of the browser.
8383
*/
8484

85-
8685
origin = { x: 0, y: 0 };
8786
if (orientation === 'vertical') {
8887
sizeWidth = innerWidth;
@@ -92,7 +91,7 @@ export default function ComponentMap({
9291
sizeWidth = innerHeight;
9392
sizeHeight = innerWidth;
9493
}
95-
//}
94+
//}
9695
const {
9796
tooltipData, // value/data that tooltip may need to render
9897
tooltipLeft, // number used for tooltip positioning

src/app/components/StateRoute/ComponentMap/LinkControls.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ export default function LinkControls({
7171
onChange={(e) => setLinkType(e.target.value)}
7272
style={dropDownStyle}
7373
>
74-
<option value='diagonal'>Diagonal</option>
7574
<option value='step'>Step</option>
75+
<option value='diagonal'>Diagonal</option>
7676
<option value='line'>Line</option>
7777
</select>
7878
<label> Select:</label> {/* Controls for the select selections. */}

src/app/components/StateRoute/PerformanceVisx/BarGraph.tsx

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -121,51 +121,9 @@ const BarGraph = (props: BarGraphProps): JSX.Element => {
121121
data,
122122
};
123123

124-
useEffect(() => {
125-
// Animates the save series button.
126-
const saveButtons = document.getElementsByClassName('save-series-button'); // finds the buttom in the DOM
127-
for (let i = 0; i < saveButtons.length; i++) {
128-
if (tabs[currentTab].seriesSavedStatus === 'saved') {
129-
saveButtons[i].classList.add('animate');
130-
saveButtons[i].innerHTML = 'Saved!';
131-
} else {
132-
saveButtons[i].innerHTML = 'Save Series';
133-
saveButtons[i].classList.remove('animate');
134-
}
135-
}
136-
});
137-
138-
const saveSeriesClickHandler = () => {
139-
// function to save the currently selected series
140-
if (tabs[currentTab].seriesSavedStatus === 'inputBoxOpen') {
141-
const actionNames = document.getElementsByClassName('actionname');
142-
for (let i = 0; i < actionNames.length; i += 1) {
143-
toStorage.data.barStack[i].name = actionNames[i].value;
144-
}
145-
dispatch(save({ newSeries: toStorage, newSeriesName: seriesNameInput })); // saves the series under seriesName
146-
setSeriesNameInput(`Series ${comparison.length}`); // sends a reducer that saves the series/toStorage object the user wants to chrome local storage
147-
return;
148-
}
149-
//if for some reason, code doesn't hit in first conditional, we have error handling below to account it
150-
dispatch(save({ newSeries: toStorage, newSeriesName: '' })); // or use a default value for newSeriesName
151-
};
152-
153-
const textbox = // Need to change so textbox isn't empty before saving
154-
tabs[currentTab].seriesSavedStatus === 'inputBoxOpen' ? (
155-
<input
156-
type='text'
157-
id='seriesname'
158-
placeholder='Enter Series Name'
159-
onChange={(e) => setSeriesNameInput(e.target.value)}
160-
/>
161-
) : null;
162124
return (
163125
<div className='bargraph-position'>
164126
<div className='saveSeriesContainer'>
165-
{textbox}
166-
<button type='button' className='save-series-button' onClick={saveSeriesClickHandler}>
167-
Save Series
168-
</button>
169127
<form className='routesForm' id='routes-formcontrol'>
170128
<label id='routes-dropdown'>Select Route: </label>
171129
<select

0 commit comments

Comments
 (0)