Merge pull request #87 from gtt-project/develop

Prepares for release 3.0.0 (webpack support version)

Author: sanak

.gitignore

@@ -1 +1,13 @@
 .DS_Store
+node_modules
+# webpack generate files
+assets/javascripts/main.js
+assets/javascripts/main.js.*
+assets/javascripts/*.png
+assets/javascripts/*.svg
+assets/javascripts/*.ttf
+assets/javascripts/*.eot
+assets/javascripts/*.woff2
+assets/javascripts/*.woff
+
+

Gemfile

@@ -4,7 +4,7 @@ gem 'deface'
 gem 'immutable-struct'
 gem "rgeo"
 gem "rgeo-geojson"
-gem "pg", (ENV['GEM_PG_VERSION'] ? "~> #{ENV['GEM_PG_VERSION']}" : "~> 1.1.4") # make sure we use a version compatible with AR
+gem "pg", (ENV['GEM_PG_VERSION'] ? "~> #{ENV['GEM_PG_VERSION']}" : "~> 1.2.2") # make sure we use a version compatible with AR
 gem "rgeo-activerecord", (ENV['GEM_RGEO_ACTIVERECORD_VERSION'] ? "~> #{ENV['GEM_RGEO_ACTIVERECORD_VERSION']}" : "~> 6.2.2") # same as above
 gem 'activerecord-postgis-adapter', (ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION'] ? "~> #{ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION']}" : "~> 5.2.3") # same as above
 gem 'rails-controller-testing' # This gem brings back assigns to your controller tests as well as assert_template to both controller and integration tests.

README.md

@@ -19,6 +19,8 @@ Redmine GTT plugins **require PostgreSQL/PostGIS** and will not work with SQLite
 - Redmine >= 4.0.0
 - PostgreSQL >= 9.6
 - PostGIS >= 2.4
+- NodeJS v14
+- yarn
 
 ## Installation
 
@@ -34,30 +36,27 @@ To install Redmine GTT plugin, download or clone this repository in your Redmine
 ```
 cd path/to/plugin/directory
 git clone https://github.com/gtt-project/redmine_gtt.git
+cd redmine_gtt
+yarn
+npx webpack
 ```
 
 Then run
 
 ```
-export GEM_PG_VERSION=your-pg-version # skip this line if redmine use pg 1.1.4.
+export GEM_PG_VERSION=your-pg-version # skip this line if redmine use pg 1.2.2.
 export GEM_RGEO_ACTIVERECORD_VERSION=your-rgeo-activerecord-version # skip this line if using rgeo-activerecord 6.2.2.
 export GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=your-activerecord-postgis-adapter-version # skip this line if using activerecord-postgis-adapter 5.2.3.
 bundle install
 bundle exec rake redmine:plugins:migrate
 ```
 
+Before restarting Redmine, you need to set `postgis` adapter instead of `postgres` adapter in your `config/database.yml`.
+
 After restarting Redmine, you should be able to see the Redmine GTT plugin in the Plugins page.
 
 More information on installing (and uninstalling) Redmine plugins can be found here: http://www.redmine.org/wiki/redmine/Plugins
 
-## How to run test
-
-After the installation, you can run the plugin test by the following command:
-
-```
-RAILS_ENV=test NAME=redmine_gtt bundle exec rake redmine:plugins:test
-```
-
 ## How to use
 
 1. Go to plugin configuration for global settings
@@ -72,6 +71,25 @@ For more information with screenshots see the [Getting Started](doc/getting-star
 
 The GTT Project appreciates any [contributions](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md)! Feel free to contact us for [reporting problems and support](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md).
 
+### How to debug frontend
+
+You can debug frontend by running the following command on another console:
+
+```
+npx webpack --watch --mode=development
+```
+
+### How to run test
+
+You can run the plugin test on rails test environment by the following command:
+
+```
+bundle exec rake db:create
+RAILS_ENV=test bundle exec rake db:migrate
+RAILS_ENV=test bundle exec rake redmine:plugins:migrate
+RAILS_ENV=test NAME=redmine_gtt bundle exec rake redmine:plugins:test
+```
+
 ## Version History
 
 See [all releases](https://github.com/gtt-project/redmine_gtt/releases) with release notes.
@@ -82,6 +100,7 @@ See [all releases](https://github.com/gtt-project/redmine_gtt/releases) with rel
 - [Daniel Kastl](https://github.com/dkastl)
 - [Thibault Mutabazi](https://github.com/eyewritecode)
 - [Ko Nagase](https://github.com/sanak)
+- [Taro Matsuzawa](https://github.com/smellman)
 - ... [and others](https://github.com/gtt-project/redmine_gtt/graphs/contributors)
 
 ## LICENSE

app/helpers/gtt_map_helper.rb

@@ -2,10 +2,10 @@
 
 module GttMapHelper
 
-  def map_form_field(form, map, field: :geojson, edit_mode:)
+  def map_form_field(form, map, field: :geojson, bounds: nil, edit_mode: nil)
     safe_join [
       form.hidden_field(field, id: 'geom'),
-      map_tag(map: map, bounds: map.bounds, edit: edit_mode)
+      map_tag(map: map, bounds: bounds, edit: edit_mode)
     ]
   end
 
@@ -33,10 +33,9 @@ def map_tag(map: nil, layers: map&.layers,
     safe_join [
       content_tag(:div, "", data: data, id: uid, class: 'ol-map'),
       javascript_tag("
-        $(document).ready(function(){
-          App.init({
-            target: $('##{uid}')[0]
-          });
+        document.addEventListener('DOMContentLoaded', function(){
+          var target = document.getElementById('#{uid}');
+          window.createGttClient(target);
         });
       ")
     ]

app/views/projects/settings/_gtt.html.erb

@@ -15,7 +15,7 @@
   </div>
 
   <div class="box">
-    <%= map_form_field f, @form.map, edit_mode: 'Polygon' %>
+    <%= map_form_field f, @form.map, bounds: nil, edit_mode: 'Polygon' %>
   </div>
 
 

app/views/redmine_gtt/hooks/_user_map.html.erb

@@ -1,5 +1,5 @@
 </fieldset>
 <fieldset class="box tabular">
   <legend><%= l(:label_user_map) %></legend>
-  <%= map_form_field form, user.map, edit_mode: 'Point' %>
+  <%= map_form_field form, user.map, bounds: nil, edit_mode: 'Point' %>
 

app/views/redmine_gtt/hooks/_view_issues_form_details_top.html.erb

@@ -2,6 +2,6 @@
       ((issue.new_record? && User.current.allowed_to?(:add_issues, issue.project)) ||
         User.current.allowed_to?(:edit_issues, issue.project))
 %>
-  <%= map_form_field form, issue.map, edit_mode: 'Point LineString Polygon' %>
+  <%= map_form_field form, issue.map, bounds: issue.project.map.bounds, edit_mode: 'Point LineString Polygon' %>
 <% end %>
 

app/views/settings/gtt/_settings.html.erb

@@ -3,7 +3,7 @@
 <% Tracker.all.each do |t| %>
   <p>
     <%= content_tag :label, t.name %>
-    <%= select_tag "settings[tracker_#{t.id}]", "<option>#{@settings["tracker_#{t.id}"]}</option>".html_safe %> 
+    <%= select_tag "settings[tracker_#{t.id}]", "<option>#{@settings["tracker_#{t.id}"]}</option>".html_safe %>
     <i id="icon_settings_tracker_<%= t.id %>"></i>
   </p>
 <% end %>
@@ -72,16 +72,5 @@
 </div>
 
 <%= javascript_tag do %>
-  var glyph = ol.style.FontSymbol.prototype.defs.glyphs;
-  for (var font in ol.style.FontSymbol.prototype.defs.fonts){
-    for (var i in glyph){
-      if (glyph[i].font == font){
-        $("[id^='settings_tracker_']").append(new Option(glyph[i].name, i))
-      }
-    }
-  }
-  $("[id^='settings_tracker_']").change(function(){
-    var trackerId = $(this).attr("id")
-    $("#icon_" + trackerId).attr("class", $(this).val())
-  })
+  window.gtt_setting()
 <% end %>