marty 4.0.0.rc2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 2e88119aa409a4b6e0b108e44f821c9ae6f3c402bde7a0b5982aaac317f8c0c0
-  data.tar.gz: f0e0a25f744a13ed98e647aa379c2421a54edc1dd8bf01e84262e4f952ce7ae2
+SHA1:
+  metadata.gz: c1dd27f462d7a2a7c78919c8388b35464b2a09db
+  data.tar.gz: a82eb24eb59673ae6a7c9f4c48a690b06dd7f984
 SHA512:
-  metadata.gz: cbfd7f8b4c3fcc8f7060f7913bd2330635517a52710acae731638d6190f05726174fddfca0447bc0400d06770e10c72dd371e24e0da4f9e2699495473041a3eb
-  data.tar.gz: e17fa1789a98f3f67fa324b2b67e7bcc1a98c48101d62088a1c1196e9d148f9275b8c3a1134a03ed7b6022d7757cfc737b2598bfc071cfd22df215ce62876293
+  metadata.gz: 36f9986869878ae91ed80ebb0d4698609ed8cc19507103d4437c3469db2f3fa32aef09b21333ee62fe92cfa2e3eafa041088e2d248c75561d6f8d1aeea5c0493
+  data.tar.gz: a9d59ed17f912a53da36a6292c2c729ce6b4daad127e621170a845b2df93faaad4c509c0e0a4e1a587f6786446bde7356127b0f7fdf1130f7f3027f9836d1c38

data/.gitignore

@@ -31,3 +31,10 @@ spec/dummy/.sass-cache
 # Files with command history for docker
 .bash_history.docker
 .pry_history.docker
+
+# Keep empty for for ssh keys in docker
+/.ssh-docker/*
+!/.ssh-docker/.keep
+
+# Ignore Gemfile.lock
+Gemfile.lock

data/.rubocop.yml

@@ -1,4 +1,5 @@
 inherit_from: .rubocop_todo.yml
+require: rubocop-performance
 
 AllCops:
   TargetRubyVersion: 2.3.3

data/.rubocop_todo.yml

@@ -48,7 +48,7 @@ Layout/ExtraSpacing:
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   Exclude:
     - 'app/components/marty/extras/layout.rb'
     - 'lib/marty/data_change.rb'
@@ -316,7 +316,7 @@ Metrics/BlockLength:
 # Offense count: 21
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 539
+  Max: 600
 
 # Offense count: 68
 Metrics/CyclomaticComplexity:
@@ -508,7 +508,7 @@ Performance/TimesMap:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Performance/UnneededSort:
+Style/UnneededSort:
   Exclude:
     - 'app/models/marty/event.rb'
 
@@ -934,19 +934,6 @@ Style/Next:
 Style/NumericLiterals:
   MinDigits: 15
 
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'app/components/marty/main_auth_app.rb'
-    - 'lib/marty/content_handler.rb'
-    - 'lib/marty/data_change.rb'
-    - 'lib/marty/data_importer.rb'
-    - 'lib/marty/xl.rb'
-
 # Offense count: 42
 # Cop supports --auto-correct.
 Style/ParallelAssignment:

data/Dockerfile.dummy

@@ -24,6 +24,9 @@ RUN curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrom
     && sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome \
     && rm google-chrome.deb
 
+# Install additional tools
+RUN apt-get install -qq -y --no-install-recommends netcat-openbsd vim
+
 RUN gem install bundler
 
 ENV BUNDLE_PATH /bundle_box/bundle

data/Gemfile

@@ -5,33 +5,37 @@ source 'http://rubygems.org'
 # development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'daemons'
-gem 'delayed_job_active_record'
-gem 'pg'
-gem 'rails', '~> 5.1.4'
-gem 'sqlite3'
+group :default do
+  gem 'daemons'
+  gem 'delayed_job_active_record'
+  gem 'pg'
+  gem 'rails'
+end
+
+group :default, :cmit do
+  gem 'delorean_lang'
+  gem 'mcfly'
+  # gem 'delorean_lang', path: File.expand_path('../../delorean', __FILE__)
+  # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
+end
 
 group :development, :test do
-  gem 'capybara', '~> 2.18.0'
+  gem 'capybara'
   gem 'connection_pool'
   gem 'database_cleaner'
+  gem 'fuubar', require: false
+  gem 'netzke', '6.5.0.0'
   gem 'pry-byebug'
   gem 'pry-rails'
+  gem 'puma'
   gem 'rails-controller-testing'
   gem 'rspec-instafail', require: false
   gem 'rspec-rails'
   gem 'rspec-retry'
   gem 'rubocop', require: false
+  gem 'rubocop-performance', require: false
+  gem 'rubocop-rails', require: false
   gem 'selenium-webdriver'
   gem 'timecop'
   gem 'webdrivers'
-
-  # gem 'mcfly', path: File.expand_path('../../mcfly', __FILE__)
-  gem 'mcfly'
-  gem 'netzke', '6.5.0.0'
-
-  # gem 'delorean_lang', path: File.expand_path('../../delorean', __FILE__)
-
-  # gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
-  gem 'marty_rspec'
 end

data/app/components/marty/base_rule_view.rb

@@ -22,16 +22,25 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     c.model = self.class.klass
     c.title = I18n.t('rule')
     c.attributes = self.class.base_fields +
-                   klass.guard_info.
-                     sort_by { |_, h| h[:order] || 0 }.
-                     reject { |_, h| h[:hidden] }.
-                     map { |name, _| name.to_sym } + self.class.computed_fields
+                   guard_info_attributes + self.class.computed_fields
     c.store_config.merge!(sorters: [{ property: :name, direction: 'ASC' }])
     c.editing      = :in_form
     c.paging       = :pagination
     c.multi_select = false
   end
 
+  def guard_info_attributes
+    res = klass.guard_info.
+      sort_by { |_, h| h[:order] || 0 }.
+      reject { |_, h| h[:hidden] }.
+      map do |name, opts|
+        next name.to_sym unless opts.fetch(:allow_not, true)
+
+        [name.to_sym, "#{name}_not".to_sym]
+      end
+    res.flatten
+  end
+
   def default_bbar
     super + [:dup_in_form]
   end
@@ -222,7 +231,11 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
   end
 
   def form_items_guards
-    klass.guard_info.reject { |_, h| h[:hidden] }.keys.map(&:to_sym)
+    klass.guard_info.reject { |_, h| h[:hidden] }.map do |field, opts|
+      next { field: field.to_sym } unless opts.fetch(:allow_not, true)
+
+      { field: field.to_sym, not_field: "#{field.to_sym}_not".to_sym }
+    end
   end
 
   def form_items_grids
@@ -246,17 +259,56 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
                  height: 225)]
   end
 
+  def default_form_items_guards
+    with_not_fields = form_items_guards.any? { |h| h.key?(:not_field) }
+
+    guards = form_items_guards.map do |h|
+      if with_not_fields
+        hbox(
+          vbox(h.fetch(:field), width: '78%', border: false),
+          vbox(width: '2%', border: false),
+          vbox(h.fetch(:not_field, nil), width: '20%', border: false),
+          width: '100%',
+          border: false
+        )
+      else
+        hbox(
+          vbox(h.fetch(:field), width: '100%', border: false),
+          width: '100%',
+          border: false
+        )
+      end
+    end
+  end
+
   def default_form_items
     [
       hbox(
-        vbox(*form_items_attrs +
-             form_items_guards,
-             border: false,
-             width: '40%',
+        vbox(
+          hbox(
+            vbox(
+              *form_items_attrs,
+              width: '100%',
+              border: false
+            ),
+            width: '100%',
+            border: false
+          ),
+          hbox(
+            vbox(
+              *default_form_items_guards,
+              width: '100%',
+              border: false
             ),
+            width: '100%',
+            border: false
+          ),
+          width: '40%',
+          border: false
+        ),
         vbox(width: '2%', border: false),
         vbox(
-          width: '55%', border: false),
+          width: '5%', border: false),
         height: '40%',
         border: false,
       ),
@@ -310,10 +362,42 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       else
         c.getter = range_getter(namestr, meth)
         c.setter = range_setter(namestr, meth)
+
         c.filterable = false
       end
+
+      c.column_config = {
+        renderer: 'simpleGuardColumnRenderer'
+      }
       c.sorting_scope = get_json_sorter(meth, namestr)
     end
+
+    # Checkbox and hidden column for "NOT" option for simpleguards
+    attribute "#{name}_not" do |c|
+      c.width = 30
+      c.label = 'Not'
+      c.type = :boolean
+      c.filterable = false
+      c.column_config = { hidden: true }
+
+      c.field_config = {
+        label_align: 'right',
+        max_width: 100,
+        label_pad: 2,
+        label_width: 30
+      }
+      c.getter = lambda do |record|
+        record.simple_guards_options.dig(name.to_s, 'not')
+      end
+
+      c.setter = lambda do |record, value|
+        options = record.simple_guards_options.fetch(name.to_s, {})
+        new_options = options.merge('not' => value)
+        record.simple_guards_options = record.simple_guards_options.merge(
+          name.to_s => new_options
+        )
+      end
+    end
   end
 
   attribute :start_dt do |c|
@@ -347,4 +431,14 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       end
     end
   end
+
+  client_class do |c|
+    c.myy_renderer = l(<<-JS)
+      function(value){
+        console.log(arguments)
+
+        return value ? "*" + value + "*" : "";
+      }
+    JS
+  end
 end

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

@@ -0,0 +1,24 @@
+{
+  simpleGuardColumnRenderer: function(value, cell, obj) {
+    if (value === undefined || value === null) {
+      return value
+    }
+
+    if (!(cell && cell.column && cell.column.config && cell.column.config.name)) {
+      return value;
+    }
+
+    if (!(obj && obj.data)) {
+      return value;
+    }
+
+    column_name = cell.column.config.name;
+    with_not = obj.data[`${column_name}_not`];
+
+    if (with_not) {
+      return `NOT (${value})`
+    }
+
+    return value;
+  }
+}

data/app/components/marty/data_grid_user_view.rb

@@ -0,0 +1,39 @@
+module Marty
+  class DataGridUserView < DataGridView
+    has_marty_permissions read: [:data_grid_editor, :admin, :dev]
+
+    def configure(c)
+      super
+
+      c.attributes =
+        [
+          :name,
+          :created_dt,
+        ]
+      c.editing = :inline
+    end
+
+    def default_bbar
+      [:edit_grid]
+    end
+
+    def get_records(params)
+      cur_perms = Mcfly.whodunnit.roles.map(&:to_sym)
+      model.where("permissions->'view'      ?| ARRAY[:roles] OR "\
+                  "permissions->'edit_data' ?| ARRAY[:roles] OR "\
+                  "permissions->'edit_all'  ?| ARRAY[:roles]",
+                  roles: cur_perms).scoping do
+        super
+      end
+    end
+
+    def self.get_edit_permission(permissions)
+      cur_perms = current_user_roles.map(&:to_s)
+      ['edit_all', 'edit_data', 'view'].detect do |p|
+        permissions[p] - cur_perms != permissions[p]
+      end
+    end
+  end
+end
+
+DataGridUserView = Marty::DataGridUserView

data/app/components/marty/data_grid_view.rb

@@ -98,6 +98,9 @@ module Marty; class DataGridView < McflyGridPanel
         :lenient,
         :data_type,
         :constraint,
+        :perm_view,
+        :perm_edit_data,
+        :perm_edit_all,
         :created_dt,
       ]
 
@@ -107,6 +110,19 @@ module Marty; class DataGridView < McflyGridPanel
     c.multi_select = false
   end
 
+  def set_perms(dg, data)
+    permstrs = %w[perm_view perm_edit_data perm_edit_all]
+    view, edit_data, edit_all = data.values_at(*permstrs).map do |plist|
+      Marty::RoleType.from_nice_names(plist)
+    end
+    dg.permissions = {
+      view: view.present? ? view : [],
+      edit_data: edit_data.present? ? edit_data : [],
+      edit_all: edit_all.present? ? edit_all : [],
+    }
+    dg.save!
+  end
+
   endpoint :add_window__add_form__submit do |params|
     data = ActiveSupport::JSON.decode(params[:data])
 
@@ -114,11 +130,12 @@ module Marty; class DataGridView < McflyGridPanel
       !config[:permissions][:create]
 
     begin
-      DataGrid.create_from_import(data['name'], data['export'])
+      dg = DataGrid.create_from_import(data['name'], data['export'])
+      set_perms(dg, data)
       client.success = true
       client.netzke_on_submit_success
-    rescue StandardError => exc
-      client.netzke_notify(exc.to_s)
+    rescue StandardError => e
+      client.netzke_notify(e.to_s)
     end
   end
 
@@ -129,10 +146,11 @@ module Marty; class DataGridView < McflyGridPanel
 
     begin
       dg.update_from_import(data['name'], data['export'])
+      set_perms(dg, data)
       client.success = true
       client.netzke_on_submit_success
-    rescue StandardError => exc
-      client.netzke_notify(exc.to_s)
+    rescue StandardError => e
+      client.netzke_notify(e.to_s)
     end
   end
 
@@ -168,14 +186,8 @@ module Marty; class DataGridView < McflyGridPanel
     client.netzke_client_show_grid maxcount, res, 'Data Grid'
   end
 
-  # placeholders for grid editing permission logic.
-  # for now, this allows the rspec to control the permission
-  def self.get_edit_edit_permission
-    Marty::Config['grid_edit_edit_perm'] || 'edit_all'
-  end
-
-  def self.get_edit_save_permission
-    Marty::Config['grid_edit_save_perm'] || 'edit_all'
+  def self.get_edit_permission(_permissions)
+    'edit_all'
   end
 
   endpoint :edit_grid do |params|
@@ -193,9 +205,21 @@ module Marty; class DataGridView < McflyGridPanel
     vdim = md.map { |m| m['dir'] == 'v' && m['attr'] }.select { |v| v }
     hdim_en = hdim.map { |d| I18n.t('attributes.' + d, default: d) }
     vdim_en = vdim.map { |d| I18n.t('attributes.' + d, default: d) }
-    name = "Editing Data Grid '#{dg.name}'"
-    permission = Marty::DataGridView.get_edit_edit_permission
-    client.edit_grid(record_id, hdim_en, vdim_en, res, name, permission)
+    perm = self.class.get_edit_permission(dg.permissions)
+    # should never happen
+    return client.netzke_notify('No permission to edit/view grid.') unless perm
+
+    doing = case perm
+            when 'view'
+              'Viewing'
+            when 'edit_all'
+              'Editing (all)'
+            when 'edit_data'
+              'Editing (data only)'
+            end
+    name = "#{doing} Data Grid '#{dg.name}'"
+
+    client.edit_grid(record_id, hdim_en, vdim_en, res, name, perm)
   end
 
   endpoint :save_grid do |params|
@@ -213,10 +237,36 @@ module Marty; class DataGridView < McflyGridPanel
   def default_form_items
     [
       :name,
+      :perm_view, :perm_edit_data, :perm_edit_all,
       textarea_field(:export, height: 300, hide_label: true),
     ]
   end
 
+  ['view', 'edit_data', 'edit_all'].each do |p|
+    s = ('perm_' + p).to_s
+    attribute s do |c|
+      c.width   = 100
+      c.flex    = 1
+      c.label   = I18n.t("data_grid_view_perms.#{s}")
+      c.type    = :string
+      c.getter = lambda do |r|
+        Marty::RoleType.to_nice_names(r.permissions[p].sort)
+      end
+      store = Marty::RoleType.to_nice_names(::Marty::RoleType.get_all.sort.map)
+
+      # edit does not work without this dummy setter
+      c.setter = ->(r, v) {}
+
+      c.editor_config = {
+        multi_select: true,
+        empty_text:   I18n.t('user_grid.select_roles'),
+        store:        store,
+        type:         :string,
+        xtype:        :combo,
+      }
+    end
+  end
+
   component :edit_window do |c|
     super(c)
     c.width = 700
@@ -228,11 +278,11 @@ module Marty; class DataGridView < McflyGridPanel
   end
 
   attribute :name do |c|
-    c.width = 120
+    c.width = 400
   end
 
   attribute :constraint do |c|
-    c.width = 100
+    c.width = 150
   end
 
   attribute :hcols do |c|