Merge pull request #103 from jobready/NEP-12470_relative_date_range

[NEP-12470] SPIKE: Add custom relative date range option in date filters

Author: msxavi

Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:2.6-slim-buster
+WORKDIR /code
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  nodejs \
+  npm
+
+RUN npm install -g npm@7.24.2
+COPY package* ./
+RUN npm install
+

README.md

@@ -231,9 +231,33 @@ the data is updated.
 
 * development within the react-filterbar repo can be performed using the example application included. see /example
 
+*Using Docker*
+
+- Build the image for your environment:
+```
+docker build -t filterbar .
+```
+- Access your new environment:
+```
+docker run --rm -it -v "$PWD:/code" -p "4567:4567" filterbar bash
+```
+- Move to the example dir and run bundle install:
+```
+cd example/ && bundle install
+```
+- Start the Sinatra Rack server on port 4567
+```
+bundle exec rackup -p 4567 -o 0.0.0.0
+```
+
+- Visit the server via: http://localhost:4567
+
+### Making Changes
+
+Run `node_modules/.bin/gulp` to deploy your changes to /example application.
+
 ## Deployment
-run the following to deploy
-gulp dist
+When your code is ready for distribuition, run: `node_modules/.bin/gulp dist`
 
 ## Common Problems / Bugs
 

dist/react-filterbar.js

@@ -8,22 +8,28 @@ This document describes how to setup Sinatra for the purposes of development and
 git clone https://github.com/jobready/react-filterbar.git
 ```
 
-* move to the example dir and run bundle install
+* Use Docker
+
+Build the image for your environment
 ```
-cd react-filterbar/example/
-bundle install
+docker build -t filterbar .
 ```
-
-* optionally reset the example data so date filters make sense
+Access your new environment
 ```
-cd react-filterbar/example/
-ruby generate_books.rb
+docker run --rm -it -v "$PWD:/code" -p "4567:4567" filterbar bash
 ```
-
-
-* start the Sinatra Rack server on port 4567
+Move to the example dir and run bundle install
 ```
-bundle exec rackup -p 4567
+cd example/ && bundle install
 ```
+Start the Sinatra Rack server on port 4567
+```
+bundle exec rackup -p 4567 -o 0.0.0.0
+```
+Visit the server via: http://localhost:4567
 
-Visit the server via: http://localhost:4567 
+* optionally reset the example data so date filters make sense
+```
+cd example/
+ruby generate_books.rb
+```

dist/react-filterbar.min.js

@@ -159,7 +159,12 @@ def search_date_relative(haystack, field, value)
       search_blank_values(haystack, field)
     else
       if(relative_value.present?)
-        from, to = calculate_relative_dates(relative_value)
+        if relative_value == "Relative from today"
+          from = Date.current.advance(days: value["from"].to_i)
+          to = Date.current.advance(days: value["to"].to_i)
+        else
+          from, to = calculate_relative_dates(relative_value)
+        end
       else
         from = Date.parse(value["from"])
         to = Date.parse(value["to"])

example/README.md

@@ -53,6 +53,7 @@
                       %dt.type{ data: { value: "multi_select" } }
                       %dt.url{ data: { value: "/authors" } }
                       %dt.default{ data: { value: "Author 31" } }
+                      %dt.operator{ data: { value: "any" }}
                     %dl.author
                       %dt.field{ data: { value: "author" } }
                       %dt.type{ data: { value: "select" } }

example/books.json

@@ -25,23 +25,6 @@ var appFile = 'app.js';
 var appDistFile = appName + '.js';
 var appMinDistFile = appName + '.min.js';
 
-gulp.task('dev', function() {
-  browserify({
-    entries: './src/' + appFile,
-    extensions: ['.js'],
-    debug: true
-  })
-  .transform(babelify.configure({
-    presets: [
-      "@babel/preset-env",
-      "@babel/preset-react",
-    ]
-  }))
-  .bundle()
-  .pipe(source(appDistFile))
-  .pipe(gulp.dest('example/public/js'));
-})
-
 gulp.task('devloop', function() {
   gulp.watch([scriptsPath + '/**/*.*'], ['dev']);
 })