Skip to content

Commit 4baf368

Browse files
committed
move isOpen and setOpen to the suite model
1 parent 74681e9 commit 4baf368

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Suite extends React.Component {
7676
setContextMenu: PropTypes.func,
7777
}
7878
handleClick() {
79-
this.store.setOpen(!this.store.isOpen)
79+
this.suite.setOpen(!this.suite.isOpen)
8080
}
8181
handleKeyDown(event) {
8282
const e = event.nativeEvent
@@ -86,7 +86,7 @@ class Suite extends React.Component {
8686
if (noModifiers && e.key === 'ArrowLeft') {
8787
event.preventDefault()
8888
event.stopPropagation()
89-
this.store.setOpen(false)
89+
this.suite.setOpen(false)
9090
UiState.selectTestByIndex(-1, this.props.suite)
9191
}
9292
}
@@ -119,7 +119,7 @@ class Suite extends React.Component {
119119
tabIndex="-1"
120120
className={classNames(
121121
PlaybackState.suiteState.get(this.props.suite.id),
122-
{ active: this.store.isOpen }
122+
{ active: this.suite.isOpen }
123123
)}
124124
onClick={this.handleClick}
125125
>
@@ -136,7 +136,7 @@ class Suite extends React.Component {
136136
{listMenu}
137137
</div>
138138
<TestList
139-
collapsed={!this.store.isOpen}
139+
collapsed={!this.suite.isOpen}
140140
suite={this.props.suite}
141141
tests={this.store.filteredTests.get()}
142142
removeTest={test => {

packages/selenium-ide/src/neo/models/Suite.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ export default class Suite {
3636
_tests = []
3737
@observable
3838
modified = false
39+
@observable
40+
isOpen = false
3941

4042
constructor(id = uuidv4(), name = 'Untitled Suite') {
4143
this.id = id
@@ -96,6 +98,11 @@ export default class Suite {
9698
}
9799
}
98100

101+
@action.bound
102+
setOpen(isOpen) {
103+
this.isOpen = isOpen
104+
}
105+
99106
containsTest(test) {
100107
// WARNING: do not turn this into a bound action, the observables it will set will cause react-dnd to fail!
101108
return this._tests.includes(test)

packages/selenium-ide/src/neo/stores/seed.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,7 @@ export default function seed(store, numberOfSuites = 0) {
598598
waitSuite.addTestCase(waitTest5)
599599

600600
UiState.changeView('Test suites')
601-
let suiteState = UiState.getSuiteState(suiteAll)
602-
suiteState.setOpen(true)
601+
suiteAll.setOpen(true)
603602
UiState.selectTest(selectWindow, suiteAll)
604603
UiState.selectCommand(click)
605604

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,9 @@
1818
import { action, computed, observable } from 'mobx'
1919

2020
export default class SuiteState {
21-
@observable
22-
isOpen = false
23-
2421
constructor(UiState, suite) {
2522
this.filteredTests = computed(() =>
2623
suite.tests.filter(UiState.filterFunction)
2724
)
2825
}
29-
30-
@action.bound
31-
setOpen(isOpen) {
32-
this.isOpen = isOpen
33-
}
3426
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ class UiState {
255255
const test = selectTestInArray(index, tests)
256256
const suiteIndex = this._project.suites.indexOf(suite)
257257
if (test) {
258-
suiteState.setOpen(true)
258+
suite.setOpen(true)
259259
this.selectTest(test, suite)
260260
} else if (suiteIndex > 0 && index < 0) {
261261
const previousSuite = this._project.suites[suiteIndex - 1]

0 commit comments

Comments
 (0)