From b96459c68eb275d889651e247c251d7089f97f80 Mon Sep 17 00:00:00 2001 From: nakul9597 Date: Sun, 18 Aug 2019 02:07:11 +0530 Subject: [PATCH] remove show of duplicate dependencies --- .../javascripts/transitive_dependencies.js | 49 +++++++------------ .../stylesheets/modules/dependencies.css | 10 ---- app/views/dependencies/_dependencies.html.erb | 12 ++--- 3 files changed, 23 insertions(+), 48 deletions(-) diff --git a/app/assets/javascripts/transitive_dependencies.js b/app/assets/javascripts/transitive_dependencies.js index ba14d6d49b3..8e889d1f921 100755 --- a/app/assets/javascripts/transitive_dependencies.js +++ b/app/assets/javascripts/transitive_dependencies.js @@ -1,73 +1,60 @@ $(document).on('click', '.caret', function () { + var current = $(this) var gem_id = $(this).attr('data-gem_id'); var ver_id = $(this).attr('data-ver'); $.ajax({ type: "get", url: "/gems/"+gem_id+"/versions/"+ver_id+"/transitive_dependencies.json", success: function(resp) { - ajaxDepActions(resp,gem_id) + ajaxDepActions(resp,gem_id,current) } }); }) -function ajaxDepActions(resp,gem_id) { +function ajaxDepActions(resp,gem_id,current) { // when we have gems like http_parser.rb, we need to replace . with \. to access any ids with the name gem_id = gem_id.replace(/\./, "\\.") - var all_deps = $('.deps_item').map(function() { - return $(this).attr('data-gem_name'); - }).get(); - if (resp.run_deps.length != 0){ - $("#"+gem_id+'runtime').find(".deps_scope").before("Runtime :"); - deps_display(resp.run_deps,gem_id,all_deps,"runtime") + var new_gems = current.parent().next().next().find(".deps_scope") + new_gems.before("Runtime :"); + deps_display(resp.run_deps,gem_id,"runtime",new_gems) } if (resp.dev_deps.length != 0){ - $("#"+gem_id+'development').find(".deps_scope").before("Development :"); - deps_display(resp.dev_deps,gem_id,all_deps,"development") + var new_gems = current.parent().next().next().next().find(".deps_scope") + new_gems.before("Development :"); + deps_display(resp.dev_deps,gem_id,"development",new_gems) } var toggler = ""; - $('#'+gem_id+'-toggle').html(toggler); - $('#'+gem_id+'-toggle').click(function() { + + current.parent().click(function() { $(this).parent().parent().find('div').first().toggleClass('deps_toggle'); $(this).parent().parent().find('div').first().next().toggleClass('deps_toggle'); $(this).find('span').first().toggleClass('deps_expanded-down'); }); - - $('#'+gem_id+'-title').addClass('deps_item--title') - $('.deps_item--duplicate').css("padding", "20") + current.parent().html(toggler); } -function deps_display(deps_names,gem_id,all_deps,scope) { - var new_gems = $("#"+gem_id+scope).find(".deps_scope") - var duplicate_gems = $("#"+gem_id+scope).find(".dup_scope") +function deps_display(deps_names,gem_id,scope,new_gems) { $.each(deps_names, function (idx,dep_details) { dep = dep_details[0] ver_num = dep_details[1] req = dep_details[2] - if(all_deps.includes(dep)) { - var value = "
  • "+dep+" "+ver_num+" "+req+"
    • "; - var link_to_gem = ""+value+""; - duplicate_gems.append(link_to_gem); - } - else { var link = ""; - var value = ""+dep+" "+ver_num+" "+req+""; + var value = ""+dep+" "+ver_num+" "+req+""; - var toggle_link = ""+link+""; + var toggle_link = ""+link+""; var link_to_gem = " "+value+""; - var deps_org = "
    " - var deps_dup = "
    \n
    \n
    " - var deps_list = deps_org+deps_dup; + var deps_run = "
    " + var deps_dev = "
    " + var deps_list = deps_run+deps_dev; new_gems.append(""); - } }); if (scope == "development"){ new_gems.toggleClass("deps_toggle") - duplicate_gems.toggleClass("deps_toggle") } } diff --git a/app/assets/stylesheets/modules/dependencies.css b/app/assets/stylesheets/modules/dependencies.css index 9d1c6ad58a0..876da54b12e 100644 --- a/app/assets/stylesheets/modules/dependencies.css +++ b/app/assets/stylesheets/modules/dependencies.css @@ -70,16 +70,6 @@ transition: 0.3s; } -.deps_item--title{ - color: #060606; -} - -.deps_item--dup{ - padding-top: 4px; - padding-left: 25px; - color: #e9000f; -} - .deps_expanded{ cursor: pointer; user-select: none; diff --git a/app/views/dependencies/_dependencies.html.erb b/app/views/dependencies/_dependencies.html.erb index c8ddf54d185..2f4792a03b3 100644 --- a/app/views/dependencies/_dependencies.html.erb +++ b/app/views/dependencies/_dependencies.html.erb @@ -9,21 +9,19 @@ <% @dependencies[scope].each do |name,version,req| %> <% end %> -
    + <% end %>