From: Tom Clegg Date: Fri, 3 May 2024 17:33:28 +0000 (-0400) Subject: Merge branch '15397-remove-obsolete-apis' X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/HEAD?hp=e20590d485505f58f7745d74a311ca539c9be940 Merge branch '15397-remove-obsolete-apis' refs #15397 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000000..f8224e417f --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,40 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +name: Arvados Tests + +on: + workflow_dispatch: + pull_request: + branches: + - main + +jobs: + workbench2: + name: Workbench2 Tests + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - name: Setup buildx + uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 + - name: Build wb2 test container + uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0 + with: + context: . + file: "services/workbench2/docker/Dockerfile" + tags: workbench2-test:latest + load: true + cache-from: type=gha + cache-to: type=gha,mode=max + push: false + - name: Run wb2 integration tests + uses: addnab/docker-run-action@4f65fabd2431ebc8d299f8e5a018d79a769ae185 # v3 + with: + image: workbench2-test:latest + options: -v ${{github.workspace}}:/usr/src/arvados -w /usr/src/arvados/services/workbench2 + run: | + yarn install + yarn test --no-watchAll --bail --ci || exit $? + tools/run-integration-tests.sh -a /usr/src/arvados diff --git a/.gitignore b/.gitignore index c156018036..2b98a71967 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,9 @@ docker/*/generated docker/config.yml doc/.site doc/sdk/python/arvados +doc/sdk/python/arvados.html +doc/sdk/python/index.html +doc/sdk/python/search.js doc/sdk/R/arvados doc/sdk/java-v2/javadoc */vendor @@ -32,3 +35,4 @@ _version.py arvados-snakeoil-ca.pem .vagrant packages +.eslintcache diff --git a/.licenseignore b/.licenseignore index 6ddb5c009c..1e1c12a53a 100644 --- a/.licenseignore +++ b/.licenseignore @@ -1,19 +1,19 @@ *agpl-3.0.html *agpl-3.0.txt apache-2.0.txt -apps/workbench/app/assets/javascripts/list.js -apps/workbench/public/webshell/* AUTHORS */bootstrap.css */bootstrap.js *bootstrap-theme.css build/package-test-dockerfiles/centos7/localrepo.repo +build/package-test-dockerfiles/rocky8/localrepo.repo build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados *by-sa-3.0.html *by-sa-3.0.txt *COPYING doc/fonts/* doc/_includes/_config_default_yml.liquid +doc/_includes/_terraform_*_tfvars.liquid doc/user/cwl/federated/* doc/_includes/_federated_cwl.liquid */docker_image @@ -53,6 +53,8 @@ sdk/cwl/tests/tool/blub.txt sdk/cwl/tests/19109-upload-secondary/* sdk/cwl/tests/federation/data/* sdk/cwl/tests/fake-keep-mount/fake_collection_dir/.arvados#collection +sdk/cwl/tests/container_request_9tee4-xvhdp-kk0ja1cl8b2kr1y-arv-mount.txt +sdk/cwl/tests/container_request_9tee4-xvhdp-kk0ja1cl8b2kr1y-crunchstat.txt sdk/go/manifest/testdata/*_manifest sdk/java/.classpath sdk/java/pom.xml @@ -92,4 +94,44 @@ sdk/cwl/tests/wf/hello.txt sdk/cwl/tests/wf/indir1/hello2.txt sdk/cwl/tests/chipseq/data/Genomes/* CITATION.cff -SECURITY.md \ No newline at end of file +SECURITY.md +lib/crunchstat/testdata/* +lib/controller/localdb/testdata/*.pub +sdk/ruby-google-api-client/* +services/api/bin/rails +services/api/bin/rake +services/api/bin/setup +services/api/bin/yarn +services/api/storage.yml +services/api/test.rb.example +services/api/config/boot.rb +services/api/config/environment.rb +services/api/config/initializers/application_controller_renderer.rb +services/api/config/initializers/assets.rb +services/api/config/initializers/backtrace_silencers.rb +services/api/config/initializers/content_security_policy.rb +services/api/config/initializers/cookies_serializer.rb +services/api/config/initializers/filter_parameter_logging.rb +services/api/config/initializers/mime_types.rb +services/api/config/initializers/new_framework_defaults_*.rb +services/api/config/initializers/permissions_policy.rb +services/api/config/initializers/wrap_parameters.rb +services/api/config/locales/en.yml +services/api/config.ru +services/workbench2/*.d.ts +services/workbench2/*.css +services/workbench2/*.scss +services/workbench2/README.md +services/workbench2/public/* +services/workbench2/.yarnrc +services/workbench2/.npmrc +services/workbench2/src/lib/cwl-svg/* +services/workbench2/tools/arvados_config.yml +services/workbench2/cypress/fixtures/files/5mb.bin +services/workbench2/cypress/fixtures/files/cat.png +services/workbench2/cypress/fixtures/files/banner.html +services/workbench2/cypress/fixtures/files/tooltips.txt +services/workbench2/cypress/fixtures/webdav-propfind-outputs.xml +services/workbench2/.yarn/releases/* +services/workbench2/package.json +services/workbench2/yarn.lock diff --git a/AUTHORS b/AUTHORS index fa9fa86d34..cb09dc67ae 100644 --- a/AUTHORS +++ b/AUTHORS @@ -22,3 +22,4 @@ Curii Corporation <*@curii.com> Dante Tsang Codex Genetics Ltd Bruno P. Kinoshita +George Chlipala diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore deleted file mode 100644 index fa42a32dd9..0000000000 --- a/apps/workbench/.gitignore +++ /dev/null @@ -1,51 +0,0 @@ -# Ignore the default SQLite database. -/db/*.sqlite3 - -# Ignore all logfiles and tempfiles. -/log/*.log -/log/*.log.gz -/tmp -.byebug_history - -package-lock.json - -/config/.secret_token -/config/initializers/secret_token.rb - -/public/assets - -/config/environments/development.rb -/config/environments/production.rb -/config/application.yml - -# Workbench doesn't need one anyway, so this shouldn't come up, but... -/config/database.yml - -/config/piwik.yml - -# Capistrano files are coming from another repo -/Capfile* -/config/deploy* - -# Themes are coming from another repo -/themes/* - -# This can be a symlink to ../../../doc/.site in dev setups -/public/doc - -# SimpleCov reports -/coverage - -# Dev/test SSL certificates -/self-signed.key -/self-signed.pem - -# Generated git-commit.version file -/git-commit.version - -# npm-rails -/node_modules -/npm-debug.log - -# Generated when building distribution packages -/package-build.version diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile deleted file mode 100644 index 00dbad0860..0000000000 --- a/apps/workbench/Gemfile +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: AGPL-3.0 - -source 'https://rubygems.org' - -gem 'rails', '~> 5.2.0' -gem 'arvados', '~> 2.1.5' - -gem 'activerecord-nulldb-adapter', git: 'https://github.com/arvados/nulldb' -gem 'multi_json' -gem 'oj' -gem 'sass' -gem 'mime-types' -gem 'responders', '~> 2.0' - -# Pin sprockets to < 4.0 to avoid issues when upgrading rails to 5.2 -# See: https://github.com/rails/sprockets-rails/issues/443 -gem 'sprockets', '~> 3.0' - -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sassc-rails' - gem 'uglifier', '~> 2.0' - - # See https://github.com/rails/execjs#readme for more supported runtimes -end - -group :development, :test, :performance do - gem 'byebug' - # Pinning launchy because 2.5 requires ruby >= 2.4, which arvbox currently - # doesn't have because of SSO. - gem 'launchy', '~> 2.4.0' -end - -group :development do - gem 'ruby-debug-passenger' - gem 'rack-mini-profiler', require: false - gem 'flamegraph', require: false - #gem 'web-console', '~> 2.0' -end - -group :test, :diagnostics, :performance do - gem 'minitest', '~> 5.10.3' - gem 'selenium-webdriver', '~> 3' - gem 'capybara', '~> 2.5.0' - gem 'poltergeist', '~> 1.5.1' - gem 'headless', '~> 1.0.2' -end - -group :test, :performance do - gem 'rails-perftest' - gem 'ruby-prof' - gem 'rvm-capistrano' - # Note: "require: false" here tells bunder not to automatically - # 'require' the packages during application startup. Installation is - # still mandatory. - gem 'simplecov', '~> 0.7', require: false - gem 'simplecov-rcov', require: false - gem 'mocha', require: false - gem 'rails-controller-testing' -end - -gem 'jquery-rails' -gem 'bootstrap-sass', '~> 3.4.1' -gem 'bootstrap-x-editable-rails' -gem 'bootstrap-tab-history-rails' - -gem 'angularjs-rails', '~> 1.3.8' - -gem 'sshkey' - -# To use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' - -# To use Jbuilder templates for JSON -# gem 'jbuilder' - -# Use unicorn as the app server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -gem 'passenger', :group => :production -gem 'andand' -gem 'RedCloth' - -gem 'piwik_analytics' -gem 'httpclient', '~> 2.5' - -# This fork has Rails 4 compatible routes -gem 'themes_for_rails', git: 'https://github.com/arvados/themes_for_rails' - -gem "deep_merge", :require => 'deep_merge/rails_compat' - -gem 'morrisjs-rails' -gem 'raphael-rails' - -gem 'lograge' -gem 'logstash-event' - -gem 'safe_yaml' - -gem 'npm-rails' - -# arvados-google-api-client and googleauth (and thus arvados) gems -# depend on signet, but signet 0.12 is incompatible with ruby 2.3. -gem 'signet', '< 0.12' diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock deleted file mode 100644 index a22214a28d..0000000000 --- a/apps/workbench/Gemfile.lock +++ /dev/null @@ -1,359 +0,0 @@ -GIT - remote: https://github.com/arvados/nulldb - revision: d8e0073b665acdd2537c5eb15178a60f02f4b413 - specs: - activerecord-nulldb-adapter (0.3.9) - activerecord (>= 2.0.0) - -GIT - remote: https://github.com/arvados/themes_for_rails - revision: ddf6e592b3b6493ea0c2de7b5d3faa120ed35be0 - specs: - themes_for_rails (0.5.1) - rails (>= 3.0.0) - -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - actioncable (5.2.8.1) - actionpack (= 5.2.8.1) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailer (5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) - rack (~> 2.0, >= 2.0.8) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.8.1) - activesupport (= 5.2.8.1) - globalid (>= 0.3.6) - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) - activestorage (5.2.8.1) - actionpack (= 5.2.8.1) - activerecord (= 5.2.8.1) - marcel (~> 1.0.0) - activesupport (5.2.8.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - andand (1.3.3) - angularjs-rails (1.3.15) - arel (9.0.0) - arvados (2.1.5) - activesupport (>= 3) - andand (~> 1.3, >= 1.3.3) - arvados-google-api-client (>= 0.7, < 0.8.9) - faraday (< 0.16) - i18n (~> 0) - json (>= 1.7.7, < 3) - jwt (>= 0.1.5, < 2) - arvados-google-api-client (0.8.7.4) - activesupport (>= 3.2, < 5.3) - addressable (~> 2.3) - autoparse (~> 0.3) - extlib (~> 0.9) - faraday (~> 0.9) - googleauth (~> 0.3) - launchy (~> 2.4) - multi_json (~> 1.10) - retriable (~> 1.4) - signet (~> 0.6) - autoparse (0.3.3) - addressable (>= 2.3.1) - extlib (>= 0.9.15) - multi_json (>= 1.0.0) - autoprefixer-rails (9.5.1.1) - execjs - bootstrap-sass (3.4.1) - autoprefixer-rails (>= 5.2.1) - sassc (>= 2.0.0) - bootstrap-tab-history-rails (0.1.0) - railties (>= 3.1) - bootstrap-x-editable-rails (1.5.1.1) - railties (>= 3.0) - builder (3.2.4) - byebug (11.0.1) - capistrano (2.15.9) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.1.0) - capybara (2.5.0) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - cliver (0.3.2) - concurrent-ruby (1.1.10) - crass (1.0.6) - deep_merge (1.2.1) - docile (1.3.1) - erubi (1.10.0) - execjs (2.7.0) - extlib (0.9.16) - faraday (0.15.4) - multipart-post (>= 1.2, < 3) - ffi (1.10.0) - flamegraph (0.9.5) - globalid (1.0.0) - activesupport (>= 5.0) - googleauth (0.9.0) - faraday (~> 0.12) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (~> 0.7) - headless (1.0.2) - highline (2.0.2) - httpclient (2.8.3) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - jquery-rails (4.3.3) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - json (2.5.1) - jwt (1.5.6) - launchy (2.4.3) - addressable (~> 2.3) - lograge (0.10.0) - actionpack (>= 4) - activesupport (>= 4) - railties (>= 4) - request_store (~> 1.0) - logstash-event (1.2.02) - loofah (2.19.1) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.2) - memoist (0.16.2) - metaclass (0.0.4) - method_source (1.0.0) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.10.3) - mocha (1.8.0) - metaclass (~> 0.0.1) - morrisjs-rails (0.5.1.2) - railties (> 3.1, < 6) - multi_json (1.15.0) - multipart-post (2.1.1) - net-scp (2.0.0) - net-ssh (>= 2.6.5, < 6.0.0) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (5.2.0) - net-ssh-gateway (2.0.0) - net-ssh (>= 4.0.0) - nio4r (2.5.8) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - npm-rails (0.2.1) - rails (>= 3.2) - oj (3.7.12) - os (1.1.1) - passenger (6.0.15) - rack - rake (>= 0.8.1) - piwik_analytics (1.0.2) - actionpack - activesupport - rails (>= 3.0.0) - poltergeist (1.5.1) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - public_suffix (4.0.6) - racc (1.6.1) - rack (2.2.4) - rack-mini-profiler (1.0.2) - rack (>= 1.2.0) - rack-test (2.0.2) - rack (>= 1.3) - rails (5.2.8.1) - actioncable (= 5.2.8.1) - actionmailer (= 5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - activemodel (= 5.2.8.1) - activerecord (= 5.2.8.1) - activestorage (= 5.2.8.1) - activesupport (= 5.2.8.1) - bundler (>= 1.3.0) - railties (= 5.2.8.1) - sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - rails-perftest (0.0.7) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rake (13.0.6) - raphael-rails (2.1.2) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) - ffi (~> 1.0) - request_store (1.4.1) - rack (>= 1.4) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) - retriable (1.4.1) - ruby-debug-passenger (0.2.0) - ruby-prof (0.17.0) - rubyzip (1.3.0) - rvm-capistrano (1.5.6) - capistrano (~> 2.15.4) - safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.0.1) - ffi (~> 1.9) - rake - sassc-rails (2.1.0) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - selenium-webdriver (3.141.0) - childprocess (~> 0.5) - rubyzip (~> 1.2, >= 1.2.2) - signet (0.11.0) - addressable (~> 2.3) - faraday (~> 0.9) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - simplecov-rcov (0.2.3) - simplecov (>= 0.4.1) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - sshkey (2.0.0) - thor (1.2.1) - thread_safe (0.3.6) - tilt (2.0.9) - tzinfo (1.2.10) - thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - xpath (2.1.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth - activerecord-nulldb-adapter! - andand - angularjs-rails (~> 1.3.8) - arvados (~> 2.1.5) - bootstrap-sass (~> 3.4.1) - bootstrap-tab-history-rails - bootstrap-x-editable-rails - byebug - capybara (~> 2.5.0) - deep_merge - flamegraph - headless (~> 1.0.2) - httpclient (~> 2.5) - jquery-rails - launchy (~> 2.4.0) - lograge - logstash-event - mime-types - minitest (~> 5.10.3) - mocha - morrisjs-rails - multi_json - npm-rails - oj - passenger - piwik_analytics - poltergeist (~> 1.5.1) - rack-mini-profiler - rails (~> 5.2.0) - rails-controller-testing - rails-perftest - raphael-rails - responders (~> 2.0) - ruby-debug-passenger - ruby-prof - rvm-capistrano - safe_yaml - sass - sassc-rails - selenium-webdriver (~> 3) - signet (< 0.12) - simplecov (~> 0.7) - simplecov-rcov - sprockets (~> 3.0) - sshkey - themes_for_rails! - uglifier (~> 2.0) - -BUNDLED WITH - 2.2.19 diff --git a/apps/workbench/README.textile b/apps/workbench/README.textile deleted file mode 100644 index 18380ac3fe..0000000000 --- a/apps/workbench/README.textile +++ /dev/null @@ -1,27 +0,0 @@ -###. Copyright (C) The Arvados Authors. All rights reserved. -.... -.... SPDX-License-Identifier: AGPL-3.0 - -h1. Developing Workbench - -This document includes information to help developers who would like to contribute to Workbench. If you just want to install it, please refer to our "Workbench installation guide":http://doc.arvados.org/install/install-workbench-app.html. - -h2. Running tests - -The Workbench application includes a series of integration tests. When you run these, it starts the API server in a test environment, with all of its fixtures loaded, then tests Workbench by starting that server and making requests against it. - -In order for this to work, you must have Firefox installed (or Iceweasel, if you're running Debian), as well as the X Virtual Frame Buffer driver. - -
-$ sudo apt-get install iceweasel xvfb
-
- -If you install the Workbench Bundle in deployment mode, you must also install the API server Bundle in deployment mode, and vice versa. If your Bundle installs have mismatched modes, the integration tests will fail with "Gem not found" errors. - -h2. Writing tests - -Integration tests are written with Capybara, which drives a fully-featured Web browser to interact with Workbench exactly as a user would. - -If your test requires JavaScript support, your test method should start with the line @Capybara.current_driver = Capybara.javascript_driver@. Otherwise, Capybara defaults to a simpler browser for speed. - -In most tests, you can directly call "Capybara's Session methods":http://rubydoc.info/github/jnicklas/capybara/Capybara/Session to drive the browser and check its state. If you need finer-grained control, refer to the "full Capybara documentation":http://rubydoc.info/github/jnicklas/capybara/Capybara. diff --git a/apps/workbench/Rakefile b/apps/workbench/Rakefile deleted file mode 100644 index 037f9013ac..0000000000 --- a/apps/workbench/Rakefile +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env rake -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: AGPL-3.0 - -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require File.expand_path('../config/application', __FILE__) - -ArvadosWorkbench::Application.load_tasks diff --git a/apps/workbench/app/assets/images/dax.png b/apps/workbench/app/assets/images/dax.png deleted file mode 100644 index c511f0ec51..0000000000 Binary files a/apps/workbench/app/assets/images/dax.png and /dev/null differ diff --git a/apps/workbench/app/assets/images/mouse-move.gif b/apps/workbench/app/assets/images/mouse-move.gif deleted file mode 100644 index 497b1596dc..0000000000 Binary files a/apps/workbench/app/assets/images/mouse-move.gif and /dev/null differ diff --git a/apps/workbench/app/assets/images/pipeline-running.gif b/apps/workbench/app/assets/images/pipeline-running.gif deleted file mode 100644 index 64e9009133..0000000000 Binary files a/apps/workbench/app/assets/images/pipeline-running.gif and /dev/null differ diff --git a/apps/workbench/app/assets/images/rails.png b/apps/workbench/app/assets/images/rails.png deleted file mode 100644 index d5edc04e65..0000000000 Binary files a/apps/workbench/app/assets/images/rails.png and /dev/null differ diff --git a/apps/workbench/app/assets/images/spinner_32px.gif b/apps/workbench/app/assets/images/spinner_32px.gif deleted file mode 100644 index 3288d1035d..0000000000 Binary files a/apps/workbench/app/assets/images/spinner_32px.gif and /dev/null differ diff --git a/apps/workbench/app/assets/images/trash-icon.png b/apps/workbench/app/assets/images/trash-icon.png deleted file mode 100644 index 5c26c2450d..0000000000 Binary files a/apps/workbench/app/assets/images/trash-icon.png and /dev/null differ diff --git a/apps/workbench/app/assets/javascripts/add_group.js b/apps/workbench/app/assets/javascripts/add_group.js deleted file mode 100644 index 23de53d408..0000000000 --- a/apps/workbench/app/assets/javascripts/add_group.js +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -$(document).on('shown.bs.modal', '#add-group-modal', function(event) { - // Disable the submit button on modal loading - $submit = $('#add-group-submit'); - $submit.prop('disabled', true); - - $('input[type=text]', event.target).val(''); - $('#add-group-error', event.target).hide(); -}).on('input propertychange', '#group_name_input', function(event) { - group_name = $(event.target).val(); - $submit = $('#add-group-submit'); - $submit.prop('disabled', (group_name === null || group_name === "")); -}).on('submit', '#add-group-form', function(event) { - var $form = $(event.target), - $submit = $(':submit', $form), - $error = $('#add-group-error', $form), - group_name = $('input[name="group_name_input"]', $form).val(); - - $submit.prop('disabled', true); - - $error.hide(); - $.ajax('/groups', - {method: 'POST', - dataType: 'json', - data: {group: {name: group_name, group_class: 'role'}}, - context: $form}). - done(function(data, status, jqxhr) { - location.reload(); - }). - fail(function(jqxhr, status, error) { - var errlist = jqxhr.responseJSON.errors; - var errmsg; - if (Array.isArray(errlist)) { - errmsg = errlist.join(); - } else { - errmsg = ("The server returned an error when creating " + - "this group (status " + jqxhr.status + - ": " + errlist + ")."); - } - $error.text(errmsg); - $error.show(); - $submit.prop('disabled', false); - }); - return false; -}); diff --git a/apps/workbench/app/assets/javascripts/add_repository.js b/apps/workbench/app/assets/javascripts/add_repository.js deleted file mode 100644 index efcd19d32a..0000000000 --- a/apps/workbench/app/assets/javascripts/add_repository.js +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -$(document).on('shown.bs.modal', '#add-repository-modal', function(event) { - $('input[type=text]', event.target).val(''); - $('#add-repository-error', event.target).hide(); -}).on('submit', '#add-repository-form', function(event) { - var $form = $(event.target), - $submit = $(':submit', $form), - $error = $('#add-repository-error', $form), - repo_owner_uuid = $('input[name="add_repo_owner_uuid"]', $form).val(), - repo_prefix = $('input[name="add_repo_prefix"]', $form).val(), - repo_basename = $('input[name="add_repo_basename"]', $form).val(); - - $submit.prop('disabled', true); - $error.hide(); - $.ajax('/repositories', - {method: 'POST', - dataType: 'json', - data: {repository: {owner_uuid: repo_owner_uuid, - name: repo_prefix + repo_basename}}, - context: $form}). - done(function(data, status, jqxhr) { - location.reload(); - }). - fail(function(jqxhr, status, error) { - var errlist = jqxhr.responseJSON.errors; - var errmsg; - if (Array.isArray(errlist)) { - errmsg = errlist.join(); - } else { - errmsg = ("The server returned an error when making " + - "this repository (status " + jqxhr.status + - ": " + errlist + ")."); - } - $error.text(errmsg); - $error.show(); - $submit.prop('disabled', false); - }); - return false; -}); diff --git a/apps/workbench/app/assets/javascripts/ajax_error.js b/apps/workbench/app/assets/javascripts/ajax_error.js deleted file mode 100644 index dd31cc6dbc..0000000000 --- a/apps/workbench/app/assets/javascripts/ajax_error.js +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -$(document).on('ajax:error', function(e, xhr, status, error) { - var errorMessage = '' + status + ': ' + error; - // $btn is the element (button/link) that initiated the failed request. - var $btn = $(e.target); - // Populate some elements with the error text (e.g., a

in an alert div) - $($btn.attr('data-on-error-write')).text(errorMessage); - // Show some elements (e.g., an alert div) - $($btn.attr('data-on-error-show')).show(); - // Hide some elements (e.g., a success/normal div) - $($btn.attr('data-on-error-hide')).hide(); -}).on('ajax:success', function(e) { - var $btn = $(e.target); - $($btn.attr('data-on-success-show')).show(); - $($btn.attr('data-on-success-hide')).hide(); -}); diff --git a/apps/workbench/app/assets/javascripts/angular_shim.js b/apps/workbench/app/assets/javascripts/angular_shim.js deleted file mode 100644 index 5da67285b1..0000000000 --- a/apps/workbench/app/assets/javascripts/angular_shim.js +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -// Compile any new HTML content that was loaded via jQuery.ajax(). -// Currently this only works for tabs, and only because they emit an -// arv:pane:loaded event after updating the DOM. - -$(document).on('arv:pane:loaded', function(event, $updatedElement) { - if (angular && $updatedElement && angular.element($updatedElement).injector()) { - angular.element($updatedElement).injector().invoke([ - '$compile', function($compile) { - var scope = angular.element($updatedElement).scope(); - $compile($updatedElement)(scope); - }]); - } -}); diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js deleted file mode 100644 index 1898128133..0000000000 --- a/apps/workbench/app/assets/javascripts/application.js +++ /dev/null @@ -1,261 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 -// -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// the compiled file. -// -// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD -// GO AFTER THE REQUIRES BELOW. -// -//= require jquery -//= require jquery_ujs -//= require bootstrap -//= require bootstrap/dropdown -//= require bootstrap/tab -//= require bootstrap/tooltip -//= require bootstrap/popover -//= require bootstrap/collapse -//= require bootstrap/modal -//= require bootstrap/button -//= require bootstrap3-editable/bootstrap-editable -//= require bootstrap-tab-history -//= require angular -//= require raphael -//= require morris -//= require jquery.number.min -//= require npm-dependencies -//= require mithril/stream/stream -//= require awesomplete -//= require jssha -//= require_tree . - -Es6ObjectAssign.polyfill() -window.m = Object.assign(window.Mithril, {stream: window.m.stream}) - -jQuery(function($){ - $(document).ajaxStart(function(){ - $('.modal-with-loading-spinner .spinner').show(); - }).ajaxStop(function(){ - $('.modal-with-loading-spinner .spinner').hide(); - }); - - $('[data-toggle=tooltip]').tooltip(); - - $('.expand-collapse-row').on('click', function(event) { - var targets = $('#' + $(this).attr('data-id')); - if (targets.css('display') == 'none') { - $(this).addClass('icon-minus-sign'); - $(this).removeClass('icon-plus-sign'); - } else { - $(this).addClass('icon-plus-sign'); - $(this).removeClass('icon-minus-sign'); - } - targets.fadeToggle(200); - }); - - var ajaxCount = 0; - - $(document). - on('ajax:send', function(e, xhr) { - ajaxCount += 1; - if (ajaxCount == 1) { - $('.loading').fadeTo('fast', 1); - } - }). - on('ajax:complete', function(e, status) { - ajaxCount -= 1; - if (ajaxCount == 0) { - $('.loading').fadeOut('fast', 0); - } - }). - on('ajaxSend', function(e, xhr) { - // jQuery triggers 'ajaxSend' event when starting an ajax call, but - // rails-generated ajax triggers generate 'ajax:send'. Workbench - // event listeners currently expect 'ajax:send', so trigger the - // rails event in response to the jQuery one. - $(document).trigger('ajax:send'); - }). - on('ajaxComplete', function(e, xhr) { - // See comment above about ajaxSend/ajax:send - $(document).trigger('ajax:complete'); - }). - on('click', '.removable-tag a', function(e) { - var tag_span = $(this).parents('[data-tag-link-uuid]').eq(0) - tag_span.fadeTo('fast', 0.2); - $.ajax('/links/' + tag_span.attr('data-tag-link-uuid'), - {dataType: 'json', - type: 'POST', - data: { '_method': 'DELETE' }, - context: tag_span}). - done(function(data, status, jqxhr) { - this.remove(); - }). - fail(function(jqxhr, status, error) { - this.addClass('label-danger').fadeTo('fast', '1'); - }); - return false; - }). - on('click', 'a.add-tag-button', function(e) { - var jqxhr; - var new_tag_uuid = 'new-tag-' + Math.random(); - var tag_head_uuid = $(this).parents('tr').attr('data-object-uuid'); - var new_tag = window.prompt("Add tag for collection "+ - tag_head_uuid, - ""); - if (new_tag == null) - return false; - var new_tag_span = - $(''). - attr('data-tag-link-uuid', new_tag_uuid). - text(new_tag). - css('opacity', '0.2'). - append(' '); - $(this). - parent(). - find('>span'). - append(new_tag_span). - append(' '); - $.ajax($(this).attr('data-remote-href'), - {dataType: 'json', - type: $(this).attr('data-remote-method'), - data: { - 'link[head_uuid]': tag_head_uuid, - 'link[link_class]': 'tag', - 'link[name]': new_tag - }, - context: new_tag_span}). - done(function(data, status, jqxhr) { - this.attr('data-tag-link-uuid', data.uuid). - fadeTo('fast', '1'); - }). - fail(function(jqxhr, status, error) { - this.addClass('label-danger').fadeTo('fast', '1'); - }); - return false; - }). - on('click focusin', 'input.select-on-focus', function(event) { - event.target.select(); - }); - - $(document). - on('ajax:complete ready', function() { - // See http://getbootstrap.com/javascript/#buttons - $('.btn').button(); - }). - on('ready ajax:complete', function() { - $('[data-toggle~=tooltip]').tooltip({container:'body'}); - }). - on('ready ajax:complete', function() { - // This makes the dialog close on Esc key, obviously. - $('.modal').attr('tabindex', '-1') - }). - on('ready', function() { - // Need this to trigger input validation/synchronization callbacks because some browsers - // auto-fill form fields (e.g., when navigating "back" to a page where some text - // had been entered in a search box) without triggering a change or input event. - $('input').each(function(el) { - $(el).trigger($.Event('input', {currentTarget: el})); - }); - }); - - HeaderRowFixer = function(selector) { - this.duplicateTheadTr = function() { - $(selector).each(function() { - var the_table = this; - if ($('>tbody>tr:first>th', the_table).length > 0) - return; - $('>tbody', the_table). - prepend($('>thead>tr', the_table). - clone(). - css('opacity', 0)); - }); - } - this.fixThead = function() { - $(selector).each(function() { - var widths = []; - $('> tbody > tr:eq(1) > td', this).each( function(i,v){ - widths.push($(v).width()); - }); - for(i=0;i - // 'foo/bar\\040baz\\040(1).txt' - var newName; - var nameStub = origName; - var suffixInt = null; - var ok = false; - var lineMatch, linesRe = /(\S+).*/gm; - var fileTokenMatch, fileTokensRe = / \d+:\d+:(\S+)/g; - while (!ok) { - ok = true; - // Add ' (N)' before the filename extension, if any. - newName = (!suffixInt ? nameStub : - nameStub.replace(/(\.[^.]*)?$/, ' ('+suffixInt+')$1')). - replace(/ /g, '\\040'); - while (ok && null !== - (lineMatch = linesRe.exec(manifest))) { - // lineMatch is [theEntireLine, streamName] - while (ok && null !== - (fileTokenMatch = fileTokensRe.exec(lineMatch[0]))) { - // fileTokenMatch is [theEntireToken, fileName] - if (lineMatch[1] + '/' + fileTokenMatch[1] - === - newStreamName + '/' + newName) { - ok = false; - } - } - } - suffixInt = (suffixInt || 0) + 1; - } - return newName; - } - - function getDiscoveryDoc() { - if (!promiseDiscovery) { - promiseDiscovery = $.ajax({ - url: arvadosDiscoveryUri, - crossDomain: true - }).then(function(data, status, xhr) { - discoveryDoc = data; - }); - } - return promiseDiscovery; - } -} diff --git a/apps/workbench/app/assets/javascripts/bootstrap.js b/apps/workbench/app/assets/javascripts/bootstrap.js deleted file mode 100644 index e315ab5356..0000000000 --- a/apps/workbench/app/assets/javascripts/bootstrap.js +++ /dev/null @@ -1,11 +0,0 @@ -// 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/collections.js b/apps/workbench/app/assets/javascripts/collections.js deleted file mode 100644 index 0752e053d8..0000000000 --- a/apps/workbench/app/assets/javascripts/collections.js +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -jQuery(function($){ - $(document).on('click', '.toggle-persist button', function() { - var toggle_group = $(this).parents('[data-remote-href]').first(); - var want_persist = !toggle_group.find('button').hasClass('active'); - var want_state = want_persist ? 'persistent' : 'cache'; - toggle_group.find('button'). - toggleClass('active', want_persist). - html(want_persist ? 'Persistent' : 'Cache'); - $.ajax(toggle_group.attr('data-remote-href'), - {dataType: 'json', - type: 'POST', - data: { - value: want_state - }, - context: { - toggle_group: toggle_group, - want_state: want_state, - button: this - } - }). - done(function(data, status, jqxhr) { - var context = this; - // Remove "danger" status in case a previous action failed - $('.btn-danger', context.toggle_group). - addClass('btn-info'). - removeClass('btn-danger'); - // Update last-saved-state - context.toggle_group. - attr('data-persistent-state', context.want_state); - }). - fail(function(jqxhr, status, error) { - var context = this; - var saved_state; - // Add a visual indication that something failed - $(context.button). - addClass('btn-danger'). - removeClass('btn-info'); - // Change to the last-saved-state - saved_state = context.toggle_group.attr('data-persistent-state'); - $(context.button). - toggleClass('active', saved_state == 'persistent'). - html(saved_state == 'persistent' ? 'Persistent' : 'Cache'); - - if (jqxhr.readyState == 0 || jqxhr.status == 0) { - // Request cancelled due to page reload. - // Displaying an alert would be rather annoying. - } else if (jqxhr.responseJSON && jqxhr.responseJSON.errors) { - window.alert("Request failed: " + - jqxhr.responseJSON.errors.join("; ")); - } else { - window.alert("Request failed."); - } - }); - }); -}); diff --git a/apps/workbench/app/assets/javascripts/components/date.js b/apps/workbench/app/assets/javascripts/components/date.js deleted file mode 100644 index 62eacc37de..0000000000 --- a/apps/workbench/app/assets/javascripts/components/date.js +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -window.LocalizedDateTime = { - view: function(vnode) { - return m('span', new Date(Date.parse(vnode.attrs.parse)).toLocaleString()) - }, -} diff --git a/apps/workbench/app/assets/javascripts/components/edit_tags.js b/apps/workbench/app/assets/javascripts/components/edit_tags.js deleted file mode 100644 index 5e02279ea1..0000000000 --- a/apps/workbench/app/assets/javascripts/components/edit_tags.js +++ /dev/null @@ -1,314 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -window.SimpleInput = { - view: function(vnode) { - return m('input.form-control', { - style: { - width: '100%', - }, - type: 'text', - placeholder: 'Add ' + vnode.attrs.placeholder, - value: vnode.attrs.value, - onchange: function() { - if (this.value != '') { - vnode.attrs.value(this.value) - } - }, - }, vnode.attrs.value) - }, -} - -window.SelectOrAutocomplete = { - view: function(vnode) { - return m('input.form-control', { - style: { - width: '100%' - }, - type: 'text', - value: vnode.attrs.value, - placeholder: (vnode.attrs.create ? 'Add or select ': 'Select ') + vnode.attrs.placeholder, - }, vnode.attrs.value) - }, - oncreate: function(vnode) { - vnode.state.awesomplete = new Awesomplete(vnode.dom, { - list: vnode.attrs.options, - minChars: 0, - maxItems: 1000000, - autoFirst: true, - sort: false, - }) - vnode.state.create = vnode.attrs.create - vnode.state.options = vnode.attrs.options - // Option is selected from the list. - $(vnode.dom).on('awesomplete-selectcomplete', function(event) { - vnode.attrs.value(this.value) - }) - $(vnode.dom).on('change', function(event) { - if (!vnode.state.create && !(this.value in vnode.state.options)) { - this.value = vnode.attrs.value() - } else { - if (vnode.attrs.value() !== this.value) { - vnode.attrs.value(this.value) - } - } - }) - $(vnode.dom).on('focusin', function(event) { - if (this.value === '') { - vnode.state.awesomplete.evaluate() - vnode.state.awesomplete.open() - } - }) - }, - onupdate: function(vnode) { - vnode.state.awesomplete.list = vnode.attrs.options - vnode.state.create = vnode.attrs.create - vnode.state.options = vnode.attrs.options - }, -} - -window.TagEditorRow = { - view: function(vnode) { - var nameOpts = Object.keys(vnode.attrs.vocabulary().tags) - var valueOpts = [] - var inputComponent = SelectOrAutocomplete - if (nameOpts.length === 0) { - // If there's not vocabulary defined, switch to a simple input field - inputComponent = SimpleInput - } else { - // Name options list - if (vnode.attrs.name() != '' && !(vnode.attrs.name() in vnode.attrs.vocabulary().tags)) { - nameOpts.push(vnode.attrs.name()) - } - // Value options list - if (vnode.attrs.name() in vnode.attrs.vocabulary().tags && - 'values' in vnode.attrs.vocabulary().tags[vnode.attrs.name()]) { - valueOpts = vnode.attrs.vocabulary().tags[vnode.attrs.name()].values - } - } - return m('tr', [ - // Erase tag - m('td', [ - vnode.attrs.editMode && - m('div.text-center', m('a.btn.btn-default.btn-sm', { - style: { - align: 'center' - }, - onclick: function(e) { vnode.attrs.removeTag() } - }, m('i.fa.fa-fw.fa-trash-o'))) - ]), - // Tag key - m('td', [ - vnode.attrs.editMode ? - m('div', {key: 'key'}, [ - m(inputComponent, { - options: nameOpts, - value: vnode.attrs.name, - // Allow any tag name unless 'strict' is set to true. - create: !vnode.attrs.vocabulary().strict, - placeholder: 'key', - }) - ]) - : vnode.attrs.name - ]), - // Tag value - m('td', [ - vnode.attrs.editMode ? - m('div', {key: 'value'}, [ - m(inputComponent, { - options: valueOpts, - value: vnode.attrs.value, - placeholder: 'value', - // Allow any value on tags not listed on the vocabulary. - // Allow any value on tags without values, or the ones - // that aren't explicitly declared to be strict. - create: !(vnode.attrs.name() in vnode.attrs.vocabulary().tags) - || !vnode.attrs.vocabulary().tags[vnode.attrs.name()].values - || vnode.attrs.vocabulary().tags[vnode.attrs.name()].values.length === 0 - || !vnode.attrs.vocabulary().tags[vnode.attrs.name()].strict, - }) - ]) - : vnode.attrs.value - ]) - ]) - } -} - -window.TagEditorTable = { - view: function(vnode) { - return m('table.table.table-condensed.table-justforlayout', [ - m('colgroup', [ - m('col', {width:'5%'}), - m('col', {width:'25%'}), - m('col', {width:'70%'}), - ]), - m('thead', [ - m('tr', [ - m('th'), - m('th', 'Key'), - m('th', 'Value'), - ]) - ]), - m('tbody', [ - vnode.attrs.tags.length > 0 - ? vnode.attrs.tags.map(function(tag, idx) { - return m(TagEditorRow, { - key: tag.rowKey, - removeTag: function() { - vnode.attrs.tags.splice(idx, 1) - vnode.attrs.dirty(true) - }, - editMode: vnode.attrs.editMode, - name: tag.name, - value: tag.value, - vocabulary: vnode.attrs.vocabulary - }) - }) - : m('tr', m('td[colspan=3]', m('center', 'Loading tags...'))) - ]), - ]) - } -} - -var uniqueID = 1 - -window.TagEditorApp = { - appendTag: function(vnode, name, value) { - var tag = {name: m.stream(name), value: m.stream(value), rowKey: uniqueID++} - vnode.state.tags.push(tag) - // Set dirty flag when any of name/value changes to non empty string - tag.name.map(function() { vnode.state.dirty(true) }) - tag.value.map(function() { vnode.state.dirty(true) }) - tag.name.map(m.redraw) - }, - fixTag: function(vnode, tagName) { - // Recover tag if deleted, recover its value if modified - savedTagValue = vnode.state.saved_tags[tagName] - if (savedTagValue === undefined) { - return - } - found = false - vnode.state.tags.forEach(function(tag) { - if (tag.name == tagName) { - tag.value = vnode.state.saved_tags[tagName] - found = true - } - }) - if (!found) { - vnode.state.tags.pop() // Remove the last empty row - vnode.state.appendTag(vnode, tagName, savedTagValue) - } - }, - oninit: function(vnode) { - vnode.state.sessionDB = new SessionDB() - // Get vocabulary - vnode.state.vocabulary = m.stream({'strict':false, 'tags':{}}) - var vocabularyTimestamp = parseInt(Date.now() / 300000) // Bust cache every 5 minutes - m.request('/vocabulary.json?v=' + vocabularyTimestamp).then(vnode.state.vocabulary) - vnode.state.editMode = vnode.attrs.targetEditable - vnode.state.tags = [] - vnode.state.saved_tags = {} - vnode.state.dirty = m.stream(false) - vnode.state.dirty.map(m.redraw) - vnode.state.error = m.stream('') - vnode.state.objPath = 'arvados/v1/' + vnode.attrs.targetController + '/' + vnode.attrs.targetUuid - // Get tags - vnode.state.sessionDB.request( - vnode.state.sessionDB.loadLocal(), - 'arvados/v1/' + vnode.attrs.targetController, - { - data: { - filters: JSON.stringify([['uuid', '=', vnode.attrs.targetUuid]]), - select: JSON.stringify(['properties']) - }, - }).then(function(obj) { - if (obj.items.length == 1) { - o = obj.items[0] - Object.keys(o.properties).forEach(function(k) { - vnode.state.appendTag(vnode, k, o.properties[k]) - }) - if (vnode.state.editMode) { - vnode.state.appendTag(vnode, '', '') - } - // Data synced with server, so dirty state should be false - vnode.state.dirty(false) - vnode.state.saved_tags = o.properties - // Add new tag row when the last one is completed - vnode.state.dirty.map(function() { - if (!vnode.state.editMode) { return } - lastTag = vnode.state.tags.slice(-1).pop() - if (lastTag === undefined || (lastTag.name() !== '' || lastTag.value() !== '')) { - vnode.state.appendTag(vnode, '', '') - } - }) - } - } - ) - }, - view: function(vnode) { - return [ - vnode.state.editMode && - m('div.pull-left', [ - m('a.btn.btn-primary.btn-sm' + (vnode.state.dirty() ? '' : '.disabled'), { - style: { - margin: '10px 0px' - }, - onclick: function(e) { - var tags = {} - vnode.state.tags.forEach(function(t) { - // Only ignore tags with empty key - if (t.name() != '') { - tags[t.name()] = t.value() - } - }) - vnode.state.sessionDB.request( - vnode.state.sessionDB.loadLocal(), - vnode.state.objPath, { - method: 'PUT', - data: {properties: JSON.stringify(tags)} - } - ).then(function(v) { - vnode.state.dirty(false) - vnode.state.error('') - vnode.state.saved_tags = tags - }).catch(function(err) { - if (err.errors !== undefined) { - var re = /protected\ property/i - var protected_props = [] - err.errors.forEach(function(error) { - if (re.test(error)) { - prop = error.split(':')[1].trim() - vnode.state.fixTag(vnode, prop) - protected_props.push(prop) - } - }) - if (protected_props.length > 0) { - errMsg = "Protected properties cannot be updated: " + protected_props.join(', ') - } else { - errMsg = errors.join(', ') - } - } else { - errMsg = err - } - vnode.state.error(errMsg) - }) - } - }, vnode.state.dirty() ? ' Save changes ' : ' Saved '), - m('span', { - style: { - color: '#ff0000', - margin: '0px 10px' - } - }, [ vnode.state.error() ]) - ]), - // Tags table - m(TagEditorTable, { - editMode: vnode.state.editMode, - tags: vnode.state.tags, - vocabulary: vnode.state.vocabulary, - dirty: vnode.state.dirty - }) - ] - }, -} diff --git a/apps/workbench/app/assets/javascripts/components/save_ui_state.js b/apps/workbench/app/assets/javascripts/components/save_ui_state.js deleted file mode 100644 index 3aece3195d..0000000000 --- a/apps/workbench/app/assets/javascripts/components/save_ui_state.js +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -// SaveUIState avoids losing scroll position due to navigation -// events, and saves/restores other caller-specified UI state. -// -// It does not display any content itself: do not pass any children. -// -// Use of multiple SaveUIState components on the same page is not -// (yet) supported. -// -// The problem being solved: -// -// Page 1 loads some content dynamically (e.g., via infinite scroll) -// after the initial render. User scrolls down, clicks a link, and -// lands on page 2. User clicks the Back button, and lands on page -// 1. Page 1 renders its initial content while waiting for AJAX. -// -// But (without SaveUIState) the document body is small now, so the -// browser resets scroll position to the top of the page. Even if we -// end up displaying the same dynamic content, the user's place on the -// page has been lost. -// -// SaveUIState fixes this by stashing the current body height when -// navigating away from page 1. When navigating back, it restores the -// body height even before the page has loaded, so the browser does -// not reset the scroll position. -// -// SaveUIState also saves/restores arbitrary UI state (like text typed -// in a search box) in response to navigation events. -// -// See CollectionsSearch for an example. -// -// Attributes: -// -// {getter-setter} currentState: the current UI state -// -// {any} defaultState: value to initialize currentState with, if -// nothing is stashed in browser history. -// -// {boolean} forgetSavedHeight: the body height loaded from the -// browser history (if any) is outdated; we should let the browser -// determine the correct body height from the current page -// content. Set this when dynamic content has been reset. -// -// {boolean} saveBodyHeight: save/restore body height as described -// above. -window.SaveUIState = { - saveState: function() { - var state = history.state || {} - state.bodyHeight = window.getComputedStyle(document.body)['height'] - state.currentState = this.currentState() - history.replaceState(state, '') - }, - oninit: function(vnode) { - vnode.state.currentState = vnode.attrs.currentState - var hstate = history.state || {} - - if (vnode.attrs.saveBodyHeight && hstate.bodyHeight) { - document.body.style['min-height'] = hstate.bodyHeight - delete hstate.bodyHeight - } - - if (hstate.currentState) { - vnode.attrs.currentState(hstate.currentState) - delete hstate.currentState - } else { - vnode.attrs.currentState(vnode.attrs.defaultState) - } - - history.replaceState(hstate, '') - }, - oncreate: function(vnode) { - vnode.state.saveState = vnode.state.saveState.bind(vnode.state) - window.addEventListener('beforeunload', vnode.state.saveState) - vnode.state.onupdate(vnode) - }, - onupdate: function(vnode) { - if (vnode.attrs.saveBodyHeight && vnode.attrs.forgetSavedHeight) { - document.body.style['min-height'] = null - } - }, - onremove: function(vnode) { - window.removeEventListener('beforeunload', vnode.state.saveState) - }, - view: function(vnode) { - return null - }, -} diff --git a/apps/workbench/app/assets/javascripts/components/search.js b/apps/workbench/app/assets/javascripts/components/search.js deleted file mode 100644 index 83ed1a68d4..0000000000 --- a/apps/workbench/app/assets/javascripts/components/search.js +++ /dev/null @@ -1,218 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -window.SearchResultsTable = { - maybeLoadMore: function(dom) { - var loader = this.loader - if (loader.state != loader.READY) - // Can't start getting more items anyway: no point in - // checking anything else. - return - var contentRect = dom.getBoundingClientRect() - var scroller = window // TODO: use dom's nearest ancestor with scrollbars - if (contentRect.bottom < 2 * scroller.innerHeight) { - // We have less than 1 page worth of content available - // below the visible area. Load more. - loader.loadMore() - // Indicate loading is in progress. - window.requestAnimationFrame(m.redraw) - } - }, - oncreate: function(vnode) { - vnode.state.maybeLoadMore = vnode.state.maybeLoadMore.bind(vnode.state, vnode.dom) - window.addEventListener('scroll', vnode.state.maybeLoadMore) - window.addEventListener('resize', vnode.state.maybeLoadMore) - vnode.state.timer = window.setInterval(vnode.state.maybeLoadMore, 200) - vnode.state.loader = vnode.attrs.loader - vnode.state.onupdate(vnode) - }, - onupdate: function(vnode) { - vnode.state.loader = vnode.attrs.loader - }, - onremove: function(vnode) { - window.clearInterval(vnode.state.timer) - window.removeEventListener('scroll', vnode.state.maybeLoadMore) - window.removeEventListener('resize', vnode.state.maybeLoadMore) - }, - view: function(vnode) { - var loader = vnode.attrs.loader - var iconsMap = { - collections: m('i.fa.fa-fw.fa-archive'), - projects: m('i.fa.fa-fw.fa-folder'), - } - var db = new SessionDB() - var sessions = db.loadActive() - return m('table.table.table-condensed', [ - m('thead', m('tr', [ - m('th'), - m('th', 'uuid'), - m('th', 'name'), - m('th', 'last modified'), - ])), - m('tbody', [ - loader.items().map(function(item) { - var session = sessions[item.uuid.slice(0,5)] - var tokenParam = '' - // Add the salted token to search result links from federated - // remote hosts. - if (!session.isFromRails && session.token.indexOf('v2/') == 0) { - tokenParam = session.token - } - return m('tr', [ - m('td', m('form', { - action: item.workbenchBaseURL() + '/' + item.objectType.wb_path + '/' + item.uuid, - method: 'GET' - }, [ - tokenParam !== '' && - m('input[type=hidden][name=api_token]', {value: tokenParam}), - item.workbenchBaseURL() && - m('button.btn.btn-xs.btn-default[type=submit]', { - 'data-original-title': 'show '+item.objectType.description, - 'data-placement': 'top', - 'data-toggle': 'tooltip', - // Bootstrap's tooltip feature - oncreate: function(vnode) { $(vnode.dom).tooltip() }, - }, iconsMap[item.objectType.wb_path]), - ])), - m('td.arvados-uuid', item.uuid), - m('td', item.name || '(unnamed)'), - m('td', m(LocalizedDateTime, {parse: item.modified_at})), - ]) - }), - ]), - loader.state == loader.DONE ? null : m('tfoot', m('tr', [ - m('th[colspan=4]', m('button.btn.btn-xs', { - className: loader.state == loader.LOADING ? 'btn-default' : 'btn-primary', - style: { - display: 'block', - width: '12em', - marginLeft: 'auto', - marginRight: 'auto', - }, - disabled: loader.state == loader.LOADING, - onclick: function() { - loader.loadMore() - return false - }, - }, loader.state == loader.LOADING ? '(loading)' : 'Load more')), - ])), - ]) - }, -} - -window.Search = { - oninit: function(vnode) { - vnode.state.sessionDB = new SessionDB() - vnode.state.sessionDB.autoRedirectToHomeCluster('/search') - vnode.state.searchEntered = m.stream() - vnode.state.searchActive = m.stream() - // When searchActive changes (e.g., when restoring state - // after navigation), update the text field too. - vnode.state.searchActive.map(vnode.state.searchEntered) - // When searchActive changes, create a new loader that filters - // with the given search term. - vnode.state.searchActive.map(function(q) { - var sessions = vnode.state.sessionDB.loadActive() - vnode.state.loader = new MergingLoader({ - children: Object.keys(sessions).map(function(key) { - var session = sessions[key] - var workbenchBaseURL = function() { - return vnode.state.sessionDB.workbenchBaseURL(session) - } - var searchable_objects = [ - { - wb_path: 'projects', - api_path: 'arvados/v1/groups', - filters: [['group_class', '=', 'project']], - description: 'project', - }, - { - wb_path: 'projects', - api_path: 'arvados/v1/groups', - filters: [['group_class', '=', 'filter']], - description: 'project', - }, - { - wb_path: 'collections', - api_path: 'arvados/v1/collections', - filters: [], - description: 'collection', - }, - ] - return new MergingLoader({ - sessionKey: key, - // For every session, search for every object type - children: searchable_objects.map(function(obj_type) { - return new MultipageLoader({ - sessionKey: key, - loadFunc: function(filters) { - // Apply additional type dependant filters - filters = filters.concat(obj_type.filters).concat(ilike_filters(q)) - return vnode.state.sessionDB.request(session, obj_type.api_path, { - data: { - filters: JSON.stringify(filters), - count: 'none', - }, - }).then(function(resp) { - resp.items.map(function(item) { - item.workbenchBaseURL = workbenchBaseURL - item.objectType = obj_type - }) - return resp - }) - }, - }) - }), - }) - }), - }) - }) - }, - view: function(vnode) { - return m('form', { - onsubmit: function() { - vnode.state.searchActive(vnode.state.searchEntered()) - vnode.state.forgetSavedHeight = true - return false - }, - }, [ - m(SaveUIState, { - defaultState: '', - currentState: vnode.state.searchActive, - forgetSavedHeight: vnode.state.forgetSavedHeight, - saveBodyHeight: true, - }), - vnode.state.loader && [ - m('.row', [ - m('.col-md-6', [ - m('.input-group', [ - m('input#search.form-control[placeholder=Search collections and projects]', { - oninput: m.withAttr('value', vnode.state.searchEntered), - value: vnode.state.searchEntered(), - }), - m('.input-group-btn', [ - m('input.btn.btn-primary[type=submit][value="Search"]'), - ]), - ]), - ]), - m('.col-md-6', [ - 'Searching sites: ', - vnode.state.loader.children.length == 0 - ? m('span.label.label-xs.label-danger', 'none') - : vnode.state.loader.children.map(function(child) { - return [m('span.label.label-xs', { - className: child.state == child.LOADING ? 'label-warning' : 'label-success', - }, child.sessionKey), ' '] - }), - ' ', - m('a[href="/sessions"]', 'Add/remove sites'), - ]), - ]), - m(SearchResultsTable, { - loader: vnode.state.loader, - }), - ], - ]) - }, -} diff --git a/apps/workbench/app/assets/javascripts/components/sessions.js b/apps/workbench/app/assets/javascripts/components/sessions.js deleted file mode 100644 index 04ca6ac926..0000000000 --- a/apps/workbench/app/assets/javascripts/components/sessions.js +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -$(document).on('ready', function() { - var db = new SessionDB(); - db.checkForNewToken(); - db.fillMissingUUIDs(); - db.autoLoadRemoteHosts(); -}); - -window.SessionsTable = { - oninit: function(vnode) { - vnode.state.db = new SessionDB(); - vnode.state.db.autoRedirectToHomeCluster('/sessions'); - vnode.state.db.migrateNonFederatedSessions(); - vnode.state.hostToAdd = m.stream(''); - vnode.state.error = m.stream(); - vnode.state.checking = m.stream(); - }, - view: function(vnode) { - var db = vnode.state.db; - var sessions = db.loadAll(); - return m('.container', [ - m('p', [ - 'You can log in to multiple Arvados sites here, then use the ', - m('a[href="/search"]', 'multi-site search'), - ' page to search collections and projects on all sites at once.' - ]), - m('table.table.table-condensed.table-hover', [ - m('thead', m('tr', [ - m('th', 'status'), - m('th', 'cluster ID'), - m('th', 'username'), - m('th', 'email'), - m('th', 'actions'), - m('th') - ])), - m('tbody', [ - Object.keys(sessions).map(function(uuidPrefix) { - var session = sessions[uuidPrefix]; - return m('tr', [ - session.token && session.user ? [ - m('td', session.user.is_active ? - m('span.label.label-success', 'logged in') : - m('span.label.label-warning', 'inactive')), - m('td', {title: session.baseURL}, uuidPrefix), - m('td', session.user.username), - m('td', session.user.email), - m('td', session.isFromRails ? null : m('button.btn.btn-xs.btn-default', { - uuidPrefix: uuidPrefix, - onclick: m.withAttr('uuidPrefix', db.logout), - }, session.listedHost ? 'Disable ':'Log out ', m('span.glyphicon.glyphicon-log-out'))) - ] : [ - m('td', m('span.label.label-default', 'logged out')), - m('td', {title: session.baseURL}, uuidPrefix), - m('td'), - m('td'), - m('td', m('a.btn.btn-xs.btn-primary', { - uuidPrefix: uuidPrefix, - onclick: db.login.bind(db, session.baseURL), - }, session.listedHost ? 'Enable ':'Log in ', m('span.glyphicon.glyphicon-log-in'))) - ], - m('td', (session.isFromRails || session.listedHost) ? null : - m('button.btn.btn-xs.btn-default', { - uuidPrefix: uuidPrefix, - onclick: m.withAttr('uuidPrefix', db.trash), - }, 'Remove ', m('span.glyphicon.glyphicon-trash')) - ), - ]) - }), - ]), - ]), - m('.row', m('.col-md-6', [ - m('form', { - onsubmit: function() { - vnode.state.error(null) - vnode.state.checking(true) - db.findAPI(vnode.state.hostToAdd()) - .then(db.login) - .catch(function() { - vnode.state.error(true) - }) - .then(vnode.state.checking.bind(null, null)) - return false - }, - }, [ - m('p', [ - 'To add a remote Arvados site, paste the remote site\'s host here (see "ARVADOS_API_HOST" on the "current token" page).', - ]), - m('.input-group', { className: vnode.state.error() && 'has-error' }, [ - m('input.form-control[type=text][name=apiHost][placeholder="zzzzz.arvadosapi.com"]', { - oninput: m.withAttr('value', vnode.state.hostToAdd), - }), - m('.input-group-btn', [ - m('input.btn.btn-primary[type=submit][value="Log in"]', { - disabled: !vnode.state.hostToAdd(), - }), - ]), - ]), - ]), - m('p'), - vnode.state.error() && m('p.alert.alert-danger', 'Request failed. Make sure this is a working API server address.'), - vnode.state.checking() && m('p.alert.alert-info', 'Checking...'), - ])), - ]) - }, -} diff --git a/apps/workbench/app/assets/javascripts/components/test.js b/apps/workbench/app/assets/javascripts/components/test.js deleted file mode 100644 index 4893544022..0000000000 --- a/apps/workbench/app/assets/javascripts/components/test.js +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -window.TestComponent = { - view: function(vnode) { - return m('div.mithril-test-component', [ - m('p', { - onclick: m.withAttr('zzz', function(){}), - }, [ - 'mithril is working; rendered at t=', - (new Date()).getTime(), - 'ms (click to re-render)', - ]), - ]) - }, -} diff --git a/apps/workbench/app/assets/javascripts/dates.js b/apps/workbench/app/assets/javascripts/dates.js deleted file mode 100644 index ed5f28431c..0000000000 --- a/apps/workbench/app/assets/javascripts/dates.js +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -jQuery(function($){ -$(document).on('ajax:complete arv:pane:loaded ready', function() { - $('[data-utc-date]').each(function(i, elm) { - // Try matching the date using a couple of different formats. - var v = $(elm).attr('data-utc-date').match(/(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d) UTC/); - if (!v) { - v = $(elm).attr('data-utc-date').match(/(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)Z/); - } - - if (v) { - // Create a new date object from the timestamp so the browser can - // render the date based on the locale/timezone. - var ts = new Date(Date.UTC(v[1], v[2]-1, v[3], v[4], v[5], v[6])); - if ($(elm).attr('data-utc-date-opts') && $(elm).attr('data-utc-date-opts').match(/noseconds/)) { - $(elm).text((ts.getHours() > 12 ? (ts.getHours()-12) : ts.getHours()) - + ":" + (ts.getMinutes() < 10 ? '0' : '') + ts.getMinutes() - + (ts.getHours() >= 12 ? " PM " : " AM ") - + ts.toLocaleDateString()); - } else { - $(elm).text(ts.toLocaleTimeString() + " " + ts.toLocaleDateString()); - } - } - }); -}); -}); diff --git a/apps/workbench/app/assets/javascripts/edit_collection.js b/apps/workbench/app/assets/javascripts/edit_collection.js deleted file mode 100644 index 9220ac3c54..0000000000 --- a/apps/workbench/app/assets/javascripts/edit_collection.js +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -// On loading of a collection, enable the "lock" button and -// disable all file modification controls (upload, rename, delete) -$(document). - ready(function(event) { - $(".btn-collection-file-control").addClass("disabled"); - $(".btn-collection-rename-file-span").attr("title", "Unlock collection to rename file"); - $(".btn-collection-remove-file-span").attr("title", "Unlock collection to remove file"); - $(".btn-remove-selected-files").attr("title", "Unlock collection to remove selected files"); - $(".tab-pane-Upload").addClass("disabled"); - $(".tab-pane-Upload").attr("title", "Unlock collection to upload files"); - $("#Upload-tab").attr("data-toggle", "disabled"); - }). - on('click', '.lock-collection-btn', function(event) { - classes = $(event.target).attr('class') - - if (classes.indexOf("fa-lock") != -1) { - // About to unlock; warn and get confirmation from user - if (confirm("Adding, renaming, and deleting files changes the portable data hash. Are you sure you want to unlock the collection?")) { - $(".lock-collection-btn").removeClass("fa-lock"); - $(".lock-collection-btn").addClass("fa-unlock"); - $(".lock-collection-btn").attr("title", "Lock collection to prevent editing files"); - $(".btn-collection-rename-file-span").attr("title", ""); - $(".btn-collection-remove-file-span").attr("title", ""); - $(".btn-collection-file-control").removeClass("disabled"); - $(".btn-remove-selected-files").attr("title", ""); - $(".tab-pane-Upload").removeClass("disabled"); - $(".tab-pane-Upload").attr("data-original-title", ""); - $("#Upload-tab").attr("data-toggle", "tab"); - } else { - // User clicked "no" and so do not unlock - } - } else { - // Lock it back - $(".lock-collection-btn").removeClass("fa-unlock"); - $(".lock-collection-btn").addClass("fa-lock"); - $(".lock-collection-btn").attr("title", "Unlock collection to edit files"); - $(".btn-collection-rename-file-span").attr("title", "Unlock collection to rename file"); - $(".btn-collection-remove-file-span").attr("title", "Unlock collection to remove file"); - $(".btn-collection-file-control").addClass("disabled"); - $(".btn-remove-selected-files").attr("title", "Unlock collection to remove selected files"); - $(".tab-pane-Upload").addClass("disabled"); - $(".tab-pane-Upload").attr("data-original-title", "Unlock collection to upload files"); - $("#Upload-tab").attr("data-toggle", "disabled"); - } - }); diff --git a/apps/workbench/app/assets/javascripts/editable.js b/apps/workbench/app/assets/javascripts/editable.js deleted file mode 100644 index 939506c2ec..0000000000 --- a/apps/workbench/app/assets/javascripts/editable.js +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -$.fn.editable.defaults.ajaxOptions = {type: 'post', dataType: 'json'}; -$.fn.editable.defaults.send = 'always'; - -// Default for editing is popup. I experimented with inline which is a little -// nicer in that it shows up right under the mouse instead of nearby. However, -// the inline box is taller than the regular content, which causes the page -// layout to shift unless we make the table rows tall, which leaves a lot of -// wasted space when not editing. Also inline can get cut off if the page is -// too narrow, when the popup box will just move to do the right thing. -//$.fn.editable.defaults.mode = 'inline'; - -$.fn.editable.defaults.success = function (response, newValue) { - $(document).trigger('editable:success', [this, response, newValue]); -}; - -$.fn.editable.defaults.params = function (params) { - var a = {}; - var key = params.pk.key; - a.id = $(this).attr('data-object-uuid') || params.pk.id; - a[key] = params.pk.defaults || {}; - // Remove null values. Otherwise they get transmitted as empty - // strings in request params. - for (i in a[key]) { - if (a[key][i] == null) - delete a[key][i]; - } - a[key][params.name] = params.value; - if (!a.id) { - a['_method'] = 'post'; - } else { - a['_method'] = 'put'; - } - return a; -}; - -$.fn.editable.defaults.validate = function (value) { - if (value == "***invalid***") { - return "Invalid selection"; - } -} - -$(document). - on('ready ajax:complete', function() { - $('.editable'). - not('.editable-done-setup'). - addClass('editable-done-setup'). - editable({ - success: function(response, newValue) { - // If we just created a new object, stash its UUID - // so we edit it next time instead of creating - // another new object. - if (!$(this).attr('data-object-uuid') && response.uuid) { - $(this).attr('data-object-uuid', response.uuid); - } - if (response.href) { - $(this).editable('option', 'url', response.href); - } - if ($(this).attr('data-name')) { - var textileAttr = $(this).attr('data-name') + 'Textile'; - if (response[textileAttr]) { - $(this).attr('data-textile', response[textileAttr]); - } - } - return; - }, - error: function(response, newValue) { - var errlist = response.responseJSON.errors; - var errmsg; - if (Array.isArray(errlist)) { - errmsg = errlist.join(); - } else { - errmsg = ("The server returned an error when making " + - "this update (status " + response.status + - ": " + errlist + ")."); - } - return errmsg; - } - }). - on('hidden', function(e, reason) { - // After saving a new attribute, update the same - // information if it appears elsewhere on the page. - if (reason != 'save') return; - var html = $(this).html(); - if( $(this).attr('data-textile') ) { - html = $(this).attr('data-textile'); - $(this).html(html); - } - var uuid = $(this).attr('data-object-uuid'); - var attr = $(this).attr('data-name'); - var edited = this; - if (uuid && attr) { - $("[data-object-uuid='" + uuid + "']" + - "[data-name='" + attr + "']").each(function() { - if (this != edited) - $(this).html(html); - }); - } - }); - }). - on('ready ajax:complete', function() { - $("[data-toggle~='x-editable']"). - not('.editable-done-setup'). - addClass('editable-done-setup'). - click(function(e) { - e.stopPropagation(); - $($(this).attr('data-toggle-selector')).editable('toggle'); - }); - }); - -$.fn.editabletypes.text.defaults.tpl = '' - -$.fn.editableform.buttons = '\ -\ -\ -' diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js deleted file mode 100644 index e576ba97a3..0000000000 --- a/apps/workbench/app/assets/javascripts/event_log.js +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -/* - * This js establishes a websockets connection with the API Server. - */ - -/* Subscribe to websockets event log. Do nothing if already connected. */ -function subscribeToEventLog () { - // if websockets are not supported by browser, do not subscribe for events - websocketsSupported = ('WebSocket' in window); - if (websocketsSupported == false) { - return; - } - - // check if websocket connection is already stored on the window - event_log_disp = $(window).data("arv-websocket"); - if (event_log_disp == null) { - // need to create new websocket and event log dispatcher - websocket_url = $('meta[name=arv-websocket-url]').attr("content"); - if (websocket_url == null) - return; - - event_log_disp = new WebSocket(websocket_url); - - event_log_disp.onopen = onEventLogDispatcherOpen; - event_log_disp.onmessage = onEventLogDispatcherMessage; - - // store websocket in window to allow reuse when multiple divs subscribe for events - $(window).data("arv-websocket", event_log_disp); - } -} - -/* Send subscribe message to the websockets server. Without any filters - arguments, this subscribes to all events */ -function onEventLogDispatcherOpen(event) { - this.send('{"method":"subscribe"}'); -} - -/* Trigger event for all applicable elements waiting for this event */ -function onEventLogDispatcherMessage(event) { - parsedData = JSON.parse(event.data); - object_uuid = parsedData.object_uuid; - - if (!object_uuid) { - return; - } - - // if there are any listeners for this object uuid or "all", trigger the event - matches = ".arv-log-event-listener[data-object-uuid=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuids~=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuid=\"all\"],.arv-log-event-listener[data-object-kind=\"" + parsedData.object_kind + "\"]"; - $(matches).trigger('arv-log-event', parsedData); -} - -/* Automatically connect if there are any elements on the page that want to - receive event log events. */ -$(document).on('ajax:complete ready', function() { - var a = $('.arv-log-event-listener'); - if (a.length > 0) { - subscribeToEventLog(); - } -}); diff --git a/apps/workbench/app/assets/javascripts/filterable.js b/apps/workbench/app/assets/javascripts/filterable.js deleted file mode 100644 index bf859c350a..0000000000 --- a/apps/workbench/app/assets/javascripts/filterable.js +++ /dev/null @@ -1,203 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -// filterable.js shows/hides content when the user operates -// search/select widgets. For "infinite scroll" content, it passes the -// filters to the server and retrieves new content. For other content, -// it filters the existing DOM elements using jQuery show/hide. -// -// Usage: -// -// 1. Add the "filterable" class to each filterable content item. -// Typically, each item is a 'tr' or a 'div class="row"'. -// -//

-//
First row
-//
Second row
-//
-// -// 2. Add the "filterable-control" class to each search/select widget. -// Also add a data-filterable-target attribute with a jQuery selector -// for an ancestor of the filterable items, i.e., the container in -// which this widget should apply filtering. -// -// -// -// Supported widgets: -// -// -// -// The input value is used as a regular expression. Rows with content -// matching the regular expression are shown. -// -// -// -// When the user selects the "Foo" option, rows with -// data-example-attr="foo" are shown, and all others are hidden. When -// the user selects the "Show all" option, all rows are shown. -// -// -// -// Merges on- or off-value with other params in query. Only works with -// infinite-scroll. -// -// Notes: -// -// When multiple filterable-control widgets operate on the same -// data-filterable-target, items must pass _all_ filters in order to -// be shown. -// -// If one data-filterable-target is the parent of another -// data-filterable-target, results are undefined. Don't do this. -// -// Combining "select" filterable-controls with infinite-scroll is not -// yet supported. - -function updateFilterableQueryNow($target) { - var newquery = $target.data('filterable-query-new'); - var params = $target.data('infinite-content-params-filterable') || {}; - params.filters = ilike_filters(newquery); - $(".modal-dialog-preview-pane").html(""); - $target.data('infinite-content-params-filterable', params); - $target.data('filterable-query', newquery); -} - -$(document). - on('ready ajax:success', function() { - // Copy any initial input values into - // data-filterable-query[-new]. - $('input[type=text].filterable-control').each(function() { - var $this = $(this); - var $target = $($this.attr('data-filterable-target')); - if ($target.data('filterable-query-new') === undefined) { - $target.data('filterable-query', $this.val()); - $target.data('filterable-query-new', $this.val()); - updateFilterableQueryNow($target); - } - }); - $('[data-infinite-scroller]').on('refresh-content', '[data-filterable-query]', function(e) { - // If some other event causes a refresh-content event while there - // is a new query waiting to cooloff, we should use the new query - // right away -- otherwise we'd launch an extra ajax request that - // would have to be reloaded as soon as the cooloff period ends. - if (this != e.target) - return; - if ($(this).data('filterable-query') == $(this).data('filterable-query-new')) - return; - updateFilterableQueryNow($(this)); - }); - }). - on('change', 'input[type=checkbox].filterable-control', function(e) { - if (this != e.target) return; - var $target = $($(this).attr('data-filterable-target')); - var currentquery = $target.data('filterable-query'); - if (currentquery === undefined) currentquery = ''; - if ($target.is('[data-infinite-scroller]')) { - var datakey = 'infiniteContentParamsFrom'+this.id; - var whichvalue = $(this).is(':checked') ? 'on-value' : 'off-value'; - if (JSON.stringify($target.data(datakey)) == JSON.stringify($(this).data(whichvalue))) - return; - $target.data(datakey, $(this).data(whichvalue)); - updateFilterableQueryNow($target); - $target.trigger('refresh-content'); - } - }). - on('paste keyup input', 'input[type=text].filterable-control', function(e) { - var regexp; - if (this != e.target) return; - var $target = $($(this).attr('data-filterable-target')); - var currentquery = $target.data('filterable-query'); - if (currentquery === undefined) currentquery = ''; - if ($target.is('[data-infinite-scroller]')) { - // We already know how to load content dynamically, so we - // can do all filtering on the server side. - - if ($target.data('infinite-cooloff-timer') > 0) { - // Clear a stale refresh-after-delay timer. - clearTimeout($target.data('infinite-cooloff-timer')); - } - // Stash the new query string in the filterable container. - $target.data('filterable-query-new', $(this).val()); - if (currentquery == $(this).val()) { - // Don't mess with existing results or queries in - // progress. - return; - } - $target.data('infinite-cooloff-timer', setTimeout(function() { - // If the user doesn't do any query-changing actions - // in the next 1/4 second (like type or erase - // characters in the search box), hide the stale - // content and ask the server for new results. - updateFilterableQueryNow($target); - $target.trigger('refresh-content'); - }, 250)); - } else { - // Target does not have infinite-scroll capability. Just - // filter the rows in the browser using a RegExp. - regexp = undefined; - try { - regexp = new RegExp($(this).val(), 'i'); - } catch(e) { - if (e instanceof SyntaxError) { - // Invalid/partial regexp. See 'has-error' below. - } else { - throw e; - } - } - $target. - toggleClass('has-error', regexp === undefined). - addClass('filterable-container'). - data('q', regexp). - trigger('refresh'); - } - }).on('refresh', '.filterable-container', function() { - var $container = $(this); - var q = $(this).data('q'); - var filters = $(this).data('filters'); - $('.filterable', this).hide().filter(function() { - var $row = $(this); - var pass = true; - if (q && !$row.text().match(q)) - return false; - if (filters) { - $.each(filters, function(filterby, val) { - if (!val) return; - if (!pass) return; - pass = false; - $.each(val.split(" "), function(i, e) { - if ($row.attr(filterby) == e) - pass = true; - }); - }); - } - return pass; - }).show(); - - // Show/hide each section heading depending on whether any - // content rows are visible in that section. - $('.row[data-section-heading]', this).each(function(){ - $(this).toggle($('.row.filterable[data-section-name="' + - $(this).attr('data-section-name') + - '"]:visible').length > 0); - }); - - // Load more content if the last result is showing. - $('.infinite-scroller').add(window).trigger('scroll'); - }).on('change', 'select.filterable-control', function() { - var val = $(this).val(); - var filterby = $(this).attr('data-filterable-attribute'); - var $target = $($(this).attr('data-filterable-target')). - addClass('filterable-container'); - var filters = $target.data('filters') || {}; - filters[filterby] = val; - $target. - data('filters', filters). - trigger('refresh'); - }).on('ajax:complete', function() { - $('.filterable-control').trigger('input'); - }); diff --git a/apps/workbench/app/assets/javascripts/ilike_filters.js b/apps/workbench/app/assets/javascripts/ilike_filters.js deleted file mode 100644 index 4f5cd48e1f..0000000000 --- a/apps/workbench/app/assets/javascripts/ilike_filters.js +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -// ilike_filters() converts a user-entered search query to a list of -// filters using the newly added (as of Arvados 1.5) trigram indexes. It returns -// [] (empty list) if it can't come up with anything valid (e.g., q consists -// entirely of punctuation). -// -// Examples: -// -// "foo" => [["any", "ilike", "%foo%"]] -// "foo.bar" => [["any", "ilike", "%foo.bar%"]] // "." is a word char in ilike queries -// "foo/b-r" => [["any", "ilike", "%foo/b-r%"]] // "/" and "-", too -// "foo_bar" => [["any", "ilike", "%foo\\_bar%"] // "_" should be escaped so it can be used as a literal -// "foo bar" => [["any", "ilike", "%foo%"], ["any", "ilike", "%bar%"]] -// "foo|bar" => [["any", "ilike", "%foo%"], ["any", "ilike", "%bar%"]] -// " oo|bar" => [["any", "ilike", "%oo%"], ["any", "ilike", "%bar%"]] -// "" => [] -// " " => [] -// null => [] -window.ilike_filters = function(q) { - q = (q || '').replace(/[^-\w\.\/]+/g, ' ').trim().replace(/_/g, '\\_') - if (q == '') - return [] - return q.split(" ").map(function(term) { - return ["any", "ilike", "%"+term+"%"] - }) -} \ No newline at end of file diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js deleted file mode 100644 index 3e63858594..0000000000 --- a/apps/workbench/app/assets/javascripts/infinite_scroll.js +++ /dev/null @@ -1,309 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -// infinite_scroll.js displays a tab's content using automatic scrolling -// when the user scrolls to the bottom of the page and there is more data. -// -// Usage: -// -// 1. Adding infinite scrolling to a tab pane using "show" method -// -// The steps below describe adding scrolling to the project#show action. -// -// a. In the "app/views/projects/" folder add a file for your tab -// (ex: _show_jobs_and_pipelines.html.erb) -// In this file, add a div or tbody with data-infinite-scroller. -// Note: This page uses _show_tab_contents.html.erb so that -// several tabs can reuse this implementation. -// Also add the filters to be used for loading the tab content. -// -// b. Add a file named "_show_contents_rows.html.erb" that loads -// the data (by invoking get_objects_and_names from the controller). -// -// c. In the "app/controllers/projects_controller.rb, -// Update the show method to add a block for "params[:partial]" -// that loads the show_contents_rows partial. -// Optionally, add a "tab_counts" method that loads the total number -// of objects count to be displayed for this tab. -// -// 2. Adding infinite scrolling to the "Recent" tab in "index" page -// The steps below describe adding scrolling to the pipeline_instances index page. -// -// a. In the "app/views/pipeline_instances/_show_recent.html.erb/" file -// add a div or tbody with data-infinite-scroller. -// -// b. Add the partial "_show_recent_rows.html.erb" that displays the -// page contents on scroll using the @objects - -function maybe_load_more_content(event) { - var scroller = this; - var $container = $(event.data.container); - var src; // url for retrieving content - var scrollHeight; - var spinner, colspan; - var serial = Date.now(); - var params; - scrollHeight = scroller.scrollHeight || $('body')[0].scrollHeight; - if ($(scroller).scrollTop() + $(scroller).height() - > - scrollHeight - 50) - { - if (!$container.attr('data-infinite-content-href0')) { - // Remember the first page source url, so we can refresh - // from page 1 later. - $container.attr('data-infinite-content-href0', - $container.attr('data-infinite-content-href')); - } - src = $container.attr('data-infinite-content-href'); - if (!src || !$container.is(':visible')) - // Finished - return; - - // Don't start another request until this one finishes - $container.attr('data-infinite-content-href', null); - spinner = ''; - if ($container.is('table,tbody,thead,tfoot')) { - // Hack to determine how many columns a new tr should have - // in order to reach full width. - colspan = $container.closest('table'). - find('tr').eq(0).find('td,th').length; - if (colspan == 0) - colspan = '*'; - spinner = ('' + - spinner + - ''); - } - $container.find(".spinner").detach(); - $container.append(spinner); - $container.data('data-infinite-serial', serial); - - if (src == $container.attr('data-infinite-content-href0')) { - // If we're loading the first page, collect filters from - // various sources. - params = mergeInfiniteContentParams($container); - $.each(params, function(k,v) { - if (v instanceof Object) { - params[k] = JSON.stringify(v); - } - }); - } else { - // If we're loading page >1, ignore other filtering - // mechanisms and just use the "next page" URI from the - // previous page's response. Aside from avoiding race - // conditions (where page 2 could have different filters - // than page 1), this allows the server to use filters in - // the "next page" URI to achieve paging. (To apply any - // new filters effectively, we need to load page 1 again - // anyway.) - params = {}; - } - - $.ajax(src, - {dataType: 'json', - type: 'GET', - data: params, - context: {container: $container, src: src, serial: serial}}). - fail(function(jqxhr, status, error) { - var $faildiv; - var $container = this.container; - if ($container.data('data-infinite-serial') != this.serial) { - // A newer request is already in progress. - return; - } - if (jqxhr.readyState == 0 || jqxhr.status == 0) { - message = "Cancelled."; - } else if (jqxhr.responseJSON && jqxhr.responseJSON.errors) { - message = jqxhr.responseJSON.errors.join("; "); - } else { - message = "Request failed."; - } - // TODO: report the message to the user. - console.log(message); - $faildiv = $('
'). - attr('data-infinite-content-href', this.src). - addClass('infinite-retry'). - append(' Oops, request failed. '); - $container.find('div.spinner').replaceWith($faildiv); - }). - done(function(data, status, jqxhr) { - if ($container.data('data-infinite-serial') != this.serial) { - // A newer request is already in progress. - return; - } - $container.find(".spinner").detach(); - $container.append(data.content); - $container.attr('data-infinite-content-href', data.next_page_href); - ping_all_scrollers(); - }); - } -} - -function ping_all_scrollers() { - // Send a scroll event to all scroll listeners that might need - // updating. Adding infinite-scroller class to the window element - // doesn't work, so we add it explicitly here. - $('.infinite-scroller').add(window).trigger('scroll'); -} - -function mergeInfiniteContentParams($container) { - var params = {}; - // Combine infiniteContentParams from multiple sources. This - // mechanism allows each of several components to set and - // update its own set of filters, without having to worry - // about stomping on some other component's filters. - // - // For example, filterable.js writes filters in - // infiniteContentParamsFilterable ("search for text foo") - // without worrying about clobbering the filters set up by the - // tab pane ("only show container requests and pipeline instances - // in this tab"). - $.each($container.data(), function(datakey, datavalue) { - // Note: We attach these data to DOM elements using - // . We store/retrieve them - // using $('element').data('foo-bar'), although - // .data('fooBar') would also work. The "all data" hash - // returned by $('element').data(), however, always has - // keys like 'fooBar'. In other words, where we have a - // choice, we stick with the 'foo-bar' style to be - // consistent with HTML. Here, our only option is - // 'fooBar'. - if (/^infiniteContentParams/.exec(datakey)) { - if (datavalue instanceof Object) { - $.each(datavalue, function(hkey, hvalue) { - if (hvalue instanceof Array) { - params[hkey] = (params[hkey] || []). - concat(hvalue); - } else if (hvalue instanceof Object) { - $.extend(params[hkey], hvalue); - } else { - params[hkey] = hvalue; - } - }); - } - } - }); - return params; -} - -function setColumnSort( $container, $header, direction ) { - // $container should be the tbody or whatever has all the infinite table data attributes - // $header should be the th with a preset data-sort-order attribute - // direction should be "asc" or "desc" - // This function returns the order by clause for this column header as a string - - // First reset all sort directions - $('th[data-sort-order]').removeData('sort-order-direction'); - // set the current one - $header.data('sort-order-direction', direction); - // change the ordering parameter - var paramsAttr = 'infinite-content-params-' + $container.data('infinite-content-params-attr'); - var params = $container.data(paramsAttr) || {}; - params.order = $header.data('sort-order').split(",").join( ' ' + direction + ', ' ) + ' ' + direction; - $container.data(paramsAttr, params); - // show the correct icon next to the column header - $container.trigger('sort-icons'); - - return params.order; -} - -$(document). - on('click', 'div.infinite-retry button', function() { - var $retry_div = $(this).closest('.infinite-retry'); - var $container = $(this).closest('.infinite-scroller-ready') - $container.attr('data-infinite-content-href', - $retry_div.attr('data-infinite-content-href')); - $retry_div. - replaceWith('