Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A1F91740A for ; Fri, 13 Feb 2015 13:35:48 +0000 (UTC) Received: (qmail 22714 invoked by uid 500); 13 Feb 2015 13:35:48 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 22669 invoked by uid 500); 13 Feb 2015 13:35:48 -0000 Mailing-List: contact commits-help@nifi.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.incubator.apache.org Delivered-To: mailing list commits@nifi.incubator.apache.org Received: (qmail 22659 invoked by uid 99); 13 Feb 2015 13:35:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2015 13:35:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 13 Feb 2015 13:35:24 +0000 Received: (qmail 20585 invoked by uid 99); 13 Feb 2015 13:35:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2015 13:35:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBA66E028F; Fri, 13 Feb 2015 13:35:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mcgilman@apache.org To: commits@nifi.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-nifi git commit: NIFI-350: - Updating the default sort direction where appropriate. Date: Fri, 13 Feb 2015 13:35:20 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-nifi Updated Branches: refs/heads/develop bf97094b8 -> 5c0ed559b NIFI-350: - Updating the default sort direction where appropriate. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/5c0ed559 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5c0ed559 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5c0ed559 Branch: refs/heads/develop Commit: 5c0ed559b566b0c821c1a005d8920d5e2e3fb3f9 Parents: bf97094 Author: Matt Gilman Authored: Fri Feb 13 08:29:24 2015 -0500 Committer: Matt Gilman Committed: Fri Feb 13 08:29:24 2015 -0500 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/cluster/nf-cluster-table.js | 8 ++++---- .../main/webapp/js/nf/counters/nf-counters-table.js | 2 +- .../webapp/js/nf/provenance/nf-provenance-table.js | 4 ++-- .../src/main/webapp/js/nf/summary/nf-summary-table.js | 14 +++++++------- .../main/webapp/js/nf/templates/nf-templates-table.js | 6 +++--- .../src/main/webapp/js/nf/users/nf-users-table.js | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5c0ed559/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js index 2968919..3ede0e5 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js @@ -445,11 +445,11 @@ nf.ClusterTable = (function () { var columnModel = [ {id: 'moreDetails', name: ' ', sortable: false, resizable: false, formatter: moreDetailsFormatter, width: 50, maxWidth: 50}, {id: 'node', field: 'node', name: 'Node Address', formatter: nodeFormatter, resizable: true, sortable: true}, - {id: 'activeThreadCount', field: 'activeThreadCount', name: 'Active Thread Count', resizable: true, sortable: true}, - {id: 'queued', field: 'queued', name: 'Queue / Size', resizable: true, sortable: true}, + {id: 'activeThreadCount', field: 'activeThreadCount', name: 'Active Thread Count', resizable: true, sortable: true, defaultSortAsc: false}, + {id: 'queued', field: 'queued', name: 'Queue / Size', resizable: true, sortable: true, defaultSortAsc: false}, {id: 'status', field: 'status', name: 'Status', formatter: statusFormatter, resizable: true, sortable: true}, - {id: 'uptime', field: 'nodeStartTime', name: 'Uptime', formatter: valueFormatter, resizable: true, sortable: true}, - {id: 'heartbeat', field: 'heartbeat', name: 'Last Heartbeat', formatter: valueFormatter, resizable: true, sortable: true} + {id: 'uptime', field: 'nodeStartTime', name: 'Uptime', formatter: valueFormatter, resizable: true, sortable: true, defaultSortAsc: false}, + {id: 'heartbeat', field: 'heartbeat', name: 'Last Heartbeat', formatter: valueFormatter, resizable: true, sortable: true, defaultSortAsc: false} ]; // only allow the admin to modify the cluster http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5c0ed559/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js index 2b26aaa..28a36bd 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js @@ -172,7 +172,7 @@ nf.CountersTable = (function () { var countersColumns = [ {id: 'context', name: 'Context', field: 'context', sortable: true, resizable: true}, {id: 'name', name: 'Name', field: 'name', sortable: true, resizable: true}, - {id: 'value', name: 'Value', field: 'value', sortable: true, resizable: true} + {id: 'value', name: 'Value', field: 'value', sortable: true, resizable: true, defaultSortAsc: false} ]; // only allow dfm's to reset counters http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5c0ed559/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js index 2880375..5e3bab4 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js @@ -584,10 +584,10 @@ nf.ProvenanceTable = (function () { // initialize the provenance table var provenanceColumns = [ {id: 'moreDetails', name: ' ', sortable: false, resizable: false, formatter: moreDetailsFormatter, width: 50, maxWidth: 50}, - {id: 'eventTime', name: 'Date/Time', field: 'eventTime', sortable: true, resizable: true}, + {id: 'eventTime', name: 'Date/Time', field: 'eventTime', sortable: true, defaultSortAsc: false, resizable: true}, {id: 'eventType', name: 'Type', field: 'eventType', sortable: true, resizable: true}, {id: 'flowFileUuid', name: 'FlowFile Uuid', field: 'flowFileUuid', sortable: true, resizable: true}, - {id: 'fileSize', name: 'Size', field: 'fileSize', sortable: true, resizable: true}, + {id: 'fileSize', name: 'Size', field: 'fileSize', sortable: true, defaultSortAsc: false, resizable: true}, {id: 'componentName', name: 'Component Name', field: 'componentName', sortable: true, resizable: true, formatter: valueFormatter}, {id: 'componentType', name: 'Component Type', field: 'componentType', sortable: true, resizable: true} ]; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5c0ed559/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js index a4583bc..77f5e31 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js @@ -301,10 +301,10 @@ nf.SummaryTable = (function () { // define the input, read, written, and output columns (reused between both tables) var nameColumn = {id: 'name', field: 'name', name: 'Name', sortable: true, resizable: true}; var runStatusColumn = {id: 'runStatus', field: 'runStatus', name: 'Run Status', formatter: runStatusFormatter, sortable: true}; - var inputColumn = {id: 'input', field: 'input', name: 'In / Size 5 min', toolTip: 'Count / data size in the last 5 min', sortable: true, resizable: true}; - var ioColumn = {id: 'io', field: 'io', name: 'Read / Write 5 min', toolTip: 'Data size in the last 5 min', formatter: ioFormatter, sortable: true, resizable: true}; - var outputColumn = {id: 'output', field: 'output', name: 'Out / Size 5 min', toolTip: 'Count / data size in the last 5 min', sortable: true, resizable: true}; - var tasksTimeColumn = {id: 'tasks', field: 'tasks', name: 'Tasks / Time 5 min', toolTip: 'Count / duration in the last 5 min', formatter: taskTimeFormatter, sortable: true, resizable: true}; + var inputColumn = {id: 'input', field: 'input', name: 'In / Size 5 min', toolTip: 'Count / data size in the last 5 min', sortable: true, defaultSortAsc: false, resizable: true}; + var ioColumn = {id: 'io', field: 'io', name: 'Read / Write 5 min', toolTip: 'Data size in the last 5 min', formatter: ioFormatter, sortable: true, defaultSortAsc: false, resizable: true}; + var outputColumn = {id: 'output', field: 'output', name: 'Out / Size 5 min', toolTip: 'Count / data size in the last 5 min', sortable: true, defaultSortAsc: false, resizable: true}; + var tasksTimeColumn = {id: 'tasks', field: 'tasks', name: 'Tasks / Time 5 min', toolTip: 'Count / duration in the last 5 min', formatter: taskTimeFormatter, sortable: true, defaultSortAsc: false, resizable: true}; // define the column model for the processor summary table var processorsColumnModel = [ @@ -565,7 +565,7 @@ nf.SummaryTable = (function () { }; // define the input, read, written, and output columns (reused between both tables) - var queueColumn = {id: 'queued', field: 'queued', name: 'Queue / Size', sortable: true, resize: true}; + var queueColumn = {id: 'queued', field: 'queued', name: 'Queue / Size', sortable: true, defaultSortAsc: false, resize: true}; // define the column model for the summary table var connectionsColumnModel = [ @@ -1264,8 +1264,8 @@ nf.SummaryTable = (function () { var transmissionStatusColumn = {id: 'transmissionStatus', field: 'transmissionStatus', name: 'Transmitting', formatter: transmissionStatusFormatter, sortable: true, resizable: true}; var targetUriColumn = {id: 'targetUri', field: 'targetUri', name: 'Target URI', sortable: true, resizable: true}; - var sentColumn = {id: 'sent', field: 'sent', name: 'Sent / Size 5 min', toolTip: 'Count / data size in the last 5 min', sortable: true, resizable: true}; - var receivedColumn = {id: 'received', field: 'received', name: 'Received / Size 5 min', toolTip: 'Count / data size in the last 5 min', sortable: true, resizable: true}; + var sentColumn = {id: 'sent', field: 'sent', name: 'Sent / Size 5 min', toolTip: 'Count / data size in the last 5 min', sortable: true, defaultSortAsc: false, resizable: true}; + var receivedColumn = {id: 'received', field: 'received', name: 'Received / Size 5 min', toolTip: 'Count / data size in the last 5 min', sortable: true, defaultSortAsc: false, resizable: true}; // define the column model for the summary table var remoteProcessGroupsColumnModel = [ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5c0ed559/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js index ec8f49e..2dcdb68 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js @@ -204,7 +204,7 @@ nf.TemplatesTable = (function () { // initialize the templates table var templatesColumns = [ - {id: 'timestamp', name: 'Date/Time', field: 'timestamp', sortable: true, resizable: false, formatter: valueFormatter, width: 225, maxWidth: 225}, + {id: 'timestamp', name: 'Date/Time', field: 'timestamp', sortable: true, defaultSortAsc: false, resizable: false, formatter: valueFormatter, width: 225, maxWidth: 225}, {id: 'name', name: 'Name', field: 'name', sortable: true, resizable: true}, {id: 'description', name: 'Description', field: 'description', sortable: true, resizable: true, formatter: valueFormatter}, {id: 'actions', name: ' ', sortable: false, resizable: false, formatter: actionFormatter, width: 100, maxWidth: 100} @@ -231,14 +231,14 @@ nf.TemplatesTable = (function () { // initialize the sort sort({ columnId: 'timestamp', - sortAsc: true + sortAsc: false }, templatesData); // initialize the grid var templatesGrid = new Slick.Grid('#templates-table', templatesData, templatesColumns, templatesOptions); templatesGrid.setSelectionModel(new Slick.RowSelectionModel()); templatesGrid.registerPlugin(new Slick.AutoTooltips()); - templatesGrid.setSortColumn('timestamp', true); + templatesGrid.setSortColumn('timestamp', false); templatesGrid.onSort.subscribe(function (e, args) { sort({ columnId: args.sortCol.field, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5c0ed559/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js index 88ea225..7718221 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js @@ -592,7 +592,7 @@ nf.UsersTable = (function () { {id: 'userName', name: 'User', field: 'userName', sortable: true, resizable: true}, {id: 'userGroup', name: 'Group', field: 'userGroup', sortable: true, resizable: true, formatter: valueFormatter}, {id: 'authorities', name: 'Roles', field: 'authorities', sortable: true, resizable: true, formatter: roleFormatter}, - {id: 'lastAccessed', name: 'Last Accessed', field: 'lastAccessed', sortable: true, resizable: true, formatter: valueFormatter}, + {id: 'lastAccessed', name: 'Last Accessed', field: 'lastAccessed', sortable: true, defaultSortAsc: false, resizable: true, formatter: valueFormatter}, {id: 'status', name: 'Status', field: 'status', sortable: true, resizable: false, formatter: statusFormatter}, {id: 'actions', name: ' ', sortable: false, resizable: false, formatter: actionFormatter, width: 100, maxWidth: 100} ];