marty 8.5.0 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6fd0c089c5ad585e2ee595e562468d11ba1bcb93561faf4af44b7efd657eead
-  data.tar.gz: 706faaa4fd4c52cdf947546fbe5362b6862335ff085c68a8a78b52c257e35380
+  metadata.gz: 7fd7c45cf6825476a774ee84fe6b3f9bff603e022747ecc5079cda8a037a869b
+  data.tar.gz: 48fdb90df6cb49e720fc4446975f8b55205eaa560a23af60a49b1d02769127cf
 SHA512:
-  metadata.gz: 5350b886990d9c4efffa480d3727efed7f357208d966394ae637f7cfae110203046a768379d1b373f931cf8bcb85d982f97ef1e5c7e1240e5ddde3e2f4038324
-  data.tar.gz: b4ac412e00641a7e5138036f9af8eac4c5c68fb48fd76c05296c195825a6eb3755659adf7287f92c70d0a058c645a7dacec675c2a590376e6ed2e786053cf6e0
+  metadata.gz: 81813549a4614fa1191c466a5506ec2d36796e21e6d45dec4eb8bf054e0614a01c1c2bf1a0539e2afdc980c81e22a32bcdce2749d27634bf65c6f491e058978d
+  data.tar.gz: be097e58e928782e89761d4980218e417c2df6c5fa9a28233c4449feed3df1a5492a244ce7211cb604471e7188e08d5b8e923921948b7614dcc6a873cab60af6

data/.eslintignore

@@ -0,0 +1 @@
+app/assets/javascripts/marty/codemirror/*

data/.eslintrc.js

@@ -0,0 +1,26 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+  },
+  extends: ["eslint:recommended", "prettier"],
+  globals: {
+    RailsApp: "writable",
+    ActionCable: "readonly",
+    Ext: "readonly",
+    CodeMirror: "readonly"
+  },
+  parserOptions: {
+    ecmaVersion: 6,
+  },
+  plugins: ["prettier"],
+  rules: {
+    "no-var": ["error"],
+    "prefer-const": ["error"],
+    "linebreak-style": ["error", "unix"],
+    "quotes": [2, "double", { "avoidEscape": true }],
+    "no-unused-vars": ["error", { "args": "after-used", "argsIgnorePattern": "^_" }],
+    "object-shorthand": ["error", "always"],
+    "no-constant-condition": ["error", { "checkLoops": false }]
+  }
+};

data/.gitignore

@@ -39,3 +39,6 @@ spec/dummy/.sass-cache
 
 # Ignore Gemfile.lock
 Gemfile.lock
+
+# JS stuff
+/node_modules

data/.gitlab-ci.yml

@@ -14,6 +14,7 @@ before_script:
   interruptible: true
   # Run only when there is an MR
   only:
+    - master
     - merge_requests
 
   stage: test
@@ -30,6 +31,12 @@ rubocop:
   script:
     - bundle exec rubocop
 
+eslint-prettier:
+  extends: .base-test
+  script:
+    - yarn
+    - make lint-js
+
 rspec (controllers):
   extends: .base-test
   script:

data/.prettierignore

@@ -0,0 +1,14 @@
+# Files ignored by Prettier.
+.gitignore
+.dockerignore
+.editorconfig
+.prettierignore
+.browserslistrc
+.env.local*
+.ssh-docker/*
+yarn.lock
+Makefile
+Dockerfile
+docker-compose.yml
+docker-entrypoint.sh
+app/assets/javascripts/marty/codemirror/**/*

data/.rubocop_todo.yml

@@ -1024,5 +1024,5 @@ Style/WordArray:
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100

data/Dockerfile.dummy

@@ -49,6 +49,9 @@ RUN export VERSION="node_${NODE_VER}" DISTRO="$(lsb_release -s -c)" && \
     apt-get -o Acquire::Check-Valid-Until=false update && \
     apt-get install -qq -y --no-install-recommends nodejs
 
+# Install Yarn
+RUN curl -o- -L https://yarnpkg.com/install.sh | bash
+
 # Install chrome for integration tests
 RUN curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
     && dpkg -i google-chrome.deb || true \

data/Makefile

@@ -1,2 +1,3 @@
 include make-app.mk
+include make-lint.mk
 

data/app/assets/javascripts/marty/cable.js

@@ -5,8 +5,12 @@
   this.RailsApp || (this.RailsApp = {});
 
   if (window.location.port === "") {
-    RailsApp.cable = ActionCable.createConsumer(`ws://${window.location.hostname}/cable`);
+    RailsApp.cable = ActionCable.createConsumer(
+      `ws://${window.location.hostname}/cable`
+    );
   } else {
-    RailsApp.cable = ActionCable.createConsumer(`ws://${window.location.hostname}:${window.location.port}/cable`);
+    RailsApp.cable = ActionCable.createConsumer(
+      `ws://${window.location.hostname}:${window.location.port}/cable`
+    );
   }
-}).call(this);
+}.call(this));

data/app/assets/javascripts/marty/extjs/extensions/datetime_field/component.js

@@ -0,0 +1,401 @@
+/*
+ * File: DateTimePicker.js
+ *
+ * This file requires use of the Ext JS library, under independent license.
+ * This is part of the UX for DateTimeField developed by Guilherme Portela
+ */
+
+Ext.define("Ext.ux.DateTimePicker", {
+  extend: "Ext.picker.Date",
+  alias: "widget.datetimepicker",
+  requires: [
+    "Ext.picker.Date",
+    "Ext.slider.Single",
+    "Ext.form.field.Time",
+    "Ext.form.Label"
+  ],
+  // <locale>
+  /**
+   * @cfg {String} todayText
+   * The default text that will be displayed in the calendar to pick the curent date.
+   */
+  todayText: "Current Date",
+  // </locale>
+  // <locale>
+  /**
+   * @cfg {String} hourText
+   * The default text displayed above the hour slider
+   */
+  hourText: "Hour",
+  // </locale>
+  // <locale>
+  /**
+   * @cfg {String} minuteText
+   * The default text displayed above the minute slider
+   */
+  minuteText: "Minutes",
+  // </locale>
+
+  /**
+   * @cfg {Object} hourSliderConfig
+   * A config object that will be applied to the hour slider. Any of the config options available for
+   * {@link Ext.slider.Single} can be specified here.
+   */
+
+  /**
+   * @cfg {Object} minuteSliderConfig
+   * A config object that will be applied to the minute slider. Any of the config options available for
+   * {@link Ext.slider.Single} can be specified here.
+   */
+
+  /**
+   * @cfg {Object} timePickerConfig
+   * A config object that will be applied to the time picker. Any of the config options available for
+   * {@link Ext.panel.Panel} can be specified here.
+   */
+
+  initEvents() {
+    const me = this,
+      eDate = Ext.Date,
+      day = eDate.DAY;
+
+    Ext.apply(me.keyNavConfig, {
+      up: (e) => {
+        if (e.ctrlKey) {
+          if (e.shiftKey) {
+            me.minuteSlider.setValue(me.minuteSlider.getValue() + 1);
+          } else {
+            me.showNextYear();
+          }
+        } else {
+          if (e.shiftKey) {
+            me.hourSlider.setValue(me.hourSlider.getValue() + 1);
+          } else {
+            me.update(eDate.add(me.activeDate, day, -7));
+          }
+        }
+      },
+
+      down: (e) => {
+        if (e.ctrlKey) {
+          if (e.shiftKey) {
+            me.minuteSlider.setValue(me.minuteSlider.getValue() - 1);
+          } else {
+            me.showPrevYear();
+          }
+        } else {
+          if (e.shiftKey) {
+            me.hourSlider.setValue(me.hourSlider.getValue() - 1);
+          } else {
+            me.update(eDate.add(me.activeDate, day, 7));
+          }
+        }
+      }
+    });
+    me.callParent();
+  },
+
+  initComponent() {
+    const me = this;
+
+    if (typeof me.value === "string") {
+      me.value = Ext.Date.parse(me.value, me.format);
+    } else if (!me.value) {
+      me.value = new Date();
+    }
+
+    const dtAux = me.value;
+
+    dtAux.setSeconds(0);
+
+    me.timeFormat = me.format.indexOf("h") !== -1 ? "h" : "H";
+    me.hourSlider = new Ext.slider.Single(
+      Ext.Object.merge(
+        {
+          fieldLabel: me.hourText,
+          labelAlign: "top",
+          labelSeparator: " ",
+          padding: "0 0 10 17",
+          focusable: false,
+          value: 0,
+          minValue: 0,
+          maxValue: 23,
+          vertical: true,
+          tipText: (thumb) => {
+            const value = thumb.value;
+
+            if (me.timeFormat === "H") {
+              return value || "0";
+            } else {
+              return value && value - 12 <= 0 ? value : Math.abs(value - 12);
+            }
+          }
+        },
+        me.hourSliderConfig
+      )
+    );
+
+    me.minuteSlider = new Ext.slider.Single(
+      Ext.Object.merge(
+        {
+          fieldLabel: me.minuteText,
+          labelAlign: "top",
+          labelSeparator: " ",
+          padding: "0 10 10 0",
+          focusable: false,
+          value: 0,
+          increment: 1,
+          minValue: 0,
+          maxValue: 59,
+          vertical: true
+        },
+        me.minuteSliderConfig
+      )
+    );
+
+    me.timePicker = new Ext.panel.Panel(
+      Ext.Object.merge(
+        {
+          layout: {
+            type: "hbox",
+            align: "stretch"
+          },
+          border: false,
+          defaults: {
+            flex: 1
+          },
+          width: 130,
+          floating: true,
+          dockedItems: [
+            {
+              xtype: "toolbar",
+              dock: "top",
+              ui: "footer",
+              items: [
+                "->",
+                {
+                  xtype: "label",
+                  text: me.timeFormat == "h" ? "12:00 AM" : "00:00"
+                },
+                "->"
+              ]
+            }
+          ],
+          items: [me.hourSlider, me.minuteSlider],
+          onMouseDown: (e) => {
+            e.preventDefault();
+          }
+        },
+        me.timePickerConfig
+      )
+    );
+
+    me.callParent();
+    me.ownerCt = me.up("[floating]");
+    me.timePicker.ownerCt = me.ownerCt;
+    me.registerWithOwnerCt();
+    me.timePicker.registerWithOwnerCt();
+    me.setValue(new Date(dtAux));
+    me.hourSlider.addListener("change", me.changeTimeValue, me);
+    me.minuteSlider.addListener("change", me.changeTimeValue, me);
+  },
+
+  handleTabClick(e) {
+    this.handleDateClick(e, this.activeCell.firstChild, true);
+  },
+
+  getSelectedDate(date) {
+    const me = this,
+      t = Ext.Date.clearTime(date, true).getTime(),
+      cells = me.cells,
+      cls = me.selectedCls,
+      cellItems = cells.elements,
+      cLen = cellItems.length;
+
+    let cell, c;
+
+    cells.removeCls(cls);
+
+    for (c = 0; c < cLen; c++) {
+      cell = cellItems[c].firstChild;
+      if (cell.dateValue === t) {
+        return cell;
+      }
+    }
+    return null;
+  },
+
+  changeTimeValue(slider) {
+    const me = this,
+      label = me.timePicker.down("label"),
+      minutePrefix = me.minuteSlider.getValue() < 10 ? "0" : "";
+
+    let hourDisplay = me.hourSlider.getValue(),
+      pickerValue,
+      timeSufix,
+      auxValue;
+
+    if (me.timeFormat == "h") {
+      timeSufix = me.hourSlider.getValue() < 12 ? " AM" : " PM";
+      hourDisplay =
+        me.hourSlider.getValue() < 13 ? hourDisplay : hourDisplay - 12;
+      hourDisplay = hourDisplay || "12";
+    }
+
+    const hourPrefix = hourDisplay < 10 ? "0" : "";
+
+    label.setText(
+      hourPrefix +
+        hourDisplay +
+        ":" +
+        minutePrefix +
+        me.minuteSlider.getValue() +
+        (timeSufix || "")
+    );
+
+    if (me.pickerField && (pickerValue = me.pickerField.getValue())) {
+      auxValue = new Date(
+        pickerValue[slider == me.hourSlider ? "setHours" : "setMinutes"](
+          slider.getValue()
+        )
+      );
+      me.pickerField.setValue(auxValue);
+      me.pickerField.fireEvent("select", me.pickerField, auxValue);
+    }
+  },
+
+  afterShow(animateTarget, callback, scope) {
+    const me = this;
+
+    me.callParent([animateTarget, callback, scope]);
+    me.timePicker.show();
+
+    // this is a workaround for the classic theme, where the time
+    // panel would have a transparent background with the classic theme.
+    const timePickerToolbarEl = me.timePicker.down("toolbar").getEl();
+    const backgroundColor = timePickerToolbarEl.getStyle("background-color");
+    if (backgroundColor == "transparent") {
+      timePickerToolbarEl.setStyle(
+        "background-color",
+        timePickerToolbarEl.getStyle("border-color")
+      );
+    }
+  },
+
+  afterSetPosition(x, y) {
+    this.callParent([x, y]);
+    this.alignTimePicker();
+  },
+
+  alignTimePicker() {
+    const me = this,
+      el = me.el,
+      alignTo = me.getTimePickerSide(),
+      xPos = alignTo == "tl" ? -1 * me.timePicker.getWidth() - 5 : 5;
+
+    me.timePicker.setHeight(el.getHeight());
+    me.timePicker.showBy(me, alignTo, [xPos, 0]);
+  },
+
+  onHide() {
+    const me = this;
+    me.timePicker.hide();
+    me.callParent();
+  },
+
+  beforeDestroy() {
+    const me = this;
+
+    if (me.rendered) {
+      Ext.destroy(me.timePicker, me.minuteSlider, me.hourSlider);
+    }
+    me.callParent();
+  },
+
+  getTimePickerSide() {
+    const el = this.el,
+      body = Ext.getBody(),
+      bodyWidth = body.getViewSize().width;
+
+    return bodyWidth < el.getX() + el.getWidth() + 140 ? "tl" : "tr";
+  },
+
+  setValue(value) {
+    value = value || new Date();
+
+    value.setSeconds(0);
+    this.value = new Date(value);
+    return this.update(this.value);
+  },
+
+  selectToday() {
+    const me = this,
+      btn = me.todayBtn,
+      handler = me.handler,
+      auxDate = new Date();
+
+    if (btn && !btn.disabled) {
+      me.setValue(new Date(auxDate.setSeconds(0)));
+      me.fireEvent("select", me, me.value);
+      if (handler) {
+        handler.call(me.scope || me, me, me.value);
+      }
+      me.onSelect();
+    }
+    return me;
+  },
+
+  handleDateClick(e, t, /*private*/ blockStopEvent) {
+    const me = this,
+      handler = me.handler,
+      hourSet = me.timePicker.items.items[0].getValue(),
+      minuteSet = me.timePicker.items.items[1].getValue(),
+      auxDate = new Date(t.dateValue);
+
+    if (blockStopEvent !== true) {
+      e.stopEvent();
+    }
+
+    if (
+      !me.disabled &&
+      t.dateValue &&
+      !Ext.fly(t.parentNode).hasCls(me.disabledCellCls)
+    ) {
+      me.doCancelFocus = me.focusOnSelect === false;
+      auxDate.setHours(hourSet, minuteSet, 0);
+      me.setValue(new Date(auxDate));
+      delete me.doCancelFocus;
+      me.fireEvent("select", me, me.value);
+      if (handler) {
+        handler.call(me.scope || me, me, me.value);
+      }
+      me.onSelect();
+    }
+  },
+
+  selectedUpdate(date) {
+    const me = this,
+      dateOnly = Ext.Date.clearTime(date, true);
+
+    this.callParent([dateOnly]);
+    me.updateSliders();
+  },
+
+  fullUpdate(date) {
+    const me = this,
+      dateOnly = Ext.Date.clearTime(date, true);
+
+    this.callParent([dateOnly]);
+    me.updateSliders();
+  },
+
+  updateSliders() {
+    const me = this,
+      currentDate = (me.pickerField && me.pickerField.getValue()) || new Date();
+
+    if (me.timePicker.rendered) {
+      me.hourSlider.setValue(currentDate.getHours());
+      me.minuteSlider.setValue(currentDate.getMinutes());
+    }
+  }
+});