netzke-basepack 1.0.1.0 → 6.5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5c58faf416227bdbc8e57fce202ba5bfe073fc
-  data.tar.gz: ab2ba7342fca7c413795685800526343e842b1ee
+  metadata.gz: abface49496fbac7db4c6a3ccbe7feba74ff737c
+  data.tar.gz: 3f2d99ca02b0310ae057b6edfc720b4a2e813716
 SHA512:
-  metadata.gz: 53de795fda7f1aa8d96802d4ddfd71a418961acbd6433d0d8398355c5566496f1cf00548a49fbf4fea525278762f7b84fca726fd771ab0c50f18dc08505f96e6
-  data.tar.gz: a1519277e2ec6d997b644adece7268ab1b84db4a13d19f9faac72e516d55670afce629fb4220354a5f94ed532096b894eed79f853be470a3840f484e54e64ac1
+  metadata.gz: aec16ea92de9fe52f5dcd15ccd8a10cedeb95624fd0e3b5f699f71710053569a45f35fd5dcd4c33bb53c89931896de9fd2a5729e946c2c69d3002b74ef1ab8ef
+  data.tar.gz: 0f18fb84455621cd1b9d721e36d8c89960f82d3d3cbf5b18368b2e66274ff66674eef7aaff4eca49815f8ae5c4b195b0aeb6346f69af9234e109440f4263ede0

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'rails', '~>4.2.0'
+gem 'rails', '~>5.1.0'
 gem 'sqlite3'
 gem 'yard'
 gem 'rake'
@@ -15,7 +15,9 @@ group :test do
   gem 'rspec-rails'
   gem 'factory_girl'
   gem 'capybara'
-  gem 'selenium-webdriver'
+  gem 'capybara-selenium'
+  gem 'selenium-webdriver', '~> 3.4.4'
+  gem 'chromedriver-helper'
   gem 'database_cleaner'
 end
 
@@ -24,9 +26,8 @@ group :development do
 end
 
 group :development, :test do
-  # gem 'spring' # troubles...
   gem 'pry-rails'
-  gem 'netzke-core', github: 'netzke/netzke-core', branch: 'master'
-  gem 'netzke-testing', github: 'netzke/netzke-testing', branch: 'master'
+  gem 'netzke-core', git: 'https://github.com/netzke/netzke-core', branch: '6-5-0'
+  gem 'netzke-testing', git: 'https://github.com/netzke/netzke-testing', branch: '6-5-0'
   gem 'faker'
 end

data/javascripts/bugfixes.js

@@ -0,0 +1,22 @@
+Ext.define('Ext.data.operation.OperationsOverrided', {
+    override : 'Ext.data.operation.Operation',
+
+    initialize : function() {
+        this.callOverridden(arguments);
+    },
+
+    execute: function() {
+        var me = this,
+            request;
+        delete me.error;
+        delete me.success;
+        me.complete = me.exception = false;
+        me.setStarted();
+        me.request = request = me.doExecute();
+        // Original version calls setOperation even when request doesn't have this method.
+        if (request && request.setOperation) {
+          request.setOperation(me);
+        }
+        return request;
+    },
+});

data/lib/netzke/basepack.rb

@@ -18,7 +18,7 @@ module Netzke
     class << self
       # Called from netzke-basepack.rb
       def init
-        %w[tristate netzkeremotecombo xdatetime basepack grid/columns grid/event_handlers].each do |name|
+        %w[bugfixes tristate netzkeremotecombo xdatetime basepack grid/columns grid/event_handlers].each do |name|
           Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/#{name}.js"
         end
 

data/lib/netzke/basepack/data_adapters/active_record_adapter.rb

@@ -326,7 +326,7 @@ module Netzke::Basepack::DataAdapters
       return nil if conditions.empty?
 
       predicates = conditions.map do |q|
-        q = HashWithIndifferentAccess.new(q)
+        q = HashWithIndifferentAccess.new(Netzke::Support.permit_hash_params(q))
 
         attr = q[:attr]
         method, assoc = method_and_assoc(attr)
@@ -445,11 +445,13 @@ module Netzke::Basepack::DataAdapters
       when Proc
         scope.call(relation)
       when Hash
-        relation.where(scope)
+        relation.where(Netzke::Support.permit_hash_params(scope))
+      when ActionController::Parameters
+        relation.where(Netzke::Support.permit_hash_params(scope))
       when NilClass
         relation
       else
-        raise ArgumentError, "Expected scope to be a Proc or a Hash, got #{scope.class}"
+        raise ArgumentError, "Expected scope to be a Proc, ActionController::Parameters or a Hash, got #{scope.class}"
       end
     end
 

data/lib/netzke/basepack/dynamic_tab_panel/client/dynamic_tab_panel.js

@@ -16,6 +16,14 @@
       tab = this.insert(i, cmp);
     }
 
+    if(config.tabIcon){
+      tab.setIcon(config.tabIcon);
+    }
+
+    if(config.tabTitle){
+      tab.setTitle(config.tabTitle);
+    }
+
     this.setActiveTab(tab);
   },
 

data/lib/netzke/basepack/query_builder/client/query_builder.js

@@ -30,7 +30,7 @@
       }, this);
     }
 
-    this.doLayout();
+    this.updateLayout();
   },
 
   addTab: function(activate, closable){

data/lib/netzke/basepack/search_panel/client/search_panel.js

@@ -14,7 +14,7 @@
       f.ownerCt = this;
       this.insert(this.items.length - 1, Ext.createByAlias('widget.netzkebasepacksearchpanelconditionfield', f));
     }, this);
-    this.doLayout();
+    this.updateLayout();
   },
 
   netzkeOnAddCondition: function() {
@@ -23,7 +23,7 @@
       this.netzkeOnAddCondition();
     }, this, {single: true});
     this.add(condField);
-    this.doLayout();
+    this.updateLayout();
     this.fireEvent('fieldsnumberchange');
   },
 

data/lib/netzke/basepack/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Basepack
-    VERSION = "1.0.1.0"
+    VERSION = "6.5.0.0.rc1"
   end
 end

data/lib/netzke/form/base/client/base.js

@@ -99,7 +99,7 @@
       tbar.insert( buttonIndex, this.actions.apply );
     }
 
-    tbar.doLayout();
+    tbar.updateLaytout();
   },
 
   /**
@@ -213,7 +213,7 @@
     });
 
     // this.getForm().cleanDestroyed(); // because fields inside of composite fields are not auto-cleaned!
-    this.doLayout();
+    this.updateLayout();
     this.inReadonlyMode = onOff;
     if (this.mode == "lockable") this.netzkeUpdateToolbar();
   },

data/lib/netzke/grid/base/client/base.js

@@ -131,9 +131,40 @@
       this.netzkeBulkExecute(commands);
     }, this);
 
+    this.netzkeApplyStoreBugfixes(store)
+
     return store;
   },
 
+  // Modifies store, to avoid bugs in Ext.js
+  netzkeApplyStoreBugfixes(store) {
+    store.totalCount = store.totalCount === undefined ? 0 : store.totalCount;
+
+    store._oldGetRange = store.getRange
+    store.getRange = function(start, end, options) {
+      var newEnd;
+      var newStart = start === undefined ? 0 : start;
+
+      if (end !== undefined) { newEnd = end }
+      else if (this.totalCount !== undefined) { newEnd = this.totalCount }
+      else { newEnd = 0 }
+
+      return this._oldGetRange(newStart, newEnd, options)
+    }
+
+    // When store is empty
+    store._oldRangeCached = store.rangeCached;
+
+    store.rangeCached = function(start, end) {
+      var newEnd = end < 0 ? 0 : end;
+      return this._oldRangeCached(start, newEnd);
+    }
+
+    store.prefetch = this.prefetchFix;
+
+    return store
+  },
+
   /**
    * @method netzkeStoreConfig
    * @return {Object} Configuration for the store
@@ -148,9 +179,9 @@
       buffered: this.paging == 'buffered'
     };
 
-    if (this.paging == 'buffered') defaults.pageSize = 300;
+    if (this.paging == 'buffered') { defaults.pageSize = 300; }
 
-    if (this.paging == 'none') defaults.pageSize = 0;
+    if (this.paging == 'none') { defaults.pageSize = 0; }
 
     return Ext.apply({}, this.storeConfig, defaults);
   },
@@ -192,5 +223,60 @@
     if (store.getNewRecords().length > 0 || store.getModifiedRecords().length > 0) {
       return confirm(this.i18n.proceedWithUnappliedChanges);
     }
+  },
+
+  prefetchFix: function(options) {
+    var me = this,
+      pageSize = me.getPageSize(),
+      data = me.getData(),
+      operation, existingPageRequest;
+    // Check pageSize has not been tampered with. That would break page caching
+    if (pageSize) {
+      if (me.lastPageSize && pageSize != me.lastPageSize) {
+        Ext.raise("pageSize cannot be dynamically altered");
+      }
+      if (!data.getPageSize()) {
+        data.setPageSize(pageSize);
+      }
+    } else // Allow first prefetch call to imply the required page size.
+    {
+      me.pageSize = data.setPageSize(pageSize = options.limit);
+    }
+    // So that we can check for tampering next time through
+    me.lastPageSize = pageSize;
+    // Always get whole pages.
+    if (!options.page) {
+      options.page = me.getPageFromRecordIndex(options.start);
+      options.start = (options.page - 1) * pageSize;
+      options.limit = Math.ceil(options.limit / pageSize) * pageSize;
+    }
+    // Currently not requesting this page, or the request was for the last
+    // generation of the data cache (clearing it changes generations)
+    // then request it...
+    existingPageRequest = me.pageRequests[options.page];
+    pageMapGeneraton = existingPageRequest && existingPageRequest.getOperation && existingPageRequest.getOperation().pageMapGeneration !== data.pageMapGeneration;
+
+    if (!existingPageRequest || pageMapGeneraton) {
+      // Copy options into a new object so as not to mutate passed in objects
+      options = Ext.apply({
+        action: 'read',
+        filters: me.getFilters().items,
+        sorters: me.getSorters().items,
+        grouper: me.getGrouper(),
+        internalCallback: me.onProxyPrefetch,
+        internalScope: me
+      }, options);
+      operation = me.createOperation('read', options);
+      // Generation # of the page map to which the requested records belong.
+      // If page map is cleared while this request is in flight, the pageMapGeneration will increment and the payload will be rejected
+      operation.pageMapGeneration = data.pageMapGeneration;
+      if (me.fireEvent('beforeprefetch', me, operation) !== false) {
+        me.pageRequests[options.page] = operation.execute();
+        if (me.getProxy().isSynchronous) {
+          delete me.pageRequests[options.page];
+        }
+      }
+    }
+    return me;
   }
 }

data/lib/netzke/tree/base/client/base.js

@@ -86,7 +86,7 @@
       var records = dataRecords.map(function(element){ return { id: element.id, parentId: parentId } });
       this.panel.server.updateParentId(records, function(response){
         dataRecords.forEach(function(record){
-          if (record.modified !== undefined &&
+          if (record.modified &&
             Object.keys(record.modified).length == 1
             && record.modified["parentId"] !== undefined){
               record.dirty = false;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 1.0.1.0
+  version: 6.5.0.0.rc1
 platform: ruby
 authors:
 - Max Gorin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies: []
 description: A set of feature-rich extendible Netzke components (such as Grid, Tree,
   Form, Window) and component extensions which can be used as building blocks for
@@ -25,6 +25,7 @@ files:
 - Rakefile
 - init.rb
 - javascripts/basepack.js
+- javascripts/bugfixes.js
 - javascripts/grid/columns.js
 - javascripts/grid/event_handlers.js
 - javascripts/netzkeremotecombo.js
@@ -113,9 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Pre-built Netzke components
 test_files: []
-has_rdoc: