From d31577f79d542950af7bb0dbffdc89a5d0e74e49 Mon Sep 17 00:00:00 2001
From: Olivier Boitel <olivier.boitel@kleegroup.com>
Date: Thu, 8 Jan 2015 14:26:33 +0100
Subject: [PATCH] #64 memory leak correction on clear

---
 .idea/workspace.xml     |  52 ++++++------
 dist/focus.js           | 182 ++++++++++++++++++++--------------------
 example/app/js/focus.js | 182 ++++++++++++++++++++--------------------
 lib/views/core-view.js  |  33 ++++----
 4 files changed, 228 insertions(+), 221 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 05e9810..f361998 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,11 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="4731a32c-cb77-44d1-a6be-dc93313b02bd" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/core/cors.js" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/core/fetch.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/views/core-view.js" afterPath="$PROJECT_DIR$/lib/views/core-view.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dist/focus.js" afterPath="$PROJECT_DIR$/dist/focus.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/app/js/focus.js" afterPath="$PROJECT_DIR$/example/app/js/focus.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/helpers/promisify_helper.js" afterPath="$PROJECT_DIR$/lib/helpers/promisify_helper.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="focus.iws" />
@@ -34,11 +32,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="search-view.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="search-view.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/views/search-view.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5752961" vertical-offset="0" max-vertical-offset="4590">
-              <caret line="20" column="24" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4590">
+              <caret line="12" column="15" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
               <folding />
             </state>
           </provider>
@@ -54,11 +52,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="core-view.js" pinned="false" current-in-tab="false">
+      <file leaf-file-name="core-view.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/views/core-view.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1525" max-vertical-offset="4335">
-              <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.7711864" vertical-offset="1398" max-vertical-offset="4420">
+              <caret line="109" column="14" selection-start-line="109" selection-start-column="14" selection-end-line="109" selection-end-column="14" />
               <folding>
                 <element signature="n#!!doc" expanded="true" />
               </folding>
@@ -153,8 +151,8 @@
         <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/lib/views/list-view.js" />
         <option value="$PROJECT_DIR$/lib/views/search-results-view.js" />
-        <option value="$PROJECT_DIR$/lib/views/core-view.js" />
         <option value="$PROJECT_DIR$/lib/views/search-view.js" />
+        <option value="$PROJECT_DIR$/lib/views/core-view.js" />
       </list>
     </option>
   </component>
@@ -285,7 +283,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
+              <option name="myItemId" value="dist" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -394,17 +392,17 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
-      <window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20714286" sideWeight="0.23338735" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20714286" sideWeight="0.23376623" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20714286" sideWeight="0.76661265" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20714286" sideWeight="0.76623374" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32934782" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3297062" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -778,16 +776,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/views/core-view.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1525" max-vertical-offset="4335">
-          <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/views/consult-edit-view.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="3982" max-vertical-offset="9826">
@@ -806,11 +794,21 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/views/search-view.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5752961" vertical-offset="0" max-vertical-offset="4590">
-          <caret line="20" column="24" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4590">
+          <caret line="12" column="15" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/views/core-view.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7711864" vertical-offset="1398" max-vertical-offset="4420">
+          <caret line="109" column="14" selection-start-line="109" selection-start-column="14" selection-end-line="109" selection-end-column="14" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/dist/focus.js b/dist/focus.js
index 9832665..26b02d2 100644
--- a/dist/focus.js
+++ b/dist/focus.js
@@ -6340,7 +6340,7 @@ module.exports = ConsultEditView;
             this.isHidden = !this.isHidden;
             this.render(options);
         },
-        //Reference lists names. 
+        //Reference lists names.
         //These _names_, must have been registered inside the the application to be used.
         referenceNames: undefined,
 
@@ -6411,6 +6411,24 @@ module.exports = ConsultEditView;
                 });
             }
 
+            this.registerSessionHelper(this);
+        },
+        /**
+         * Register session helper
+         * @param context execution context
+         */
+        registerSessionHelper: function registerSessionHelper(context){
+            context.session = {
+                save : function saveItem(item){
+                    return sessionHelper.saveItem(context.getSessionKey(), item);
+                },
+                get : function getItem(){
+                    return sessionHelper.getItem(context.getSessionKey());
+                },
+                delete : function deleteItem(){
+                    return sessionHelper.removeItem(context.getSessionKey());
+                }
+            };
         },
 
         //Initialize the model of the view.
@@ -6518,23 +6536,12 @@ module.exports = ConsultEditView;
                 toogle: true
             });
         },
-        //Get the criteria from the session storage if exists.
-        getSessionCriteria: function getCriteria() {
-            return sessionHelper.getItem(this.getCriteriaId());
-        },
-        //Save the criteria in the session storage.
-        saveSessionCriteria: function saveSessionCriteria(criteria) {
-            return sessionHelper.saveItem(this.getCriteriaId(), criteria);
-        },
         // Get the id of the criteria.
-        getCriteriaId: function getCriteriaId() {
+        getSessionKey: function getSessionKey() {
             var hash = window.location.hash;
             if (this.model.modelName !== undefined) {
                 hash += this.model.modelName;
             }
-            if (this.opts.criteriaId !== undefined) {
-                hash += this.opts.criteriaId;
-            }
             return hash;
         },
         //Call the history back.
@@ -6770,7 +6777,7 @@ module.exports = {
 };
 
 },{"./collection-pagination-view":51,"./composite-view":52,"./consult-edit-view":53,"./core-view":54,"./header-items-view":55,"./header-view":56,"./list-view":58,"./modal-view":59,"./notifications-view":60,"./search-results-view":61,"./search-view":62}],58:[function(require,module,exports){
-/*global Backbone,  $,  _*/
+/*global Backbone,  $,  _, window*/
 "use strict";
 // Filename: views/list-view.js
 //Dependencies.
@@ -6878,14 +6885,13 @@ var ListView = ConsultEditView.extend({
     ConsultEditView.prototype.initialize.call(this, options);
     //By default the search criteria is empty.
     this.searchCriteria = this.opts.searchCriteria || this.searchCriteria;
-    this.isSearchTriggered = options.isSearchTriggered || false;
     this.listenTo(this.model, "reset", this.render, this);
     // Listen to the model add event.
     this.listenTo(this.model, "add", this.addOne, this);
     var currentView = this;
     if (this.opts.isModelToLoad) {
       this.opts.isReadyModelData = false;
-      this.getSessionCriteria().then(function (crit) {
+      this.session.get().then(function (crit) {
         //Restore the criteria if save into the session.
         if (crit !== undefined && crit !== null && crit.pageInfo !== undefined && crit.pageInfo !== null) {
           currentView.model.setPageInfo(crit.pageInfo);
@@ -7124,7 +7130,7 @@ var ListView = ConsultEditView.extend({
     }
   },
   saveCriteria: function (criteria, pageInfo) {
-    this.saveSessionCriteria({
+    this.session.save({
       criteria: criteria,
       pageInfo: pageInfo
     });
@@ -7320,6 +7326,12 @@ var SearchResultsView = ListView.extend({
     isReadyResultsData: true
   }),
 
+  initialize: function initializeListView(options) {
+    options = options || {};
+    ListView.prototype.initialize.call(this, options);
+    this.isSearchTriggered = options.isSearchTriggered || false;
+  },
+
   // Get the criteria used to get the results.
   getCriteria: function getCriteriaResultsView() {
     var criteria = this.opts.searchView.getCriteria();
@@ -7366,7 +7378,7 @@ var SearchResultsView = ListView.extend({
   },
 
   saveCriteria: function saveSearchCriteria(criteria, pageInfo) {
-    this.saveSessionCriteria({criteria: criteria, pageInfo: pageInfo}).then(function (s) {
+    this.session.save({criteria: criteria, pageInfo: pageInfo}).then(function (s) {
       console.log('criteria save in session', s);
     });
   }
@@ -7386,7 +7398,8 @@ var CoreView = require('./core-view');
 var errorHelper = require('../helpers/error_helper');
 var backboneNotification = require("../helpers/backbone_notification");
 
-var SearchView = CoreView.extend({
+var SearchView;
+SearchView = CoreView.extend({
   tagName: 'div',
   className: 'searchView',
   ResultsView: undefined,
@@ -7439,7 +7452,7 @@ var SearchView = CoreView.extend({
       $('.collapse', this.$el).collapse('hide');
     });
     var currentView = this;
-    this.getSessionCriteria().then(function (crit) {
+    this.session.get().then(function (crit) {
       //Restore the criteria if save into the session.
       if (crit !== undefined && crit !== null && crit.pageInfo !== undefined && crit.pageInfo !== null) {
         currentView.model.set(crit.criteria, {
@@ -7464,15 +7477,14 @@ var SearchView = CoreView.extend({
     this.delegateEvents();
   },
 
-  defaultEvents: {
+  events: {
     "submit form": 'runSearch', // Launch the search.
     "click button.btnReset": 'clearSearchCriteria', // Reset all the criteria.
     "click button.btnEditCriteria": 'editCriteria', //Deal with the edit mode.
     "click button.toogleCriteria": 'toogleMoreCriteria', // Deal with the more / less criteria.
     "click .panel-heading": "toogleCollapse",
-    "click button.btnCreate": "create",
+    "click button.btnCreate": "create"
   },
-  events: this.defaultEvents,
 
   refreshSearchOnInputChangeEvents: {
     "change [data-refresh]  input:not([noRefresh])": "runSearch",
@@ -7550,49 +7562,49 @@ var SearchView = CoreView.extend({
     this.searchResultsView.render();
     var currentView = this;
     ModelValidator
-      .validate(this.model)
-      .then(function (model) {
-        currentView.model.unsetErrors({
-          silent: false
-        });
-        var criteria = currentView.getCriteria();
-        var pageInfo = currentView.searchResults.pageInfo();
-
-        if (isEvent) {
-          pageInfo.currentPage = 1;
-        }
-        if (!currentView.search) {
-          throw new NotImplementedException('The search property of this view is not defined, the search cannot be launched.', this);
-        }
-        currentView
-          .search(criteria, pageInfo)
-          .then(function success(jsonResponse) {
-            //Save the criteria in session.
-            currentView.searchResultsView.opts.isReadyResultsData = true;
-            currentView.searchResultsView.isSearchTriggered = true;
-            currentView.searchResults.setPageInfo(pageInfo);
-            currentView.saveSessionCriteria({
-              criteria: criteria,
-              pageInfo: pageInfo
-            }).then(function (s) {
-              //console.log('criteria save in session', s);
-              backboneNotification.clearNotifications();
-              return currentView.searchSuccess(jsonResponse);
-            });
-          }).then(null, function error(errorResponse) {
-            currentView.searchResultsView.opts.isReadyResultsData = true;
-            currentView.searchError(errorResponse);
-          }).then(function resetButton() {
-            if (searchButton) {
-              searchButton.button('reset');
-            }
+        .validate(this.model)
+        .then(function(model) {
+          currentView.model.unsetErrors({
+            silent: false
           });
-      }).then(null, function error(errors) {
-        currentView.model.setErrors(errors);
-        if (searchButton) {
-          searchButton.button('reset');
-        }
-      });
+          var criteria = currentView.getCriteria();
+          var pageInfo = currentView.searchResults.pageInfo();
+
+          if (isEvent) {
+            pageInfo.currentPage = 1;
+          }
+          if (!currentView.search) {
+            throw new NotImplementedException('The search property of this view is not defined, the search cannot be launched.', this);
+          }
+          currentView
+              .search(criteria, pageInfo)
+              .then(function success(jsonResponse) {
+                //Save the criteria in session.
+                currentView.searchResultsView.opts.isReadyResultsData = true;
+                currentView.searchResultsView.isSearchTriggered = true;
+                currentView.searchResults.setPageInfo(pageInfo);
+                currentView.session.save({
+                  criteria: criteria,
+                  pageInfo: pageInfo
+                }).then(function (s) {
+                  //console.log('criteria save in session', s);
+                  backboneNotification.clearNotifications();
+                  return currentView.searchSuccess(jsonResponse);
+                });
+              }).then(null, function error(errorResponse) {
+                currentView.searchResultsView.opts.isReadyResultsData = true;
+                currentView.searchError(errorResponse);
+              }).then(function resetButton() {
+                if (searchButton) {
+                  searchButton.button('reset');
+                }
+              });
+        }).then(null, function error(errors) {
+          currentView.model.setErrors(errors);
+          if (searchButton) {
+            searchButton.button('reset');
+          }
+        });
 
     if (this.isReadOnly) {
       this.model.set({
@@ -7603,24 +7615,24 @@ var SearchView = CoreView.extend({
 
   clearSearchCriteria: function clearSearchCriteria(event) {
     event.preventDefault();
-    //Backbone.Notification.clearNotifications();
-    var unchanged = {};
-    var vals = this.getUnchangedFields();
-    for (var i in vals) {
-      unchanged[vals[i]] = this.model.get(vals[i]);
-    }
     this.model.clear();
-    for (field in unchanged) {
-      this.model.set(field, unchanged[field], {
-        silent: true
-      });
-    }
-    this.saveSessionCriteria({}); // clear session criteria.
-    this.initialize(); //Call initialize again in order to refresh the view with criteria lists.
+    var currentView = this;
+    this.session.get().then(function (item) {
+      if (item !== null) {
+        currentView.session.delete().then(function(item){}); // clear session criteria.
+      }
+      currentView.searchResultsView.isSearchTriggered = false;
+      currentView.searchResults.reset();
+    });
   },
 
-  getUnchangedFields: function getUnchangedFields() {
-    return []
+  // Get the id of the criteria.
+  getSessionKey: function getSessionKey() {
+    var hash = CoreView.prototype.getSessionKey.call(this);
+    if (this.opts.criteriaId !== undefined) {
+      hash += this.opts.criteriaId;
+    }
+    return hash;
   },
 
   render: function renderSearch(options) {
@@ -7638,16 +7650,6 @@ var SearchView = CoreView.extend({
   }
 });
 
-/*ModelValidator.validate(this.model)
- .catch (currentView.model.setErrors)
- .then(function(model) {
- currentView.model.unsetErrors();
- currentView.search(currentView.model.toJSON())
- //.then(currentView.searchSuccess.bind(currentView))
- .then(currentView.searchResults.reset.bind(currentView.searchResults))
- .catch (currentView.searchError.bind(currentView))
- });*/
-
 module.exports = SearchView;
 },{"../helpers/backbone_notification":8,"../helpers/custom_exception":9,"../helpers/error_helper":10,"../helpers/form_helper":11,"../helpers/model_validation_promise":18,"./core-view":54}],63:[function(require,module,exports){
 "use strict";
diff --git a/example/app/js/focus.js b/example/app/js/focus.js
index 9832665..26b02d2 100644
--- a/example/app/js/focus.js
+++ b/example/app/js/focus.js
@@ -6340,7 +6340,7 @@ module.exports = ConsultEditView;
             this.isHidden = !this.isHidden;
             this.render(options);
         },
-        //Reference lists names. 
+        //Reference lists names.
         //These _names_, must have been registered inside the the application to be used.
         referenceNames: undefined,
 
@@ -6411,6 +6411,24 @@ module.exports = ConsultEditView;
                 });
             }
 
+            this.registerSessionHelper(this);
+        },
+        /**
+         * Register session helper
+         * @param context execution context
+         */
+        registerSessionHelper: function registerSessionHelper(context){
+            context.session = {
+                save : function saveItem(item){
+                    return sessionHelper.saveItem(context.getSessionKey(), item);
+                },
+                get : function getItem(){
+                    return sessionHelper.getItem(context.getSessionKey());
+                },
+                delete : function deleteItem(){
+                    return sessionHelper.removeItem(context.getSessionKey());
+                }
+            };
         },
 
         //Initialize the model of the view.
@@ -6518,23 +6536,12 @@ module.exports = ConsultEditView;
                 toogle: true
             });
         },
-        //Get the criteria from the session storage if exists.
-        getSessionCriteria: function getCriteria() {
-            return sessionHelper.getItem(this.getCriteriaId());
-        },
-        //Save the criteria in the session storage.
-        saveSessionCriteria: function saveSessionCriteria(criteria) {
-            return sessionHelper.saveItem(this.getCriteriaId(), criteria);
-        },
         // Get the id of the criteria.
-        getCriteriaId: function getCriteriaId() {
+        getSessionKey: function getSessionKey() {
             var hash = window.location.hash;
             if (this.model.modelName !== undefined) {
                 hash += this.model.modelName;
             }
-            if (this.opts.criteriaId !== undefined) {
-                hash += this.opts.criteriaId;
-            }
             return hash;
         },
         //Call the history back.
@@ -6770,7 +6777,7 @@ module.exports = {
 };
 
 },{"./collection-pagination-view":51,"./composite-view":52,"./consult-edit-view":53,"./core-view":54,"./header-items-view":55,"./header-view":56,"./list-view":58,"./modal-view":59,"./notifications-view":60,"./search-results-view":61,"./search-view":62}],58:[function(require,module,exports){
-/*global Backbone,  $,  _*/
+/*global Backbone,  $,  _, window*/
 "use strict";
 // Filename: views/list-view.js
 //Dependencies.
@@ -6878,14 +6885,13 @@ var ListView = ConsultEditView.extend({
     ConsultEditView.prototype.initialize.call(this, options);
     //By default the search criteria is empty.
     this.searchCriteria = this.opts.searchCriteria || this.searchCriteria;
-    this.isSearchTriggered = options.isSearchTriggered || false;
     this.listenTo(this.model, "reset", this.render, this);
     // Listen to the model add event.
     this.listenTo(this.model, "add", this.addOne, this);
     var currentView = this;
     if (this.opts.isModelToLoad) {
       this.opts.isReadyModelData = false;
-      this.getSessionCriteria().then(function (crit) {
+      this.session.get().then(function (crit) {
         //Restore the criteria if save into the session.
         if (crit !== undefined && crit !== null && crit.pageInfo !== undefined && crit.pageInfo !== null) {
           currentView.model.setPageInfo(crit.pageInfo);
@@ -7124,7 +7130,7 @@ var ListView = ConsultEditView.extend({
     }
   },
   saveCriteria: function (criteria, pageInfo) {
-    this.saveSessionCriteria({
+    this.session.save({
       criteria: criteria,
       pageInfo: pageInfo
     });
@@ -7320,6 +7326,12 @@ var SearchResultsView = ListView.extend({
     isReadyResultsData: true
   }),
 
+  initialize: function initializeListView(options) {
+    options = options || {};
+    ListView.prototype.initialize.call(this, options);
+    this.isSearchTriggered = options.isSearchTriggered || false;
+  },
+
   // Get the criteria used to get the results.
   getCriteria: function getCriteriaResultsView() {
     var criteria = this.opts.searchView.getCriteria();
@@ -7366,7 +7378,7 @@ var SearchResultsView = ListView.extend({
   },
 
   saveCriteria: function saveSearchCriteria(criteria, pageInfo) {
-    this.saveSessionCriteria({criteria: criteria, pageInfo: pageInfo}).then(function (s) {
+    this.session.save({criteria: criteria, pageInfo: pageInfo}).then(function (s) {
       console.log('criteria save in session', s);
     });
   }
@@ -7386,7 +7398,8 @@ var CoreView = require('./core-view');
 var errorHelper = require('../helpers/error_helper');
 var backboneNotification = require("../helpers/backbone_notification");
 
-var SearchView = CoreView.extend({
+var SearchView;
+SearchView = CoreView.extend({
   tagName: 'div',
   className: 'searchView',
   ResultsView: undefined,
@@ -7439,7 +7452,7 @@ var SearchView = CoreView.extend({
       $('.collapse', this.$el).collapse('hide');
     });
     var currentView = this;
-    this.getSessionCriteria().then(function (crit) {
+    this.session.get().then(function (crit) {
       //Restore the criteria if save into the session.
       if (crit !== undefined && crit !== null && crit.pageInfo !== undefined && crit.pageInfo !== null) {
         currentView.model.set(crit.criteria, {
@@ -7464,15 +7477,14 @@ var SearchView = CoreView.extend({
     this.delegateEvents();
   },
 
-  defaultEvents: {
+  events: {
     "submit form": 'runSearch', // Launch the search.
     "click button.btnReset": 'clearSearchCriteria', // Reset all the criteria.
     "click button.btnEditCriteria": 'editCriteria', //Deal with the edit mode.
     "click button.toogleCriteria": 'toogleMoreCriteria', // Deal with the more / less criteria.
     "click .panel-heading": "toogleCollapse",
-    "click button.btnCreate": "create",
+    "click button.btnCreate": "create"
   },
-  events: this.defaultEvents,
 
   refreshSearchOnInputChangeEvents: {
     "change [data-refresh]  input:not([noRefresh])": "runSearch",
@@ -7550,49 +7562,49 @@ var SearchView = CoreView.extend({
     this.searchResultsView.render();
     var currentView = this;
     ModelValidator
-      .validate(this.model)
-      .then(function (model) {
-        currentView.model.unsetErrors({
-          silent: false
-        });
-        var criteria = currentView.getCriteria();
-        var pageInfo = currentView.searchResults.pageInfo();
-
-        if (isEvent) {
-          pageInfo.currentPage = 1;
-        }
-        if (!currentView.search) {
-          throw new NotImplementedException('The search property of this view is not defined, the search cannot be launched.', this);
-        }
-        currentView
-          .search(criteria, pageInfo)
-          .then(function success(jsonResponse) {
-            //Save the criteria in session.
-            currentView.searchResultsView.opts.isReadyResultsData = true;
-            currentView.searchResultsView.isSearchTriggered = true;
-            currentView.searchResults.setPageInfo(pageInfo);
-            currentView.saveSessionCriteria({
-              criteria: criteria,
-              pageInfo: pageInfo
-            }).then(function (s) {
-              //console.log('criteria save in session', s);
-              backboneNotification.clearNotifications();
-              return currentView.searchSuccess(jsonResponse);
-            });
-          }).then(null, function error(errorResponse) {
-            currentView.searchResultsView.opts.isReadyResultsData = true;
-            currentView.searchError(errorResponse);
-          }).then(function resetButton() {
-            if (searchButton) {
-              searchButton.button('reset');
-            }
+        .validate(this.model)
+        .then(function(model) {
+          currentView.model.unsetErrors({
+            silent: false
           });
-      }).then(null, function error(errors) {
-        currentView.model.setErrors(errors);
-        if (searchButton) {
-          searchButton.button('reset');
-        }
-      });
+          var criteria = currentView.getCriteria();
+          var pageInfo = currentView.searchResults.pageInfo();
+
+          if (isEvent) {
+            pageInfo.currentPage = 1;
+          }
+          if (!currentView.search) {
+            throw new NotImplementedException('The search property of this view is not defined, the search cannot be launched.', this);
+          }
+          currentView
+              .search(criteria, pageInfo)
+              .then(function success(jsonResponse) {
+                //Save the criteria in session.
+                currentView.searchResultsView.opts.isReadyResultsData = true;
+                currentView.searchResultsView.isSearchTriggered = true;
+                currentView.searchResults.setPageInfo(pageInfo);
+                currentView.session.save({
+                  criteria: criteria,
+                  pageInfo: pageInfo
+                }).then(function (s) {
+                  //console.log('criteria save in session', s);
+                  backboneNotification.clearNotifications();
+                  return currentView.searchSuccess(jsonResponse);
+                });
+              }).then(null, function error(errorResponse) {
+                currentView.searchResultsView.opts.isReadyResultsData = true;
+                currentView.searchError(errorResponse);
+              }).then(function resetButton() {
+                if (searchButton) {
+                  searchButton.button('reset');
+                }
+              });
+        }).then(null, function error(errors) {
+          currentView.model.setErrors(errors);
+          if (searchButton) {
+            searchButton.button('reset');
+          }
+        });
 
     if (this.isReadOnly) {
       this.model.set({
@@ -7603,24 +7615,24 @@ var SearchView = CoreView.extend({
 
   clearSearchCriteria: function clearSearchCriteria(event) {
     event.preventDefault();
-    //Backbone.Notification.clearNotifications();
-    var unchanged = {};
-    var vals = this.getUnchangedFields();
-    for (var i in vals) {
-      unchanged[vals[i]] = this.model.get(vals[i]);
-    }
     this.model.clear();
-    for (field in unchanged) {
-      this.model.set(field, unchanged[field], {
-        silent: true
-      });
-    }
-    this.saveSessionCriteria({}); // clear session criteria.
-    this.initialize(); //Call initialize again in order to refresh the view with criteria lists.
+    var currentView = this;
+    this.session.get().then(function (item) {
+      if (item !== null) {
+        currentView.session.delete().then(function(item){}); // clear session criteria.
+      }
+      currentView.searchResultsView.isSearchTriggered = false;
+      currentView.searchResults.reset();
+    });
   },
 
-  getUnchangedFields: function getUnchangedFields() {
-    return []
+  // Get the id of the criteria.
+  getSessionKey: function getSessionKey() {
+    var hash = CoreView.prototype.getSessionKey.call(this);
+    if (this.opts.criteriaId !== undefined) {
+      hash += this.opts.criteriaId;
+    }
+    return hash;
   },
 
   render: function renderSearch(options) {
@@ -7638,16 +7650,6 @@ var SearchView = CoreView.extend({
   }
 });
 
-/*ModelValidator.validate(this.model)
- .catch (currentView.model.setErrors)
- .then(function(model) {
- currentView.model.unsetErrors();
- currentView.search(currentView.model.toJSON())
- //.then(currentView.searchSuccess.bind(currentView))
- .then(currentView.searchResults.reset.bind(currentView.searchResults))
- .catch (currentView.searchError.bind(currentView))
- });*/
-
 module.exports = SearchView;
 },{"../helpers/backbone_notification":8,"../helpers/custom_exception":9,"../helpers/error_helper":10,"../helpers/form_helper":11,"../helpers/model_validation_promise":18,"./core-view":54}],63:[function(require,module,exports){
 "use strict";
diff --git a/lib/views/core-view.js b/lib/views/core-view.js
index 396c3f5..db8fd4c 100755
--- a/lib/views/core-view.js
+++ b/lib/views/core-view.js
@@ -19,7 +19,7 @@
             this.isHidden = !this.isHidden;
             this.render(options);
         },
-        //Reference lists names. 
+        //Reference lists names.
         //These _names_, must have been registered inside the the application to be used.
         referenceNames: undefined,
 
@@ -90,6 +90,24 @@
                 });
             }
 
+            this.registerSessionHelper(this);
+        },
+        /**
+         * Register session helper
+         * @param context execution context
+         */
+        registerSessionHelper: function registerSessionHelper(context){
+            context.session = {
+                save : function saveItem(item){
+                    return sessionHelper.saveItem(context.getSessionKey(), item);
+                },
+                get : function getItem(){
+                    return sessionHelper.getItem(context.getSessionKey());
+                },
+                delete : function deleteItem(){
+                    return sessionHelper.removeItem(context.getSessionKey());
+                }
+            };
         },
 
         //Initialize the model of the view.
@@ -197,19 +215,6 @@
                 toogle: true
             });
         },
-
-        //Access from/to session storage
-        session:{
-            save : function saveItem(item){
-                return sessionHelper.saveItem(this.getSessionKey(), item);
-            },
-            get : function getItem(){
-                return sessionHelper.getItem(this.getSessionKey());
-            },
-            delete : function deleteItem(){
-                return sessionHelper.removeItem(this.getSessionKey());
-            }
-        },
         // Get the id of the criteria.
         getSessionKey: function getSessionKey() {
             var hash = window.location.hash;