marty 2.9.3 → 3.0.0

data/app/components/marty/import_type_view.rb

@@ -13,7 +13,7 @@ class Marty::ImportTypeView < Marty::Grid
     c.attributes =
       [
         :name,
-        :role__name,
+        :role,
         :db_model_name,
         :cleaner_function,
         :validation_function,
@@ -26,8 +26,17 @@ class Marty::ImportTypeView < Marty::Grid
     c.flex = 1
   end
 
-  attribute :role__name do |c|
+  attribute :role do |c|
     c.width = 150
+
+    store = ::Marty::RoleType.get_all.sort
+
+    c.editor_config = {
+      multi_select: false,
+      store:        store,
+      type:         :string,
+      xtype:        :combo,
+    }
   end
 
   attribute :db_model_name do |c|

data/app/components/marty/main_auth_app.rb

@@ -27,7 +27,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   end
 
   def self.has_scripting_perm?
-    has_admin_perm?
+    has_perm?(:admin)
   end
 
   def posting_menu
@@ -50,7 +50,7 @@ class Marty::MainAuthApp < Marty::AuthApp
       {
         text: 'Log Maintenance',
         icon_cls: 'fa fa-wrench glyph',
-        disabled: !self.class.has_admin_perm?,
+        disabled: !self.class.has_perm?(:admin),
         menu: [
           :log_view,
           :log_cleanup,
@@ -64,7 +64,7 @@ class Marty::MainAuthApp < Marty::AuthApp
       {
         text: 'API Management',
         icon_cls: 'fa fa-fighter-jet glyph',
-        disabled: !self.class.has_admin_perm?,
+        disabled: !self.class.has_perm?(:admin),
         menu: [
           :api_auth_view,
           :api_config_view,
@@ -108,7 +108,7 @@ class Marty::MainAuthApp < Marty::AuthApp
       {
         text: 'Background Jobs',
         icon_cls: 'fa fa-user-clock glyph',
-        disabled: !self.class.has_admin_perm?,
+        disabled: !self.class.has_perm?(:admin),
         menu: [
           :bg_status,
           :bg_stop,
@@ -151,8 +151,8 @@ class Marty::MainAuthApp < Marty::AuthApp
     return super unless self.class.has_any_perm?
 
     [ident_menu, sep] +
-      (self.class.has_admin_perm? ||
-       self.class.has_user_manager_perm? ? [system_menu, sep] : []) +
+      (self.class.has_perm?(:admin) ||
+       self.class.has_perm?(:user_manager) ? [system_menu, sep] : []) +
       data_menus +
       [
         applications_menu, sep,
@@ -165,7 +165,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   action :import_type_view do |a|
     a.text      = I18n.t('import_type')
     a.handler   = :netzke_load_component_by_action
-    a.disabled  = !self.class.has_admin_perm?
+    a.disabled  = !self.class.has_perm?(:admin)
     a.icon_cls = 'fa fa-file-import glyph'
   end
 
@@ -194,30 +194,30 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.text      = I18n.t('user_view')
     a.handler   = :netzke_load_component_by_action
     a.icon_cls = 'fa fa-users glyph'
-    a.disabled  = !self.class.has_admin_perm? &&
-      !self.class.has_user_manager_perm?
+    a.disabled  = !self.class.has_perm?(:admin) &&
+      !self.class.has_perm?(:user_manager)
   end
 
   action :event_view do |a|
     a.text      = I18n.t('event_view')
     a.handler   = :netzke_load_component_by_action
     a.icon_cls = 'fa fa-bolt glyph'
-    a.disabled  = !self.class.has_admin_perm?
+    a.disabled  = !self.class.has_perm?(:admin)
   end
 
   action :config_view do |a|
     a.text      = I18n.t('config_view')
     a.handler   = :netzke_load_component_by_action
     a.icon_cls = 'fa fa-cog glyph'
-    a.disabled  = !self.class.has_admin_perm? &&
-      !self.class.has_user_manager_perm?
+    a.disabled  = !self.class.has_perm?(:admin) &&
+      !self.class.has_perm?(:user_manager)
   end
 
   action :api_auth_view do |a|
     a.text      = 'API Auth Management'
     a.handler   = :netzke_load_component_by_action
     a.icon_cls = 'fa fa-key glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :api_config_view do |a|
@@ -225,7 +225,7 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.tooltip  = 'Manage API behavior and settings'
     a.handler  = :netzke_load_component_by_action
     a.icon_cls = 'fa fa-sliders-h glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :api_log_view do |a|
@@ -233,7 +233,7 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.tooltip  = 'View API logs'
     a.handler  = :netzke_load_component_by_action
     a.icon_cls = 'fa fa-pencil-alt glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :data_grid_view do |a|
@@ -247,42 +247,42 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.text     = 'Reload Scripts'
     a.tooltip  = 'Reload and tag Delorean scripts'
     a.icon_cls = 'fa fa-sync-alt glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :load_seed do |a|
     a.text     = 'Load Seeds'
     a.tooltip  = 'Load Seeds'
     a.icon_cls = 'fa fa-retweet glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :bg_status do |a|
     a.text     = 'Show Delayed Jobs Status'
     a.tooltip  = 'Run delayed_job status script'
     a.icon_cls = 'fa fa-desktop glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :bg_stop do |a|
     a.text     = 'Stop Delayed Jobs'
     a.tooltip  = 'Run delayed_job stop script'
     a.icon_cls = 'fa fa-skull glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :bg_restart do |a|
     a.text     = 'Restart Delayed Jobs'
     a.tooltip  = 'Run delayed_job restart script using DELAYED_JOB_PARAMS'
     a.icon_cls = 'fa fa-power-off glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :schedule_jobs_dashboard do |a|
     a.text     = 'Schedule Jobs Dashboard'
     a.tooltip  = 'Edit Delayed Jobs Cron schedules'
     a.icon_cls = 'fa fa-cog glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
     a.handler = :netzke_load_component_by_action
   end
 
@@ -291,14 +291,14 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.tooltip  = 'View Log'
     a.handler  = :netzke_load_component_by_action
     a.icon_cls = 'fa fa-cog glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   action :log_cleanup do |a|
     a.text     = 'Cleanup Log Table'
     a.tooltip  = 'Delete old log records'
     a.icon_cls = 'fa fa-cog glyph'
-    a.disabled = !self.class.has_admin_perm?
+    a.disabled = !self.class.has_perm?(:admin)
   end
 
   ######################################################################

data/app/components/marty/promise_view.rb

@@ -59,7 +59,7 @@ class Marty::PromiseView < Netzke::Tree::Base
     a.text     = a.tooltip = 'Clear'
     a.disabled = false
     a.icon_cls = 'fa fa-minus glyph'
-    a.hidden   = !self.class.has_admin_perm?
+    a.hidden   = !self.class.has_perm?(:admin)
   end
 
   action :download do |a|

data/app/components/marty/report_select.rb

@@ -66,6 +66,7 @@ class Marty::ReportSelect < Marty::Form
 
     nodes.map do |node|
       roles = engine.evaluate(node, 'roles') rescue nil
+
       next if roles && !roles.any? { |r| Marty::User.has_role(r) }
 
       begin

data/app/components/marty/script_form.rb

@@ -39,7 +39,7 @@ class Marty::ScriptForm < Marty::Form
   end
 
   def can_save?(script)
-    script && self.class.has_dev_perm? && Mcfly.is_infinity(script.obsoleted_dt)
+    script && self.class.has_perm?(:dev) && Mcfly.is_infinity(script.obsoleted_dt)
   end
 
   ######################################################################

data/app/components/marty/user_view.rb

@@ -11,7 +11,7 @@ module Marty; class UserView < Marty::Grid
       :firstname,
       :lastname,
       :active,
-      :roles,
+      :user_roles,
     ]
   end
 
@@ -27,21 +27,27 @@ module Marty; class UserView < Marty::Grid
     c.store_config.merge!(sorters: [{ property: :login,
                                      direction: 'ASC',
                                     }]) if c.attributes.include?(:login)
-    c.scope = ->(arel) { arel.includes(:roles) }
+    c.scope = ->(arel) { arel.includes(:user_roles) }
   end
 
   def self.set_roles(roles, user)
-    roles ||= []
+    roles = [] unless roles.present?
 
-    # Destroy old roles (must call destroy for auditing to work properly)
-    user.user_roles.each do |ur|
-      ur.destroy unless roles.include?(I18n.t("roles.#{ur.role.name}"))
+    roles = Marty::RoleType.get_all.select do |role|
+      roles.include?(I18n.t("roles.#{role}", default: role))
     end
 
-    # set new roles
-    user.roles = Role.select { |r|
-                   roles.include? I18n.t("roles.#{r.name}")
-    }
+    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)
@@ -49,12 +55,12 @@ module Marty; class UserView < Marty::Grid
     user = data['id'].nil? ? User.new : User.find(data['id'])
 
     user_columns.each do |c|
-      user.send("#{c}=", data[c.to_s]) unless c == :roles
+      user.send("#{c}=", data[c.to_s]) unless c == :user_roles
     end
 
     if user.valid?
       user.save
-      set_roles(data['roles'], user)
+      set_roles(data['user_roles'], user)
     end
 
     user
@@ -139,20 +145,26 @@ module Marty; class UserView < Marty::Grid
     c.label   = I18n.t('user_grid.active')
   end
 
-  attribute :roles do |c|
+  attribute :user_roles do |c|
     c.width   = 100
     c.flex    = 1
     c.label   = I18n.t('user_grid.roles')
-    c.type    = :string,
+    c.type    = :string
 
-                c.getter = lambda do |r|
-                  r.roles.map { |ur| I18n.t("roles.#{ur.name}") }.sort
-                end
+    c.getter = lambda do |r|
+      r.user_roles.map do |ur|
+        I18n.t("roles.#{ur.role}", default: ur.role)
+      end
+    end
+
+    store = ::Marty::RoleType.get_all.sort.map do |role|
+      I18n.t("roles.#{role}", default: role)
+    end
 
     c.editor_config = {
       multi_select: true,
       empty_text:   I18n.t('user_grid.select_roles'),
-      store:        Role.pluck(:name).map { |n| I18n.t("roles.#{n}") }.sort,
+      store:        store,
       type:         :string,
       xtype:        :combo,
     }

data/app/models/marty/data_grid.rb

@@ -70,6 +70,23 @@ class Marty::DataGrid < Marty::Base
 
       dg.errors.add(:base, 'duplicate vertical key combination') unless
         v_zip_keys.uniq.length == v_zip_keys.length
+
+      con_chk = []
+      begin
+        con_chk = Marty::DataGrid::Constraint.parse(dg.data_type, dg.constraint)
+      rescue StandardError => e
+        dg.errors.add(:base, "Error in constraint: #{e.message}")
+      end
+      data_check = Marty::DataGrid::Constraint.check_data(dg.data_type,
+                                                          dg.data, con_chk)
+      return unless data_check.present?
+
+      data_check.each do |(err, x, y)|
+        dg.errors.add(:base, "cell #{x}, #{y} fails constraint check") if
+          err == :constraint
+        dg.errors.add(:base, "cell #{x}, #{y} incorrect type") if
+          err == :type
+      end
     end
   end
 
@@ -342,10 +359,14 @@ class Marty::DataGrid < Marty::Base
 
   def export_array
     # add data type metadata row if not default
-    dt_row = lenient ? ['lenient'] : []
-    dt_row << data_type unless [nil, DEFAULT_DATA_TYPE].member?(data_type)
+    lenstr = 'lenient' if lenient
+    typestr = data_type unless [nil, DEFAULT_DATA_TYPE].member?(data_type) &&
+                               !constraint.present?
+
+    len_dt = [lenstr, typestr].compact.join(' ')
 
-    meta_rows = dt_row.empty? ? [] : [[dt_row.join(' ')]]
+    meta_rows = len_dt.present? || constraint.present? ?
+                  [[len_dt, constraint]] : []
 
     meta_rows += metadata.map do |inf|
       [inf['attr'], inf['type'], inf['dir'], inf['rs_keep'] || '']
@@ -466,7 +487,7 @@ class Marty::DataGrid < Marty::Base
     data_type, lenient = nil, false
 
     # check if there's a data_type definition
-    dt, *x = rows[0]
+    dt, constraint, *x = rows[0]
     if dt && x.all?(&:nil?)
       dts = dt.split
       raise "bad data type '#{dt}'" if dts.count > 2
@@ -474,8 +495,10 @@ class Marty::DataGrid < Marty::Base
       lenient = dts.delete 'lenient'
       data_type = dts.first
     end
+    constraint = nil if x.first.in?(['v', 'h'])
 
-    rows_for_metadata = rows[(data_type || lenient ? 1 : 0)...blank_index]
+    start_md = constraint || data_type || lenient ? 1 : 0
+    rows_for_metadata = rows[start_md...blank_index]
     metadata = rows_for_metadata.map do |attr, type, dir, rs_keep, key|
       raise 'metadata elements must include attr/type/dir' unless
         attr && type && dir
@@ -549,11 +572,12 @@ class Marty::DataGrid < Marty::Base
       end
     end
 
-    [metadata, data, data_type, lenient]
+    [metadata, data, data_type, lenient, constraint]
   end
 
   def self.create_from_import(name, import_text, created_dt = nil)
-    metadata, data, data_type, lenient = parse(created_dt, import_text, {})
+    metadata, data, data_type, lenient, constraint = parse(created_dt,
+                                                           import_text, {})
     dg            = new
     dg.name       = name
     dg.data       = data
@@ -561,12 +585,13 @@ class Marty::DataGrid < Marty::Base
     dg.lenient    = !!lenient
     dg.metadata   = metadata
     dg.created_dt = created_dt if created_dt
+    dg.constraint = constraint
     dg.save!
     dg
   end
 
   def update_from_import(name, import_text, created_dt = nil)
-    new_metadata, data, data_type, lenient =
+    new_metadata, data, data_type, lenient, constraint =
       self.class.parse(created_dt, import_text, {})
 
     self.name       = name
@@ -575,6 +600,7 @@ class Marty::DataGrid < Marty::Base
     self.lenient    = !!lenient
     # Otherwise changed will depend on order in hashes
     self.metadata   = new_metadata unless metadata == new_metadata
+    self.constraint = constraint
     self.created_dt = created_dt if created_dt
     save!
   end

data/app/models/marty/import_type.rb

@@ -27,9 +27,7 @@ class Marty::ImportType < Marty::Base
     self.preprocess_function = nil if preprocess_function.blank?
   end
 
-  belongs_to :role
-
-  validates_presence_of :name, :db_model_name, :role_id
+  validates_presence_of :name, :db_model_name, :role
   validates_uniqueness_of :name
   validates_with ImportTypeValidator
 
@@ -38,6 +36,6 @@ class Marty::ImportType < Marty::Base
   end
 
   def allow_import?
-    Mcfly.whodunnit && Mcfly.whodunnit.roles.pluck(:id).include?(role_id)
+    Mcfly.whodunnit && Mcfly.whodunnit.roles.include?(role)
   end
 end

data/app/models/marty/role_type.rb

@@ -0,0 +1,10 @@
+class Marty::RoleType < Marty::Base
+  extend Marty::PgEnum
+
+  VALUES = [
+    'admin',
+    'user_manager',
+    'dev',
+    'viewer'
+  ]
+end