[TIC-Web] fix the search filter operation

- fix the search filter operation

Change-Id: I22d5704e28aafe0a5493700a28213bf59c1e914b
Signed-off-by: ChangHyun Lee <leechwin.lee@samsung.com>

diff --git a/public/src/css/style.css b/public/src/css/style.css
index e247f60..105faa7 100644 (file)
--- a/public/src/css/style.css
+++ b/public/src/css/style.css
@@ -143,6 +143,11 @@ body {
     overflow: auto;
 }
 
+/* Bootstrap Treeview */
+.treeview .node-disabled {
+    display: none;
+}
+
 /* Job Page */
 #tic-job-section {
     height: 100%;

diff --git a/public/src/index.html b/public/src/index.html
index 8e2f228..63594d6 100644 (file)
--- a/public/src/index.html
+++ b/public/src/index.html
@@ -116,6 +116,22 @@
                                 <h3 class="panel-title">Package List</h3>
                             </div>
                             <div class="panel-body">
+                                <!-- Category Toolbar -->
+                                <div class="btn-group btn-group-justified" data-toggle="buttons">
+                                    <label class="btn btn-default active">
+                                        <input type="radio" name="category" id="tic-package-category-presets" autocomplete="off" checked>Presets
+                                    </label>
+                                    <label class="btn btn-default">
+                                        <input type="radio" name="category" id="tic-package-category-domains" autocomplete="off">Domains
+                                    </label>
+                                    <label class="btn btn-default">
+                                        <input type="radio" name="category" id="tic-package-category-epicfeature" autocomplete="off">Epic Feature
+                                    </label>
+                                    <label class="btn btn-default">
+                                        <input type="radio" name="category" id="tic-package-category-all" autocomplete="off">All
+                                    </label>
+                                </div>
+
                                 <!-- Package Tree Toolbar -->
                                 <div id="tic-package-left-col-tree-toolbar">
                                     <div class="input-group">
@@ -393,7 +409,7 @@
                                     <input class="form-control tic-import-recipe-file-group" id="tic-import-recipe-file-input" type="text" readonly>
                                 </div>
                                 <div class="form-group col-md-2">
-                                    <button id="tic-import-recipe-file-browser" class="tic-import-recipe-file-group btn btn-primary" type="button">Browser..</button>
+                                    <button id="tic-import-recipe-file-browser" class="tic-import-recipe-file-group btn btn-default" type="button">Browser..</button>
                                 </div>
                             </div>
 

diff --git a/public/src/js/page/package.js b/public/src/js/page/package.js
index a49beb2..ac70a74 100644 (file)
--- a/public/src/js/page/package.js
+++ b/public/src/js/page/package.js
@@ -1057,9 +1057,12 @@ define([
                 });
                 _setDefaultPackage(rawData.defaultpackages);
                 _updateSummary();
+
                 // init filter and restore checkbox state
                 $('#tic-package-toolbar-source').click().click();
 
+                $tree.treeview('collapseAll', { silent: true });
+
                 resolve();
             }
 
@@ -1075,7 +1078,6 @@ define([
 
             $tree.treeview({
                 data: rawData.view,
-                levels: 1,
                 showIcon: false,
                 showCheckbox: true,
                 onRendered: _onRendered,
@@ -1114,25 +1116,26 @@ define([
             })
 
             _.forEach(packages, function (node) {
-                node.$el.hide();
+                node.$el.addClass('node-disabled'); // hide
             });
 
             if (!_.isEmpty(matchNodes)) {
                 _.forEach(matchNodes, function (node) {
-                    node.$el.show();
+                    node.$el.removeClass('node-disabled'); // show
                 });
             } else {
                 // empty input text
                 if (_.isEmpty(_.trim(_.take(patternList)))) {
                     _.forEach(packages, function (node) {
-                        node.$el.show();
+                        node.$el.removeClass('node-disabled'); // show
                     });
                 }
             }
 
             _.forEach(filterNodes, function (node) {
-                node.$el.hide();
+                node.$el.addClass('node-disabled'); // hide
             });
+
             $tree.treeview('clearSearch');
         }
 
@@ -1183,10 +1186,10 @@ define([
             }
             _filter([$('#tic-package-toolbar-input').val()]);
         }
-        // FIXME: bug for tree is not folding
-        // $("#tic-package-toolbar-debug").on('click', _filterType);
-        // $("#tic-package-toolbar-devel").on('click', _filterType);
-        // $("#tic-package-toolbar-source").on('click', _filterType);
+
+        $("#tic-package-toolbar-debug").on('click', _filterType);
+        $("#tic-package-toolbar-devel").on('click', _filterType);
+        $("#tic-package-toolbar-source").on('click', _filterType);
 
         function _collapseAll() {
             $tree.treeview('collapseAll');