marty 8.5.0 → 9.3.0

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

@@ -1,8 +1,8 @@
-{
-  selectReport: function () {
+({
+  selectReport() {
     // this.netzkeGetComponent('report_form').netzkeLoad({});
     // FIXME: NetzkeReload() doesn't work when performed on
     // ReportForm. So, reload all of Reporting.
     this.netzkeReload();
   }
-}
+});

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

@@ -1,44 +1,50 @@
-{
-  setActionModes: function (a) {
+({
+  setActionModes(a) {
     this.actions.apply.setDisabled(!a["save"]);
     // style input field text based on whether it is editable
-    this.getForm().findField('body').editor.setOption(
-      "readOnly", !a["save"]);
+    this.getForm()
+      .findField("body")
+      .editor.setOption("readOnly", !a["save"]);
   },
 
-  getScriptId: function () {
-    return this.getForm().findField('id').getValue();
+  getScriptId() {
+    return this.getForm()
+      .findField("id")
+      .getValue();
   },
 
-  setLineError: function (idx) {
-
+  setLineError(idx) {
     idx -= 1;
-    var editor = this.getForm().findField('body').editor;
+    const editor = this.getForm().findField("body").editor;
 
     if (idx > -1) {
-      var line = editor.getLine(idx)
-      editor.markText({
-        line: idx,
-        ch: 0
-      }, {
-        line: idx,
-        ch: line.length
-      }, {
-        className: "errorline"
-      });
+      const line = editor.getLine(idx);
+      editor.markText(
+        {
+          line: idx,
+          ch: 0
+        },
+        {
+          line: idx,
+          ch: line.length
+        },
+        {
+          className: "errorline"
+        }
+      );
     }
     editor.refresh();
   },
 
-  refreshParent: function (script_name) {
+  refreshParent(script_name) {
     this.netzkeGetParentComponent().scriptRefresh(script_name);
   },
 
-  netzkeOnDoPrint: function (params) {
+  netzkeOnDoPrint(_params) {
     this.server.doPrint(this.getScriptId());
   },
 
-  getReport: function (report_path) {
+  getReport(report_path) {
     window.location = report_path;
   }
-}
+});

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

@@ -1,7 +1,6 @@
-{
-  setResult: function (val) {
-    var result = this.netzkeGetComponent('result');
+({
+  setResult(val) {
+    const result = this.netzkeGetComponent("result");
     result.updateBodyHtml(val);
   }
-
-}
+});

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

@@ -1,62 +1,66 @@
-{
-  initComponent: function () {
-    var me = this;
+({
+  initComponent() {
+    const me = this;
     me.callParent();
 
-    var tag_grid = me.netzkeGetComponent('tag_grid').getView();
-    var script_grid = me.netzkeGetComponent('script_grid').getView();
-    var script_form = me.netzkeGetComponent('script_form');
+    const tag_grid = me.netzkeGetComponent("tag_grid").getView();
+    const script_grid = me.netzkeGetComponent("script_grid").getView();
+    const script_form = me.netzkeGetComponent("script_form");
 
-    tag_grid.getSelectionModel().on('selectionchange',
-      function (self, records) {
+    tag_grid.getSelectionModel().on(
+      "selectionchange",
+      function(self, records) {
+        if (records[0] == null) return;
 
-        if (records[0] == null)
-          return;
-
-        var tag_id = records[0].get('id');
+        const tag_id = records[0].get("id");
         me.server.selectTag({
-          tag_id: tag_id
+          tag_id
         });
         script_grid.getStore().load();
-        var script_name = null;
+        const script_name = null;
         script_form.server.netzkeLoad({
-          script_name: script_name
+          script_name
         });
-      }, me);
-
-    script_grid.getSelectionModel().on('selectionchange',
-      function (self, records) {
+      },
+      me
+    );
 
-        if (script_grid.getStore().isLoading() == true)
-          return;
+    script_grid.getSelectionModel().on(
+      "selectionchange",
+      function(self, records) {
+        if (script_grid.getStore().isLoading() == true) return;
 
-        if (records[0] == null)
-          return;
+        if (records[0] == null) return;
 
-        var script_name = records[0].get('name');
+        const script_name = records[0].get("name");
         me.server.selectScript({
-          script_name: script_name
+          script_name
         });
         script_form.server.netzkeLoad({
-          script_name: script_name
+          script_name
         });
-      }, me);
+      },
+      me
+    );
   },
 
-  scriptRefresh: function (script_name) {
+  scriptRefresh(script_name) {
     if (!script_name) {
       this.server.selectScript({});
       this.netzkeReload();
     } else {
       this.server.selectScript({
-        script_name: script_name
+        script_name
       });
-      this.netzkeGetComponent('tag_grid').getStore().load();
-      this.netzkeGetComponent('script_grid').getStore().load();
-      this.netzkeGetComponent('script_form').server.netzkeLoad({
-        script_name: script_name
+      this.netzkeGetComponent("tag_grid")
+        .getStore()
+        .load();
+      this.netzkeGetComponent("script_grid")
+        .getStore()
+        .load();
+      this.netzkeGetComponent("script_form").server.netzkeLoad({
+        script_name
       });
     }
-  },
-
-}
+  }
+});

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

@@ -1,21 +1,23 @@
-{
+({
   initComponent() {
     this.callParent();
 
     this.mainPanel = this.down('panel[itemId="main_panel"]');
     this.menuBar = this.down('container[itemId="menu_bar"]');
-    var statusBar = this.statusBar = this.down('container[itemId="status_bar"]');
+    const statusBar = (this.statusBar = this.down(
+      'container[itemId="status_bar"]'
+    ));
 
     // Setting the "busy" indicator for Ajax requests
-    Ext.Ajax.on('beforerequest', function () {
+    Ext.Ajax.on("beforerequest", function() {
       statusBar.showBusy();
     });
 
-    Ext.Ajax.on('requestcomplete', function () {
+    Ext.Ajax.on("requestcomplete", function() {
       statusBar.hideBusy();
     });
 
-    Ext.Ajax.on('requestexception', function () {
+    Ext.Ajax.on("requestexception", function() {
       statusBar.hideBusy();
     });
 
@@ -26,7 +28,7 @@
   setRouting() {
     this.router = Ext.util.History;
     this.router.init();
-    this.router.on('change', this.loadRoute, this);
+    this.router.on("change", this.loadRoute, this);
   },
 
   loadRoute(token) {
@@ -41,7 +43,7 @@
 
   afterRender() {
     this.callParent();
-    var currentToken = this.router.getToken();
+    const currentToken = this.router.getToken();
     if (typeof currentToken == "string" && currentToken.length > 0) {
       this.loadRoute(currentToken);
     }
@@ -55,43 +57,50 @@
     this.router.add(action.name.underscore());
   },
 
-  onToggleConfigMode(params) {
+  onToggleConfigMode(_params) {
     this.toggleConfigMode();
   },
 
-  netzkeInitComponentCallback() {
-  },
+  netzkeInitComponentCallback() {},
 
   // FIXME: move to netzke
   netzkeCallEndpoint(action) {
-    const selected = this.getSelectionModel().getSelection().map((r) => r.id)
+    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 camelCasedEndpointName = endpointName.replace(/_([a-z])/g, (g) =>
+      g[1].toUpperCase()
     );
 
-    const requireConfirmation = action.requireConfirmation || action.confirmationMessage;
+    const requireConfirmation =
+      action.requireConfirmation || action.confirmationMessage;
 
     const handlerFunction = this.server[camelCasedEndpointName];
 
     if (!requireConfirmation) {
-      return handlerFunction(selected, () => { this.unmask()});
-    };
+      return handlerFunction(selected, () => {
+        this.unmask();
+      });
+    }
 
     const confirmationTitle = action.confirmationTitle || action.name;
-    const confirmationMessage = action.confirmationMessage || 'Are you sure?';
-    const inProgressMessage = action.inProgressMessage || 'In progress...';
+    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; };
+      (btn, _value, _cfg) => {
+        if (btn !== "yes") {
+          return null;
+        }
         this.mask(inProgressMessage);
-        return handlerFunction(selected, () => { this.unmask()});
+        return handlerFunction(selected, () => {
+          this.unmask();
+        });
       }
     );
-  },
-}
+  }
+});

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

@@ -1,5 +1,5 @@
 Ext.override(Ext.ux.StatusBar, {
-  hideBusy : function(){
+  hideBusy() {
     return this.setStatus({
       text: this.defaultText,
       icon_cls: this.defaultIconCls

data/app/controllers/marty/rpc_controller.rb

@@ -34,6 +34,9 @@ class Marty::RpcController < ActionController::Base
           api.log(result, log_params, request)
         end
 
+        # Do not expose backtrace in case of error
+        next result.except('backtrace', :backtrace) if result.is_a?(Hash)
+
         result
       rescue StandardError => e
         Marty::Logger.log('rpc_controller', 'failure', e.message)

data/app/models/marty/promise.rb

@@ -150,7 +150,7 @@ class Marty::Promise < Marty::Base
         # timeout error.
         if !last.start_dt
           # log "TO11 #{Process.pid} #{last}"
-          return { 'error' => "promise #{last.id} timed out (never started)" }
+          return { 'error' => self.class.never_started_message(last) }
         end
       end
 
@@ -163,7 +163,7 @@ class Marty::Promise < Marty::Base
         last = latest
 
         if !last.end_dt
-          return { 'error' => "promise #{last.id} timed out (didn't end)" }
+          return { 'error' => self.class.timeout_message(last) }
         end
       end
 
@@ -227,5 +227,13 @@ class Marty::Promise < Marty::Base
 
       { 'error' => exception.message, 'backtrace' => exception.backtrace }
     end
+
+    def never_started_message(promise)
+      "promise #{promise.id} timed out (never started)"
+    end
+
+    def timeout_message(promise)
+      "promise #{promise.id} timed out (didn't end)"
+    end
   end
 end

data/app/services/marty/data_grid/constraint.rb

@@ -55,7 +55,7 @@ module Marty
             err = nil
             begin
               cvt_val = cvt && !data_v.class.in?(rt) ?
-                          DataGrid.parse_fvalue(pt, data_v, dt, klass).first :
+                          DataGrid.parse_fvalue(pt, data_v, dt, klass)&.first :
                           data_v
             rescue StandardError => e
               err = e.message
@@ -63,6 +63,7 @@ module Marty
             next res << [:type, x, y] if err
 
             res << [:constraint, x, y] unless
+              cvt_val.nil? ||
               chks.map { |op, chk_val| cvt_val.send(op, chk_val) }.all? { |v| v }
           end
         end

data/app/services/marty/jobs/schedule.rb

@@ -5,10 +5,10 @@ module Marty
 
       delorean_fn :call, sig: 0 do
         glob = Rails.root.join('app', 'jobs', '**', '*_job.rb')
-        Dir.glob(glob).each { |f| require f }
+        Dir.glob(glob).sort.each { |f| require f }
 
         glob2 = Marty.root.join('app', 'jobs', '**', '*_job.rb')
-        Dir.glob(glob2).each { |f| require f }
+        Dir.glob(glob2).sort.each { |f| require f }
 
         Delayed::Job.where.not(cron: nil).each(&:destroy!)
 

data/app/services/marty/promises/delorean/create.rb

@@ -41,10 +41,17 @@ module Marty
               node_name,
               params,
               args,
-              hook
+              hook,
+              # FIXME: should we use default timeout if not specified
+              # Do we want to limit job execution time with that?
+              promise_params['p_timeout']
             )
 
-            job = Delayed::Job.enqueue(promise_job, priority: priority)
+            job = Delayed::Job.enqueue(
+              promise_job,
+              priority: priority,
+              queue: promise_params['p_queue'] ||
+                Delayed::Worker.default_queue_name)
           rescue StandardError => e
             # log "CALLERR #{exc}"
             res = ::Delorean::Engine.grok_runtime_exception(e)

data/app/services/marty/promises/ruby/create.rb

@@ -37,10 +37,15 @@ module Marty
               module_name,
               method_name,
               method_args,
-              hook
+              hook,
+              promise_params['p_timeout']
             )
 
-            job = Delayed::Job.enqueue(promise_job, priority: priority)
+            job = Delayed::Job.enqueue(
+              promise_job,
+              priority: priority,
+              queue: promise_params['p_queue'] ||
+                Delayed::Worker.default_queue_name)
           rescue StandardError => e
             res = { 'error' => e.message }
             promise.set_start

data/config/initializers/delayed_job_config.rb

@@ -0,0 +1 @@
+Delayed::Worker.default_queue_name = 'default'

data/delorean/blame_report.dl

@@ -1,10 +1,13 @@
-import MartyFields
+import Fields
 import Styles
 
-PostingField2: MartyFields::PostingField2
-    store = [ ["NOW", "NOW"] ] + [ [ lp.name, lp.name + ' (' + lp.comment + ')']
-                       for lp in Marty::Posting.get_latest_by_type(
-                         20, ['BASE', 'INTRA', 'CLOSE'])]
+DateField1: Fields::DatetimeField
+    field_label = "Date 1"
+    name        = "dt1"
+
+DateField2: Fields::DatetimeField
+    field_label = "Date 2"
+    name        = "dt2"
 
 StyleRow:
     profile     =?
@@ -56,12 +59,12 @@ StyleGroup:
         ]
 
 ModelRows:
-    klass       =?
-    t1          =?
-    t2          =?
-    ids         =?
+    klass =?
+    dt1   =?
+    dt2   =?
+    ids   =?
 
-    groups = Marty::DataChange.changes(t1, t2, klass, ids)
+    groups = Marty::DataChange.changes(dt1, dt2, klass, ids)
 
     headers = ["Group ID", "Created", "By", "Deleted", "By"] +
         Marty::DataChange.class_headers(klass)
@@ -84,36 +87,31 @@ ModelRows:
     count       = row_groups.length
     ws          = if count > 0 then [klass, rows] else nil
 
-OptionalIDsField: MartyFields::TextField
+OptionalIDsField: Fields::TextField
     field_label = "Group IDs (optional)"
     name = "restrict_to_ids"
 
 DataBlameReport:
     title = "Data Blame Report"
 
-    pt_name1    =?
-    posting1    =? Marty::Posting.lookup(pt_name1)
-    t1          = posting1.created_dt
-
-    pt_name2    =?
-    posting2    =? Marty::Posting.lookup(pt_name2)
-    t2          = posting2.created_dt
+    dt1 =?
+    dt2 =?
 
-    class_list  =? false
+    class_list  =? []
     restrict_to_ids =? nil
 
     form = [
-        MartyFields::PostingField1,
-        PostingField2,
-        MartyFields::ClassListField,
+        DateField1,
+        DateField2,
+        Fields::ClassListField,
         OptionalIDsField
         ]
 
-    ts = if Marty::Helper.infinity_dt(t1)
-         then [t2, t1]
-         else if Marty::Helper.infinity_dt(t2)
-              then [t1, t2]
-              else [t1, t2].sort
+    ts = if Marty::Helper.infinity_dt(dt1)
+         then [dt2, dt1]
+         else if Marty::Helper.infinity_dt(dt2)
+              then [dt1, dt2]
+              else [dt1, dt2].sort
 
     sanitized = if class_list
         then Marty::DataChange.sanitize_classes(class_list)
@@ -128,7 +126,7 @@ DataBlameReport:
         else true
 
     result = ids_check && [
-        ModelRows(t1 = ts[0], t2 = ts[1], klass = klass,
+        ModelRows(dt1 = ts[0], dt2 = ts[1], klass = klass,
                   ids = ids).ws
         for klass in sanitized
         ].compact
@@ -136,11 +134,11 @@ DataBlameReport:
     format = "xlsx"
 
 ModelSummaryRow:
-    klass       =?
-    t1          =?
-    t2          =?
+    klass =?
+    dt1   =?
+    dt2   =?
 
-    r = Marty::DataChange.change_summary(t1, t2, klass)
+    r = Marty::DataChange.change_summary(dt1, dt2, klass)
     cr = r['created']
     up = r['updated']
     dl = r['deleted']
@@ -150,22 +148,17 @@ ModelSummaryRow:
 DataBlameReportSummary:
     title = "Summary Data Blame Report"
 
-    pt_name1    =?
-    posting1    =? Marty::Posting.lookup(pt_name1)
-    t1          = posting1.created_dt
-
-    pt_name2    =?
-    posting2    =? Marty::Posting.lookup(pt_name2)
-    t2          = posting2.created_dt
+    dt1 =?
+    dt2 =?
 
     form = [
-        MartyFields::PostingField1,
-        PostingField2,
+        DateField1,
+        DateField2,
         ]
 
-    postings = [
-        ["Posting 1", pt_name1,],
-        ["Posting 2", pt_name2,],
+    dates = [
+        ["Date 1", dt1,],
+        ["Date 2", dt2,],
         ]
 
     hrow = [
@@ -173,18 +166,18 @@ DataBlameReportSummary:
         Styles::Style.m_hdr_style0,
         ]
 
-    ts = if Marty::Helper.infinity_dt(t1)
-         then [t2, t1]
-         else if Marty::Helper.infinity_dt(t2)
-              then [t1, t2]
-              else [t1, t2].sort
+    ts = if Marty::Helper.infinity_dt(dt1)
+         then [dt2, dt1]
+         else if Marty::Helper.infinity_dt(dt2)
+              then [dt1, dt2]
+              else [dt1, dt2].sort
 
     rows = [
-        ModelSummaryRow(t1 = ts[0], t2 = ts[1], klass = klass).ws
+        ModelSummaryRow(dt1 = ts[0], dt2 = ts[1], klass = klass).ws
         for klass in Marty::DataChange.class_list
         ].compact
 
-    header = [["row", r, {"style" : [Styles::Style.s_hdr]}] for r in postings]
+    header = [["row", r, {"style" : [Styles::Style.s_hdr]}] for r in dates]
     result = [[title,[hrow] + rows, {"widths" : [30]}], ["Parameters", header]]
     format = "xlsx"
 
@@ -192,21 +185,20 @@ DeadReferenceReport:
     title = "Dead Reference Report"
 
     class_list =? false
-    pt_name    =?
-    posting    =? Marty::Posting.lookup(pt_name)
+    date =?
 
     sanitized = if class_list
         then Marty::DataChange.sanitize_classes(class_list)
         else Marty::DataChange.class_list
 
     form = [
-        MartyFields::PostingField,
-        MartyFields::ClassListField,
+        Fields::DateField,
+        Fields::ClassListField,
         ]
 
     result = [
         [[[klass, attr, obj].flatten for obj in list]
-         for attr, list in Marty::DataChange.dead_refs(posting.created_dt,
+         for attr, list in Marty::DataChange.dead_refs(date,
                                                        klass)].flatten(1)
         for klass in sanitized
         ].flatten(1)
@@ -226,7 +218,7 @@ DataImportParam:
         }
     height      =  600
 
-CommaSepField: MartyFields::CheckboxField
+CommaSepField: Fields::CheckboxField
     name        = "comma_sep"
     field_label = "Comma Separated"
 
@@ -260,7 +252,7 @@ DiffReport:
               ]
 
     form = [
-        MartyFields::ClassField,
+        Fields::ClassField,
         DataImportParam,
         CommaSepField,
         ]