Skip to content

Commit 0cc822c

Browse files
committed
better handling of selection when removing tests
1 parent d2d377a commit 0cc822c

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

packages/selenium-ide/src/neo/components/Suite/index.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ class Suite extends React.Component {
103103
<ListMenuItem onClick={this.props.remove}>Delete</ListMenuItem>
104104
</ListMenu>
105105
</div>
106-
<TestList collapsed={!this.store.isOpen} suite={this.props.suite} tests={this.store.filteredTests.get()} removeTest={this.props.suite.removeTestCase} />
106+
<TestList collapsed={!this.store.isOpen} suite={this.props.suite} tests={this.store.filteredTests.get()} removeTest={(test) => {
107+
this.props.suite.removeTestCase(test);
108+
UiState.selectTest();
109+
}} />
107110
</div>
108111
);
109112
}

packages/selenium-ide/src/neo/containers/Navigation/index.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ import "./style.css";
3535
constructor(props) {
3636
super(props);
3737
this.state = {
38-
showTests: true
38+
showTests: true,
39+
lastSelection: {}
3940
};
4041
this.handleChangedTab = this.handleChangedTab.bind(this);
4142
}
@@ -45,9 +46,12 @@ import "./style.css";
4546
moveTest: PropTypes.func.isRequired
4647
};
4748
handleChangedTab(tab) {
49+
const lastSelection = this.state.lastSelection;
4850
this.setState({
49-
showTests: tab === "Tests"
51+
showTests: tab === "Tests",
52+
lastSelection: UiState.selectedTest
5053
});
54+
UiState.selectTest(lastSelection.test, lastSelection.suite);
5155
}
5256
handleKeyDown(event) {
5357
const e = event.nativeEvent;

packages/selenium-ide/src/neo/stores/view/ModalState.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ class ModalState {
8181
}, (choseDelete) => {
8282
if (choseDelete) {
8383
this._project.deleteSuite(suite);
84+
UiState.selectTest();
8485
}
8586
});
8687
}
@@ -94,6 +95,7 @@ class ModalState {
9495
}, (choseDelete) => {
9596
if (choseDelete) {
9697
this._project.deleteTestCase(testCase);
98+
UiState.selectTest();
9799
}
98100
});
99101
}

packages/selenium-ide/src/neo/stores/view/UiState.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import { action, computed, observable, observe, extendObservable } from "mobx";
18+
import { action, computed, observable, observe, extendObservable, reaction } from "mobx";
1919
import storage from "../../IO/storage";
2020
import SuiteState from "./SuiteState";
2121
import TestState from "./TestState";

0 commit comments

Comments
 (0)