marty 0.5.41 → 1.0.0

data/app/components/marty/new_posting_form.rb

@@ -4,8 +4,8 @@ class Marty::NewPostingForm < Marty::Form
   # override this to set permissions for posting types
   has_marty_permissions read: :any
 
-  js_configure do |c|
-    c.close_me = <<-JS
+  client_class do |c|
+    c.close_me = l(<<-JS)
     function() {
       // assume we're embedded in a window
       this.netzkeGetParentComponent().close();
@@ -21,9 +21,9 @@ class Marty::NewPostingForm < Marty::Form
 
   ######################################################################
 
-  endpoint :netzke_submit do |params, this|
-    res = super(params, this)
-    this.close_me
+  endpoint :submit do |params|
+    res = super(params)
+    client.close_me
     res
   end
 

data/app/components/marty/new_posting_window.rb

@@ -1,6 +1,6 @@
 require 'marty/new_posting_form'
 
-class Marty::NewPostingWindow < Netzke::Basepack::Window
+class Marty::NewPostingWindow < Netzke::Window::Base
   def configure(c)
     super
 

data/app/components/marty/panel.rb

@@ -1,7 +1,7 @@
 # Marty's version of the Netzke Panel component.
 class Marty::Panel < Netzke::Core::Panel
-  js_configure do |c|
-    c.update_body_html = <<-JS
+  client_class do |c|
+    c.update_body_html = l(<<-JS)
         function(html){
           this.body.update(html);
         }

data/app/components/marty/posting_grid.rb

@@ -7,49 +7,40 @@ class Marty::PostingGrid < Marty::Grid
 
     c.header             = false
     c.model              = "Marty::Posting"
-    c.columns            = [:name, :created_dt, :user__name, :comment]
+    c.attributes            = [:name, :created_dt, :user__name, :comment]
     c.multi_select       = false
-    c.data_store.sorters = {property: :created_dt, direction: 'DESC'}
+    c.store_config.merge!({sorters: [{property: :created_dt, direction: 'DESC'}],
+                           page_size: 12})
   end
 
   # hijacking delete button
-  action :del do |a|
+  action :delete do |a|
     a.text      = "Select"
     a.tooltip   = "Select"
     a.icon      = :time_go
     a.disabled  = true
   end
 
-  js_configure do |c|
-    c.init_component = <<-JS
+  client_class do |c|
+    c.init_component = l(<<-JS)
     function() {
        this.callParent();
+
        this.getSelectionModel().on('selectionchange', function(selModel) {
           this.actions.detail &&
           this.actions.detail.setDisabled(!selModel.hasSelection());
        }, this);
-
-       var me = this;
-       me.getView().on('itemkeydown', function(view, record, item, index, e) {
-          if (e.getKey() === e.SPACE) {
-             record_id = me.getSelectionModel().selected.first().getId();
-             me.getView().fireEvent('itemclick', me, record);
-             me.serverDetail({record_id: record_id});
-             var rowIndex = me.find('id', record.getId());
-             me.getView().select(rowIndex);
-          }
-       });
     }
     JS
 
-    c.detail = <<-JS
+    c.detail = l(<<-JS)
     function() {
        record_id = this.getSelectionModel().selected.first().getId();
-       this.serverDetail({record_id: record_id});
+       this.server.detail({record_id: record_id});
     }
     JS
 
-    c.show_detail = <<-JS
+    c.netzke_show_detail = l(<<-JS)
     function(details) {
       Ext.create('Ext.Window', {
         height:         150,
@@ -63,7 +54,7 @@ class Marty::PostingGrid < Marty::Grid
     }
     JS
 
-    c.on_del = <<-JS
+    c.netzke_on_delete = l(<<-JS)
       function() {
         var records = [];
         var me = this;
@@ -80,13 +71,13 @@ class Marty::PostingGrid < Marty::Grid
         }
 
         // assumes main_app has serverSelectPosting method
-        main_app.serverSelectPosting(records);
+        main_app.server.selectPosting(records);
       }
       JS
   end
 
   def default_bbar
-    [:del, :detail]
+    [:delete, :detail]
   end
 
   action :detail do |a|
@@ -96,7 +87,7 @@ class Marty::PostingGrid < Marty::Grid
     a.disabled  = true
   end
 
-  endpoint :server_detail do |params, this|
+  endpoint :detail do |params|
     record_id = params[:record_id]
 
     # Prepare an HTML popup with session details such that the
@@ -113,24 +104,24 @@ class Marty::PostingGrid < Marty::Grid
       "<b>User:</b>\t#{pt.user.name}<br/>" +
       "<b>Comment:</b>\t#{pt.comment}"
 
-    this.show_detail html
+    client.netzke_show_detail html
   end
 
-  column :name do |c|
+  attribute :name do |c|
     c.flex      = 1
   end
 
-  column :created_dt do |c|
+  attribute :created_dt do |c|
     c.text      = "Date/Time"
     c.format    = "Y-m-d H:i"
     c.hidden    = true
   end
 
-  column :user__name do |c|
+  attribute :user__name do |c|
     c.width     = 100
   end
 
-  column :comment do |c|
+  attribute :comment do |c|
     c.width     = 100
   end
 

data/app/components/marty/posting_window.rb

@@ -1,4 +1,4 @@
-class Marty::PostingWindow < Netzke::Basepack::Window
+class Marty::PostingWindow < Netzke::Window::Base
   def configure(c)
     super
 
@@ -12,13 +12,12 @@ class Marty::PostingWindow < Netzke::Basepack::Window
 
   component :posting_grid do |c|
     c.klass			= Marty::PostingGrid
-    c.enable_edit_in_form	= false
-    c.enable_extended_search	= false
     c.rows_per_page		= 12
-    c.column_filters_available 	= true
-    c.prohibit_update		= true
-    c.prohibit_delete		= false # hijacked for selection
-    c.prohibit_create		= true
+    c.permissions = {
+      update:           false,
+      delete:		true, # hijacked for selection
+      create:		false,
+    }
     # c.bbar	= []
   end
 

data/app/components/marty/promise_view.rb

@@ -1,12 +1,11 @@
-class Marty::PromiseView < Netzke::Basepack::Tree
+class Marty::PromiseView < Netzke::Tree::Base
   extend ::Marty::Permissions
 
-  css_configure do |config|
+  client_styles do |config|
     config.require :promise_view
   end
-
-  js_configure do |config|
-    config.default_get_row_class = <<-JS
+  client_class do |config|
+    config.default_get_row_class = l(<<-JS)
     function(record, index, rowParams, ds) {
        var status = record.get('status');
        if (status === false) return "red-row";
@@ -15,7 +14,7 @@ class Marty::PromiseView < Netzke::Basepack::Tree
     }
     JS
 
-    config.listen_fn = <<-JS
+    config.listen_fn = l(<<-JS)
     function(obj, search_text) {
         var lg = this.ownerCt.ownerCt;
         lg.getStore().getProxy().extraParams.live_search = search_text;
@@ -43,7 +42,7 @@ class Marty::PromiseView < Netzke::Basepack::Tree
     super
     config.title = I18n.t("jobs.promise_view")
     config.model = "Marty::Promise"
-    config.columns = [
+    config.attributes = [
       {name: :title, xtype: :treecolumn},
       :user__login,
       :job_id,
@@ -54,7 +53,7 @@ class Marty::PromiseView < Netzke::Basepack::Tree
       :error,
     ]
     config.root_visible = false
-    config.enable_pagination = false
+    config.paging = :none
     config.bbar = bbar
 
     # garbage collect old promises (hacky to do this here)
@@ -65,8 +64,8 @@ class Marty::PromiseView < Netzke::Basepack::Tree
     [:clear, '->', :refresh, :download]
   end
 
-  js_configure do |config|
-    config.init_component = <<-JS
+  client_class do |config|
+    config.init_component = l(<<-JS)
     function() {
        this.callParent();
        this.getSelectionModel().on('selectionchange', function(selModel) {
@@ -77,7 +76,7 @@ class Marty::PromiseView < Netzke::Basepack::Tree
     }
     JS
 
-    config.on_download = <<-JS
+    config.netzke_on_download = l(<<-JS)
     function() {
        var jid = this.getSelectionModel().selected.first().getId();
        // FIXME: seems pretty hacky
@@ -85,13 +84,13 @@ class Marty::PromiseView < Netzke::Basepack::Tree
     }
     JS
 
-    config.on_refresh = <<-JS
+    config.netzke_on_refresh = l(<<-JS)
     function() {
        this.store.load();
     }
     JS
 
-    config.on_clear = <<-JS
+    config.netzke_on_clear = l(<<-JS)
     function(params) {
        var me = this;
        Ext.Msg.show({
@@ -101,7 +100,7 @@ class Marty::PromiseView < Netzke::Basepack::Tree
          buttons: Ext.Msg.OKCANCEL,
          prompt: true,
          fn: function (btn, value) {
-          (btn == "ok" && value == "CLEAR") && me.serverClear({});
+          (btn == "ok" && value == "CLEAR") && me.server.clear({});
          }
        });
     }
@@ -127,9 +126,9 @@ class Marty::PromiseView < Netzke::Basepack::Tree
     a.icon     = :arrow_refresh
   end
 
-  endpoint :server_clear do |params, this|
+  endpoint :clear do |params|
     Marty::Promise.cleanup(true)
-    this.on_refresh
+    client.on_refresh
   end
 
   def get_records params
@@ -137,38 +136,38 @@ class Marty::PromiseView < Netzke::Basepack::Tree
     Marty::Promise.children_for_id(params[:id], params[search_scope])
   end
 
-  column :title do |config|
+  attribute :title do |config|
     config.text = I18n.t('jobs.title')
     config.width = 300
   end
 
-  column :user__login do |config|
+  attribute :user__login do |config|
     config.text = I18n.t('jobs.user_login')
     config.width = 100
   end
 
-  column :job_id do |config|
+  attribute :job_id do |config|
     config.width = 90
   end
 
-  column :start_dt do |config|
+  attribute :start_dt do |config|
     config.text = I18n.t('jobs.start_dt')
   end
 
-  column :end_dt do |config|
+  attribute :end_dt do |config|
     config.text = I18n.t('jobs.end_dt')
   end
 
-  column :status do |config|
+  attribute :status do |config|
     config.hidden = true
   end
 
-  column :cformat do |config|
+  attribute :cformat do |config|
     config.text = I18n.t('jobs.cformat')
     config.width = 90
   end
 
-  column :error do |config|
+  attribute :error do |config|
     config.getter = ->(record) { record.result.to_s if record.status == false }
     config.flex = 1
   end

data/app/components/marty/report_form.rb

@@ -3,22 +3,23 @@ class Marty::ReportForm < Marty::Form
   # override apply for background generation
   action :apply do |a|
     a.text     = a.tooltip = I18n.t("reporting.background")
-    a.handler  = :on_apply
+    a.handler  = :netzke_on_apply
     a.icon     = :report_disk
     a.disabled = false
   end
 
   action :foreground do |a|
     a.text     = a.tooltip = I18n.t("reporting.generate")
-    a.handler  = :on_foreground
     a.icon     = :report_go
     a.disabled = false
   end
 
   ######################################################################
 
-  def configure_bbar(c)
-    c[:bbar] = ['->', :apply, :foreground]
+  def default_bbar
+    [
+      '->', :apply, :foreground
+    ]
   end
 
   ######################################################################
@@ -65,12 +66,12 @@ class Marty::ReportForm < Marty::Form
     end
   end
 
-  endpoint :netzke_submit do |params, this|
+  endpoint :submit do |params|
     # We get here when user is asking for a background report
 
     engine, d_params, node = self.class.get_report_engine(params)
 
-    return this.netzke_feedback "Insufficient permissions to run report!" unless
+    return client.netzke_notify "Insufficient permissions to run report!" unless
       engine
 
     # start background promise to get report result
@@ -79,19 +80,19 @@ class Marty::ReportForm < Marty::Form
                            ["result", "title", "format"],
                            )
 
-    this.netzke_feedback "Report can be accessed from the Jobs Dashboard ..."
+    client.netzke_notify "Report can be accessed from the Jobs Dashboard ..."
   end
 
   ######################################################################
 
-  js_configure do |c|
+  client_class do |c|
     # Find the mount path for the Marty engine. FIXME: this is likely
     # very brittle.
     @@mount_path = Rails.application.routes.routes.detect {
       |r| r.app.app == Marty::Engine
     }.format({})
 
-    c.on_foreground = <<-JS
+    c.netzke_on_foreground = l(<<-JS)
     function() {
        var values = this.getForm().getValues();
        var data = Ext.encode(values);
@@ -135,7 +136,7 @@ class Marty::ReportForm < Marty::Form
     JS
   end
 
-  endpoint :netzke_load do |params, this|
+  endpoint :netzke_load do |params|
   end
 
   def eval_form_items(engine, items)

data/app/components/marty/report_select.rb

@@ -6,7 +6,7 @@ class Marty::ReportSelect < Marty::Form
     c.height           = 200
     c.load_inline_data = false
     c.title            = I18n.t("script.selection_history")
-    c.columns          = [:name, :created_dt, :comment]
+    c.attributes          = [:name, :created_dt, :comment]
     c.bbar             = []
   end
 
@@ -15,8 +15,10 @@ class Marty::ReportSelect < Marty::Form
     c.klass            = Marty::ScriptGrid
     c.title            = I18n.t("script.selection_list")
     c.bbar             = []
-    c.columns          = [:name, :tag]
-    c.scope            = ["name like '%Report'"]
+    c.attributes          = [:name, :tag]
+    c.scope            = lambda { |r|
+      r.where("name like '%Report'")
+    }
   end
 
   ######################################################################
@@ -43,10 +45,10 @@ class Marty::ReportSelect < Marty::Form
     c.bbar = []
   end
 
-  js_configure do |c|
+  client_class do |c|
     c.header = false
 
-    c.init_component = <<-JS
+    c.init_component = l(<<-JS)
     function() {
        var me = this;
        me.callParent();
@@ -60,13 +62,13 @@ class Marty::ReportSelect < Marty::Form
             record = record[0]
           }
           var data = record && record.data;
-          me.selectNode({node: data.value});
+          me.server.selectNode({node: data.value});
        });
 
        tag_grid.getSelectionModel().on('selectionchange',
         function(self, records) {
           var tag_id = records[0].get('id');
-          me.selectTag({tag_id: tag_id});
+          me.server.selectTag({tag_id: tag_id});
           script_grid.getStore().load();
        }, me);
 
@@ -78,14 +80,14 @@ class Marty::ReportSelect < Marty::Form
              return;
 
           var script_name = records[0].get('name');
-          me.selectScript({script_name: script_name});
+          me.server.selectScript({script_name: script_name});
           nodename.reset();
           nodename.store.load({params: {}});
           }, me);
     }
     JS
 
-    c.parent_select_report = <<-JS
+    c.parent_select_report = l(<<-JS)
     function() {
        this.netzkeGetParentComponent().selectReport();
     }
@@ -119,26 +121,26 @@ class Marty::ReportSelect < Marty::Form
     }.compact.sort{ |a,b| a[1] <=> b[1]}
   end
 
-  endpoint :get_combobox_options do |params, this|
-    this.data = node_list if params["attr"] == "nodename"
+  endpoint :get_combobox_options do |params|
+    client.data = node_list if params["attr"] == "nodename"
   end
 
   ######################################################################
 
-  endpoint :select_tag do |params, this|
+  endpoint :select_tag do |params|
     root_sess[:selected_tag_id]      = params[:tag_id]
     root_sess[:selected_script_name] = nil
     root_sess[:selected_node]        = nil
   end
 
-  endpoint :select_script do |params, this|
+  endpoint :select_script do |params|
     root_sess[:selected_script_name] = params[:script_name]
     root_sess[:selected_node]        = nil
   end
 
-  endpoint :select_node do |params, this|
+  endpoint :select_node do |params|
     root_sess[:selected_node]        = params[:node]
-    this.parent_select_report
+    client.parent_select_report
   end
 end