diff --git a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
index d4ee0c8a1db1d38f35a7c836dce4861702a4c4cc..e1c5457dddc306f2489b343e914b2547758eb0d7 100644
--- a/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
+++ b/beat/web/reports/static/reports/app/directives/edit/addItemsMenu.js
@@ -101,7 +101,13 @@ angular.module('reportApp')
},
template: `
<div class="btn-group" role="group">
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <button
+ ng-disabled='group.experiments.length == 0'
+ type="button"
+ class="btn btn-default dropdown-toggle"
+ data-toggle="dropdown"
+ aria-haspopup="true"
+ aria-expanded="false">
Add Plot
<span class="caret"></span>
</button>
@@ -111,11 +117,15 @@ angular.module('reportApp')
</li>
</ul>
</div>
-<button class='btn btn-default' ng-click='addNewTable()'>
+<button
+ ng-disabled='group.experiments.length == 0'
+ class='btn btn-default'
+ ng-click='addNewTable()'>
Add Table
</button>
<div class="btn-group" role="group">
<button
+ ng-disabled='group.experiments.length == 0'
ng-click='addNewText()'
type="button"
class="btn btn-default"
diff --git a/beat/web/reports/static/reports/test/report-spec.js b/beat/web/reports/static/reports/test/report-spec.js
index 2f4eb924d8af474b01732e0e27cef0a98e5f8e61..542404b3d8685cbe383cbc738af9c8fae1df3d96 100644
--- a/beat/web/reports/static/reports/test/report-spec.js
+++ b/beat/web/reports/static/reports/test/report-spec.js
@@ -200,26 +200,6 @@ describe('reports app', function(){
});
describe('experiments list panel', function(){
- describe('inline toolbar', function(){
- const toolbar = element(by.css('#filters'));
-
- it('has 3 filters', function(){
- expect(toolbar.all(by.xpath("./div")).count()).toBe(3);
- });
-
- it('has a filter-rows widget', function(){
- expect(toolbar.element(by.css('#text-filter')).getAttribute('placeholder')).toBe('Filter rows...');
- });
-
- it('has an attestation filter', function(){
- expect(toolbar.element(by.css('#attestation-filter')).all(by.tagName('option')).count()).toBe(3);
- });
-
- it('has a privacy filter', function(){
- expect(toolbar.element(by.css('#privacy-filter')).all(by.tagName('option')).count()).toBe(4);
- });
- });
-
describe('table', function(){
const table = element(by.css('#experiment-list-test'));
@@ -808,10 +788,19 @@ describe('reports app', function(){
describe('group report items functionality', function() {
describe('plot', function() {
-
+ const plotContainer = element(by.css('#group1_plot_0-render'));
});
describe('table', function() {
+ const panelHeaderButtonGroup = element.all(by.css('#group1_table_0-heading > h4 > .btn-group')).get(1);
+ const colsButton = panelHeaderButtonGroup.element(by.css('#group1_table_0_columnSelector'));
+ const precButton = panelHeaderButtonGroup.element(by.css('#group1_table_0-precision'));
+ const tcsvButton = panelHeaderButtonGroup.element(by.buttonText('Toggle CSV View'));
+
+ const table = element(by.css('#collapse-group1_table_0 table'));
+ const headers = table.all(by.css('thead > tr > th'));
+ const rows = table.all(by.css('tbody > tr'));
+
describe('changing columns', function() {
});
@@ -822,6 +811,9 @@ describe('reports app', function(){
});
describe('text block', function() {
+ const htmlContainer = element(by.css('#collapse-group1_text_0 > .panel-body > .row > .col-sm-10 > div'));
+ const editButton = element(by.css('#collapse-group1_text_0 > .panel-body > .row > .col-sm-2 > div > a'));
+
describe('edit mode', function() {
});
diff --git a/beat/web/reports/templates/reports/panels/experiment_table.html b/beat/web/reports/templates/reports/panels/experiment_table.html
index 401cefc135c5f3ba4a836f73a15a375381fffa35..31689e70b6f521b68a75ab9f2d5df094a79daeb4 100644
--- a/beat/web/reports/templates/reports/panels/experiment_table.html
+++ b/beat/web/reports/templates/reports/panels/experiment_table.html
@@ -23,48 +23,6 @@
{% load experiment_tags %}
{% if objects %}
-<div class="col-sm-10 vertical-center">
- <div id="filters" class="form-inline">
- <div class="form-group form-group-sm">
- <div class="input-group input-group-sm">
- <span class="input-group-addon" id="basic-addon1"><i class="fa fa-search"></i></span>
- <input type="text" tabindex="2" id="text-filter" class="form-control" placeholder="Filter rows..." aria-describedby="basic-addon1">
- </div>
- </div>
-
- <div class="form-group form-group-sm">
- <label for="attestation-filter" class="control-label">Attestation:</label>
- <select id="attestation-filter" class="form-control">
- <option selected>All</option>
- <option>Attested</option>
- <option>Locked</option>
- </select>
- </div>
-
- <div class="form-group form-group-sm">
- <label for="privacy-filter" class="control-label">Privacy:</label>
- <select id="privacy-filter" class="form-control">
- <option selected>All</option>
- <option>Public</option>
- <option>Shared</option>
- <option>Private</option>
- </select>
- </div>
-
- <div class="form-group form-group-sm">
- <label for="status-filter" class="control-label">Status:</label>
- <select id="status-filter" class="form-control">
- <option selected>All</option>
- <option>Done</option>
- <option>Running</option>
- <option>Scheduled</option>
- <option>Pending</option>
- <option>Failed</option>
- </select>
- </div>
- </div>
-</div><!-- row -->
-
<div ng-controller='GroupsController as ctrl'>
<div class="row" >
<div class="col-sm-12">
@@ -180,7 +138,6 @@
{% csrf_token %}
-{% filter_script panel_id "text-filter" "attestation-filter" "privacy-filter" "status-filter" %}
{% if not request.user.is_anonymous %}
{% report_script panel_id "master-report-checkbox" "report-checkbox" "add-to-report" %}
{% endif %}