UI deps updates (#190)

* UI Deps updates

* Updates krane base image

* Bump redisgraph to 2.6.1

Co-authored-by: marcinc <[email protected]>

.circleci/config.yml

@@ -2,7 +2,7 @@
 version: 2.1
 
 orbs:
-  ruby: circleci/ruby@0.2.1
+  ruby: circleci/ruby@1.2.0
 
 executors:
   skaffold:
@@ -13,7 +13,7 @@ jobs:
   test:
     parallelism: 1
     docker:
-      - image: ruby:2.6.5-alpine3.10
+      - image: ruby:2.7.3-alpine3.13
         environment:
           BUNDLE_JOBS: 10
           BUNDLE_RETRY: 5
@@ -30,10 +30,8 @@ jobs:
       - run:
           name: Configure Bundler
           command: gem install bundler -v $(cat Gemfile.lock | tail -1 | tr -d " ")
-      - ruby/load-cache
       - ruby/install-deps
-      - ruby/save-cache
-      - ruby/run-tests
+      - ruby/rspec-test
       - store_artifacts:
           path: coverage
 

.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.3

Dockerfile

@@ -15,7 +15,7 @@
 
 ##############################################################
 # Stage: builder
-FROM ruby:2.6.5-alpine3.10 AS builder
+FROM ruby:2.7.3-alpine3.13 AS builder
 
 WORKDIR /app
 
@@ -25,14 +25,16 @@ RUN apk add --update --no-cache git bash curl make gcc libc-dev tzdata g++ npm
 COPY . /app
 
 # install gems
-RUN bundle install --jobs 20 --retry 5 --deployment --without development test
+RUN bundle config set deployment 'true'
+RUN bundle config set without 'development test'
+RUN bundle install --jobs 20 --retry 5
 
 # build the UI
-RUN cd dashboard && npm install --no-optional && npm rebuild node-sass && node_modules/.bin/gulp release
+RUN cd dashboard && npm install --no-optional && npm audit fix && npm rebuild node-sass && npm install -g sass-migrator && sass-migrator division **/*.scss && node_modules/.bin/gulp release
 
 ##############################################################
 # Stage: final
-FROM ruby:2.6.5-alpine3.10
+FROM ruby:2.7.3-alpine3.13
 
 LABEL org="Appvia Ltd"
 LABEL website="appvia.io"

Gemfile.lock

@@ -201,4 +201,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

bin/setup

@@ -18,6 +18,7 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install --path .bundle
+bundle config set path '.bundle'
+bundle install
 
 # Do any other automated setup that you need to do here

dashboard/gulpfile.js

@@ -28,7 +28,7 @@ const header = require("gulp-header");
 const merge = require("merge-stream");
 const plumber = require("gulp-plumber");
 const rename = require("gulp-rename");
-const sass = require("gulp-sass");
+const sass = require('gulp-sass')(require('sass'));
 const uglify = require("gulp-uglify");
 
 // Load package.json for banner
@@ -103,21 +103,21 @@ function modules() {
   // Stickyfill
   var stickyfillJS = gulp.src('./node_modules/stickyfilljs/dist/stickyfill.min.js')
     .pipe(gulp.dest('./compiled/vendor/stickyfilljs'));
-  // vis-network  
+  // vis-network
   var visNetworkJS = gulp.src('./node_modules/vis-network/standalone/umd/*')
     .pipe(gulp.dest('./compiled/vendor/vis-network'));
-  // vue.js  
+  // vue.js
   var vueJS = gulp.src('./node_modules/vue/dist/vue.min.js')
     .pipe(gulp.dest('./compiled/vendor/vue'));
   return merge(
-    bootstrapJS, 
-    bootstrapSCSS, 
-    bootstrapTreeview, 
-    prismjsJS, 
-    prismjsCSS, 
-    chartJS, 
-    fontAwesome, 
-    jquery, 
+    bootstrapJS,
+    bootstrapSCSS,
+    bootstrapTreeview,
+    prismjsJS,
+    prismjsCSS,
+    chartJS,
+    fontAwesome,
+    jquery,
     jqueryEasing,
     stickyfillJS,
     visNetworkJS,