netzke-basepack 0.7.7 → 0.8.0

data/lib/netzke/basepack/item_persistence.rb

@@ -0,0 +1,44 @@
+module Netzke
+  module Basepack
+    # When mixed into a component with resizable layout (e.g. border layout), this module enables persistence for regions size and collapsed/expanded state.
+    module ItemPersistence
+      extend ActiveSupport::Concern
+
+      included do
+        # this plugins does the job of assigning resize/collapse events for the component
+        plugin :events_plugin do |c|
+          c.klass = EventsPlugin
+        end
+
+        # Added endpoints
+        endpoint :region_resized do |params, this|
+          state[:"#{params[:item]}_width"] = params[:width].to_i if params[:width]
+          state[:"#{params[:item]}_height"] = params[:height].to_i if params[:height]
+        end
+
+        endpoint :region_collapsed do |params, this|
+          state[:"#{params[:item]}_collapsed"] = true
+        end
+
+        endpoint :region_expanded do |params, this|
+          state[:"#{params[:item]}_collapsed"] = false
+        end
+      end
+
+      def extend_item(item)
+        item = super
+        item_id = item[:netzke_component] || item[:item_id] # identify regions by item_id
+
+        if item_id
+          item[:width] = state[:"#{item_id}_width"] if state[:"#{item_id}_width"]
+          item[:height] = state[:"#{item_id}_height"] if state[:"#{item_id}_height"]
+          if state[:"#{item_id}_collapsed"].present?
+            item[:collapsed] = state[:"#{item_id}_collapsed"]
+          end
+        end
+
+        item
+      end
+    end
+  end
+end

data/lib/netzke/basepack/item_persistence/events_plugin.rb

@@ -0,0 +1,47 @@
+module Netzke
+  module Basepack
+    module ItemPersistence
+      class EventsPlugin < Netzke::Plugin
+        js_configure do |c|
+          c.init = <<-JS
+            function(){
+              this.callParent(arguments);
+
+              this.cmp.on('afterlayout', function(){
+
+                // scope of the parent panel
+                this.items.each(function(item, index, length){
+                  if (!item.oldSize) item.oldSize = item.getSize(); // remember initial size
+
+                  item.on('resize', function(panel, w, h){
+                    var params = {item: panel.itemId};
+
+                    if ((panel.region == 'west' || panel.region == 'east') && panel.oldSize.width != w) {
+                      params.width = w;
+                      this.regionResized(params);
+                    } else if (panel.region == 'north' || panel.region == 'south' && panel.oldSize.height != h){
+                      params.height = h;
+                      this.regionResized(params);
+                    }
+
+                    panel.oldSize = panel.getSize();
+                  }, this);
+
+                  item.on('collapse', function(panel){
+                    this.regionCollapsed({item: panel.itemId});
+                  }, this);
+
+                  item.on('expand', function(panel){
+                    this.regionExpanded({item: panel.itemId});
+                  }, this);
+
+                }, this);
+
+              }, this.cmp, {single: true});
+            }
+          JS
+        end
+      end
+    end
+  end
+end

data/lib/netzke/basepack/{paging_form_panel.rb → paging_form.rb}

@@ -1,9 +1,9 @@
 module Netzke
   module Basepack
-    # A FormPanel with paging toolbar. Allows browsing and editing records one-by-one.
+    # A Form with paging toolbar. Allows browsing and editing records one-by-one.
     #
     # == Configuration
-    # Besides +Netzke::Basepack::FormPanel+ config options, accepts:
+    # Besides +Netzke::Basepack::Form+ config options, accepts:
     # * +scope+ - specifies how the data should be filtered.
     #   When it's a symbol, it's used as a scope name.
     #   When it's a string, it's a SQL statement (passed directly to +ActiveRecord::Relation#where+).
@@ -18,55 +18,49 @@ module Netzke
     #
     # == ToDo
     # * Update the number of records after form submit
-    class PagingFormPanel < FormPanel
-      js_mixin :paging_form_panel
+    class PagingForm < Form
+      js_configure do |c|
+        c.mixin
+      end
 
       # override
       def record
         @record ||= data_adapter.first
       end
 
-      # Pass total records amount and the first record to the JS constructor
-      def js_config
-        super.merge({
-          :total_records => total_records
-        })
+      def js_configure(c)
+        super
+        # Pass total records amount and the first record to the JS constructor
+        c.total_records = total_records
       end
 
-      endpoint :get_data do |params|
+      endpoint :get_data do |params, this|
         @record = data_adapter.get_records(params).first
         record_hash = @record && js_record_data
-        {:records => record_hash && [record_hash] || [], :total => total_records(params)}
+        this.merge!(:records => record_hash && [record_hash] || [], :total => total_records(params))
       end
 
-      action :search do
-        {
-          :text => I18n.t('netzke.basepack.paging_form_panel.actions.search'),
-          :tooltip => I18n.t('netzke.basepack.paging_form_panel.actions.search_tooltip'),
-          :icon => :find,
-          :select => true
-        }
+      action :search do |a|
+        a.icon = :find
+        a.select = true
       end
 
       def configure_bbar(c)
         super
-        c[:bbar] << :search.action
+        c[:bbar] << :search
       end
 
-      component :search_form do
-        {
-          :lazy_loading => true,
-          :class_name => "Netzke::Basepack::SearchWindow",
-          :model => config[:model]
-        }
+      component :search_form do |c|
+        c.klass = SearchWindow
+        c.model = config[:model]
+        c.fields = fields
       end
 
-      protected
-
-        def total_records(params = {})
-          @total_records ||= data_adapter.count_records(params, [])
-        end
+    protected
 
+      def total_records(params = {})
+        @total_records ||= data_adapter.count_records(params, [])
+      end
     end
   end
 end

data/lib/netzke/basepack/{paging_form_panel/javascripts/paging_form_panel.js → paging_form/javascripts/paging_form.js}

@@ -3,7 +3,7 @@
     if (this.searchWindow) {
       this.searchWindow.show();
     } else {
-      this.loadNetzkeComponent({name: 'search_form', callback: function(win){
+      this.netzkeLoadComponent('search_form', {callback: function(win){
         this.searchWindow = win;
         win.show();
 
@@ -30,15 +30,13 @@
   },
 
   afterRender: function() {
-    // delete this.record so our parent FormPanel doesn't have to load it - we do it ourselves
+    // delete this.record so our parent Form doesn't have to load it - we do it ourselves
     var record = this.record;
     delete (this.record);
 
     this.callParent();
 
     if (record) this.store.loadRawData({records: [record], total: this.totalRecords});
-
-    new Ext.LoadMask(this, Ext.apply(this.applyMask, {store: this.store}));
   },
 
   initComponent: function() {

data/lib/netzke/basepack/query_builder.rb

@@ -1,87 +1,60 @@
 module Netzke
   module Basepack
+    # Search query builder used in Grid's advanced search
     class QueryBuilder < Netzke::Base
-      js_base_class "Ext.tab.Panel"
-
-      js_property :active_tab, 0
-
-      js_translate :overwrite_confirm, :overwrite_confirm_title, :delete_confirm, :delete_confirm_title
-
-      js_mixin :query_builder
+      js_configure do |c|
+        c.extend = "Ext.tab.Panel"
+        c.active_tab = 0
+        c.translate :overwrite_confirm, :overwrite_confirm_title, :delete_confirm, :delete_confirm_title
+        c.mixin
+      end
 
-      component :search_panel do
-        {
-          :class_name => "Netzke::Basepack::SearchPanel",
-          :model => config[:model],
-          :fields => config[:fields],
-          :preset_query => config[:query],
-          :auto_scroll => config[:auto_scroll]
-        }
+      component :search_panel do |c|
+        c.klass = SearchPanel
+        c.model = config[:model]
+        c.fields = config[:fields]
+        c.preset_query = config[:query]
+        c.auto_scroll = config[:auto_scroll]
+        c.eager_loading = true
       end
 
-      action :clear_all do
-        {
-          :text => I18n.t('netzke.basepack.query_builder.actions.clear_all'),
-          :tooltip => I18n.t('netzke.basepack.query_builder.actions.clear_all_tooltip'),
-          :icon => :cross
-        }
+      action :clear_all do |a|
+        a.text = I18n.t('netzke.basepack.query_builder.actions.clear_all')
+        a.tooltip = I18n.t('netzke.basepack.query_builder.actions.clear_all_tooltip')
+        a.icon = :cross
       end
 
-      action :reset do
-        {
-          :text => I18n.t('netzke.basepack.query_builder.actions.reset'),
-          :tooltip => I18n.t('netzke.basepack.query_builder.actions.reset_tooltip'),
-          :icon => :application_form
-        }
+      action :reset do |a|
+        a.text = I18n.t('netzke.basepack.query_builder.actions.reset')
+        a.tooltip = I18n.t('netzke.basepack.query_builder.actions.reset_tooltip')
+        a.icon = :application_form
       end
 
-      action :save_preset do
-        {
-          :text => I18n.t('netzke.basepack.query_builder.actions.save_preset'),
-          :tooltip => I18n.t('netzke.basepack.query_builder.actions.save_preset_tooltip'),
-          :icon => :disk
-        }
+      action :save_preset do |a|
+        a.text = I18n.t('netzke.basepack.query_builder.actions.save_preset')
+        a.tooltip = I18n.t('netzke.basepack.query_builder.actions.save_preset_tooltip')
+        a.icon = :disk
       end
 
-      action :delete_preset do
-        {
-          :text => I18n.t('netzke.basepack.query_builder.actions.delete_preset'),
-          :tooltip => I18n.t('netzke.basepack.query_builder.actions.delete_preset_tooltip'),
-          :icon => :cross
-        }
+      action :delete_preset do |a|
+        a.text = I18n.t('netzke.basepack.query_builder.actions.delete_preset')
+        a.tooltip = I18n.t('netzke.basepack.query_builder.actions.delete_preset_tooltip')
+        a.icon = :cross
       end
 
-      action :apply do
-        {
-          :text => I18n.t('netzke.basepack.query_builder.actions.apply'),
-          :tooltip => I18n.t('netzke.basepack.query_builder.actions.apply_tooltip'),
-          :icon => :accept
-        }
+      action :apply do |a|
+        a.text = I18n.t('netzke.basepack.query_builder.actions.apply')
+        a.tooltip = I18n.t('netzke.basepack.query_builder.actions.apply_tooltip')
+        a.icon = :accept
       end
 
-      def js_config
-        super.tap do |s|
-          s[:bbar] = (config[:bbar] || []) + [:clear_all.action, :reset.action, "->",
-            I18n.t('netzke.basepack.query_builder.presets'),
-            {
-              :itemId => "presetsCombo",
-              :xtype => "combo",
-              :triggerAction => "all",
-              :value => super[:load_last_preset] && last_preset.try(:fetch, "name"),
-              :store => state[:presets].blank? ? [[[], ""]] : state[:presets].map{ |s| [s["query"], s["name"]] },
-              :ref => "../presetsCombo",
-              :listeners => {:before_select => {
-                :fn => "function(combo, record){
-                  var form = Ext.getCmp('#{global_id}');
-                  form.buildFormFromQuery(record.data.value);
-                }".l
-              }}
-            }, :save_preset.action, :delete_preset.action
-          ]
-        end
+      def js_configure(c)
+        super
+        c.preset_store = state[:presets].blank? ? [[[], ""]] : state[:presets].map{ |s| [s["query"], s["name"]] }
+        c.bbar = (config[:bbar] || []) + [:clear_all, :reset, "->", I18n.t('netzke.basepack.query_builder.presets'), :preset_selector, :save_preset, :delete_preset ]
       end
 
-      endpoint :save_preset do |params|
+      endpoint :save_preset do |params, this|
         saved_searches = state[:presets] || []
         existing = saved_searches.detect{ |s| s["name"] == params[:name] }
         query = ActiveSupport::JSON.decode(params[:query])
@@ -90,18 +63,16 @@ module Netzke
         else
           saved_searches << {"name" => params[:name], "query" => query}
         end
-        update_state(:presets, saved_searches)
-        {:netzke_feedback => I18n.t('netzke.basepack.query_builder.preset_saved')}
+        state[:presets] = saved_searches
+        this.netzke_feedback(I18n.t('netzke.basepack.query_builder.preset_saved'))
       end
 
-      endpoint :delete_preset do |params|
+      endpoint :delete_preset do |params, this|
         saved_searches = state[:presets]
         saved_searches.delete_if{ |s| s["name"] == params[:name] }
-        update_state(:presets, saved_searches)
-        {:netzke_feedback => I18n.t('netzke.basepack.query_builder.preset_deleted')}
+        state[:presets] = saved_searches
+        this.netzke_feedback(I18n.t('netzke.basepack.query_builder.preset_deleted'))
       end
-
-
     end
   end
 end

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

@@ -2,7 +2,7 @@
   initComponent: function() {
     this.callParent();
 
-    this.presetsCombo = this.getDockedItems()[1].getComponent('presetsCombo');
+    this.presetsCombo = this.down("combo[itemId='presets-combo']");
 
     this.add({title: "+"});
 
@@ -38,7 +38,7 @@
   addTab: function(activate, closable){
     var newTabConfig = Ext.apply({}, this.netzkeComponents.searchPanel);
     newTabConfig.id = Ext.id(); // We need a unique ID every time
-    newTabConfig.preventHeader = true;
+    newTabConfig.header = false;
     newTabConfig.border = false;
 
     var newTab = this.insert(
@@ -149,5 +149,19 @@
     var presetsComboStore = this.presetsCombo.getStore();
     presetsComboStore.removeAt(presetsComboStore.find('text', name));
     this.presetsCombo.reset();
+  },
+
+  presetSelectorConfig: function(config) {
+    return {
+      itemId: 'presets-combo',
+      xtype: "combo",
+      triggerAction: "all",
+      store: config.presetStore,
+      listeners: {
+        beforeselect: function(self, record) {
+          this.netzkeParent.buildFormFromQuery(record.get('field1'));
+        }
+      },
+    }
   }
 }

data/lib/netzke/basepack/record_form_window.rb

@@ -0,0 +1,67 @@
+module Netzke
+  module Basepack
+    class RecordFormWindow < Netzke::Basepack::Window
+
+      component :add_form do |c|
+        preconfigure_form(c)
+      end
+
+      component :edit_form do |c|
+        preconfigure_form(c)
+      end
+
+      component :multi_edit_form do |c|
+        preconfigure_form(c)
+        c.multi_edit = true
+      end
+
+      def configure(c)
+        super
+        c.fbar = [:ok, :cancel]
+      end
+
+      js_configure do |c|
+        c.button_align = :right
+        c.width = 400
+        c.auto_height = true
+        c.modal = true
+        c.init_component = <<-JS
+          function(params){
+            this.callParent();
+            this.items.first().on("submitsuccess", function(){ this.closeRes = "ok"; this.close(); }, this);
+          }
+        JS
+
+        c.on_ok = <<-JS
+          function(params){
+            this.items.first().onApply();
+          }
+        JS
+
+        c.on_cancel = <<-JS
+          function(params){
+            this.close();
+          }
+        JS
+      end
+
+      action :ok
+
+      action :cancel
+
+    protected
+
+      def self.server_side_config_options
+        [:form_config, *super]
+      end
+
+      def preconfigure_form(c)
+        c.klass = Form
+        c.border = true
+        c.bbar = false
+        c.prevent_header = true
+        c.merge! config.form_config
+      end
+    end
+  end
+end