SDG Issuelib - code review tweaks

Author: etdsoft

app/assets/javascripts/hera/behaviors.js

@@ -16,10 +16,7 @@ document.addEventListener('turbo:load', function () {
   });
 
   // If project id is changed in project path
-  if (
-    !/^\/projects\/1(\/|$)/.test(window.location.pathname) &&
-    !/^\/addons\/issuelib(\/|$)/.test(window.location.pathname)
-  ) {
+  if (!/^\/projects\/1(\/|$)/.test(window.location.pathname)) {
     $('[data-behavior~=project-teaser]').removeClass('d-none');
   }
 

app/controllers/static_pages_controller.rb

@@ -1,7 +1,7 @@
 class StaticPagesController < AuthenticatedController
   include ProjectScoped
 
-  def issuelib; end
+  def issuelib_index; end
 
-  def import; end
+  def issuelib_import; end
 end

app/helpers/hera_helper.rb

@@ -61,7 +61,7 @@ def flash_messages
 
   def navbar_brand
     if !defined?(Dradis::Pro)
-      link_to main_app.root_path, class: 'navbar-brand' do
+      link_to main_app.project_path(current_project), class: 'navbar-brand' do
         image_tag 'logo_small.png', alt: 'Dradis CE logo', class: 'p-lg-0'
       end
     else

app/views/issues/_empty_import_ce.html.erb

@@ -2,7 +2,7 @@
 <ul class="fa-ul">
   <li><i class="fa-solid fa-li fa-chevron-right"></i><a href="https://dradis.com/integrations/mediawiki.html?utm_source=ce&utm_medium=app" target="_blank">MediaWiki</a></li>
   <li><i class="fa-solid fa-li fa-chevron-right"></i>
-    <%= link_to projects_1_issue_import_path do %>
+    <%= link_to static_issuelib_path do %>
       <i class="fa-solid fa-book"></i> Built-in IssueLibrary
     <% end %>
   </li>

app/views/issues/_import_box.html.erb

@@ -19,13 +19,22 @@
     </p>
     <p class="mb-2">Libraries:</p>
     <ul class="fa-ul">
-      <li><i class="fa-solid fa-li fa-chevron-right"></i><a href="https://dradis.com/integrations/mediawiki.html?utm_source=ce&utm_medium=app" target="_blank">MediaWiki</a></li>
       <li><i class="fa-solid fa-li fa-chevron-right"></i>
-        <%= link_to projects_1_issue_import_path do %>
+        <a href="https://dradis.com/integrations/mediawiki.html?utm_source=ce&utm_medium=app" target="_blank">
+          MediaWiki
+        </a>
+      </li>
+      <li><i class="fa-solid fa-li fa-chevron-right"></i>
+        <%= link_to static_issuelib_path do %>
           <i class="fa-solid fa-book"></i> Built-in Issue Library
         <% end %>
       </li>
     </ul>
+    <form action="<%=  static_issuelib_import_path %>" class="form-inline mb-4" method="get">
+      <div class="inset-button-wrapper">
+        <input type="text" class="form-control search-query", placeholder="Search Issue Library" />
+      </div>
+    </form>
   <% else %>
     <% Dradis::Plugins::with_feature(:import).each do |plugin| %>
       <div>

app/views/layouts/hera/navbar/main_nav/_tools_menu.html.erb

@@ -5,9 +5,10 @@
   </a>
 
   <ul class="dropdown-menu" aria-labelledby="tools-dropdown">
+    <%= render_view_hooks('tools_menu') %>
     <% if !defined?(Dradis::Pro) %>
-      <li><%= link_to 'Issue Library', addons_issuelib_path, class: 'dropdown-item' %></li>
+      <li><div class="dropdown-divider"></div></li>
+      <li><%= link_to 'Issue Library', static_issuelib_path, class: 'dropdown-item' %></li>
     <% end %>
-    <%= render_view_hooks('tools_menu') %>
   </ul>
 </li>

app/views/static_pages/import.html.erb …ws/static_pages/issuelib_import.html.erbapp/views/static_pages/import.html.erb renamed to app/views/static_pages/issuelib_import.html.erb app/views/static_pages/import.html.erb renamed to app/views/static_pages/issuelib_import.html.erb

@@ -4,6 +4,9 @@
   <li class="breadcrumb-item">
     <%= link_to 'Dashboard', main_app.root_path %>
   </li>
+  <li class="breadcrumb-item">
+    <%= link_to 'Issue Library', main_app.static_issuelib_path %>
+  </li>
   <li class="breadcrumb-item active">
     Import Issues
   </li>

app/views/static_pages/issuelib.html.erb …ews/static_pages/issuelib_index.html.erbapp/views/static_pages/issuelib.html.erb renamed to app/views/static_pages/issuelib_index.html.erb app/views/static_pages/issuelib.html.erb renamed to app/views/static_pages/issuelib_index.html.erb

@@ -20,17 +20,17 @@
   </div>
   <div id="il-page-tips" class="page-tips show collapse">
     <div class="bg-info">
-      <p>Maintain a library of issues that can be easily accessed, and achieve consistency across your projects.</p>
+      <p>Maintain a library of findings that can be easily accessed, and achieve consistency across your projects.</p>
       <p>Authors can be given permission to access or manage the Issue Library.</p>
-      <p class="text-end card-link">More about <a href="https://dradis.com/support/guides/issuelibrary/" target="_blank">Issue Library</a>.</p>
+      <p class="text-end card-link">More about <a href="https://dradis.com/tools/issuelib.html" target="_blank">Issue Library</a>.</p>
     </div>
   </div>
 <% end %>
 
 <div class="row d-flex align-items-start justify-content-between">
   <div class="col-12 col-md-9">
     <h1>Build Your Issue Library</h1>
-    <h2 class="mb-3">Maintain reusable issues to ensure consistency across all of your projects</h2>
+    <h2 class="mb-3">Maintain reusable findings to ensure consistency across all of your projects</h2>
   </div>
   <div class="col-12 col-md-3 d-flex justify-content-start justify-content-md-end mb-4 mb-md-0">
     <a