ahoy_captain 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b2500018e9b54eebbe3265041ed28c4a545698362738c9e2dfe34db83edc221
-  data.tar.gz: dc8b920328f271d5ff63047360b6e5ef1b06ba12b1598346005063bc3548d102
+  metadata.gz: a8ee0971d696dceab133146c4f8a53a0e7f687c474497bc49ee8bf914bda2430
+  data.tar.gz: 3fc99cc0c51f8abbb07acbbf6a39e9f77a5b2adcabc6bd8e5e0583c0bd77b1af
 SHA512:
-  metadata.gz: 823d78198fc0b83ed2535fa9482a5b468fee0aa7a8668db13a625b4b10b68b1910c345790b1ade4e3a9eea7a96f86f5042721dae6a162877f3ac78260437973c
-  data.tar.gz: c0969c25e1bb0170eb49b310e48b7a4a5b5cde951d927d535af261f76a8c6c49f7bde837978e23e1e50042f0e706e39d90605d159860aefe179ac27842c3a179
+  metadata.gz: 99352a390c1f4641d5664882e5807909f4948f77f8b3ab3de89c4e5bad2773b78f6ff4ced0433d490ffa8db1050e6f5b284ad43086b4521328ab5e9af2f01a2c
+  data.tar.gz: 7b13a9571dcc60c6d4a8ab4677cdd6f0fd77123a192a5833e1e837a2f3117e5beed71ab4cb3ab00b66de3b8dafa134f30eeb72f9da98cddf5d3040b7c2dfb963

data/Rakefile

@@ -1,3 +1,24 @@
-require "bundler/setup"
+# frozen_string_literal: true
 
-require "bundler/gem_tasks"
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Caffeinate'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
+load 'rails/tasks/engine.rake'
+
+load 'rails/tasks/statistics.rake'
+
+require 'bundler/gem_tasks'

data/app/assets/javascript/ahoy_captain/controllers/application_controller.js

@@ -10,6 +10,18 @@ export default class extends Controller {
         }, 1000 * 30);
       });
     }
+
+    document.querySelectorAll('a[data-turbo-frame]').forEach(link => {
+      const frameSelector = link.dataset.turboFrame;
+      const frame = document.querySelector(`turbo-frame#${frameSelector}`);
+      if(frame) {
+        const src = frame.src;
+        if(link.href.includes(src)) {
+          link.classList.add('text-primary', 'font-semibold')
+        }
+      }
+
+    })
   }
 
   comboboxInit(event) {

data/app/assets/javascript/ahoy_captain/controllers/combobox_controller.js

@@ -22,7 +22,7 @@ export default class extends Controller {
     input: String,
     highlightedIndex: Number,
     singleOption: Boolean,
-    freeChoice: Boolean,
+    freeChoice: { type: Boolean, default: false },
     selected: Array,
     url: String,
     query: String
@@ -51,11 +51,33 @@ export default class extends Controller {
       value: this,
     });
 
+    const targetNode = this.selectTarget;
+    const config = { attributes: true };
+
+    const callback = (mutationList, observer) => {
+      for (const mutation of mutationList) {
+        if (mutation.type === "attributes") {
+          this.handleNameChange()
+        }
+      }
+    };
+
+    const observer = new MutationObserver(callback);
+    observer.observe(targetNode, config);
+
+
     window.dispatchEvent(new CustomEvent('combobox:init', { detail: { combobox: this } }))
     this.search = new URLSearchParams(window.location.search);
     this.search.delete(this.selectTarget.name)
   }
 
+  handleNameChange() {
+    if(this.selectTarget.name.includes("_cont]")) {
+      this.freeChoiceValue = true
+    } else {
+      this.freeChoiceValue = false
+    }
+  }
   checkDisabledState() {
     if (this.disabledValue) {
       this.element.classList.add('opacity-80', 'cursor-default', 'pointer-events-none');
@@ -71,29 +93,30 @@ export default class extends Controller {
 
   fetchOptions(query) {
     if(this.disabledValue) { return }
-    this.isLoadingValue = true;
-    this.isOpenValue = true;
 
-    const searchParams = new URLSearchParams(this.search.toString());
-    const formData = new FormData(this.element.form);
+    if(this.freeChoiceValue) {
+      this.isLoadingValue = false;
+      this.highlightedIndexValue = 0;
+      this.optionsValue = [{ text: query, value: query }];
+      this.isOpenValue = true;
+
+    } else {
+      this.isLoadingValue = true;
+      this.isOpenValue = true;
 
-    let deleted = [];
-    for (const [key, value] of formData) {
-      if(!deleted.includes(key)) {
-        searchParams.delete(key)
-        deleted.push(key)
-      }
-    }
+      const formData = new FormData(this.selectTarget.form);
+      const searchParams = new URLSearchParams([...formData.entries()]);
 
-    searchParams.delete(this.element.name);
-    searchParams.delete(this.queryValue);
-    searchParams.set(this.queryValue, query);
+      searchParams.delete(this.selectTarget.name);
+      searchParams.delete(this.queryValue);
+      searchParams.set(this.queryValue, query);
 
-    fetch(`${this.urlValue}?${searchParams.toString()}`).then(resp => resp.json()).then(loadedOptions => {
-      this.isLoadingValue = false;
-      this.highlightedIndexValue = 0;
-      this.optionsValue = loadedOptions.map(option => ({ text: option.text, value: option.value }));
-    });
+      fetch(`${this.urlValue}?${searchParams.toString()}`).then(resp => resp.json()).then(loadedOptions => {
+        this.isLoadingValue = false;
+        this.highlightedIndexValue = 0;
+        this.optionsValue = loadedOptions.map(option => ({ text: option.text, value: option.value }));
+      });
+    }
   }
 
   highlight(element) {
@@ -328,6 +351,13 @@ export default class extends Controller {
     }
   }
 
+  freeChoiceValueChanged(current, prev) {
+    if(this.selectedValue.filter(value => value.freeChoice).length) {
+      console.log("free choice changed")
+      this.setSelected([])
+    }
+
+  }
   disabledValueChanged(current) {
     if(current) {
       this.isOpenValue = false

data/app/assets/javascript/ahoy_captain/controllers/frame_link_controller.js

@@ -0,0 +1,20 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+  static targets = ["link", "alt"]
+  static values = {
+    classes: { type: Array, default: ["text-primary", "font-semibold"] }
+  }
+
+  connect() {
+    this.element.addEventListener('click', () => {
+      const frame = this.element.dataset.turboFrame;
+      const otherLinks = document.querySelectorAll(`[data-turbo-frame="${frame}"]`);
+      otherLinks.forEach(link => {
+        link.classList.remove('text-primary', 'font-semibold');
+      })
+
+      this.element.classList.add("text-primary", "font-semibold")
+    })
+  }
+}

data/app/assets/javascript/ahoy_captain/controllers/line_chart_controller.js

@@ -33,6 +33,7 @@ export default class extends Controller {
 
   connect() {
     const onClick = (e) => {
+      if(drag) { return }
       const element = this.chart.getElementsAtEventForMode(e, 'index', { intersect: false })[0];
       const searchParams = new URLSearchParams(window.location.search);
 
@@ -76,8 +77,7 @@ export default class extends Controller {
     }
 
     const typeForDate = this.comparisonValue === 'year' ? 'long' : "short"
-    this.chart = new Chart(this.element,
-      {
+    const options = {
         type: 'line',
         data: {
           labels: Object.keys(this.currentValue),
@@ -139,8 +139,71 @@ export default class extends Controller {
             }
           }
         }
-      },
-    );
+      }
+    this.chart = new Chart(this.element, options);
+
+
+    var canvas = this.element;
+    var overlay = document.getElementById('overlay');
+    var startIndex = 0;
+    overlay.width = canvas.width;
+    overlay.height = canvas.height;
+    var selectionContext = overlay.getContext('2d');
+    var selectionRect = {
+      w: 0,
+      startX: 0,
+      startY: 0
+    };
+    var drag = false;
+    canvas.addEventListener('pointerdown', evt => {
+      const points = this.chart.getElementsAtEventForMode(evt, 'index', {
+        intersect: false
+      });
+
+      startIndex = points[0].index;
+      const rect = canvas.getBoundingClientRect();
+      selectionRect.startX = evt.clientX - rect.left;
+      selectionRect.startY = this.chart.chartArea.top;
+      drag = true;
+    });
+    canvas.addEventListener('pointermove', evt => {
+      const rect = canvas.getBoundingClientRect();
+      if (drag) {
+
+        const rect = canvas.getBoundingClientRect();
+        selectionContext.fillStyle = getCSS('--p')
+        selectionRect.w = (evt.clientX - rect.left) - selectionRect.startX;
+        selectionContext.globalAlpha = 0.5;
+        selectionContext.clearRect(0, 0, canvas.width, canvas.height);
+        selectionContext.fillRect(selectionRect.startX,
+          selectionRect.startY,
+          selectionRect.w,
+          this.chart.chartArea.bottom - this.chart.chartArea.top);
+      } else {
+        selectionContext.clearRect(0, 0, canvas.width, canvas.height);
+        var x = evt.clientX - rect.left;
+        if (x > this.chart.chartArea.left) {
+          selectionContext.fillStyle = getCSS('--p')
+          selectionContext.fillRect(x,
+            this.chart.chartArea.top,
+            1,
+            this.chart.chartArea.bottom - this.chart.chartArea.top);
+        }
+      }
+    });
+    canvas.addEventListener('pointerup', evt => {
+      const points = this.chart.getElementsAtEventForMode(evt, 'index', {
+        intersect: false
+      });
+      const dates = [options.data.labels[startIndex], options.data.labels[points[0].index]].sort()
+      const searchParams = new URLSearchParams(window.location.search);
+      searchParams.set('start_date', dates[0])
+      searchParams.set('end_date', dates[1])
+      searchParams.delete('period')
+      searchParams.delete('compare_to_start_date')
+      searchParams.delete('compare_to_end_date')
+      Turbo.visit(window.location.pathname + "?" + searchParams.toString())
+    });
   }
 
   formatLabel(label) {

data/app/assets/javascript/ahoy_captain/controllers/map_controller.js

@@ -0,0 +1,47 @@
+import { Controller } from "@hotwired/stimulus";
+import "chartjs-chart-geo";
+import CountryMap from "helpers/countries"
+
+export default class extends Controller {
+  static values = {
+    data: Object
+  }
+  connect() {
+    fetch('https://unpkg.com/world-atlas/countries-50m.json').then((r) => r.json()).then((data) => {
+      const countries = ChartGeo.topojson.feature(data, data.objects.countries).features;
+      const numericToCode = {};
+      Object.keys(CountryMap).forEach(key => { numericToCode[CountryMap[key]['Numeric code']] = key })
+
+      countries.forEach(country => {
+        const abbrev = numericToCode[country.id];
+        country.value = this.dataValue[abbrev]
+      })
+
+      const chart = new Chart(this.element.getContext("2d"), {
+        type: 'choropleth',
+        data: {
+          labels: countries.map((d) => d.properties.name),
+          datasets: [{
+            label: 'Countries',
+            data: countries.map((d) => ({feature: d, value: d.value || 0 })),
+          }]
+        },
+        options: {
+          showOutline: false,
+          showGraticule: false,
+          plugins: {
+            legend: {
+              display: false
+            },
+          },
+          scales: {
+            projection: {
+              axis: 'x',
+              projection: 'equalEarth'
+            }
+          }
+        }
+      });
+    });
+  }
+}

data/app/assets/javascript/ahoy_captain/controllers/predicate_select_controller.js

@@ -4,6 +4,7 @@ export default class extends Controller {
   static targets = ["select"]
 
   handleChange(event) {
+    this.selectTarget.dataset.predicate = event.target.value
     this.selectTarget.name = event.target.value
   }
 }