From 06b2f430c766da4bfeba2bfec61b1451d008e0bd Mon Sep 17 00:00:00 2001 From: ChangHyun Lee Date: Wed, 5 Apr 2017 20:46:01 +0900 Subject: [PATCH] [TIC-Web] add source filter - add source filter - set default filter Change-Id: I31fb58360d2c334bcb5d377a4065adf349a6a48d Signed-off-by: ChangHyun Lee --- public/src/index.html | 13 +++-- public/src/js/page/package.js | 115 +++++++++++++++++++++++------------------- 2 files changed, 73 insertions(+), 55 deletions(-) diff --git a/public/src/index.html b/public/src/index.html index 9152391..8e2f228 100644 --- a/public/src/index.html +++ b/public/src/index.html @@ -130,12 +130,17 @@ @@ -278,7 +283,7 @@
-
Recipe
+
Recipe & Repository
@@ -373,7 +378,7 @@
-

Add Recipe or Repository

+

Import Recipe or Repository

diff --git a/public/src/js/page/package.js b/public/src/js/page/package.js index ac72232..80b2f77 100644 --- a/public/src/js/page/package.js +++ b/public/src/js/page/package.js @@ -660,7 +660,7 @@ define([ } else { // the capability does not exist. Stop dependency analysis progressStatus = false; - errorMsg = 'The '+require.name+' needed by '+ node.name +' does not exist. Please check the repository'; + errorMsg = 'The ' + require.name + ' needed by ' + node.name + ' does not exist. Please check the repository'; logger.info('###' + errorMsg); // break forEach return false; @@ -1042,7 +1042,6 @@ define([ }) return new Promise(function (resolve, reject) { - function _onRendered(event, nodes) { packages = _.values(nodes); _.forEach(nodes, function(node, key) { @@ -1058,8 +1057,12 @@ define([ }); _setDefaultPackage(rawData.defaultpackages); _updateSummary(); + // init filter and restore checkbox state + $('#tic-package-toolbar-source').click().click(); + resolve(); } + function _onNodeUnselected(event, node) { $('#tic-package-info-text').empty(); $('#tic-package-info-version').empty(); @@ -1083,12 +1086,7 @@ define([ }); } - function init() { - logger.info('init'); - - // button - image creation - $('#tic-package-create').on('click', onClickHandlerForImgCreationBtn); - + function _initToolbar() { function _filter(patternList) { var matchNodes = []; _.forEach(patternList, function (pattern) { @@ -1144,6 +1142,13 @@ define([ } $('#tic-package-toolbar-input').on('keyup', _.debounce(_filterInput, 500)); + function _inputClearBtnHandler() { + $('#tic-package-toolbar-input').val('').focus(); + _filter([]); + $(this).toggleClass('hidden', true); + } + $('#tic-package-toolbar-input-clear').on('click', _inputClearBtnHandler); + function _filterType() { var debug = $('#tic-package-toolbar-debug').is(':checked'); if (debug) { @@ -1165,49 +1170,21 @@ define([ return filter === '-devel'; }); } + var source = $('#tic-package-toolbar-source').is(':checked'); + if (source) { + if (!_.includes(defaultFilters, '-source')) { + defaultFilters.push('-source'); + } + } else { + _.remove(defaultFilters, function(filter) { + return filter === '-source'; + }); + } _filter([$('#tic-package-toolbar-input').val()]); } $("#tic-package-toolbar-debug").on('click', _filterType); $("#tic-package-toolbar-devel").on('click', _filterType); - - function _inputClearBtnHandler() { - $('#tic-package-toolbar-input').val('').focus(); - _filter([]); - $(this).toggleClass('hidden', true); - } - $('#tic-package-toolbar-input-clear').on('click', _inputClearBtnHandler); - - function _contextMenuHandler() { - function _uncheckAllBtnHandler() { - // INFO: bug for state.checked = false in treeview objects - $tree.treeview('checkAll', { silent: true }); - $tree.treeview('uncheckAll', { silent: true }); - _.forEach(pkgInfo, function(value, key) { - value.checked = false; - value.selfChecked = false; - value.forward = null; - value.backward = null; - value.group = null; - - // INFO: bug for state.checked = false in treeview objects - _.forEach(value.view, function(node) { - node.state.checked = false; - }); - }); - groups = {}; - conflicts = {}; - _updateSummary(); - } - $tree.contextmenu({ - target: '#tic-package-context-menu', - onItem: function (row, e) { - if (e.target.id === 'tic-package-context-menu-uncheck-all') { - _uncheckAllBtnHandler(); - } - } - }); - } - _contextMenuHandler(); + $("#tic-package-toolbar-source").on('click', _filterType); function _collapseAll() { $tree.treeview('collapseAll'); @@ -1218,10 +1195,47 @@ define([ $tree.treeview('expandAll'); } $('#tic-package-left-col-tree-toolbar-expand-all').on('click', _expandAll); + } - // FIXME: @Author: leechwin.lee@samsung.com - // Patch: Bootstrap dropdown menu not working (not dropping down when clicked) - // $('.dropdown-toggle').dropdown(); + function _initContextMenu() { + function _uncheckAllBtnHandler() { + // INFO: bug for state.checked = false in treeview objects + $tree.treeview('checkAll', { silent: true }); + $tree.treeview('uncheckAll', { silent: true }); + _.forEach(pkgInfo, function(value, key) { + value.checked = false; + value.selfChecked = false; + value.forward = null; + value.backward = null; + value.group = null; + + // INFO: bug for state.checked = false in treeview objects + _.forEach(value.view, function(node) { + node.state.checked = false; + }); + }); + groups = {}; + conflicts = {}; + _updateSummary(); + } + $tree.contextmenu({ + target: '#tic-package-context-menu', + onItem: function (row, e) { + if (e.target.id === 'tic-package-context-menu-uncheck-all') { + _uncheckAllBtnHandler(); + } + } + }); + } + + function init() { + logger.info('init'); + + _initToolbar(); + _initContextMenu(); + + // button - image creation + $('#tic-package-create').on('click', onClickHandlerForImgCreationBtn); Util.getAppConfig() .then(function (config) { @@ -1238,7 +1252,6 @@ define([ } }); }); - } init(); -- 2.7.4