marty 8.4.1 → 8.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d2b7a71540fdd0a796cc8bd62725ddfa80231af28875eff79b5cbf1e6b8d65a
-  data.tar.gz: de508c108b52dc8b89d9d873030173594952a5c48ee507c68438f2e01a21d136
+  metadata.gz: f6fd0c089c5ad585e2ee595e562468d11ba1bcb93561faf4af44b7efd657eead
+  data.tar.gz: 706faaa4fd4c52cdf947546fbe5362b6862335ff085c68a8a78b52c257e35380
 SHA512:
-  metadata.gz: efbcc2b834193e2525809e494d6e12936d75606b03f7c2fb9970008eb3adac30bb4a193c9bd64323691db0fdd983401aba0e73907df16f839bfb4675551094af
-  data.tar.gz: 1c2834966a5b98f4177a14a297eed967b88a94b7f56c6c3597445e6dcd25ab96cad08465bcbf31f4675a76cc2d977f0a198efae2b15f47e64f771159ae2dfdf6
+  metadata.gz: 5350b886990d9c4efffa480d3727efed7f357208d966394ae637f7cfae110203046a768379d1b373f931cf8bcb85d982f97ef1e5c7e1240e5ddde3e2f4038324
+  data.tar.gz: b4ac412e00641a7e5138036f9af8eac4c5c68fb48fd76c05296c195825a6eb3755659adf7287f92c70d0a058c645a7dacec675c2a590376e6ed2e786053cf6e0

data/Dockerfile.dummy

@@ -1,21 +1,53 @@
 # ONLY FOR DEVELOPMENT PURPOSES
 # dockerfile is not suitable to produce a production-grade docker image
-FROM ruby:2.6.3
+FROM ruby:2.6.3-buster
 
 WORKDIR /opt/app
 
-ADD https://dl.yarnpkg.com/debian/pubkey.gpg /tmp/yarn-pubkey.gpg
-RUN apt-key add /tmp/yarn-pubkey.gpg && rm /tmp/yarn-pubkey.gpg
-RUN echo 'deb http://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list
+# Versioned dependencies
+ENV FREETDS_VER 1.1.20
+ENV TDSVER 7.1
+ENV NODE_VER 12.x
+ENV POSTGRES_VER 11
 
-RUN apt-get update && apt-get install -qq -y --no-install-recommends \
-      build-essential libpq-dev curl
-
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
-RUN apt-get update && apt-get install -qq -y --no-install-recommends nodejs yarn
+# Other useful env variables to set
+ENV BUNDLE_PATH /bundle_box/bundle
+ENV GEM_HOME /bundle_box/bundle
+ENV PATH /bundle_box/bundle/bin:$PATH
 
-# Install psql client for tests
-RUN apt-get install -qq -y --no-install-recommends postgresql-client
+# Install several necessary packages and add Postgres repo key
+RUN apt-get update && apt-get install -y -qq software-properties-common apt-transport-https
+
+# Add Debian Buster postgres keychain for verification to download psql client
+RUN \
+     echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+     wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&\
+     apt-get update
+
+# Install several more packages
+RUN \
+      apt-get install -qq -y --no-install-recommends \
+      build-essential libpq-dev curl unixodbc unixodbc-dev freetds-dev \
+      freetds-bin tdsodbc postgresql-client-${POSTGRES_VER} xvfb imagemagick \
+      netcat-openbsd vim libc6-dev
+
+# Install FreeTDS
+RUN wget https://www.freetds.org/files/stable/freetds-"${FREETDS_VER}".tar.gz && \
+      tar -xzf freetds-"${FREETDS_VER}".tar.gz && \
+      rm freetds-"${FREETDS_VER}".tar.gz && \
+      cd freetds-"${FREETDS_VER}" && \
+      ./configure --prefix=/usr/local --with-tdsver=${TDSVER} && \
+      make && \
+      make install && \
+      make clean
+
+# Install Nodejs
+RUN export VERSION="node_${NODE_VER}" DISTRO="$(lsb_release -s -c)" && \
+    curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
+    echo "deb https://deb.nodesource.com/$VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list && \
+    echo "deb-src https://deb.nodesource.com/$VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
+    apt-get -o Acquire::Check-Valid-Until=false update && \
+    apt-get install -qq -y --no-install-recommends nodejs
 
 # Install chrome for integration tests
 RUN curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
@@ -24,25 +56,4 @@ 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
-ENV GEM_HOME /bundle_box/bundle
-ENV PATH /bundle_box/bundle/bin:$PATH
-# ENV NODE_PATH /bundle_box/node
-
-COPY . .
-
-# RUN bundle install
-# RUN yarn install
-
-# RUN mv .rbenv-vars.example .rbenv-vars
-# RUN chmod +x entrypoint.sh
-
-# ENV RAILS_ENV=development
-# ENV PORT=3001
-# EXPOSE 3001
-
+RUN gem update --system

data/app/components/marty/background_job/schedule_jobs_grid.rb

@@ -68,6 +68,11 @@ module Marty
         a.tooltip  = 'Run'
         a.icon_cls = 'fa fa-play glyph'
         a.disabled = true
+        a.handler = :netzke_call_endpoint
+        a.require_confirmation = true
+        a.confirmation_title = 'Run Job'
+        a.in_progress_message = 'Performing job...'
+        a.endpoint_name = :job_run
       end
 
       endpoint :edit_window__edit_form__submit do |params|
@@ -121,7 +126,7 @@ module Marty
         res
       end
 
-      endpoint :job_run do
+      endpoint :job_run do |_ids|
         begin
           s = Marty::BackgroundJob::Schedule.find(client_config['selected'])
           klass = s.job_class

data/app/components/marty/background_job/schedule_jobs_logs.rb

@@ -61,15 +61,22 @@ module Marty
         a.text     = 'Delete all'
         a.tooltip  = 'Delete all logs'
         a.icon_cls = 'fa fa-trash glyph'
+
+        a.handler = :netzke_call_endpoint
+        a.require_confirmation = true
+        a.confirmation_title = 'Delete All'
+        a.in_progress_message = 'Deleting...'
+        a.endpoint_name = :destroy_all
       end
 
       action :ignore do |a|
         a.text     = 'Ignore in diag'
         a.tooltip  = 'Ignore in diag'
         a.icon_cls = 'fa fa-trash glyph'
+        a.handler = :netzke_call_endpoint
       end
 
-      endpoint :destroy_all do
+      endpoint :destroy_all do |_params|
         Marty::BackgroundJob::Log.delete_all
         client.reload
       end

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

@@ -1,13 +1,13 @@
 {
-  getComponent: function(name) {
+  getComponent(name) {
     return Ext.getCmp(name);
   },
 
-  findComponent: function(name) {
+  findComponent(name) {
     return Ext.ComponentQuery.query(`[name=${name}]`)[0];
   },
 
-  setDisableComponentActions: function(prefix, flag) {
+  setDisableComponentActions(prefix, flag) {
     for (var key in this.actions) {
       if (key.substring(0, prefix.length) == prefix) {
         this.actions[key].setDisabled(flag);
@@ -15,7 +15,7 @@
     }
   },
 
-  initComponent: function() {
+  initComponent() {
     this.dockedItems = this.dockedItems || [];
     if (this.paging == 'pagination') {
       this.dockedItems.push({
@@ -103,14 +103,14 @@
     }
   },
 
-  onSelectionChange: function(f) {
+  onSelectionChange(f) {
     var me = this;
     me.getSelectionModel().on('selectionchange', f);
   },
 
   // override netzkeReloadStore to allow option passthrough
   // reference: http://api.netzke.org/client/files/doc_client_netzke-basepack_javascripts_grid_event_handlers.js.html
-  netzkeReloadStore: function(opts = {}) {
+  netzkeReloadStore(opts = {}) {
     var store = this.getStore();
 
     // HACK to work around buffered store's buggy reload()
@@ -119,7 +119,7 @@
     } else store.reload(opts);
   },
 
-  doViewInForm: function(record) {
+  doViewInForm(record) {
     this.netzkeLoadComponent("view_window", {
       serverConfig: {
         record_id: record.id
@@ -138,13 +138,11 @@
   // always reset store to first page on reload
   // to avoid load bug when moving from a higher page count
   // to a grid with a lower page count
-  reload: function(opts = {
-    start: 0
-  }) {
+  reload(opts = { start: 0 }) {
     this.netzkeReloadStore(opts);
   },
 
-  reloadAll: function() {
+  reloadAll() {
     var me = this;
     var children = me.serverConfig.child_components || [];
     this.store.reload();
@@ -156,11 +154,16 @@
     }
   },
 
-  clearFilters: function() {
+  clearFilters() {
     this.filters.clearFilters();
   },
 
-  netzkeGridSelectedDefaultAction: function(endpoint, confirmation) {
+  netzkeGridSelectedDefaultAction(endpoint, confirmation) {
+    console.log(`
+      netzkeGridSelectedDefaultAction is deprecated.
+      Please use netzkeCallEndpoint instead.
+    `);
+
     var selected = this.getSelectionModel().getSelection().map((r) => r.id)
 
     if (confirmation) {
@@ -176,5 +179,38 @@
     } else {
       this.server[endpoint](selected, () => { this.unmask() })
     }
-  }
+  },
+
+  // FIXME: move to netzke
+  netzkeCallEndpoint(action) {
+    const selected = this.getSelectionModel().getSelection().map((r) => r.id)
+    const endpointName = action.endpointName || action.name;
+
+    const camelCasedEndpointName = endpointName.replace(
+      /_([a-z])/g,
+      (g) => g[1].toUpperCase()
+    );
+
+    const requireConfirmation = action.requireConfirmation || action.confirmationMessage;
+
+    const handlerFunction = this.server[camelCasedEndpointName];
+
+    if (!requireConfirmation) {
+      return handlerFunction(selected, () => { this.unmask()});
+    };
+
+    const confirmationTitle = action.confirmationTitle || action.name;
+    const confirmationMessage = action.confirmationMessage || 'Are you sure?';
+    const inProgressMessage = action.inProgressMessage || 'In progress...';
+
+    return Ext.Msg.confirm(
+      confirmationTitle,
+      Ext.String.format(confirmationMessage),
+      (btn, value, cfg) => {
+        if (btn !== "yes") { return null; };
+        this.mask(inProgressMessage);
+        return handlerFunction(selected, () => { this.unmask()});
+      }
+    );
+  },
 }

data/app/components/marty/promise_view.rb

@@ -89,9 +89,21 @@ class Marty::PromiseView < Netzke::Tree::Base
     client.netzke_on_refresh
   end
 
-  def get_records params
+  def get_records(params)
     search_scope = config[:live_search_scope] || :live_search
-    Marty::VwPromise.children_for_id(params[:id], params[search_scope])
+    res = Marty::VwPromise.children_for_id(params[:id], params[search_scope])
+
+    # Fetch actual promise objects without results in advance to avoid N+1
+    promises_without_status_ids = res.reject(&:status).map(&:id)
+    promises_without_status = Marty::Promise.where(
+      id: promises_without_status_ids
+    )
+
+    @results = promises_without_status.each_with_object({}) do |promise, hash|
+      hash[promise.id] = promise.result.to_s
+    end
+
+    res
   end
 
   attribute :title do |config|
@@ -130,11 +142,10 @@ class Marty::PromiseView < Netzke::Tree::Base
   end
 
   attribute :error do |config|
-    config.getter = ->(record) {
-      if !record.status
-        Marty::Promise.find_by(id: record.id).try(:result).to_s
-      end
-    }
+    config.getter = ->(record) do
+      @results[record.id] unless record.status
+    end
+
     config.flex = 1
   end
 end

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

@@ -1,5 +1,5 @@
 {
-  initComponent: function () {
+  initComponent() {
     this.callParent();
 
     this.mainPanel = this.down('panel[itemId="main_panel"]');
@@ -10,9 +10,11 @@
     Ext.Ajax.on('beforerequest', function () {
       statusBar.showBusy();
     });
+
     Ext.Ajax.on('requestcomplete', function () {
       statusBar.hideBusy();
     });
+
     Ext.Ajax.on('requestexception', function () {
       statusBar.hideBusy();
     });
@@ -21,13 +23,13 @@
     this.netzkeInitComponentCallback();
   },
 
-  setRouting: function () {
+  setRouting() {
     this.router = Ext.util.History;
     this.router.init();
     this.router.on('change', this.loadRoute, this);
   },
 
-  loadRoute: function (token) {
+  loadRoute(token) {
     if (token) {
       this.netzkeLoadComponent(token, {
         container: this.mainPanel
@@ -37,7 +39,7 @@
     }
   },
 
-  afterRender: function () {
+  afterRender() {
     this.callParent();
     var currentToken = this.router.getToken();
     if (typeof currentToken == "string" && currentToken.length > 0) {
@@ -45,18 +47,51 @@
     }
   },
 
-  appLoadComponent: function (name) {
+  appLoadComponent(name) {
     this.router.add(name);
   },
 
-  netzkeLoadComponentByAction: function (action) {
+  netzkeLoadComponentByAction(action) {
     this.router.add(action.name.underscore());
   },
 
-  onToggleConfigMode: function (params) {
+  onToggleConfigMode(params) {
     this.toggleConfigMode();
   },
 
-  netzkeInitComponentCallback: function() {
+  netzkeInitComponentCallback() {
+  },
+
+  // FIXME: move to netzke
+  netzkeCallEndpoint(action) {
+    const selected = this.getSelectionModel().getSelection().map((r) => r.id)
+    const endpointName = action.endpointName || action.name;
+
+    const camelCasedEndpointName = endpointName.replace(
+      /_([a-z])/g,
+      (g) => g[1].toUpperCase()
+    );
+
+    const requireConfirmation = action.requireConfirmation || action.confirmationMessage;
+
+    const handlerFunction = this.server[camelCasedEndpointName];
+
+    if (!requireConfirmation) {
+      return handlerFunction(selected, () => { this.unmask()});
+    };
+
+    const confirmationTitle = action.confirmationTitle || action.name;
+    const confirmationMessage = action.confirmationMessage || 'Are you sure?';
+    const inProgressMessage = action.inProgressMessage || 'In progress...';
+
+    return Ext.Msg.confirm(
+      confirmationTitle,
+      Ext.String.format(confirmationMessage),
+      (btn, value, cfg) => {
+        if (btn !== "yes") { return null; };
+        this.mask(inProgressMessage);
+        return handlerFunction(selected, () => { this.unmask()});
+      }
+    );
   },
 }

data/app/models/marty/promise.rb

@@ -176,12 +176,12 @@ class Marty::Promise < Marty::Base
 
   delorean_fn :result_and_status, sig: 1 do |promise_id|
     promise = find_by(id: promise_id)
-    next { error: 'not found' } if promise.nil?
+    next { 'error' => 'not found' } if promise.nil?
 
     {
-      completed: !promise.status.nil?,
-      status: promise.status,
-      result: promise.result
+      'completed' => !promise.status.nil?,
+      'status' => promise.status,
+      'result' => promise.result
     }
   end
 

data/docker-compose.dummy.yml

@@ -32,7 +32,7 @@ services:
     stdin_open: true
 
   postgres:
-    image: "postgres:9.6"
+    image: "postgres:11"
     volumes:
       - postgresql-data:/var/lib/postgresql/data
 

data/lib/marty/monkey.rb

@@ -122,7 +122,11 @@ module Netzke
         return unless @model_adapter.attr_type(name) == :boolean
         return if key?(:default_value)
 
-        self.default_value = false
+        m = @model_adapter.model
+
+        return self.default_value = false unless m.respond_to?(:column_defaults)
+
+        self.default_value = @model_adapter.model.column_defaults[name] || false
       end
     end
   end

data/lib/marty/version.rb

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

data/spec/dummy/app/components/gemini/simple_view.rb

@@ -12,6 +12,7 @@ class Gemini::SimpleView < Marty::McflyGridPanel
       :user_id,
       :some_name,
       :active,
+      :default_true
     ]
   end
 end

data/spec/dummy/db/migrate/20191206132729_add_default_true_column_to_simple.rb

@@ -0,0 +1,9 @@
+class AddDefaultTrueColumnToSimple < ActiveRecord::Migration[5.2]
+  def up
+    add_column :gemini_simples, :default_true, :boolean, null: false, default: true
+  end
+
+  def down
+    remove_column :gemini_simples, :default_true
+  end
+end

data/spec/features/inline_editing_spec.rb

@@ -14,9 +14,8 @@ feature 'Inline editing', js: true do
     grid = netzke_find('simple_view')
     press 'Add'
 
-    row = grid.select_row(1)
-    user_id = row.all('.x-grid-cell')[0]
-    name = row.all('.x-grid-cell')[1]
+    user_id = grid.all('.x-grid-cell')[0]
+    name = grid.all('.x-grid-cell')[1]
 
     user_id.double_click
     user_id.fill_in 'user_id', with: 1
@@ -29,5 +28,6 @@ feature 'Inline editing', js: true do
 
     model = Gemini::Simple.find_by(some_name: 'test name')
     expect(model.active).to be false
+    expect(model.default_true).to be true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 8.4.1
+  version: 8.5.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -313,9 +313,7 @@ files:
 - app/components/marty/background_job/delayed_jobs_grid.rb
 - app/components/marty/background_job/schedule_jobs_dashboard.rb
 - app/components/marty/background_job/schedule_jobs_grid.rb
-- app/components/marty/background_job/schedule_jobs_grid/client/schedule_jobs_grid.js
 - app/components/marty/background_job/schedule_jobs_logs.rb
-- app/components/marty/background_job/schedule_jobs_logs/client/schedule_jobs_logs.js
 - app/components/marty/base_rule_view.rb
 - app/components/marty/base_rule_view/client/base_rule_view.js
 - app/components/marty/config_view.rb
@@ -665,6 +663,7 @@ files:
 - spec/dummy/db/migrate/20171222150100_add_rule_indices.rb
 - spec/dummy/db/migrate/20190702115241_add_simple_guards_options_to_rules.rb
 - spec/dummy/db/migrate/20191101132729_add_activity_flag_to_simple.rb
+- spec/dummy/db/migrate/20191206132729_add_default_true_column_to_simple.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/delorean/base_code.dl
 - spec/dummy/delorean/blame_report.dl

data/app/components/marty/background_job/schedule_jobs_grid/client/schedule_jobs_grid.js

@@ -1,13 +0,0 @@
-{
-    netzkeOnDoJobRun: function(params) {
-	Ext.Msg.confirm(
-            'Run Job',
-            Ext.String.format('Are you sure?'),
-            (btn, value, cfg) => {
-		if (btn == "yes") {
-		    this.mask('Performing job...');
-		    this.server.jobRun(() => { this.unmask()});
-		}
-            });
-    }
-}

data/app/components/marty/background_job/schedule_jobs_logs/client/schedule_jobs_logs.js

@@ -1,15 +0,0 @@
-{
-    netzkeOnDestroyAll: function(params) {
-      Ext.Msg.confirm(
-        'Delete all',
-        Ext.String.format('Are you sure?'),
-        (btn, value, cfg) => {
-          if (btn == "yes") {
-            this.mask('Deleting...');
-            this.server.destroyAll(() => { this.unmask()});
-          }
-        });
-      },
-
-    netzkeOnIgnore: function(_) { return this.netzkeGridSelectedDefaultAction('ignore') }
-}