-
Notifications
You must be signed in to change notification settings - Fork 730
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow to disable user selection in the grid model. (#8345)
* Allow to disable user selection in the grid model. Fixes vaadin/framework8-issues#546
- Loading branch information
Denis
committed
Jan 27, 2017
1 parent
5c24cff
commit 5616216
Showing
7 changed files
with
145 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
uitest/src/main/java/com/vaadin/tests/components/grid/GridDisallowUserSelection.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,50 @@ | |||
/* | |||
* Copyright 2000-2016 Vaadin Ltd. | |||
* | |||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | |||
* use this file except in compliance with the License. You may obtain a copy of | |||
* the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* Unless required by applicable law or agreed to in writing, software | |||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | |||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.tests.components.grid; | |||
|
|||
import com.vaadin.data.ValueProvider; | |||
import com.vaadin.server.VaadinRequest; | |||
import com.vaadin.tests.components.AbstractTestUI; | |||
import com.vaadin.ui.Button; | |||
import com.vaadin.ui.Grid; | |||
import com.vaadin.ui.Grid.SelectionMode; | |||
import com.vaadin.ui.components.grid.GridSelectionModel; | |||
|
|||
/** | |||
* @author Vaadin Ltd | |||
* | |||
*/ | |||
public class GridDisallowUserSelection extends AbstractTestUI { | |||
|
|||
@Override | |||
protected void setup(VaadinRequest request) { | |||
Grid<String> grid = new Grid<>(); | |||
grid.addColumn(ValueProvider.identity()); | |||
grid.setItems("a", "b"); | |||
GridSelectionModel<String> model = grid | |||
.setSelectionMode(SelectionMode.SINGLE); | |||
model.setUserSelectionAllowed(false); | |||
|
|||
addComponent(grid); | |||
|
|||
Button button = new Button("Multi select", event -> { | |||
GridSelectionModel<String> multi = grid | |||
.setSelectionMode(SelectionMode.MULTI); | |||
multi.setUserSelectionAllowed(false); | |||
}); | |||
addComponent(button); | |||
} | |||
} |
51 changes: 51 additions & 0 deletions
51
uitest/src/test/java/com/vaadin/tests/components/grid/GridDisallowUserSelectionTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,51 @@ | |||
/* | |||
* Copyright 2000-2016 Vaadin Ltd. | |||
* | |||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | |||
* use this file except in compliance with the License. You may obtain a copy of | |||
* the License at | |||
* | |||
* http://www.apache.org/licenses/LICENSE-2.0 | |||
* | |||
* Unless required by applicable law or agreed to in writing, software | |||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | |||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | |||
* License for the specific language governing permissions and limitations under | |||
* the License. | |||
*/ | |||
package com.vaadin.tests.components.grid; | |||
|
|||
import org.junit.Assert; | |||
import org.junit.Test; | |||
|
|||
import com.vaadin.testbench.elements.ButtonElement; | |||
import com.vaadin.testbench.elements.GridElement; | |||
import com.vaadin.tests.tb3.MultiBrowserTest; | |||
|
|||
/** | |||
* @author Vaadin Ltd | |||
* | |||
*/ | |||
public class GridDisallowUserSelectionTest extends MultiBrowserTest { | |||
|
|||
@Test | |||
public void checkSelection() { | |||
openTestURL(); | |||
|
|||
assertNoSelection(0); | |||
assertNoSelection(1); | |||
|
|||
// change model from single select to mutli | |||
$(ButtonElement.class).first().click(); | |||
|
|||
assertNoSelection(0); | |||
assertNoSelection(1); | |||
} | |||
|
|||
private void assertNoSelection(int index) { | |||
GridElement grid = $(GridElement.class).first(); | |||
grid.getCell(index, 0).click(); | |||
|
|||
Assert.assertFalse(grid.getRow(0).isSelected()); | |||
} | |||
} |