[38/50] [abbrv] metron git commit: METRON-1621: Sorting alerts table by score closes apache/incubator-metron#1088
METRON-1621: Sorting alerts table by score closes apache/incubator-metron#1088 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/4519f721 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/4519f721 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/4519f721 Branch: refs/heads/feature/METRON-1554-pcap-query-panel Commit: 4519f72104b294c2f0eb8135181a3fa68eee9088 Parents: c4c790d Author: tiborm Authored: Fri Jun 29 09:17:27 2018 -0400 Committer: cstella Committed: Fri Jun 29 09:17:27 2018 -0400 -- .../alert-filters/alert-filters.e2e-spec.ts | 2 +- .../e2e/alerts-list/alerts-list.po.ts | 6 +- .../meta-alerts/meta-alert.e2e-spec.ts | 2 +- .../table-view/table-view.e2e-spec.ts | 90 .../e2e/alerts-list/table-view/table-view.po.ts | 26 ++ .../alerts-list/tree-view/tree-view.e2e-spec.ts | 4 +- .../e2e/mock-data/alerts_ui_e2e_index.data | 16 ++-- .../metron-alerts/e2e/utils/e2e_util.ts | 62 -- .../metron-alerts/protractor.conf.js| 1 + .../table-view/table-view.component.html| 10 +-- 10 files changed, 172 insertions(+), 47 deletions(-) -- http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts -- diff --git a/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts b/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts index d9caf7c..6783d3d 100644 --- a/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts +++ b/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts @@ -47,7 +47,7 @@ describe('Test spec for facet filters', function() { }); it('should display facets data', async function() : Promise { -let facetValues = [ 'enrichm...:country 3', 'ip_dst_addr 8', 'ip_src_addr 2', 'source:type 1' ]; +let facetValues = [ 'enrichm...:country 3', 'ip_dst_addr 8', 'ip_src_addr 6', 'source:type 1' ]; await page.navgateToAlertList(); expect(await page.getFacetsTitle()).toEqualBcoz('Filters', 'for Title as Filters'); http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts -- diff --git a/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts b/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts index 13aeb27..389d218 100644 --- a/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts +++ b/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts @@ -16,7 +16,7 @@ * limitations under the License. */ -import {browser, element, by, protractor} from 'protractor'; +import {browser, element, by, protractor, ElementArrayFinder} from 'protractor'; import * as moment from 'moment/moment'; import { waitForElementVisibility, waitForElementPresence, waitForElementInVisibility, @@ -446,10 +446,6 @@ export class MetronAlertsPage { .element(by.xpath('../..')).all(by.css('td a')).get(8).getText(); } - sortTable(colName: string) { -element.all(by.css('table thead th')).all(by.linkText(colName)).get(0).click(); - } - getCellValue(rowIndex: number, colIndex: number, previousText: string) { let cellElement = element.all(by.css('table tbody tr')).get(rowIndex).all(by.css('td')).get(colIndex); return this.waitForTextChange(cellElement, previousText).then(() => cellElement.getText()); http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts -- diff --git a/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts b/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts index 5425523..5bf7fd8 100644 --- a/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts +++ b/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts @@ -158,7 +158,7 @@ describe('Test spec for meta alerts workflow', function() { 'source:type': '1', 'ip_dst_addr': '7', 'enrichm...:country': '3', - 'ip_src_addr': '2' + 'ip_src_addr': '4' }; let alertsInMetaAlerts = [ '82f8046d-d...03b17480dd', http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/table-view/table-view.e2e-spec.ts
metron git commit: METRON-1621: Sorting alerts table by score closes apache/incubator-metron#1088
Repository: metron Updated Branches: refs/heads/master c4c790dbe -> 4519f7210 METRON-1621: Sorting alerts table by score closes apache/incubator-metron#1088 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/4519f721 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/4519f721 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/4519f721 Branch: refs/heads/master Commit: 4519f72104b294c2f0eb8135181a3fa68eee9088 Parents: c4c790d Author: tiborm Authored: Fri Jun 29 09:17:27 2018 -0400 Committer: cstella Committed: Fri Jun 29 09:17:27 2018 -0400 -- .../alert-filters/alert-filters.e2e-spec.ts | 2 +- .../e2e/alerts-list/alerts-list.po.ts | 6 +- .../meta-alerts/meta-alert.e2e-spec.ts | 2 +- .../table-view/table-view.e2e-spec.ts | 90 .../e2e/alerts-list/table-view/table-view.po.ts | 26 ++ .../alerts-list/tree-view/tree-view.e2e-spec.ts | 4 +- .../e2e/mock-data/alerts_ui_e2e_index.data | 16 ++-- .../metron-alerts/e2e/utils/e2e_util.ts | 62 -- .../metron-alerts/protractor.conf.js| 1 + .../table-view/table-view.component.html| 10 +-- 10 files changed, 172 insertions(+), 47 deletions(-) -- http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts -- diff --git a/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts b/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts index d9caf7c..6783d3d 100644 --- a/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts +++ b/metron-interface/metron-alerts/e2e/alerts-list/alert-filters/alert-filters.e2e-spec.ts @@ -47,7 +47,7 @@ describe('Test spec for facet filters', function() { }); it('should display facets data', async function() : Promise { -let facetValues = [ 'enrichm...:country 3', 'ip_dst_addr 8', 'ip_src_addr 2', 'source:type 1' ]; +let facetValues = [ 'enrichm...:country 3', 'ip_dst_addr 8', 'ip_src_addr 6', 'source:type 1' ]; await page.navgateToAlertList(); expect(await page.getFacetsTitle()).toEqualBcoz('Filters', 'for Title as Filters'); http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts -- diff --git a/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts b/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts index 13aeb27..389d218 100644 --- a/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts +++ b/metron-interface/metron-alerts/e2e/alerts-list/alerts-list.po.ts @@ -16,7 +16,7 @@ * limitations under the License. */ -import {browser, element, by, protractor} from 'protractor'; +import {browser, element, by, protractor, ElementArrayFinder} from 'protractor'; import * as moment from 'moment/moment'; import { waitForElementVisibility, waitForElementPresence, waitForElementInVisibility, @@ -446,10 +446,6 @@ export class MetronAlertsPage { .element(by.xpath('../..')).all(by.css('td a')).get(8).getText(); } - sortTable(colName: string) { -element.all(by.css('table thead th')).all(by.linkText(colName)).get(0).click(); - } - getCellValue(rowIndex: number, colIndex: number, previousText: string) { let cellElement = element.all(by.css('table tbody tr')).get(rowIndex).all(by.css('td')).get(colIndex); return this.waitForTextChange(cellElement, previousText).then(() => cellElement.getText()); http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts -- diff --git a/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts b/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts index 5425523..5bf7fd8 100644 --- a/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts +++ b/metron-interface/metron-alerts/e2e/alerts-list/meta-alerts/meta-alert.e2e-spec.ts @@ -158,7 +158,7 @@ describe('Test spec for meta alerts workflow', function() { 'source:type': '1', 'ip_dst_addr': '7', 'enrichm...:country': '3', - 'ip_src_addr': '2' + 'ip_src_addr': '4' }; let alertsInMetaAlerts = [ '82f8046d-d...03b17480dd', http://git-wip-us.apache.org/repos/asf/metron/blob/4519f721/metron-interface/metron-alerts/e2e/alerts-list/table-view/table-view.e2e-spec.ts