marty 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46bed6f3169beec2514318a672e7b116ef0031f679f774cb51bb14dc9fa935fd
-  data.tar.gz: 74d430112df6bdf70bf9fa91d0efae7fbba4a0de08d53cb8f6cc9ab0d8029945
+  metadata.gz: cdb72d97f91a1f370754d64b41ca268addf4f001b061cc3e531f5993d7f5dae7
+  data.tar.gz: 1cefbf2a2e8d6e1176be63e876f7207fbc1fe8c07dd8b78b182ac4621e9f638b
 SHA512:
-  metadata.gz: 8ba1fa3171e1887fe79331dcb623ef1936557e16b238117c84c3b6dff4d0b519db0596f64e0dd4fa4ec08bd2703e715c3d21bcf6d5d11c8cb46d1d4e1991a46d
-  data.tar.gz: cdf887a7e66c5ce77f9c23f6467460d6b71b74f2e146fa7c7e1bfe79ad6d5534803a9930221376101683df68e360c0f30aba75072a7574c641fab4252210f818
+  metadata.gz: c82561e607fcb7ffd5e154e85279c7afd1c992867d495cee261310282fa55912247b09db6bff1d88d773a3e49fac0fe5f361fc2048c4f8cd4ea5f70a3d70db2c
+  data.tar.gz: 540081cb0f2474a32ebb47a5fc42741cedc717d2dc71ebc7bb772af7a8c24c475db5c6812b403b29b2997b95c1123ba576997b95af5cc84f5b1afa9163bc7168

data/.gitignore

@@ -31,3 +31,8 @@ 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
+

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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.10.0)
+    marty (3.0.0)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay

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,7 +130,8 @@ 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
@@ -129,6 +146,7 @@ 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
@@ -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|

data/app/components/marty/main_auth_app.rb

@@ -4,6 +4,7 @@ require 'marty/api_log_view'
 require 'marty/config_view'
 require 'marty/data_grid_view'
 require 'marty/schedule_jobs_dashboard'
+require 'marty/data_grid_user_view'
 require 'marty/event_view'
 require 'marty/import_type_view'
 require 'marty/new_posting_window'
@@ -96,6 +97,7 @@ class Marty::MainAuthApp < Marty::AuthApp
         icon_cls: 'fa fa-window-restore glyph',
       menu: [
         :data_grid_view,
+        :data_grid_user_view,
         :reporting,
         :scripting,
         :promise_view,
@@ -237,7 +239,14 @@ class Marty::MainAuthApp < Marty::AuthApp
   end
 
   action :data_grid_view do |a|
-    a.text      = I18n.t('data_grid_view', default: 'Data Grids')
+    a.text      = I18n.t('data_grid_view')
+    a.handler   = :netzke_load_component_by_action
+    a.icon_cls = 'fa fa-table glyph'
+    a.disabled = !self.class.has_any_perm?
+  end
+
+  action :data_grid_user_view do |a|
+    a.text      = I18n.t('data_grid_user_view')
     a.handler   = :netzke_load_component_by_action
     a.icon_cls = 'fa fa-table glyph'
     a.disabled = !self.class.has_any_perm?
@@ -388,6 +397,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   component :config_view
 
   component :data_grid_view
+  component :data_grid_user_view
 
   component :event_view
 

data/app/components/marty/user_view.rb

@@ -33,9 +33,7 @@ module Marty; class UserView < Marty::Grid
   def self.set_roles(roles, user)
     roles = [] unless roles.present?
 
-    roles = Marty::RoleType.get_all.select do |role|
-      roles.include?(I18n.t("roles.#{role}", default: role))
-    end
+    roles = ::Marty::RoleType.from_nice_names(roles)
 
     roles_in_user = user.user_roles.map(&:role)
     roles_to_delete = roles_in_user - roles
@@ -152,14 +150,10 @@ module Marty; class UserView < Marty::Grid
     c.type    = :string
 
     c.getter = lambda do |r|
-      r.user_roles.map do |ur|
-        I18n.t("roles.#{ur.role}", default: ur.role)
-      end
+      Marty::RoleType.to_nice_names(r.user_roles.map(&:role))
     end
 
-    store = ::Marty::RoleType.get_all.sort.map do |role|
-      I18n.t("roles.#{role}", default: role)
-    end
+    store = ::Marty::RoleType.to_nice_names(::Marty::RoleType::VALUES.sort)
 
     c.editor_config = {
       multi_select: true,

data/app/models/marty/data_grid.rb

@@ -360,13 +360,19 @@ class Marty::DataGrid < Marty::Base
   def export_array
     # add data type metadata row if not default
     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 = len_dt.present? || constraint.present? ?
-                  [[len_dt, constraint]] : []
+    typestr = data_type unless [nil, DEFAULT_DATA_TYPE].member?(data_type)
+    len_type = [lenstr, typestr].compact.join(' ')
+
+    meta_rows = if (lenient || typestr) && constraint
+                  [[len_type, constraint]]
+                elsif lenient || typestr
+                  [[len_type]]
+                elsif constraint
+                  [['', constraint]]
+                else
+                  []
+                end
 
     meta_rows += metadata.map do |inf|
       [inf['attr'], inf['type'], inf['dir'], inf['rs_keep'] || '']

data/app/models/marty/role_type.rb

@@ -5,6 +5,19 @@ class Marty::RoleType < Marty::Base
     'admin',
     'user_manager',
     'dev',
-    'viewer'
+    'viewer',
+    'data_grid_editor'
   ]
+
+  def self.from_nice_names(roles)
+    Marty::RoleType.get_all.select do |role|
+      roles.include?(I18n.t("roles.#{role}", default: role))
+    end
+  end
+
+  def self.to_nice_names(roles)
+    roles.map do |role|
+      I18n.t("roles.#{role}", default: role)
+    end
+  end
 end

data/app/services/marty/data_grid_view/save_grid.rb

@@ -15,8 +15,9 @@ module Marty
       end
 
       def self.call(params)
-        user_perm = Marty::DataGridView.get_edit_save_permission
         rec_id = params['record_id']
+        dg = Marty::DataGrid.mcfly_pt('infinity').find_by(group_id: rec_id)
+        user_perm = Marty::DataGridView.get_edit_permission(dg.permissions)
         data = params['data']
         raise GridError.new('entered with view permissions', data, rec_id) if
           user_perm == 'view'
@@ -24,7 +25,6 @@ module Marty
         data_as_array = data.map do |row|
           row.keys.map { |key| row[key] }
         end
-        dg = Marty::DataGrid.mcfly_pt('infinity').find_by(group_id: rec_id)
         vcnt = dg.metadata.select { |md| md['dir'] == 'v' }.count
         hcnt = dg.metadata.select { |md| md['dir'] == 'h' }.count
         cur_data_dim = [dg.data.length, dg.data[0].length]

data/config/locales/en.yml

@@ -18,8 +18,10 @@ en:
   create_posting: Create
   api_auth: API Authorization
   event_view: Event View
-  data_grid_view: Data Grids
-  data_grid: Data Grids
+  data_grid_view: Data Grids Admin
+  data_grid: Data Grids Admin
+  data_grid_user: Data Grids
+  data_grid_user_view: Data Grids
 
   data_import_view:
     import: Import
@@ -30,6 +32,7 @@ en:
     admin: Admin
     dev: Developer
     user_manager: User Manager
+    data_grid_editor: Data Grid Editor
 
   posting_types:
     BASE: BASE
@@ -176,3 +179,9 @@ en:
     grid:
       base:
         view_record: "%{model} (Read-only)"
+
+  data_grid_view_perms:
+    perm_view: Can View
+    perm_edit_data: Can Edit Data
+    perm_edit_all: Can Edit All
+    

data/db/migrate/108_add_data_grid_perms.rb

@@ -0,0 +1,16 @@
+class AddDataGridPerms < ActiveRecord::Migration[4.2]
+  def self.up
+    default = {
+      view: [],
+      edit_data: [],
+      edit_all: []
+    }
+    table = :marty_data_grids
+    add_column table, :permissions, :jsonb, null: false, default: default
+    add_index table, "(permissions->'view')", using: "GIN",
+              name: :marty_data_grids_perm_idx
+  end
+  def self.down
+    remove_column :marty_data_grids, :permissions
+  end
+end

data/docker-compose.dummy.yml

@@ -24,6 +24,7 @@ services:
       - .:/opt/app:delegated
       - '.bash_history.docker:/root/.bash_history'
       - '.pry_history.docker:/root/.pry_history'
+      - '.ssh-docker:/root/.ssh'
       - bundle_box:/bundle_box
     tty: true
     stdin_open: true

data/lib/marty/data_conversion.rb

@@ -1,7 +1,7 @@
 class Marty::DataConversion
   EXCEL_START_DATE = Date.parse('1/1/1900') - 2
 
-  FLOAT_PAT = /^-?\d+(\.\d+)?$/
+  FLOAT_PAT = /\A-?\d+(\.?\d+)?([eE][-+]?[0-9]+)?\z/
 
   PATS = {
     integer: /^-?\d+(\.0+)?$/,

data/lib/marty/migrations.rb

@@ -41,7 +41,7 @@ module Marty::Migrations
     SQL
 
     db_values = res.first['enum_range'].gsub(/[{"}]/, '').split(',')
-    ex_values = klass::VALUES - db_values
+    ex_values = klass::VALUES.map(&:to_s) - db_values
 
     return if ex_values.empty?
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/other/marty/diagnostic/aws/ec2_instance.rb

@@ -35,15 +35,30 @@ class Marty::Diagnostic::Aws::Ec2Instance < Marty::Aws::Request
 
   def ec2_request action, params = {}
     resp = request({ action: action }, params)
-    Hash.from_xml(resp)["#{action}Response"]
+    parsed = Hash.from_xml(resp)
+
+    # check AWS response for errors
+    error = parsed.dig('Response', 'Errors', 'Error')
+    raise Marty::Diagnostic::Aws::Error.new(action, error) if error
+
+    action_resp = parsed["#{action}Response"]
+    raise Marty::Diagnostic::Aws::Error.new(action, parsed) unless action_resp
+
+    action_resp
   end
 
   def get_tag
+    action = 'DescribeTags'
     params = { 'Filter.1.Name' => 'resource-id',
               'Filter.1.Value.1' => get_instance_id,
               'Filter.2.Name'    => 'key',
               'Filter.2.Value.1' => 'Name' }
-    ec2_request('DescribeTags', params)['tagSet']['item']['value']
+
+    action_resp = ec2_request(action, params)
+    tag = action_resp.dig('tagSet', 'item', 'value')
+    raise Marty::Diagnostic::Aws::Error.new(action, action_resp) unless tag
+
+    tag
   end
 
   def get_instances

data/other/marty/diagnostic/aws/error.rb

@@ -0,0 +1,8 @@
+class Marty::Diagnostic::Aws::Error < StandardError
+  attr_accessor :object
+
+  def initialize(action, object = nil)
+    super("#{action}: #{object.try(:[], 'Message') || 'Unexpected Response'}")
+    self.object = object
+  end
+end

data/spec/dummy/config/application.rb

@@ -79,6 +79,7 @@ module Dummy
                           :dev,
                           :viewer,
                           :user_manager,
+                          :data_grid_editor,
                          ]
     #config.marty.default_posting_type = 'BASE'
     config.secret_key_base = "SECRET_KEY_BASE"

data/spec/features/data_grid_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 require 'marty_rspec'
 
 feature 'data grid view', js: true do
+  before(:all) do
+    self.use_transactional_tests = true
+  end
+
   before(:each) do
     marty_whodunnit
     Marty::Script.load_scripts
@@ -11,12 +15,22 @@ feature 'data grid view', js: true do
       n = File.basename(path, '.txt').camelize
       Marty::DataGrid.create_from_import(n, File.read(path), dt)
     end
+    u = Marty::User.create!(login: 'grid_user',
+                            firstname: 'grid',
+                            lastname: 'user',
+                            active: true)
+    Marty::UserRole.create!(user_id: u.id, role: 'data_grid_editor')
+    @no_perm = { 'view' => [],
+                 'edit_data' => [],
+                 'edit_all' => [] }
   end
 
-  def go_to_data_grids
+  def go_to_data_grids(admin: true)
+    log_in_as(admin ? 'marty' : 'grid_user')
     press('Applications')
-    press('Data Grids')
-    expect(page).to have_content 'Data Grids'
+    dest = 'Data Grids' + (admin ? ' Admin' : '')
+    press(dest)
+    expect(page).to have_content dest
   end
 
   # setup the info for the ext grid
@@ -24,7 +38,7 @@ feature 'data grid view', js: true do
     widths, rows = get_grid_info
     @grid = page.all(:xpath,
                      ".//div[contains(@class, 'x-grid-item-container')]").
-              reject { |e| e.text.include?('2016-12-31') }.first
+              reject { |e| e.text.include?('DataGrid1') }.first
     @gridx = @grid.native.rect.x
     @gridy = @grid.native.rect.y
     height = @grid.native.size.height
@@ -278,18 +292,97 @@ feature 'data grid view', js: true do
     expect(grid_meta).to eq(exp_meta)
   end
 
-  it 'dg editor' do
+  it 'dg perms' do
     log_in_as('marty')
     go_to_data_grids
     dgv = netzke_find('data_grid_view')
     grids = dgv.get_col_vals('name', 5)
-    context_test_all = ENV['DG_FEATURE_QUICK'] != 'true'
-    [['edit_all', context_test_all],
+    set_one = lambda do |grid, perms|
+      pos = grids.index(grid) + 1
+      dgv.select_row(pos)
+      press('Edit')
+      wait_for_ajax
+      view_combo = netzke_find('Can View', 'combobox')
+      edit_data_combo = netzke_find('Can Edit Data', 'combobox')
+      edit_all_combo = netzke_find('Can Edit All', 'combobox')
+      view_combo.select_values(perms['view'].join(', '))
+      edit_data_combo.select_values(perms['edit_data'].join(', '))
+      edit_all_combo.select_values(perms['edit_all'].join(', '))
+      press('OK')
+      wait_for_ajax
+    end
+    dg1p = { 'view' => ['Data Grid Editor'],
+             'edit_data' => ['Data Grid Editor'],
+             'edit_all' => ['Admin'] }
+    dg2p = { 'view' => ['Data Grid Editor', 'User Manager'],
+             'edit_data' => ['Data Grid Editor', 'User Manager'],
+            'edit_all' => ['Data Grid Editor', 'Admin'] }
+    set_one.call('DataGrid1', dg1p)
+    set_one.call('DataGrid2', dg2p)
+    dg1 = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid1')
+    dg2 = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid2')
+    fixexp = lambda do |orig_h|
+      orig_h.each_with_object({}) do |(k, v), h|
+        h[k] = v.map do |vals|
+          vals.split(' ').map(&:downcase).join('_')
+        end.sort
+      end
+    end
+    exp1 = fixexp.call(dg1p)
+    exp2 = fixexp.call(dg2p)
+    fixgot = ->(orig_h) { Hash[orig_h.map { |k, v| [k, v.sort] }] }
+    got1 = fixgot.call(dg1.permissions)
+    got2 = fixgot.call(dg2.permissions)
+    cmp1 = struct_compare(got1, exp1)
+    cmp2 = struct_compare(got2, exp2)
+    expect(cmp1).to be_falsey
+    expect(cmp2).to be_falsey
+
+    set_one.call('DataGrid1', @no_perm)
+    set_one.call('DataGrid2', @no_perm)
+    dg1 = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid1')
+    dg2 = Marty::DataGrid.mcfly_pt('infinity').find_by(name: 'DataGrid2')
+    expect(dg1.permissions).to eq(@no_perm)
+    expect(dg2.permissions).to eq(@no_perm)
+  end
+
+  it 'show grid' do
+    log_in_as('marty')
+    go_to_data_grids
+    dgv = netzke_find('data_grid_view')
+    grids = dgv.get_col_vals('name', 5)
+    pos = grids.index('DataGrid1') + 1
+    dgv.select_row(pos)
+    press('Show Grid')
+    expect(page).to have_content('Antwerp')
+  end
+
+  def set_perm(perm)
+    p = @no_perm + (perm ? { perm => ['data_grid_editor'] } : {})
+    Marty::DataGrid.mcfly_pt('infinity').each do |dg|
+      dg.permissions = p
+      dg.save!
+    end
+  end
+
+  it 'dg context menus' do
+    log_in_as('grid_user')
+    go_to_data_grids(admin: false)
+    dgv = netzke_find('data_grid_user_view')
+    context_test_all = ENV['DG_FEATURE_FULL'] == 'true'
+    [[nil, nil],
+     ['edit_all', context_test_all],
      ['edit_data', false],
      ['view', false]].each do |perm, all_cells|
+
+      set_perm(perm)
+      press('Refresh')
+      grids = dgv.get_col_vals('name', 5)
+      if perm.nil?
+        expect(grids).to be_nil
+        next
+      end
       grids.each do |grid|
-        Marty::Config['grid_edit_edit_perm'] = perm
-        Marty::Config['grid_edit_save_perm'] = perm
         pos = grids.index(grid) + 1
         dgv.select_row(pos)
         press('Edit Grid')
@@ -300,8 +393,14 @@ feature 'data grid view', js: true do
         wait_for_ajax
       end
     end
-    Marty::Config['grid_edit_edit_perm'] = 'edit_all'
-    Marty::Config['grid_edit_save_perm'] = 'edit_all'
+  end
+
+  it 'dg editor' do
+    set_perm('edit_all')
+    log_in_as('grid_user')
+    go_to_data_grids(admin: false)
+    dgv = netzke_find('data_grid_user_view')
+    grids = dgv.get_col_vals('name', 5)
 
     # now test some editing, saving, and cancel logic
     get_latest = lambda do
@@ -460,40 +559,5 @@ feature 'data grid view', js: true do
     press('Save')
     sleep 1
     validate_grid('1')
-
-    Marty::Config['grid_edit_save_perm'] = 'view'
-    pos = grids.index('DataGrid5') + 1
-    dgv.select_row(pos)
-    count = 1
-    begin
-      press('Edit Grid')
-      wait_for_ajax
-      grid_setup
-      cell_edit(2, 3, '123.456')
-    rescue StandardError => e
-      if count > 0
-        sleep 1
-        retry
-      end
-      count -= 1
-    end
-    press('Save')
-    errexp = 'error: save_grid: entered with view permissions'
-    expect(page).to have_content(errexp)
-    press('OK')
-    wait_for_ajax
-    context_click(2, 4, 4, click: true)
-    Marty::Config['grid_edit_save_perm'] = 'edit_data'
-    press('Save')
-    errexp = 'error: save_grid: grid modification not allowed'
-    expect(page).to have_content(errexp)
-    exp_log = JSON.parse(File.read('spec/fixtures/misc/grid_log_errs.json'))
-    got = Marty::Log.all.select(:message, :details).attributes.map do |l|
-      newl = l.except('id')
-      newl['details'].delete('rec_id')
-      newl
-    end
-    cmp = struct_compare(got, exp_log)
-    expect(cmp).to be_falsey
   end
 end

data/spec/features/rule_spec.rb

@@ -419,7 +419,7 @@ EOL
                                                    %Q({"grid1":"DataGrid1"}),
                                                    %Q({"grid1":"DataGrid1"})])
     press('Applications')
-    press('Data Grids')
+    press('Data Grids Admin')
     dgv = netzke_find('data_grid_view')
     cvs = dgv.get_col_vals(:name, 4, 0)
     ind1 = cvs.index('DataGrid1') + 1

data/spec/features/user_view_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'under Sytem menu, User Management worflows', js: true do
+feature 'under System menu, User Management worflows', js: true do
   def go_to_user_view
     press('System')
     press('User Management')
@@ -77,6 +77,7 @@ feature 'under Sytem menu, User Management worflows', js: true do
 
     and_by 'check row got edited' do
       wait_for_ajax
+      r2 = user_view.get_row_vals(2)
       expect(user_view.get_row_vals(2)).to netzke_include(
         login: 'new_login',
         firstname: 'new_fname',
@@ -114,6 +115,9 @@ feature 'under Sytem menu, User Management worflows', js: true do
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
         user_view.select_row(1)
+        expect { find(:btn, 'New User') }.not_to raise_error
+        expect { find(:btn, 'Edit') }.not_to raise_error
+        expect { find(:btn, 'Delete') }.not_to raise_error
         expect(btn_disabled?('New User')).to be_falsy
         expect(btn_disabled?('Edit')).to be_falsy
         expect(btn_disabled?('Delete')).to be_falsy
@@ -127,6 +131,9 @@ feature 'under Sytem menu, User Management worflows', js: true do
       by 'check buttons' do
         find(:btn, 'New User', match: :first)
         user_view.select_row(1)
+        expect { find(:btn, 'New User') }.not_to raise_error
+        expect { find(:btn, 'Edit') }.not_to raise_error
+        expect { find(:btn, 'Delete') }.not_to raise_error
         expect(btn_disabled?('New User')).to be_falsy
         expect(btn_disabled?('Edit')).to be_falsy
         expect(btn_disabled?('Delete')).to be_falsy
@@ -140,9 +147,10 @@ feature 'under Sytem menu, User Management worflows', js: true do
       user_view = netzke_find('user_view')
       by 'check buttons' do
         user_view.select_row(1)
-        expect(page).not_to have_content('New User')
-        expect(page).not_to have_content('Edit')
-        expect(page).not_to have_content('Delete')
+        err = /Unable to find visible btn/
+        expect { find(:btn, 'New User') }.to raise_error(err)
+        expect { find(:btn, 'Edit') }.to raise_error(err)
+        expect { find(:btn, 'Delete') }.to raise_error(err)
       end
     end
 
@@ -153,9 +161,10 @@ feature 'under Sytem menu, User Management worflows', js: true do
       user_view = netzke_find('user_view')
       by 'check buttons' do
         user_view.select_row(1)
-        expect(page).not_to have_content('New User')
-        expect(page).not_to have_content('Edit')
-        expect(page).not_to have_content('Delete')
+        err = /Unable to find visible btn/
+        expect { find(:btn, 'New User') }.to raise_error(err)
+        expect { find(:btn, 'Edit') }.to raise_error(err)
+        expect { find(:btn, 'Delete') }.to raise_error(err)
       end
     end
   end

data/spec/models/data_grid_spec.rb

@@ -814,7 +814,8 @@ EOS
       # rubocop:disable Style/NestedTernaryOperator
       type_str = type == 'float' ? (explicit_float ? 'float' : nil) : type
       # rubocop:enable Style/NestedTernaryOperator
-      top = [lenient_str, type_str].compact.join(' ') + "\t" + constraint + "\n"
+      con_part = constraint.present? ? "\t" + constraint : ''
+      top = [lenient_str, type_str].compact.join(' ') + con_part + "\n"
       (top =~ /\A\s*\z/ ? '' : top) +
         <<~EOS
           b\tboolean\tv
@@ -836,8 +837,8 @@ EOS
         tests = JSON.parse(File.read('spec/fixtures/json/data_grid.json'))
         aggregate_failures do
           tests.each do |test|
-            keys = %w[id type constraint values error]
-            id, type, constraint, values, error = test.values_at(*keys)
+            keys = %w[id type constraint values error line1]
+            id, type, constraint, values, error, line1 = test.values_at(*keys)
             err_re = Regexp.new(error) if error
             # for float, do both ex- and implicit declaration
             exfls = type == 'float' ? [true, false] : [true]
@@ -848,7 +849,21 @@ EOS
                 got = nil
                 tnam = "Test #{id} lenient=#{lenient} exfl=#{exfl}"
                 begin
-                  dg_from_import(tnam, grid)
+                  dg = dg_from_import(tnam, grid)
+
+                  # make sure export of line1  works correctly
+                  # when dg is lenient and/or has constraint and/or
+                  # not float
+                  next unless lenient || constraint.present? ||
+                              type != 'float'
+
+                  # also skip grids where we included float explicitly
+                  # because export will convert back to implicit
+                  next if type == 'float' && exfl
+
+                  dga = dg.export_array
+                  line1 = dga.first.first.join("\t") + "\n"
+                  expect(line1).to eq(grid.lines.first)
                 rescue StandardError => e
                   got = e.message
                 end

data/spec/support/netzke.rb

@@ -53,7 +53,8 @@ module Marty; module RSpec; module Netzke
     wait_for_element do
       begin
         cmp = first("a[data-qtip='#{button_name}']")
-        cmp ||= first(:xpath, './/a', text: button_name.to_s)
+        cmp ||= all(:xpath, './/a', text: button_name.to_s).
+                  detect { |c| c.text == button_name.to_s }
         cmp ||= find(:btn, button_name, match: :first)
         cmp.click
         true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -230,6 +230,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ssh-docker/.keep"
 - ".travis.yml"
 - Dockerfile.dummy
 - Gemfile
@@ -256,6 +257,7 @@ files:
 - app/components/marty/auth_app/client/auth_app.js
 - app/components/marty/base_rule_view.rb
 - app/components/marty/config_view.rb
+- app/components/marty/data_grid_user_view.rb
 - app/components/marty/data_grid_view.rb
 - app/components/marty/data_grid_view/client/data_grid_edit.js
 - app/components/marty/delorean_rule_view.rb
@@ -394,6 +396,7 @@ files:
 - db/migrate/105_create_marty_grid_index_booleans.rb
 - db/migrate/106_make_grid_indexes_nullable.rb
 - db/migrate/107_add_data_grid_constraint.rb
+- db/migrate/108_add_data_grid_perms.rb
 - db/migrate/200_create_marty_event_operation_enum.rb
 - db/migrate/201_create_marty_events.rb
 - db/migrate/202_add_completion_status_to_event.rb
@@ -462,6 +465,7 @@ files:
 - marty.gemspec
 - other/marty/api/base.rb
 - other/marty/diagnostic/aws/ec2_instance.rb
+- other/marty/diagnostic/aws/error.rb
 - other/marty/diagnostic/base.rb
 - other/marty/diagnostic/collection.rb
 - other/marty/diagnostic/connections.rb