From: Tom Clegg Date: Sat, 16 Aug 2014 06:06:20 +0000 (-0400) Subject: Merge branch '2800-python-global-state' into 2800-pgs X-Git-Tag: 1.1.0~2316^2~5 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0bd1c28bed9a0756c61037947d5a9dccd5066f00?hp=c6db15d0529212126920002665c9c99a4f864529 Merge branch '2800-python-global-state' into 2800-pgs Conflicts: sdk/python/arvados/api.py --- diff --git a/.gitignore b/.gitignore index 0cddee596c..8cc6b89324 100644 --- a/.gitignore +++ b/.gitignore @@ -11,11 +11,9 @@ sdk/perl/Makefile sdk/perl/blib sdk/perl/pm_to_blib */vendor/bundle -services/keep/bin -services/keep/pkg -services/keep/src/github.com sdk/java/target *.class apps/workbench/vendor/bundle services/api/vendor/bundle sdk/java/log +sdk/cli/vendor diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile index 754d5c6043..a289303e4d 100644 --- a/apps/workbench/Gemfile +++ b/apps/workbench/Gemfile @@ -49,6 +49,8 @@ gem 'bootstrap-x-editable-rails' gem 'less' gem 'less-rails' +gem 'wiselinks' +gem 'sshkey' # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index 173be13cc3..3daa501ca5 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -167,6 +167,7 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.8) + sshkey (1.6.1) therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref @@ -183,6 +184,7 @@ GEM json (>= 1.8.0) websocket (1.0.7) websocket-driver (0.3.2) + wiselinks (1.2.1) xpath (2.0.0) nokogiri (~> 1.3) @@ -216,6 +218,8 @@ DEPENDENCIES simplecov (~> 0.7.1) simplecov-rcov sqlite3 + sshkey themes_for_rails! therubyracer uglifier (>= 1.0.3) + wiselinks diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js index d21c4b5625..c4cb68322f 100644 --- a/apps/workbench/app/assets/javascripts/application.js +++ b/apps/workbench/app/assets/javascripts/application.js @@ -21,6 +21,7 @@ //= require bootstrap/modal //= require bootstrap/button //= require bootstrap3-editable/bootstrap-editable +//= require wiselinks //= require_tree . jQuery(function($){ @@ -135,11 +136,13 @@ jQuery(function($){ on('ajax:complete ready', function() { // See http://getbootstrap.com/javascript/#buttons $('.btn').button(); - }); - - $(document). + }). 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') }); HeaderRowFixer = function(selector) { @@ -177,4 +180,29 @@ jQuery(function($){ fixer.duplicateTheadTr(); fixer.fixThead(); }); + + $(document).ready(function() { + /* When wiselinks is initialized, selection.js is not working. Since we want to stop + using selection.js in the near future, let's not initialize wiselinks for now. */ + + // window.wiselinks = new Wiselinks(); + + $(document).off('page:loading').on('page:loading', function(event, $target, render, url){ + $("#page-wrapper").fadeOut(200); + }); + + $(document).off('page:redirected').on('page:redirected', function(event, $target, render, url){ + }); + + $(document).off('page:always').on('page:always', function(event, xhr, settings){ + $("#page-wrapper").fadeIn(200); + }); + + $(document).off('page:done').on('page:done', function(event, $target, status, url, data){ + }); + + $(document).off('page:fail').on('page:fail', function(event, $target, status, url, error, code){ + }); + }); + }); diff --git a/apps/workbench/app/assets/javascripts/filterable.js b/apps/workbench/app/assets/javascripts/filterable.js index 76c5ac3ca1..7da461ec44 100644 --- a/apps/workbench/app/assets/javascripts/filterable.js +++ b/apps/workbench/app/assets/javascripts/filterable.js @@ -1,11 +1,12 @@ $(document). - on('paste keyup change', 'input[type=text].filterable-control', function() { + on('paste keyup input', 'input[type=text].filterable-control', function() { var q = new RegExp($(this).val(), 'i'); $($(this).attr('data-filterable-target')). addClass('filterable-container'). data('q', q). 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() { @@ -26,6 +27,16 @@ $(document). } 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(); @@ -38,5 +49,5 @@ $(document). data('filters', filters). trigger('refresh'); }).on('ajax:complete', function() { - $('.filterable-control').trigger('change'); + $('.filterable-control').trigger('input'); }); diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js index 1f9997efa0..e70ca259e4 100644 --- a/apps/workbench/app/assets/javascripts/infinite_scroll.js +++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js @@ -1,25 +1,31 @@ -function maybe_load_more_content() { +function maybe_load_more_content(event) { var scroller = this; // element with scroll bars - var container; // element that receives new content + var $container; // element that receives new content var src; // url for retrieving content var scrollHeight; var spinner, colspan; + var serial = Date.now(); scrollHeight = scroller.scrollHeight || $('body')[0].scrollHeight; - var num_scrollers = $(window).data("arv-num-scrollers"); if ($(scroller).scrollTop() + $(scroller).height() > scrollHeight - 50) { - for (var i = 0; i < num_scrollers; i++) { - $container = $($(this).data('infinite-container'+i)); + $container = $(event.data.container); + 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')) - continue; + // 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')) { + 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'). @@ -30,16 +36,21 @@ function maybe_load_more_content() { spinner + ''); } + $container.find(".spinner").detach(); $container.append(spinner); + $container.attr('data-infinite-serial', serial); $.ajax(src, {dataType: 'json', type: 'GET', - data: {}, - context: {container: $container, src: src}}). - always(function() { - $(this.container).find(".spinner").detach(); - }). + data: ($container.data('infinite-content-params') || {}), + context: {container: $container, src: src, serial: serial}}). fail(function(jqxhr, status, error) { + var $faildiv; + var $container = this.container; + if ($container.attr('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) { @@ -47,32 +58,60 @@ function maybe_load_more_content() { } else { message = "Request failed."; } - // TODO: report this to the user. + // TODO: report the message to the user. console.log(message); - $(this.container).attr('data-infinite-content-href', this.src); + $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) { - $(this.container).append(data.content); - $(this.container).attr('data-infinite-content-href', data.next_page_href); + if ($container.attr('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); }); - break; } - } } $(document). + on('click', 'div.infinite-retry button', function() { + var $retry_div = $(this).closest('.infinite-retry'); + var $scroller = $(this).closest('.infinite-scroller') + $scroller.attr('data-infinite-content-href', + $retry_div.attr('data-infinite-content-href')); + $retry_div.replaceWith('
- + +
  • + <%= render partial: "projects_tree_menu", locals: { + :project_link_to => Proc.new do |pnode, &block| + link_to "#", { + class: "chooser-show-project", + data: {'project_uuid' => pnode[:object].uuid}, + }, &block + end, + :top_button => nil + } %> + +
    • + <% end %> + +
    +
    - <% preview_pane = (params[:preview_pane] != "false") - pane_col_class = preview_pane ? "col-sm-6" : "" %> + <% preview_pane = (params[:preview_pane].to_s != "false") + pane_col_class = preview_pane ? "col-sm-6" : "col-sm-12" %>
    -
    - <%= render partial: 'choose_rows', locals: {multiple: multiple} %> -
    +
    + <%= render partial: 'choose_rows' %> +
    <% if preview_pane %> -
    +
    <% end %>
    diff --git a/apps/workbench/app/views/application/_choose.js.erb b/apps/workbench/app/views/application/_choose.js.erb index b033c9bf2f..c482b4597e 100644 --- a/apps/workbench/app/views/application/_choose.js.erb +++ b/apps/workbench/app/views/application/_choose.js.erb @@ -1,3 +1,4 @@ +<% session[:selected_move_items] = params['move_items'] if params['move_items'] %> $('body > .modal-container').html("<%= escape_javascript(render partial: 'choose.html', locals: {multiple: multiple}) %>"); $('body > .modal-container .modal').modal('show'); $('body > .modal-container .modal .modal-footer .btn-primary'). @@ -5,24 +6,3 @@ $('body > .modal-container .modal .modal-footer .btn-primary'). attr('data-action-href', '<%= j params[:action_href] %>'). attr('data-method', '<%= j params[:action_method] %>'). data('action-data', <%= raw params[:action_data] %>); -$(".chooser-show-project").on("click", function() { - $("#choose-scroll").html(""); - $(".modal-dialog-preview-pane").html(''); - var t = $(this); - var d = { - partial: true, - multiple: <%= multiple || "false" %> - }; - if (t.attr("data-project-uuid") != null) { - d.project_uuid = t.attr("data-project-uuid"); - } - $.ajax('<%=j url_for %>', { - dataType: "json", - type: "GET", - data: d - }).done(function(data, status, jqxhr) { - $("#chooser-breadcrumb").text(t.text()); - $("#choose-scroll").html(data.content); - $("#choose-scroll").prop("data-infinite-content-href", "next_page_href"); - }); -}); diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb index 1609a66b09..f7ae90912f 100644 --- a/apps/workbench/app/views/application/_content.html.erb +++ b/apps/workbench/app/views/application/_content.html.erb @@ -1,24 +1,3 @@ -<% content_for :content_top do %> - <% if @object and not @object.is_a?(Group) and @object.class.goes_in_projects? and @object.owner_uuid == current_user.uuid and not @name_link %> -
    -
    - - Hey. This <%= @object.class_for_display.downcase %> belongs to your account, but it's not in any of your projects. If you want it to be easy to find in the future, you should move it to a project.
    - <%= button_to(choose_projects_path( - title: 'Move to...', - editable: true, - action_name: 'Move', - action_href: url_for(action: :update), - action_method: 'patch', - action_data: {selection_param: @object.resource_param_name+'[owner_uuid]', success: 'page-refresh'}.to_json), - { class: "btn btn-primary btn-sm", remote: true, method: 'get' }) do %> - Choose a project... - <% end %> -
    -
    - <% end %> -<% end %> - <% content_for :tab_panes do %> <% comparable = controller.respond_to? :compare %> @@ -42,8 +21,7 @@
    <% if i == 0 %> - <%= render(partial: 'show_' + pane.downcase, - locals: { comparable: comparable, objects: @objects }) %> + <%= render_pane pane, to_string: true %> <% else %> <% end %> diff --git a/apps/workbench/app/views/application/_content_layout.html.erb b/apps/workbench/app/views/application/_content_layout.html.erb index c8e3827720..3e50b6eb8c 100644 --- a/apps/workbench/app/views/application/_content_layout.html.erb +++ b/apps/workbench/app/views/application/_content_layout.html.erb @@ -1,13 +1,6 @@ <%= content_for :content_top %> - <% if @object and @object.is_a?(Group) and @object.group_class.in?(['project','folder']) %> -
    - <%= content_for :tab_line_buttons %> -
    -
    -<% else %> -
    -
    - <%= content_for :tab_line_buttons %> -
    -<% end %> +
    + <%= content_for :tab_line_buttons %> +
    +
    <%= content_for :tab_panes %> diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb index 876b0be65c..600c6ab96f 100644 --- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb +++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb @@ -1,12 +1,13 @@ -
  • + <%= project_link_to.call({object: current_user, depth: 0}) do %> + Home + <% end %>
    • <% my_project_tree.each do |pnode| %> <% next if pnode[:object].class != Group %> -
  • +
  • <%= project_link_to.call pnode do %> - <%= pnode[:object].name %> + <%= pnode[:object].name %> <% end %>
    • <% end %> @@ -16,9 +17,9 @@ <% shared_project_tree.each do |pnode| %> <% next if pnode[:object].class != Group %> -
  • +
  • <%= project_link_to.call pnode do %> - <%= pnode[:object].name %> + <%= pnode[:object].name %> <% end %>
    • <% end %> diff --git a/apps/workbench/app/views/application/_tab_line_buttons.html.erb b/apps/workbench/app/views/application/_tab_line_buttons.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/workbench/app/views/application/index.html.erb b/apps/workbench/app/views/application/index.html.erb index 0e72f7a2dd..3e2a608ed7 100644 --- a/apps/workbench/app/views/application/index.html.erb +++ b/apps/workbench/app/views/application/index.html.erb @@ -13,6 +13,8 @@ Add a new user <% end %> + <% elsif controller.controller_name == 'manage_account' %> + <%# No add button is needed %> <% else %> <%= button_to({action: 'create'}, {class: 'btn btn-sm btn-primary'}) do %> diff --git a/apps/workbench/app/views/application/show.html.erb b/apps/workbench/app/views/application/show.html.erb index d6eca3a215..105e1c356d 100644 --- a/apps/workbench/app/views/application/show.html.erb +++ b/apps/workbench/app/views/application/show.html.erb @@ -27,4 +27,3 @@ <% end %> <%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%> - diff --git a/apps/workbench/app/views/collections/_choose_rows.html.erb b/apps/workbench/app/views/collections/_choose_rows.html.erb index d87f56f9cd..8079eb44a6 100644 --- a/apps/workbench/app/views/collections/_choose_rows.html.erb +++ b/apps/workbench/app/views/collections/_choose_rows.html.erb @@ -1,13 +1,15 @@ <% @name_links.each do |name_link| %> <% if (object = get_object(name_link.head_uuid)) %> -
    - - <%= name_link.name %> - <% Link.filter([['link_class','=','tag'],['head_uuid','=',object.uuid]]).collect(&:name).each do |tagname| %> - <%= tagname %> - <% end %> + + <%= name_link.name %> + <% links_for_object(object).each do |tag| %> + <% if tag.link_class == 'tag' %> + <%= tag.name %> + <% end %> + <% end %>
    <% end %> <% end %> diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb index 8576d40440..ea55577e70 100644 --- a/apps/workbench/app/views/collections/_show_files.html.erb +++ b/apps/workbench/app/views/collections/_show_files.html.erb @@ -1,8 +1,3 @@ -<% content_for :tab_line_buttons do %> -Collection storage status: -<%= render partial: 'toggle_persist', locals: { uuid: @object.uuid, current_state: (@is_persistent ? 'persistent' : 'cache') } %> -<% end %> - <% file_tree = @object.andand.files_tree %> <% if file_tree.nil? or file_tree.empty? %>

    This collection is empty.

    diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb index 2f81073305..d624749a4a 100644 --- a/apps/workbench/app/views/collections/_show_recent.html.erb +++ b/apps/workbench/app/views/collections/_show_recent.html.erb @@ -1,16 +1,3 @@ -<% content_for :tab_line_buttons do %> - <%= form_tag collections_path, method: 'get', remote: true, class: 'form-search' do %> -
    - <%= text_field_tag :search, params[:search], class: 'form-control', placeholder: 'Search collections' %> - - <%= button_tag(class: 'btn btn-info') do %> - - <% end %> - -
    - <% end %> -<% end %> - <%= render partial: "paging", locals: {results: @collections, object: @object} %>
    diff --git a/apps/workbench/app/views/collections/index.html.erb b/apps/workbench/app/views/collections/index.html.erb new file mode 100644 index 0000000000..061b05b474 --- /dev/null +++ b/apps/workbench/app/views/collections/index.html.erb @@ -0,0 +1,14 @@ +<% content_for :tab_line_buttons do %> + <%= form_tag collections_path, method: 'get', remote: true, class: 'form-search' do %> +
    + <%= text_field_tag :search, params[:search], class: 'form-control', placeholder: 'Search collections' %> + + <%= button_tag(class: 'btn btn-info') do %> + + <% end %> + +
    + <% end %> +<% end %> + +<%= render file: 'application/index.html.erb', locals: local_assigns %> diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb index a51c450ea0..83dcb4511b 100644 --- a/apps/workbench/app/views/collections/show.html.erb +++ b/apps/workbench/app/views/collections/show.html.erb @@ -90,4 +90,9 @@
    -<%= render file: 'application/show.html.erb' %> +<% content_for :tab_line_buttons do %> + Collection storage status: + <%= render partial: 'toggle_persist', locals: { uuid: @object.uuid, current_state: (@is_persistent ? 'persistent' : 'cache') } %> +<% end %> + +<%= render file: 'application/show.html.erb', locals: local_assigns %> diff --git a/apps/workbench/app/views/groups/_choose_rows.html.erb b/apps/workbench/app/views/groups/_choose_rows.html.erb index 772ef197d0..fca0415e29 100644 --- a/apps/workbench/app/views/groups/_choose_rows.html.erb +++ b/apps/workbench/app/views/groups/_choose_rows.html.erb @@ -1,6 +1,6 @@ <% icon_class = fa_icon_class_for_class(Group) %> <% @objects.each do |object| %> -
    +
    <%= object.name %> diff --git a/apps/workbench/app/views/keep_disks/_content_layout.html.erb b/apps/workbench/app/views/keep_disks/_content_layout.html.erb index 0f5cd7aece..56177ae6e5 100644 --- a/apps/workbench/app/views/keep_disks/_content_layout.html.erb +++ b/apps/workbench/app/views/keep_disks/_content_layout.html.erb @@ -17,5 +17,7 @@ <% end %> <% end %> <%= content_for :content_top %> -<%= content_for :tab_line_buttons %> +
    + <%= content_for :tab_line_buttons %> +
    <%= content_for :tab_panes %> diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb index d0b27c3758..0a309db5b5 100644 --- a/apps/workbench/app/views/layouts/application.html.erb +++ b/apps/workbench/app/views/layouts/application.html.erb @@ -41,184 +41,12 @@ } +<%= piwik_tracking_tag %> -
    - - - <% if current_user.andand.is_active %> - - <% end %> - -
    - <%= yield %> -
    -
    - - <%= yield :footer_html %> - <%= piwik_tracking_tag %> - <%= javascript_tag do %> - <%= yield :footer_js %> - <% end %> - -
    +<%= render template: 'layouts/body' %> +<%= javascript_tag do %> +<%= yield :footer_js %> +<% end %> diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb new file mode 100644 index 0000000000..4c58daba70 --- /dev/null +++ b/apps/workbench/app/views/layouts/body.html.erb @@ -0,0 +1,204 @@ +
    + + + <% if current_user.andand.is_active %> + + <% end %> + +
    + <%= yield %> +
    +
    + + <%= yield :footer_html %> + +
    diff --git a/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb b/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb index 5106710b0e..4573919286 100644 --- a/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_show_inputs.html.erb @@ -12,8 +12,7 @@ not pvalue_spec[:value])) %> <% n_inputs += 1 %>

    diff --git a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb index 0b78e07d65..08b24f13cb 100644 --- a/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_show_recent.html.erb @@ -1,10 +1,3 @@ -<%= content_for :tab_line_buttons do %> -<%= form_tag({action: 'compare', controller: params[:controller], method: 'get'}, {method: 'get', id: 'compare', class: 'pull-right small-form-margin'}) do |f| %> - <%= submit_tag 'Compare 2 or 3 selected', {class: 'btn btn-primary', disabled: true, style: 'display: none'} %> -   -<% end rescue nil %> -<% end %> - <%= render partial: "paging", locals: {results: @objects, object: @object} %> <%= form_tag do |f| %> diff --git a/apps/workbench/app/views/pipeline_instances/index.html.erb b/apps/workbench/app/views/pipeline_instances/index.html.erb new file mode 100644 index 0000000000..4b73bd499a --- /dev/null +++ b/apps/workbench/app/views/pipeline_instances/index.html.erb @@ -0,0 +1,8 @@ +<% content_for :tab_line_buttons do %> +<%= form_tag({action: 'compare', controller: params[:controller], method: 'get'}, {method: 'get', id: 'compare', class: 'pull-right small-form-margin'}) do |f| %> + <%= submit_tag 'Compare 2 or 3 selected', {class: 'btn btn-primary', disabled: true, style: 'display: none'} %> +   +<% end rescue nil %> +<% end %> + +<%= render file: 'application/index.html.erb', locals: local_assigns %> diff --git a/apps/workbench/app/views/pipeline_templates/_choose_rows.html.erb b/apps/workbench/app/views/pipeline_templates/_choose_rows.html.erb index 9aebd695bf..9b96b47d19 100644 --- a/apps/workbench/app/views/pipeline_templates/_choose_rows.html.erb +++ b/apps/workbench/app/views/pipeline_templates/_choose_rows.html.erb @@ -1,5 +1,5 @@ <% @objects.each do |object| %> -

    +
    <%= object.name %> diff --git a/apps/workbench/app/views/pipeline_templates/_show_components.html.erb b/apps/workbench/app/views/pipeline_templates/_show_components.html.erb index 1f2c1baaf4..cd03a5c790 100644 --- a/apps/workbench/app/views/pipeline_templates/_show_components.html.erb +++ b/apps/workbench/app/views/pipeline_templates/_show_components.html.erb @@ -1,18 +1 @@ -<% content_for :tab_line_buttons do %> - <%= button_to(choose_projects_path(id: "run-pipeline-button", - title: 'Choose project', - editable: true, - action_name: 'Choose', - action_href: pipeline_instances_path, - action_method: 'post', - action_data: {selection_param: 'pipeline_instance[owner_uuid]', - 'pipeline_instance[pipeline_template_uuid]' => @object.uuid, - 'success' => 'redirect-to-created-object' - }.to_json), - { class: "btn btn-primary btn-sm", remote: true, method: 'get' } - ) do %> - Run this pipeline - <% end %> -<% end %> - <%= render_pipeline_components("editable", :json, editable: false) %> diff --git a/apps/workbench/app/views/pipeline_templates/show.html.erb b/apps/workbench/app/views/pipeline_templates/show.html.erb new file mode 100644 index 0000000000..725d63db73 --- /dev/null +++ b/apps/workbench/app/views/pipeline_templates/show.html.erb @@ -0,0 +1,18 @@ +<% content_for :tab_line_buttons do %> + <%= button_to(choose_projects_path(id: "run-pipeline-button", + title: 'Choose project', + editable: true, + action_name: 'Choose', + action_href: pipeline_instances_path, + action_method: 'post', + action_data: {selection_param: 'pipeline_instance[owner_uuid]', + 'pipeline_instance[pipeline_template_uuid]' => @object.uuid, + 'success' => 'redirect-to-created-object' + }.to_json), + { class: "btn btn-primary btn-sm", remote: true, method: 'get' } + ) do %> + Run this pipeline + <% end %> +<% end %> + +<%= render file: 'application/show.html.erb', locals: local_assigns %> diff --git a/apps/workbench/app/views/projects/_index_projects.html.erb b/apps/workbench/app/views/projects/_index_projects.html.erb index b05a87dd49..027dc29b8e 100644 --- a/apps/workbench/app/views/projects/_index_projects.html.erb +++ b/apps/workbench/app/views/projects/_index_projects.html.erb @@ -9,8 +9,10 @@ <%= projectnode[:object] %> <% elsif show_root_node and rowtype == User %> <% if projectnode[:object].uuid == current_user.andand.uuid %> - - My Projects + + <%= link_to project_path(id: projectnode[:object].uuid) do %> + Home + <% end %> <% else %> <%= projectnode[:object].friendly_link_name %> @@ -22,7 +24,7 @@ <% end %> <% end %>
    - <% if not projectnode[:object].description.blank? %> + <% if projectnode[:object].respond_to?(:description) and not projectnode[:object].description.blank? %>
    <%= projectnode[:object].description %>
    <% end %>
    diff --git a/apps/workbench/app/views/projects/_show_contents_rows.html.erb b/apps/workbench/app/views/projects/_show_contents_rows.html.erb index b690a1bf8f..e1996a7f40 100644 --- a/apps/workbench/app/views/projects/_show_contents_rows.html.erb +++ b/apps/workbench/app/views/projects/_show_contents_rows.html.erb @@ -1,24 +1,34 @@ -<% objects_and_names.each do |object, name_link| %> +<% get_objects_and_names.each do |object, name_link| %> <% name_object = (object.respond_to?(:name) || !name_link) ? object : name_link %> - <%= render partial: 'selection_checkbox', locals: {object: name_object, friendly_name: ((name_object.name rescue '') || '')} %> +
    + <%= render partial: 'selection_checkbox', locals: {object: name_object, friendly_name: ((name_object.name rescue '') || '')} %> +
    + - <% if project.editable? %> - <%= link_to({action: 'remove_item', id: project.uuid, item_uuid: ((name_link && name_link.uuid) || object.uuid)}, method: :delete, remote: true, data: {confirm: "Remove #{object.class_for_display.downcase} #{name_object.name rescue object.uuid} from this project?", toggle: 'tooltip', placement: 'top'}, class: 'btn btn-sm btn-default btn-nodecorate', title: 'remove') do %> + + <% if @object.editable? %> + <%= link_to({action: 'remove_item', id: @object.uuid, item_uuid: ((name_link && name_link.uuid) || object.uuid)}, method: :delete, remote: true, data: {confirm: "Remove #{object.class_for_display.downcase} #{name_object.name rescue object.uuid} from this project?", toggle: 'tooltip', placement: 'top'}, class: 'btn btn-sm btn-default btn-nodecorate', title: 'remove') do %> <% end %> <% else %> <%# placeholder %> <% end %> + + <%= render :partial => "show_object_button", :locals => {object: object, size: 'sm', name_link: name_link} %> + + <%= render_editable_attribute (name_link || object), 'name', nil, {tiptitle: 'rename'} %> + <%= render_controller_partial( 'show_object_description_cell.html', diff --git a/apps/workbench/app/views/projects/_show_data_collections.html.erb b/apps/workbench/app/views/projects/_show_data_collections.html.erb index c44db5f4bd..e56321dde8 100644 --- a/apps/workbench/app/views/projects/_show_data_collections.html.erb +++ b/apps/workbench/app/views/projects/_show_data_collections.html.erb @@ -1,65 +1,3 @@ -<% content_for :content_top do %> - -

    - <%= render_editable_attribute @object, 'name', nil, { 'data-emptytext' => "New project" } %> -

    - -
    - <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %> -
    - -<% end %> - -<% content_for :tab_line_buttons do %> - <% if @object.editable? %> - <%= link_to( - choose_collections_path( - title: 'Add data to project:', - multiple: true, - action_name: 'Add', - action_href: actions_path(id: @object.uuid), - action_method: 'post', - action_data: {selection_param: 'selection[]', copy_selections_into_project: @object.uuid, success: 'page-refresh'}.to_json), - { class: "btn btn-primary btn-sm", remote: true, method: 'get', data: {'event-after-select' => 'page-refresh'} }) do %> - Add data... - <% end %> - <%= link_to( - choose_pipeline_templates_path( - title: 'Choose a pipeline to run:', - action_name: 'Next: choose inputs ', - action_href: pipeline_instances_path, - action_method: 'post', - action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => @object.uuid, 'success' => 'redirect-to-created-object'}.to_json), - { class: "btn btn-primary btn-sm", remote: true, method: 'get' }) do %> - Run a pipeline... - <% end %> - <%= link_to projects_path('project[owner_uuid]' => @object.uuid), method: 'post', class: 'btn btn-sm btn-primary' do %> - - Add a subproject - <% end %> - <%= link_to( - choose_projects_path( - title: 'Move this project to...', - editable: true, - my_root_selectable: true, - action_name: 'Move', - action_href: project_path(@object.uuid), - action_method: 'put', - action_data: {selection_param: 'project[owner_uuid]', success: 'page-refresh'}.to_json), - { class: "btn btn-sm btn-primary arv-move-to-project", remote: true, method: 'get' }) do %> - Move project... - <% end %> - <%= link_to(project_path(id: @object.uuid), method: 'delete', class: 'btn btn-sm btn-primary', data: {confirm: "Really delete project '#{@object.name}'?"}) do %> - Delete project - <% end %> - <% end %> -<% end %> - -<% - filters = [['uuid', 'is_a', "arvados#collection"]] - @objects = @object.contents({limit: 50, include_linked: true, :filters => filters}) - objects_and_names = get_objects_and_names @objects - page_offset = next_page_offset @objects -%> - -<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Data_collections'} %> +<%= render_pane 'tab_contents', to_string: true, locals: { + filters: [['uuid', 'is_a', "arvados#collection"]] + }.merge(local_assigns) %> diff --git a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb index f9e6306a9d..df31fec8ee 100644 --- a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb +++ b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb @@ -1,8 +1,3 @@ -<% - filters = [['uuid', 'is_a', ["arvados#pipelineInstance","arvados#job"]]] - @objects = @object.contents({limit: 50, include_linked: true, :filters => filters}) - objects_and_names = get_objects_and_names @objects - page_offset = next_page_offset @objects -%> - -<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Jobs_and_pipelines'} %> +<%= render_pane 'tab_contents', to_string: true, locals: { + filters: [['uuid', 'is_a', ["arvados#job", "arvados#pipelineInstance"]]] + }.merge(local_assigns) %> diff --git a/apps/workbench/app/views/projects/_show_other_objects.html.erb b/apps/workbench/app/views/projects/_show_other_objects.html.erb index 308034ed54..af6fbd1a92 100644 --- a/apps/workbench/app/views/projects/_show_other_objects.html.erb +++ b/apps/workbench/app/views/projects/_show_other_objects.html.erb @@ -1,8 +1,3 @@ -<% - filters = [['uuid', 'is_a', ["arvados#human","arvados#specimen","arvados#trait"]]] - @objects = @object.contents({limit: 50, include_linked: true, :filters => filters}) - objects_and_names = get_objects_and_names @objects - page_offset = next_page_offset @objects -%> - -<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Other_objects'} %> +<%= render_pane 'tab_contents', to_string: true, locals: { + filters: [['uuid', 'is_a', ["arvados#human", "arvados#specimen", "arvados#trait"]]] + }.merge(local_assigns) %> diff --git a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb index c54e28dfeb..b875b086ec 100644 --- a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb +++ b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb @@ -1,8 +1,3 @@ -<% - filters = [['uuid', 'is_a', "arvados#pipelineTemplate"]] - @objects = @object.contents({limit: 50, include_linked: true, :filters => filters}) - objects_and_names = get_objects_and_names @objects - page_offset = next_page_offset @objects -%> - -<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Pipeline_templates'} %> +<%= render_pane 'tab_contents', to_string: true, locals: { + filters: [['uuid', 'is_a', ["arvados#pipelineTemplate"]]] + }.merge(local_assigns) %> diff --git a/apps/workbench/app/views/projects/_show_sharing.html.erb b/apps/workbench/app/views/projects/_show_sharing.html.erb index a5482efc1d..ff0062c24b 100644 --- a/apps/workbench/app/views/projects/_show_sharing.html.erb +++ b/apps/workbench/app/views/projects/_show_sharing.html.erb @@ -1,7 +1,13 @@ <% uuid_map = {} - [@users, @groups].each do |obj_list| - obj_list.each { |o| uuid_map[o.uuid] = o } + if @share_links + [User, Group].each do |type| + type.limit(10000) + .filter([['uuid','in',@share_links.collect(&:tail_uuid)]]) + .each do |o| + uuid_map[o.uuid] = o + end + end end perm_name_desc_map = {} perm_desc_name_map = {} @@ -13,6 +19,10 @@ perms_json << {value: link_name, text: link_desc} end perms_json = perms_json.to_json + choose_filters = { + "groups" => [["group_class", "=", nil]], + } + choose_filters.default = [] owner_icon = fa_icon_class_for_uuid(@object.owner_uuid) if owner_icon == "fa-users" owner_icon = "fa-folder" @@ -27,9 +37,11 @@ <%= link_to(send("choose_#{share_class}_path", title: "Share with #{share_class}", + by_project: false, preview_pane: false, multiple: true, limit: 10000, + filters: choose_filters[share_class].to_json, action_method: 'post', action_href: share_with_project_path, action_name: 'Add', diff --git a/apps/workbench/app/views/projects/_show_subprojects.html.erb b/apps/workbench/app/views/projects/_show_subprojects.html.erb index 4497ca4ea7..2c0ba60178 100644 --- a/apps/workbench/app/views/projects/_show_subprojects.html.erb +++ b/apps/workbench/app/views/projects/_show_subprojects.html.erb @@ -1,8 +1,3 @@ -<% - filters = [['uuid', 'is_a', "arvados#group"]] - @objects = @object.contents({limit: 50, include_linked: true, :filters => filters}) - objects_and_names = get_objects_and_names @objects - page_offset = next_page_offset @objects -%> - -<%= render partial: 'show_tab_contents', locals: {project: @object, objects_and_names: objects_and_names, filters: filters, page_offset: page_offset, tab_name: 'Subprojects'} %> +<%= render_pane 'tab_contents', to_string: true, locals: { + filters: [['uuid', 'is_a', ["arvados#group"]]] + }.merge(local_assigns) %> diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb index 36f1907a3d..e3884b6292 100644 --- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb +++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb @@ -2,7 +2,7 @@
    - +
    - +
    - +
    - - + + + + + - "> - <%= render partial: 'show_contents_rows', locals: {project: @object, objects_and_names: objects_and_names} %> + - - + + + + +
    - - description - namedescription
    -
    diff --git a/apps/workbench/app/views/projects/index.html.erb b/apps/workbench/app/views/projects/index.html.erb index 2c764335f6..219bad262b 100644 --- a/apps/workbench/app/views/projects/index.html.erb +++ b/apps/workbench/app/views/projects/index.html.erb @@ -1,8 +1,3 @@ -<% content_for :breadcrumbs do %> -
    • -
  • Home
    • -<% end %> -
    @@ -37,7 +32,7 @@
    - <%= render partial: 'index_projects', locals: {tree: my_project_tree, show_root_node: false} %> + <%= render partial: 'index_projects', locals: {tree: my_project_tree, show_root_node: true} %>
    diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb new file mode 100644 index 0000000000..c221ca1d16 --- /dev/null +++ b/apps/workbench/app/views/projects/show.html.erb @@ -0,0 +1,62 @@ +<% if @object.uuid != current_user.uuid # Not the "Home" project %> +<% content_for :content_top do %> + +

    + <%= render_editable_attribute @object, 'name', nil, { 'data-emptytext' => "New project" } %> +

    + +
    + <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %> +
    + +<% end %> +<% end %> + +<% content_for :tab_line_buttons do %> + <% if @object.editable? %> + <%= link_to( + choose_collections_path( + title: 'Add data to project:', + multiple: true, + action_name: 'Add', + action_href: actions_path(id: @object.uuid), + action_method: 'post', + action_data: {selection_param: 'selection[]', copy_selections_into_project: @object.uuid, success: 'page-refresh'}.to_json), + { class: "btn btn-primary btn-sm", remote: true, method: 'get', data: {'event-after-select' => 'page-refresh'} }) do %> + Add data... + <% end %> + <%= link_to( + choose_pipeline_templates_path( + title: 'Choose a pipeline to run:', + action_name: 'Next: choose inputs ', + action_href: pipeline_instances_path, + action_method: 'post', + action_data: {'selection_param' => 'pipeline_instance[pipeline_template_uuid]', 'pipeline_instance[owner_uuid]' => @object.uuid, 'success' => 'redirect-to-created-object'}.to_json), + { class: "btn btn-primary btn-sm", remote: true, method: 'get' }) do %> + Run a pipeline... + <% end %> + <%= link_to projects_path('project[owner_uuid]' => @object.uuid), method: 'post', class: 'btn btn-sm btn-primary' do %> + + Add a subproject + <% end %> + <% if @object.uuid != current_user.uuid # Not the "Home" project %> + <%= link_to( + choose_projects_path( + title: 'Move this project to...', + editable: true, + my_root_selectable: true, + action_name: 'Move', + action_href: project_path(@object.uuid), + action_method: 'put', + action_data: {selection_param: 'project[owner_uuid]', success: 'page-refresh'}.to_json), + { class: "btn btn-sm btn-primary arv-move-to-project", remote: true, method: 'get' }) do %> + Move project... + <% end %> + <%= link_to(project_path(id: @object.uuid), method: 'delete', class: 'btn btn-sm btn-primary', data: {confirm: "Really delete project '#{@object.name}'?"}) do %> + Delete project + <% end %> + <% end %> + <% end %> +<% end %> + +<%= render file: 'application/show.html.erb', locals: local_assigns %> diff --git a/apps/workbench/app/views/search/_choose_rows.html.erb b/apps/workbench/app/views/search/_choose_rows.html.erb new file mode 100644 index 0000000000..61f9300356 --- /dev/null +++ b/apps/workbench/app/views/search/_choose_rows.html.erb @@ -0,0 +1,26 @@ +<% current_class = params[:last_object_class] %> +<% @objects.each do |object| %> + <% icon_class = fa_icon_class_for_class(object.class) %> + <% if object.class.to_s != current_class %> + <% current_class = object.class.to_s %> +
    +
    + <%= object.class_for_display.pluralize.downcase %> +
    +
    + <% end %> +
    +
    + + <% if (name_link = @objects.links_for(object, 'name').first) %> + <%= name_link.name %> + <%= object.uuid %> + <% elsif object.respond_to?(:name) and object.name and object.name.length > 0 %> + <%= object.name %> + <%= object.uuid %> + <% else %> + <%= object.uuid %> + <% end %> +
    +
    +<% end %> diff --git a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb new file mode 100644 index 0000000000..efa8cae5c9 --- /dev/null +++ b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb @@ -0,0 +1,38 @@ +