[ARVADOS] updated: 2.1.0-1768-g2ae3a644f
Git user
git at public.arvados.org
Wed Dec 29 02:43:11 UTC 2021
Summary of changes:
apps/workbench/Gemfile | 7 ----
apps/workbench/Gemfile.lock | 8 ----
apps/workbench/app/assets/javascripts/bootstrap.js | 11 ++++++
.../app/assets/javascripts/bootstrap.js.coffee | 8 ----
.../workbench/app/assets/javascripts/keep_disks.js | 43 ++++++++++++++++++++++
.../app/assets/javascripts/keep_disks.js.coffee | 32 ----------------
.../common-test-rails-server-package.sh | 2 +-
7 files changed, 55 insertions(+), 56 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/bootstrap.js
delete mode 100644 apps/workbench/app/assets/javascripts/bootstrap.js.coffee
create mode 100644 apps/workbench/app/assets/javascripts/keep_disks.js
delete mode 100644 apps/workbench/app/assets/javascripts/keep_disks.js.coffee
discards 021ca12b276fa9dd9a7687c43c1485ff9474b0bd (commit)
via 2ae3a644ffd385ca42e1e297e5e874e5e425c16d (commit)
via cd2a2d5ead6c6405dca39ed157fbdce77e3d88a7 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (021ca12b276fa9dd9a7687c43c1485ff9474b0bd)
\
N -- N -- N (2ae3a644ffd385ca42e1e297e5e874e5e425c16d)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 2ae3a644ffd385ca42e1e297e5e874e5e425c16d
Author: Ward Vandewege <ward at curii.com>
Date: Tue Dec 28 21:41:54 2021 -0500
17417: remove the coffee-rails gem dependency in wb1, and convert the
two files where we used it to straight up javascript.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index bc08b2ded..1bf8e0d7d 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -18,13 +18,6 @@ gem 'responders', '~> 2.0'
# See: https://github.com/rails/sprockets-rails/issues/443
gem 'sprockets', '~> 3.0'
-# Note: keeping this out of the "group :assets" section "may" allow us
-# to use Coffescript for UJS responses. It also prevents a
-# warning/problem when running tests: "WARN: tilt autoloading
-# 'coffee_script' in a non thread-safe way; explicit require
-# 'coffee_script' suggested."
-gem 'coffee-rails'
-
# Gems used only for assets and not required
# in production environments by default.
group :assets do
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index f9575ac50..b44864ec7 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -111,13 +111,6 @@ GEM
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
- coffee-rails (4.2.2)
- coffee-script (>= 2.2.0)
- railties (>= 4.0.0)
- coffee-script (2.4.1)
- coffee-script-source
- execjs
- coffee-script-source (1.12.2)
concurrent-ruby (1.1.9)
crass (1.0.6)
deep_merge (1.2.1)
@@ -326,7 +319,6 @@ DEPENDENCIES
bootstrap-x-editable-rails
byebug
capybara (~> 2.5.0)
- coffee-rails
deep_merge
flamegraph
headless (~> 1.0.2)
diff --git a/apps/workbench/app/assets/javascripts/bootstrap.js b/apps/workbench/app/assets/javascripts/bootstrap.js
new file mode 100644
index 000000000..e315ab535
--- /dev/null
+++ b/apps/workbench/app/assets/javascripts/bootstrap.js
@@ -0,0 +1,11 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+(function() {
+ jQuery(function() {
+ $("a[rel=popover]").popover();
+ $(".tooltip").tooltip();
+ return $("a[rel=tooltip]").tooltip();
+ });
+}).call(this);
diff --git a/apps/workbench/app/assets/javascripts/bootstrap.js.coffee b/apps/workbench/app/assets/javascripts/bootstrap.js.coffee
deleted file mode 100644
index 441d77fb8..000000000
--- a/apps/workbench/app/assets/javascripts/bootstrap.js.coffee
+++ /dev/null
@@ -1,8 +0,0 @@
-### Copyright (C) The Arvados Authors. All rights reserved.
-
-SPDX-License-Identifier: AGPL-3.0 ###
-
-jQuery ->
- $("a[rel=popover]").popover()
- $(".tooltip").tooltip()
- $("a[rel=tooltip]").tooltip()
diff --git a/apps/workbench/app/assets/javascripts/keep_disks.js b/apps/workbench/app/assets/javascripts/keep_disks.js
new file mode 100644
index 000000000..b3fb6dc44
--- /dev/null
+++ b/apps/workbench/app/assets/javascripts/keep_disks.js
@@ -0,0 +1,43 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+(function() {
+ var cache_age_axis_label, cache_age_hover, cache_age_in_days, float_as_percentage;
+
+ cache_age_in_days = function(milliseconds_age) {
+ var ONE_DAY;
+ ONE_DAY = 1000 * 60 * 60 * 24;
+ return milliseconds_age / ONE_DAY;
+ };
+
+ cache_age_hover = function(milliseconds_age) {
+ return 'Cache age ' + cache_age_in_days(milliseconds_age).toFixed(1) + ' days.';
+ };
+
+ cache_age_axis_label = function(milliseconds_age) {
+ return cache_age_in_days(milliseconds_age).toFixed(0) + ' days';
+ };
+
+ float_as_percentage = function(proportion) {
+ return (proportion.toFixed(4) * 100) + '%';
+ };
+
+ $.renderHistogram = function(histogram_data) {
+ return Morris.Area({
+ element: 'cache-age-vs-disk-histogram',
+ pointSize: 0,
+ lineWidth: 0,
+ data: histogram_data,
+ xkey: 'age',
+ ykeys: ['persisted', 'cache'],
+ labels: ['Persisted Storage Disk Utilization', 'Cached Storage Disk Utilization'],
+ ymax: 1,
+ ymin: 0,
+ xLabelFormat: cache_age_axis_label,
+ yLabelFormat: float_as_percentage,
+ dateFormat: cache_age_hover
+ });
+ };
+
+}).call(this);
diff --git a/apps/workbench/app/assets/javascripts/keep_disks.js.coffee b/apps/workbench/app/assets/javascripts/keep_disks.js.coffee
deleted file mode 100644
index d33312d21..000000000
--- a/apps/workbench/app/assets/javascripts/keep_disks.js.coffee
+++ /dev/null
@@ -1,32 +0,0 @@
-### Copyright (C) The Arvados Authors. All rights reserved.
-
-SPDX-License-Identifier: AGPL-3.0 ###
-
-cache_age_in_days = (milliseconds_age) ->
- ONE_DAY = 1000 * 60 * 60 * 24
- milliseconds_age / ONE_DAY
-
-cache_age_hover = (milliseconds_age) ->
- 'Cache age ' + cache_age_in_days(milliseconds_age).toFixed(1) + ' days.'
-
-cache_age_axis_label = (milliseconds_age) ->
- cache_age_in_days(milliseconds_age).toFixed(0) + ' days'
-
-float_as_percentage = (proportion) ->
- (proportion.toFixed(4) * 100) + '%'
-
-$.renderHistogram = (histogram_data) ->
- Morris.Area({
- element: 'cache-age-vs-disk-histogram',
- pointSize: 0,
- lineWidth: 0,
- data: histogram_data,
- xkey: 'age',
- ykeys: ['persisted', 'cache'],
- labels: ['Persisted Storage Disk Utilization', 'Cached Storage Disk Utilization'],
- ymax: 1,
- ymin: 0,
- xLabelFormat: cache_age_axis_label,
- yLabelFormat: float_as_percentage,
- dateFormat: cache_age_hover
- })
diff --git a/build/package-testing/common-test-rails-server-package.sh b/build/package-testing/common-test-rails-server-package.sh
index 33167f049..e04556bb6 100755
--- a/build/package-testing/common-test-rails-server-package.sh
+++ b/build/package-testing/common-test-rails-server-package.sh
@@ -15,7 +15,7 @@ fi
if [ "$PACKAGE_NAME" = "arvados-workbench" ]; then
mkdir -p /etc/arvados
cat <<'EOF' >/etc/arvados/config.yml
----
+---
Clusters:
xxxxx:
Services:
commit cd2a2d5ead6c6405dca39ed157fbdce77e3d88a7
Author: Ward Vandewege <ward at curii.com>
Date: Fri Dec 24 15:57:07 2021 -0500
17417: we really need a javascript runtime for wb1, for the asset
generation stage.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 8005cb321..bc08b2ded 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -32,6 +32,7 @@ group :assets do
gem 'uglifier', '~> 2.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
+ gem 'mini_racer', :platforms => :ruby
end
group :development, :test, :performance do
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 12e14518e..f9575ac50 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -151,6 +151,7 @@ GEM
jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
+ libv8-node (15.14.0.1)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
@@ -171,6 +172,8 @@ GEM
mime-types-data (3.2019.0331)
mini_mime (1.1.0)
mini_portile2 (2.6.1)
+ mini_racer (0.4.0)
+ libv8-node (~> 15.14.0.0)
minitest (5.10.3)
mocha (1.8.0)
metaclass (~> 0.0.1)
@@ -333,6 +336,7 @@ DEPENDENCIES
lograge
logstash-event
mime-types
+ mini_racer
minitest (~> 5.10.3)
mocha
morrisjs-rails
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list