marty 10.0.3 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 360af94e92c74e7d1102352352fb0b412fb286028fd250b388532c48abb197f4
-  data.tar.gz: 848685b6765630af1acdae54e6667ea995eee94d86ec36e0103313054df80140
+  metadata.gz: 119afa3c55c47a985cce5d53a9868f605e2fe401f90bd66bcf3465b03eaf8c5d
+  data.tar.gz: 83dfb56e30a009281111f825a05d603fef30830cf3c67e69c9e0399124d7e5a6
 SHA512:
-  metadata.gz: d85a3910d4654ea5ee18a330b22c1bc23cef9dab6c6e745ff4fbb5b70a0a06a29b46b81b426adb3bbe51c3b2ccedc81264352beacc5b9161a2f32f23c92eed7a
-  data.tar.gz: bd061cae990b2b935beac03df951065a405834c5d3757e641f557a4d1170bd9a9b3217cdd89267b262bb906a184202c7318a39eb3d8deb198ea22274ec3b43e2
+  metadata.gz: 1dfadeffa2456aa43340ba6a6848d78dcf8f938e7e500b78a262c9ae5886145884921ef58c08c9e8edc5451a01d0d21e1eabbd37a175065f988c402f63af8e11
+  data.tar.gz: 35e5a24aa4475cd027cc2111f64fba44510aeac35040ea0d13e84f64bbc6f4e3df45120ec9101499cf13c9b1676036a9dcd6e3f8a6b4fb58416f6311091a9ea0

data/.rubocop.yml

@@ -73,6 +73,9 @@ Rails/DynamicFindBy:
     - 'spec/features/**/*'
     - 'spec/support/**/*'
 
+Style/NumericPredicate:
+  Enabled: false
+
 Rails/ApplicationRecord:
   Enabled: false
 
@@ -81,3 +84,6 @@ Rails/ApplicationJob:
 
 Rails/ApplicationController:
   Enabled: false
+
+Rails/IndexWith:
+  Enabled: false

data/app/components/marty/base_rule_view.rb

@@ -256,13 +256,11 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     [
       jsonb_field(
         :results,
-        {
-          getter: jsonb_simple_getter(:results),
-          setter: jsonb_simple_setter(:results),
-          min_height: 150,
-          height: nil, # must be nil to allow the field to resize automatically
-          grow: true,
-        }
+        getter: jsonb_simple_getter(:results),
+        setter: jsonb_simple_setter(:results),
+        min_height: 150,
+        height: nil, # must be nil to allow the field to resize automatically
+        grow: true,
       )
     ]
   end

data/app/components/marty/main_auth_app.rb

@@ -8,14 +8,14 @@ require 'marty/config_view'
 require 'marty/data_grid_view'
 require 'marty/data_grid_user_view'
 require 'marty/import_type_view'
-require 'marty/new_posting_window'
 require 'marty/notifications/config_view'
 require 'marty/notifications/deliveries_view'
-require 'marty/posting_window'
+require 'marty/postings/new_window'
+require 'marty/postings/window'
 require 'marty/promise_view'
 require 'marty/reporting'
 require 'marty/scripting'
-require 'marty/user_view'
+require 'marty/users/user_view'
 
 class Marty::MainAuthApp < Marty::AuthApp
   extend ::Marty::Permissions
@@ -27,7 +27,7 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   # set of posting types user is allowed to post with
   def self.has_posting_perm?
-    Marty::NewPostingForm.has_any_perm?
+    Marty::Postings::NewForm.has_any_perm?
   end
 
   def self.has_scripting_perm?
@@ -507,6 +507,7 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   component :new_posting_window do |c|
     c.disabled = Marty::Util.warped? || !self.class.has_posting_perm?
+    c.klass = ::Marty::Postings::NewWindow
   end
 
   component :notifications_config_view do |c|
@@ -517,7 +518,9 @@ class Marty::MainAuthApp < Marty::AuthApp
     c.klass = ::Marty::Notifications::DeliveriesView
   end
 
-  component :posting_window
+  component :posting_window do |c|
+    c.klass = ::Marty::Postings::Window
+  end
 
   component :promise_view do |c|
     c.klass = Marty::PromiseView
@@ -537,7 +540,9 @@ class Marty::MainAuthApp < Marty::AuthApp
     c.allow_edit = self.class.has_scripting_perm?
   end
 
-  component :user_view
+  component :user_view do |c|
+    c.klass = ::Marty::Users::UserView
+  end
 
   endpoint :reload_scripts do |_params|
     Marty::Script.load_scripts

data/app/components/marty/postings/grid.rb

@@ -0,0 +1,80 @@
+module Marty
+  module Postings
+    class Grid < Marty::Grid
+      has_marty_permissions read: :any,
+                            delete: :any # delete is hijacked for a select
+
+      def configure(c)
+        super
+
+        c.header = false
+        c.model = 'Marty::Posting'
+        c.attributes = [:name, :created_dt, :user__name, :comment]
+        c.multi_select = false
+        c.store_config.merge!(sorters: [{ property: :created_dt, direction: 'DESC' }],
+                               page_size: 12)
+      end
+
+      client_class do |c|
+        c.include :grid
+      end
+
+      # hijacking delete button
+      action :delete do |a|
+        a.text      = 'Select'
+        a.tooltip   = 'Select'
+        a.icon_cls  = 'fa fa-clock glyph'
+        a.disabled  = true
+      end
+
+      def default_bbar
+        [:delete, :detail]
+      end
+
+      action :detail do |a|
+        a.text      = 'Detail'
+        a.icon_cls  = 'fa fa-th-large glyph'
+        a.handler   = :detail
+        a.disabled  = true
+      end
+
+      endpoint :detail do |params|
+        record_id = params[:record_id]
+
+        # Prepare an HTML popup with session details such that the
+        # contents can be easily pasted into a spreadsheet.
+
+        pt = Marty::Posting.find_by(id: record_id)
+
+        dt = pt.created_dt.to_s == 'Infinity' ? '---' :
+          pt.created_dt.strftime('%Y-%m-%d %I:%M %p')
+
+        html =
+          "<b>Name:</b>\t#{pt.name}<br/>" \
+          "<b>Date/Time:</b>\t#{dt}<br/>" \
+          "<b>User:</b>\t#{pt.user.name}<br/>" \
+          "<b>Comment:</b>\t#{pt.comment}"
+
+        client.netzke_show_detail html
+      end
+
+      attribute :name do |c|
+        c.flex      = 1
+      end
+
+      attribute :created_dt do |c|
+        c.text      = 'Date/Time'
+        c.format    = 'Y-m-d H:i'
+        c.hidden    = true
+      end
+
+      attribute :user__name do |c|
+        c.width     = 100
+      end
+
+      attribute :comment do |c|
+        c.width     = 100
+      end
+    end
+  end
+end

data/app/components/marty/postings/new_form.rb

@@ -0,0 +1,52 @@
+require 'marty/postings/summary_grid'
+
+module Marty
+  module Postings
+    class NewForm < Marty::Form
+      extend ::Marty::Permissions
+
+      # override this to set permissions for posting types
+      has_marty_permissions read: :any
+
+      client_class do |c|
+        c.include :new_form
+      end
+
+      action :apply do |a|
+        a.text     = I18n.t('create_posting')
+        a.tooltip  = I18n.t('create_posting')
+        a.icon_cls = 'fa fa-clock glyph'
+      end
+
+      ######################################################################
+
+      endpoint :submit do |params|
+        res = super(params)
+        client.close_me
+        res
+      end
+
+      def configure(c)
+        super
+
+        c.model = 'Marty::Posting'
+        c.items = [
+          {
+            name: :posting_type__name,
+            scope: lambda { |r|
+              r.where(name: Marty::Postings::NewForm.can_perform_actions)
+            },
+          },
+          :comment,
+          :summary_grid
+        ]
+      end
+
+      component :summary_grid do |c|
+        c.klass = Marty::Postings::SummaryGrid
+        c.data_store = { auto_load: false }
+        c.selected_posting_type = client_config[:selected_posting_type]
+      end
+    end
+  end
+end

data/app/components/marty/postings/new_form/client/new_form.js

@@ -0,0 +1,33 @@
+({
+  closeMe() {
+    // assume we're embedded in a window
+    this.netzkeGetParentComponent().close();
+  },
+
+  initComponent() {
+    this.callParent();
+
+    const postingType = this.getForm().findField("posting_type__name");
+    const me = this;
+
+    me.serverConfig.selected_posting_type = null;
+    // For some reason initComponent gets called twice
+    // So this workaround prevents from adding the listener second time
+    if (this.hasPostingTypeChangeListener) {
+      return;
+    }
+
+    postingType.on("change", function(self, record) {
+      if (record instanceof Array) {
+        record = record[0];
+      }
+
+      me.serverConfig.selected_posting_type = record;
+      me.getComponent("summary_grid")
+        .getStore()
+        .load();
+    });
+
+    this.hasPostingTypeChangeListener = true;
+  }
+});

data/app/components/marty/postings/new_window.rb

@@ -0,0 +1,23 @@
+require 'marty/postings/new_form'
+
+module Marty
+  module Postings
+    class NewWindow < Netzke::Window::Base
+      def configure(c)
+        super
+
+        c.title        = I18n.t('new_posting')
+        c.modal        = true
+        c.items        = [:new_posting_form]
+        c.lazy_loading = true
+        c.width        = 800
+        c.height       = 550
+      end
+
+      component :new_posting_form do |c|
+        c.header = false
+        c.klass = Marty::Postings::NewForm
+      end
+    end
+  end
+end

data/app/components/marty/postings/summary_grid.rb

@@ -0,0 +1,100 @@
+module Marty
+  module Postings
+    class SummaryGrid < Marty::Grid
+      def configure(c)
+        super
+
+        c.model = 'Marty::Log' # Hack, since grid requires a model to be set
+        c.multi_select = false
+        c.read_only = true
+        c.attributes ||= [:klass, :created, :updated, :deleted]
+        c.title ||= I18n.t('summary', default: 'Summary')
+        c.paging = false
+        c.min_height = 400
+        c.height = 400
+        c.bbar = nil
+      end
+
+      client_styles do |c|
+        c.require :summary_grid
+      end
+
+      attribute :klass do |c|
+        c.min_width = 300
+        c.sortable = true
+      end
+
+      column :created do |c|
+        c.sortable = true
+      end
+
+      column :updated do |c|
+        c.sortable = true
+      end
+
+      column :deleted do |c|
+        c.sortable = true
+      end
+
+      def get_records(params)
+        return [] if config[:selected_posting_type].blank?
+        return [] if config[:selected_posting_type].to_i.negative?
+
+        last_posting = Marty::Posting.where(
+          posting_type_id: config[:selected_posting_type]
+        ).where.not(created_dt: 'infinity').order(:created_dt).last
+
+        start_dt = last_posting&.created_dt || 1.year.ago
+        end_dt = Time.zone.now
+
+        posting_type = Marty::PostingType.find(config[:selected_posting_type])
+
+        summary_records = class_list(posting_type).map do |klass|
+          summary = Marty::DataChange.change_summary(start_dt, end_dt, klass)
+          OpenStruct.new(summary.merge('klass' => klass))
+        end
+
+        records_with_changes = summary_records.select do |record|
+          record.created > 0 || record.updated > 0 || record.deleted > 0
+        end
+
+        total_summary = OpenStruct.new(
+          klass: 'Total',
+          created: summary_records.sum(&:created),
+          updated: summary_records.sum(&:updated),
+          deleted: summary_records.sum(&:deleted)
+        )
+
+        [total_summary] + sort_records(params, records_with_changes)
+      end
+
+      def class_list(posting_type)
+        method_name = "class_list_#{posting_type.name}".downcase.to_sym
+
+        if Marty::DataChange.respond_to?(method_name)
+          Marty::DataChange.send(method_name)
+        else
+          Marty::DataChange.class_list
+        end
+      end
+
+      def sort_records(params, records)
+        return records if params['sorters'].blank?
+
+        sorting_attr = params.dig('sorters', 0, 'property').to_sym
+
+        sorted = records.sort_by(&:sorting_attr)
+        sorted = sorted.reverse if params.dig('sorters', 0, 'direction') != 'ASC'
+
+        sorted
+      end
+
+      def count_records(_params, _columns = [])
+        return 0 if config[:selected_posting_type].blank?
+        return 0 if config[:selected_posting_type].to_i.negative?
+
+        Marty::DataChange.class_list.size + 1
+      end
+    end
+  end
+end

data/app/components/marty/postings/summary_grid/client/summary_grid.css

@@ -0,0 +1,3 @@
+.x-grid-row.bold .x-grid-td {
+  font-weight: bold;
+}

data/app/components/marty/postings/summary_grid/client/summary_grid.js

@@ -0,0 +1,10 @@
+({
+  initComponent() {
+    this.viewConfig = {
+      getRowClass(r) {
+        return r.get("klass") === "Total" ? "bold" : "";
+      }
+    };
+    this.callParent();
+  }
+});

data/app/components/marty/postings/window.rb

@@ -0,0 +1,29 @@
+require 'marty/postings/grid'
+
+module Marty
+  module Postings
+    class Window < Netzke::Window::Base
+      def configure(c)
+        super
+
+        c.title = I18n.t('select_posting')
+        c.modal = true
+        c.items = [:posting_grid]
+        c.lazy_loading = true
+        c.width = 600
+        c.height = 350
+      end
+
+      component :posting_grid do |c|
+        c.klass = Marty::Postings::Grid
+        c.rows_per_page = 12
+        c.permissions = {
+          update:           false,
+          delete:    true, # hijacked for selection
+          create:    false,
+        }
+        # c.bbar  = []
+      end
+    end
+  end
+end

data/app/components/marty/users/user_view.rb

@@ -1,5 +1,5 @@
 module Marty
-  class Users
+  module Users
     class UserView < Marty::Grid
       has_marty_permissions create: [:admin, :user_manager],
                             read:   :any,
@@ -156,7 +156,8 @@ module Marty
           Marty::RoleType.to_nice_names(r.user_roles.map(&:role))
         end
 
-        store = ::Marty::RoleType.to_nice_names(::Marty::RoleType.values.sort)
+        roles = Rails.application.config.marty.roles || ::Marty::RoleType.values
+        store = ::Marty::RoleType.to_nice_names(roles.sort)
 
         c.editor_config = {
           multi_select: true,

data/app/models/marty/data_grid.rb

@@ -100,8 +100,8 @@ class Marty::DataGrid < Marty::Base
   validates_with DataGridValidator
   validates_with Marty::NameValidator, field: :name
 
-  gen_mcfly_lookup :lookup, [:name], cache: true
-  gen_mcfly_lookup :get_all, [], mode: nil
+  gen_mcfly_lookup :lookup, [:name], cache: true, to_hash: true
+  gen_mcfly_lookup :get_all, [], mode: nil, to_hash: true
 
   # FIXME: if the caller requests data as part of fields, there could
   # be memory concerns with caching since some data_grids have massive data

data/app/models/marty/script.rb

@@ -9,7 +9,7 @@ class Marty::Script < Marty::Base
 
   belongs_to :user, class_name: 'Marty::User'
 
-  gen_mcfly_lookup :lookup, [:name], cache: true
+  gen_mcfly_lookup :lookup, [:name], cache: true, to_hash: true
 
   # find script by name/tag (not cached)
 

data/lib/marty/data_change.rb

@@ -309,4 +309,9 @@ class Marty::DataChange
       res[fk] = arr unless arr.empty?
     end
   end
+
+  # Can be overriden in Marty apps
+  def self.class_list_base
+    class_list
+  end
 end

data/lib/marty/mcfly_model.rb

@@ -6,8 +6,16 @@ module Mcfly::Model
   end
 
   module ClassMethods
-    def openstruct_if_necessary(q, private)
-      !private && q.is_a?(ActiveRecord::Base) ? make_openstruct(q) : q
+    def openstruct_if_necessary(q, private_lookup)
+      return q if private_lookup
+      return q unless q.is_a?(ActiveRecord::Base)
+
+      warning = 'Mcfly::Model#openstruct_if_necessary is deprecated.' \
+        "Please use 'to_hash: true' or 'private: true' option instead"
+
+      Rails.logger.warn warning
+
+      make_openstruct(q)
     end
 
     def hash_if_necessary(q, to_hash)

data/lib/marty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marty
-  VERSION = '10.0.3'
+  VERSION = '11.0.0'
 end

data/spec/dummy/config/initializers/postings.rb

@@ -0,0 +1,6 @@
+require 'marty/postings/new_form'
+
+Marty::Postings::NewForm
+
+Marty::Postings::NewForm.has_marty_permissions(BASE: :admin)
+

data/spec/features/auth_app_spec.rb

@@ -17,7 +17,7 @@ feature 'Posting workflows', js: true do
   def monkey_patch_new_posting_form
     # presently, Gemini displays similar monkeypatching behavior.
     # consider coming up with a proper fix...
-    Marty::NewPostingForm.has_marty_permissions(BASE: :admin)
+    Marty::Postings::NewForm.has_marty_permissions(BASE: :admin)
   end
 
   it 'create posting and select it' do

data/spec/models/data_grid_spec.rb

@@ -553,7 +553,7 @@ EOS
       end
 
       it 'should handle string typed data grids' do
-        expect(Marty::DataGrid.lookup('infinity', 'G7').data_type).to eq 'string'
+        expect(Marty::DataGrid.lookup('infinity', 'G7')['data_type']).to eq 'string'
 
         res = lookup_grid_helper('infinity',
                                  'G7',
@@ -564,7 +564,7 @@ EOS
       end
 
       it 'should handle DataGrid typed data grids' do
-        expect(Marty::DataGrid.lookup('infinity', 'G8').data_type).
+        expect(Marty::DataGrid.lookup('infinity', 'G8')['data_type']).
           to eq 'Marty::DataGrid'
         g1 = Marty::DataGrid.lookup('infinity', 'G1')
 
@@ -573,7 +573,7 @@ EOS
       end
 
       it 'should handle multi DataGrid lookups' do
-        expect(Marty::DataGrid.lookup('infinity', 'G8').data_type).
+        expect(Marty::DataGrid.lookup('infinity', 'G8')['data_type']).
           to eq 'Marty::DataGrid'
 
         h = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 10.0.3
+  version: 11.0.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -345,18 +345,21 @@ files:
 - app/components/marty/main_auth_app/client/main_auth_app.js
 - app/components/marty/mcfly_grid_panel.rb
 - app/components/marty/mcfly_grid_panel/client/mcfly_grid_panel.js
-- app/components/marty/new_posting_form.rb
-- app/components/marty/new_posting_form/client/new_posting_form.js
-- app/components/marty/new_posting_window.rb
 - app/components/marty/notifications/config_view.rb
 - app/components/marty/notifications/deliveries_view.rb
 - app/components/marty/notifications/grid_view.rb
 - app/components/marty/notifications/window.rb
 - app/components/marty/panel.rb
 - app/components/marty/panel/client/panel.js
-- app/components/marty/posting_grid.rb
-- app/components/marty/posting_grid/client/posting_grid.js
-- app/components/marty/posting_window.rb
+- app/components/marty/postings/grid.rb
+- app/components/marty/postings/grid/client/grid.js
+- app/components/marty/postings/new_form.rb
+- app/components/marty/postings/new_form/client/new_form.js
+- app/components/marty/postings/new_window.rb
+- app/components/marty/postings/summary_grid.rb
+- app/components/marty/postings/summary_grid/client/summary_grid.css
+- app/components/marty/postings/summary_grid/client/summary_grid.js
+- app/components/marty/postings/window.rb
 - app/components/marty/promise_view.rb
 - app/components/marty/promise_view/client/promise_view.css
 - app/components/marty/promise_view/client/promise_view.js
@@ -380,7 +383,6 @@ files:
 - app/components/marty/tag_grid.rb
 - app/components/marty/tree.rb
 - app/components/marty/tree/client/tree.js
-- app/components/marty/user_view.rb
 - app/components/marty/users/user_view.rb
 - app/controllers/marty/application_controller.rb
 - app/controllers/marty/components_controller.rb
@@ -662,6 +664,7 @@ files:
 - spec/dummy/config/initializers/delayed_job.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/postings.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb

data/app/components/marty/new_posting_form.rb

@@ -1,41 +0,0 @@
-class Marty::NewPostingForm < Marty::Form
-  extend ::Marty::Permissions
-
-  # override this to set permissions for posting types
-  has_marty_permissions read: :any
-
-  client_class do |c|
-    c.include :new_posting_form
-  end
-
-  action :apply do |a|
-    a.text     = I18n.t('create_posting')
-    a.tooltip  = I18n.t('create_posting')
-    a.icon_cls = 'fa fa-clock glyph'
-  end
-
-  ######################################################################
-
-  endpoint :submit do |params|
-    res = super(params)
-    client.close_me
-    res
-  end
-
-  def configure(c)
-    super
-
-    c.model = 'Marty::Posting'
-    c.items = [
-      {
-        name: :posting_type__name,
-        scope: lambda { |r|
-          r.where(name: Marty::NewPostingForm.can_perform_actions)
-        },
-      },
-      :comment,
-    ]
-  end
-end
-
-NewPostingForm = Marty::NewPostingForm

data/app/components/marty/new_posting_form/client/new_posting_form.js

@@ -1,6 +0,0 @@
-({
-  closeMe() {
-    // assume we're embedded in a window
-    this.netzkeGetParentComponent().close();
-  }
-});

data/app/components/marty/new_posting_window.rb

@@ -1,19 +0,0 @@
-require 'marty/new_posting_form'
-
-class Marty::NewPostingWindow < Netzke::Window::Base
-  def configure(c)
-    super
-
-    c.title        = I18n.t('new_posting')
-    c.modal        = true
-    c.items        = [:new_posting_form]
-    c.layout       = 'fit'
-    c.lazy_loading = true
-  end
-
-  component :new_posting_form do |c|
-    c.header = false
-  end
-end
-
-NewPostingWindow = Marty::NewPostingWindow

data/app/components/marty/posting_grid.rb

@@ -1,78 +0,0 @@
-class Marty::PostingGrid < Marty::Grid
-  has_marty_permissions read: :any,
-                        delete: :any # delete is hijacked for a select
-
-  def configure(c)
-    super
-
-    c.header             = false
-    c.model              = 'Marty::Posting'
-    c.attributes = [:name, :created_dt, :user__name, :comment]
-    c.multi_select = false
-    c.store_config.merge!(sorters: [{ property: :created_dt, direction: 'DESC' }],
-                           page_size: 12)
-  end
-
-  client_class do |c|
-    c.include :posting_grid
-  end
-
-  # hijacking delete button
-  action :delete do |a|
-    a.text      = 'Select'
-    a.tooltip   = 'Select'
-    a.icon_cls  = 'fa fa-clock glyph'
-    a.disabled  = true
-  end
-
-  def default_bbar
-    [:delete, :detail]
-  end
-
-  action :detail do |a|
-    a.text      = 'Detail'
-    a.icon_cls  = 'fa fa-th-large glyph'
-    a.handler   = :detail
-    a.disabled  = true
-  end
-
-  endpoint :detail do |params|
-    record_id = params[:record_id]
-
-    # Prepare an HTML popup with session details such that the
-    # contents can be easily pasted into a spreadsheet.
-
-    pt = Marty::Posting.find_by(id: record_id)
-
-    dt = pt.created_dt.to_s == 'Infinity' ? '---' :
-      pt.created_dt.strftime('%Y-%m-%d %I:%M %p')
-
-    html =
-      "<b>Name:</b>\t#{pt.name}<br/>" +
-      "<b>Date/Time:</b>\t#{dt}<br/>" +
-      "<b>User:</b>\t#{pt.user.name}<br/>" +
-      "<b>Comment:</b>\t#{pt.comment}"
-
-    client.netzke_show_detail html
-  end
-
-  attribute :name do |c|
-    c.flex      = 1
-  end
-
-  attribute :created_dt do |c|
-    c.text      = 'Date/Time'
-    c.format    = 'Y-m-d H:i'
-    c.hidden    = true
-  end
-
-  attribute :user__name do |c|
-    c.width     = 100
-  end
-
-  attribute :comment do |c|
-    c.width     = 100
-  end
-end
-
-PostingGrid = Marty::PostingGrid

data/app/components/marty/posting_window.rb

@@ -1,25 +0,0 @@
-class Marty::PostingWindow < Netzke::Window::Base
-  def configure(c)
-    super
-
-    c.title 		= I18n.t('select_posting')
-    c.modal 		= true
-    c.items 		= [:posting_grid]
-    c.lazy_loading 	= true
-    c.width 		= 600
-    c.height 		= 350
-  end
-
-  component :posting_grid do |c|
-    c.klass			= Marty::PostingGrid
-    c.rows_per_page		= 12
-    c.permissions = {
-      update:           false,
-      delete:		true, # hijacked for selection
-      create:		false,
-    }
-    # c.bbar	= []
-  end
-end
-
-PostingWindow = Marty::PostingWindow

data/app/components/marty/user_view.rb

@@ -1,174 +0,0 @@
-module Marty; class UserView < Marty::Grid
-  has_marty_permissions create: [:admin, :user_manager],
-                        read:   :any,
-                        update: [:admin, :user_manager],
-                        delete: [:admin, :user_manager]
-
-  # list of columns to be displayed in the grid view
-  def self.user_columns
-    [
-      :login,
-      :firstname,
-      :lastname,
-      :active,
-      :user_roles,
-    ]
-  end
-
-  def configure(c)
-    super
-
-    c.attributes   ||= self.class.user_columns
-    c.title        ||= I18n.t('users', default: 'Users')
-    c.model          = 'Marty::User'
-    c.editing        = :in_form
-    c.paging         = :pagination
-    c.multi_select   = false
-    c.store_config.merge!(sorters: [{ property: :login,
-                                     direction: 'ASC',
-                                    }]) if c.attributes.include?(:login)
-    c.scope = ->(arel) { arel.includes(:user_roles) }
-  end
-
-  def self.set_roles(roles, user)
-    roles = [] if roles.blank?
-
-    roles = ::Marty::RoleType.from_nice_names(roles)
-
-    roles_in_user = user.user_roles.map(&:role)
-    roles_to_delete = roles_in_user - roles
-    roles_to_add = roles - roles_in_user
-
-    Marty::User.transaction do
-      user.user_roles.where(role: roles_to_delete).map(&:destroy!)
-
-      roles_to_add.each do |role|
-        user.user_roles.create!(role: role)
-      end
-    end
-  end
-
-  def self.create_edit_user(data)
-    # Creates initial place-holder user object and validate
-    user = data['id'].nil? ? User.new : User.find(data['id'])
-
-    user_columns.each do |c|
-      user.send("#{c}=", data[c.to_s]) unless c == :user_roles
-    end
-
-    if user.valid?
-      user.save
-      set_roles(data['user_roles'], user)
-    end
-
-    user
-  end
-
-  # override the add_in_form and edit_in_form endpoint. User creation/update
-  # needs to use the create_edit_user method.
-
-  endpoint :add_window__add_form__submit do |params|
-    data = ActiveSupport::JSON.decode(params[:data])
-
-    data['id'] = nil
-
-    unless self.class.can_perform_action?(:create)
-      client.netzke_notify 'Permission Denied'
-      return
-    end
-
-    user = self.class.create_edit_user(data)
-    if user.valid?
-      client.success = true
-      client.netzke_on_submit_success
-    else
-      client.netzke_notify(model_adapter.errors_array(user).join("\n"))
-    end
-  end
-
-  endpoint :edit_window__edit_form__submit do |params|
-    data = ActiveSupport::JSON.decode(params[:data])
-    unless self.class.can_perform_action?(:update)
-      client.netzke_notify 'Permission Denied'
-      return
-    end
-
-    user = self.class.create_edit_user(data)
-    if user.valid?
-      client.success = true
-      client.netzke_on_submit_success
-    else
-      client.netzke_notify(model_adapter.errors_array(user).join("\n"))
-    end
-  end
-
-  action :add do |a|
-    super(a)
-    a.text     = I18n.t('user_grid.new')
-    a.tooltip  = I18n.t('user_grid.new')
-    a.icon_cls = 'fa fa-user-plus glyph'
-  end
-
-  action :edit do |a|
-    super(a)
-    a.icon_cls = 'fa fa-user-cog glyph'
-  end
-
-  action :delete do |a|
-    super(a)
-    a.icon_cls = 'fa fa-user-minus glyph'
-  end
-
-  def default_context_menu
-    []
-  end
-
-  attribute :login do |c|
-    c.width   = 100
-    c.label   = I18n.t('user_grid.login')
-  end
-
-  attribute :firstname do |c|
-    c.width   = 100
-    c.label   = I18n.t('user_grid.firstname')
-  end
-
-  attribute :lastname do |c|
-    c.width   = 100
-    c.label   = I18n.t('user_grid.lastname')
-  end
-
-  attribute :active do |c|
-    c.width   = 60
-    c.label   = I18n.t('user_grid.active')
-  end
-
-  attribute :user_roles do |c|
-    c.width   = 100
-    c.flex    = 1
-    c.label   = I18n.t('user_grid.roles')
-    c.type    = :string
-
-    c.getter = lambda do |r|
-      Marty::RoleType.to_nice_names(r.user_roles.map(&:role))
-    end
-
-    store = ::Marty::RoleType.to_nice_names(::Marty::RoleType.values.sort)
-
-    c.editor_config = {
-      multi_select: true,
-      empty_text:   I18n.t('user_grid.select_roles'),
-      store:        store,
-      type:         :string,
-      xtype:        :combo,
-    }
-  end
-
-  attribute :created_dt do |c|
-    c.label     = I18n.t('user_grid.created_dt')
-    c.format    = 'Y-m-d H:i'
-    c.read_only = true
-  end
-end; end
-
-UserView = Marty::UserView