plan_my_stuff 0.1.0 → 1.0.0

data/app/views/plan_my_stuff/issues/partials/_labels.html.erb

@@ -1,11 +1,12 @@
-<% if issue.labels.any? %>
+<%# locals: (issue:) %>
+<% if issue.labels.present? %>
   <% issue.labels.each do |label| %>
     <span>
       <%= label %>
       <%=
         button_to(
           'x',
-          plan_my_stuff.issue_remove_label_path(issue.number, label),
+          plan_my_stuff.issue_label_path(issue.number, label),
           method: :delete,
           form: { style: 'display:inline' }
         )
@@ -16,7 +17,7 @@
   <em>No labels</em>
 <% end %>
 
-<%= form_with(url: plan_my_stuff.issue_add_label_path(issue.number), method: :post, local: true) do |form| %>
+<%= form_with(url: plan_my_stuff.issue_labels_path(issue.number), method: :post, local: true) do |form| %>
   <%= form.label(:label_name, 'Add label') %>
   <%= form.text_field(:label_name) %>
   <%= form.submit('Add') %>

data/app/views/plan_my_stuff/issues/partials/_links.html.erb

@@ -0,0 +1,113 @@
+<%# locals: (issue:, support_user:) %>
+<%
+  # read_only sections have no add form; remove_only sections allow X but
+  # no add (blocking is created from the blocked side; duplicate_of is
+  # created via mark_duplicate! and cleared by reopening on GitHub).
+  sections = [
+    {
+      type: 'parent',
+      label: 'Parent',
+      single: true,
+      add_form: true,
+      removable: true,
+      targets: [issue.parent].compact
+    },
+    {
+      type: 'sub_ticket',
+      label: 'Sub-tickets',
+      single: false,
+      add_form: true,
+      removable: true,
+      targets: issue.sub_tickets
+    },
+    {
+      type: 'blocked_by',
+      label: 'Blocked by',
+      single: false,
+      add_form: true,
+      removable: true,
+      targets: issue.blocked_by
+    },
+    {
+      type: 'blocking',
+      label: 'Blocking',
+      single: false,
+      add_form: false,
+      removable: false,
+      targets: issue.blocking
+    },
+    {
+      type: 'related',
+      label: 'Related',
+      single: false,
+      add_form: true,
+      removable: true,
+      targets: issue.related
+    },
+    {
+      type: 'duplicate_of',
+      label: 'Duplicate of',
+      single: true,
+      add_form: false,
+      removable: false,
+      targets: [issue.duplicate_of].compact
+    },
+  ]
+  visible_sections = support_user ? sections : sections.select { |s| s[:type] == 'related' }
+%>
+
+<section aria-label="Ticket links">
+  <h3>Links</h3>
+  <% visible_sections.each do |section| %>
+    <div>
+      <h4><%= section[:label] %></h4>
+      <% if section[:targets].present? %>
+        <ul>
+          <% section[:targets].each do |target| %>
+            <li>
+              <%=
+                link_to(
+                  "#{target.repo.full_name}##{target.number} - #{target.title}",
+                  plan_my_stuff.issue_path(target),
+                )
+              %>
+              <% if section[:removable] %>
+                <%
+                  link_id = "#{section[:type]}:#{target.repo.full_name}:#{target.number}"
+                %>
+                <%=
+                  button_to(
+                    'Remove',
+                    plan_my_stuff.issue_link_path(issue, link_id),
+                    method: :delete,
+                    form: { style: 'display:inline' },
+                  )
+                %>
+              <% end %>
+            </li>
+          <% end %>
+        </ul>
+      <% else %>
+        <p><em>None</em></p>
+      <% end %>
+
+      <% if section[:add_form] && (!section[:single] || section[:targets].empty?) %>
+        <%=
+          form_with(
+            scope: :link,
+            url: plan_my_stuff.issue_links_path(issue),
+            method: :post,
+            local: true,
+          ) do |form|
+        %>
+          <%= form.hidden_field(:type, value: section[:type]) %>
+          <%= form.label(:issue_number, 'Issue #') %>
+          <%= form.number_field(:issue_number) %>
+          <%= form.label(:repo, 'Repo (optional)') %>
+          <%= form.text_field(:repo, placeholder: issue.repo.full_name) %>
+          <%= form.submit("Add #{section[:label].downcase}") %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+</section>

data/app/views/plan_my_stuff/issues/partials/_viewers.html.erb

@@ -1,7 +1,8 @@
+<%# locals: (issue:) %>
 <h2>Manage Viewers</h2>
 
 <% viewers = issue.metadata.visibility_allowlist %>
-<% if viewers.any? %>
+<% if viewers.present? %>
   <ul>
     <% viewers.each do |viewer_id| %>
       <li>
@@ -9,7 +10,7 @@
         <%=
           button_to(
             'Remove',
-            plan_my_stuff.remove_viewer_issue_path(issue.number, viewer_id: viewer_id),
+            plan_my_stuff.issue_viewer_path(issue, viewer_id),
             method: :delete
           )
         %>
@@ -20,7 +21,7 @@
   <p>No viewers added.</p>
 <% end %>
 
-<%= form_with(url: plan_my_stuff.add_viewers_issue_path(issue.number), method: :post) do |form| %>
+<%= form_with(url: plan_my_stuff.issue_viewers_path(issue), method: :post) do |form| %>
   <div>
     <%= form.label(:viewer_ids, 'Add viewer IDs (comma-separated)') %>
     <%= form.text_field(:viewer_ids) %>

data/app/views/plan_my_stuff/issues/show.html.erb

@@ -1,11 +1,45 @@
 <h1><%= @issue.title %> <small>#<%= @issue.number %></small></h1>
 
 <p>
-  <%= link_to('Edit', plan_my_stuff.edit_issue_path(@issue.number)) %>
+  <%= link_to('Edit', plan_my_stuff.edit_issue_path(@issue)) %>
+  <% if @support_user && @issue.html_url.present? %>
+    <%= link_to('View on GitHub', @issue.html_url, target: '_blank', rel: 'noopener') %>
+  <% end %>
   <% if @issue.state == 'open' %>
-    <%= button_to('Close Issue', plan_my_stuff.close_issue_path(@issue.number), method: :patch) %>
+    <%= button_to('Close Issue', plan_my_stuff.issue_closure_path(@issue), method: :post) %>
   <% else %>
-    <%= button_to('Reopen Issue', plan_my_stuff.reopen_issue_path(@issue.number), method: :patch) %>
+    <%= button_to('Reopen Issue', plan_my_stuff.issue_closure_path(@issue), method: :delete) %>
+  <% end %>
+  <% if @support_user && @issue.state == 'open' %>
+    <% if @issue.metadata.waiting_on_user_at.present? %>
+      <%= button_to('Mark replied', plan_my_stuff.issue_waiting_path(@issue), method: :delete) %>
+    <% else %>
+      <%= button_to('Mark waiting', plan_my_stuff.issue_waiting_path(@issue), method: :post) %>
+    <% end %>
+  <% end %>
+  <% if @support_user && @pipeline_enabled && @pipeline_item.nil? && @issue.assignees.blank? %>
+    <%= button_to('Take', plan_my_stuff.issue_take_path(@issue), method: :post) %>
+  <% end %>
+  <%
+    show_unassign =
+      @support_user &&
+      @pipeline_enabled &&
+      @current_user_login.present? &&
+      @issue.assignees.include?(@current_user_login)
+  %>
+  <% if show_unassign %>
+    <%= button_to('Unassign', plan_my_stuff.issue_take_path(@issue), method: :delete) %>
+  <% end %>
+  <% if @support_user && @pipeline_enabled && @pipeline_item.present? %>
+    <% testing_value = @pipeline_item.field_values[PlanMyStuff.configuration.pipeline_testing_field_name] %>
+    <% if testing_value == PlanMyStuff.configuration.pipeline_testing_values[:active] %>
+      <%= button_to('Clear testing', plan_my_stuff.issue_testing_path(@issue), method: :delete) %>
+    <% else %>
+      <%= button_to('Request testing', plan_my_stuff.issue_testing_path(@issue), method: :post) %>
+    <% end %>
+  <% end %>
+  <% if @support_user %>
+    <%= link_to('Start Testing Project', plan_my_stuff.new_testing_project_path(subject_url: @issue.html_url)) %>
   <% end %>
 </p>
 
@@ -27,15 +61,42 @@
 
 <hr>
 
+<%=
+  render({
+    partial: 'plan_my_stuff/issues/partials/links',
+    locals: { issue: @issue, support_user: @support_user },
+  })
+%>
+
+<hr>
+
+<%=
+  render({
+    partial: 'plan_my_stuff/issues/partials/approvals',
+    locals: {
+      issue: @issue,
+      support_user: @support_user,
+      current_user_id_local: @current_user_id,
+    },
+  })
+%>
+
+<hr>
+
 <h2>Comments (<%= @comments.size %>)</h2>
 
-<% if @comments.any? %>
+<% if @comments.present? %>
   <% @comments.each do |comment| %>
     <div>
       <%= PlanMyStuff::Markdown.render(comment.body || '').html_safe %>
       <% if comment.pms_comment? && (@support_user || comment.metadata.created_by == @current_user_id) %>
         <p>
-          <%= link_to('Edit', plan_my_stuff.edit_issue_comment_path(@issue.number, comment.id)) %>
+          <%= link_to('Edit', plan_my_stuff.edit_issue_comment_path(@issue, comment.id)) %>
+        </p>
+      <% end %>
+      <% if @support_user && comment.html_url.present? %>
+        <p>
+          <%= link_to('View on GitHub', comment.html_url, target: '_blank', rel: 'noopener') %>
         </p>
       <% end %>
     </div>
@@ -51,7 +112,7 @@
     partial: 'plan_my_stuff/comments/partials/form',
     locals: {
       issue: @issue,
-      comment: PlanMyStuff::Comment.new,
+      comment: PlanMyStuff::Comment.new(visibility: :public),
       support_user: @support_user,
     },
   })

data/app/views/plan_my_stuff/partials/_flash.html.erb

@@ -0,0 +1,3 @@
+<% if flash[:error].present? %>
+  <p role="alert" style="color: red;"><%= flash[:error] %></p>
+<% end %>

data/app/views/plan_my_stuff/projects/edit.html.erb

@@ -0,0 +1,5 @@
+<h1>Edit Project #<%= @project.number %></h1>
+
+<%= render({ partial: 'plan_my_stuff/partials/flash' }) %>
+
+<%= render({ partial: 'plan_my_stuff/projects/partials/form', locals: { project: @project } }) %>

data/app/views/plan_my_stuff/projects/index.html.erb

@@ -1,13 +1,29 @@
 <h1>Projects</h1>
 
-<% if @projects.any? %>
+<p>
+  <%= link_to('All', plan_my_stuff.projects_path(filter: 'all')) %>
+  <%= link_to('Regular', plan_my_stuff.projects_path(filter: 'regular')) %>
+  <%= link_to('Testing', plan_my_stuff.projects_path(filter: 'testing')) %>
+</p>
+
+<% if @projects.present? %>
   <ul>
     <% @projects.each do |project| %>
       <li>
-        <%= link_to(project.title, plan_my_stuff.project_path(project.number)) %>
+        <% if project.is_a?(PlanMyStuff::TestingProject) %>
+          <%= link_to(project.title, plan_my_stuff.testing_project_path(project.number)) %>
+          <span>[Testing]</span>
+        <% else %>
+          <%= link_to(project.title, plan_my_stuff.project_path(project.number)) %>
+        <% end %>
       </li>
     <% end %>
   </ul>
 <% else %>
   <p>No projects found.</p>
 <% end %>
+
+<p><%= link_to('New Project', plan_my_stuff.new_project_path) %></p>
+<% if @support_user %>
+  <p><%= link_to('New Testing Project', plan_my_stuff.new_testing_project_path) %></p>
+<% end %>

data/app/views/plan_my_stuff/projects/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Project</h1>
+
+<%= render({ partial: 'plan_my_stuff/partials/flash' }) %>
+
+<%= render({ partial: 'plan_my_stuff/projects/partials/form', locals: { project: @project } }) %>

data/app/views/plan_my_stuff/projects/partials/_form.html.erb

@@ -0,0 +1,30 @@
+<%# locals: (project:) %>
+<%
+  persisted = project.persisted?
+  url =
+    if persisted
+      plan_my_stuff.project_path(project.number)
+    else
+      plan_my_stuff.projects_path
+    end
+%>
+<%= form_with(url: url, method: persisted ? :patch : :post, scope: :project) do |form| %>
+  <div>
+    <%= form.label(:title, 'Title') %>
+    <%= form.text_field(:title, value: project.title, required: true) %>
+  </div>
+
+  <div>
+    <%= form.label(:description, 'Description') %>
+    <%= form.text_field(:description, value: project.description) %>
+  </div>
+
+  <div>
+    <%= form.label(:readme, 'Readme') %>
+    <%= form.text_area(:readme, rows: 8, value: project.readme) %>
+  </div>
+
+  <div>
+    <%= form.submit(persisted ? 'Update Project' : 'Create Project') %>
+  </div>
+<% end %>

data/app/views/plan_my_stuff/projects/show.html.erb

@@ -1,6 +1,13 @@
 <h1><%= @project.title %></h1>
 
-<% if @statuses.any? %>
+<p>
+  <%= link_to('Edit', plan_my_stuff.edit_project_path(@project.number)) %>
+  <% if @support_user && @project.url.present? %>
+    <%= link_to('View on GitHub', @project.url, target: '_blank', rel: 'noopener') %>
+  <% end %>
+</p>
+
+<% if @statuses.present? %>
   <table>
     <thead>
       <tr>
@@ -16,18 +23,20 @@
             <% items = @items_by_status[status] || [] %>
             <% items.each do |item| %>
               <div style="border: 1px solid black; margin: 1em">
-                <% if item.number.present? %>
-                  <strong><%= link_to(item.title, plan_my_stuff.issue_path(item.number)) %></strong>
+                <% unless item.draft? %>
+                  <strong>
+                    <%= link_to(item.title, plan_my_stuff.issue_path(item.issue.to_param)) %>
+                  </strong>
                 <% else %>
                   <strong><%= item.title %></strong>
                 <% end %>
-                <% if item.number.present? %>
+                <% unless item.draft? %>
                   <small>#<%= item.number %></small>
                 <% end %>
 
                 <%=
                   form_with(
-                    url: plan_my_stuff.move_project_item_path(@project.number, item.id),
+                    url: plan_my_stuff.project_item_status_path(@project.number, item.id),
                     method: :patch,
                     local: true,
                   ) do |form|
@@ -36,21 +45,21 @@
                 <% end %>
 
                 <% assignees = item.field_values['Assignees'] || [] %>
-                <% if assignees.any? %>
+                <% if assignees.present? %>
                   <div>
                     <% assignees.each do |username| %>
                       <span>
                         <%= username %>
                         <%=
                           form_with(
-                            url: plan_my_stuff.unassign_project_item_path(@project.number, item.id),
-                            method: :patch,
+                            url: plan_my_stuff.project_item_assignment_path(@project.number, item.id),
+                            method: :delete,
                             local: true,
-                            style: 'display: inline',
+                            html: { style: 'display: inline' },
                           ) do |form|
                         %>
                           <%= form.hidden_field(:username, value: username) %>
-                          <%= form.submit('×', title: "Unassign #{username}") %>
+                          <%= form.submit('x', title: "Unassign #{username}") %>
                         <% end %>
                       </span>
                     <% end %>
@@ -59,7 +68,7 @@
 
                 <%=
                   form_with(
-                    url: plan_my_stuff.assign_project_item_path(@project.number, item.id),
+                    url: plan_my_stuff.project_item_assignment_path(@project.number, item.id),
                     method: :patch,
                     local: true,
                   ) do |form|
@@ -67,6 +76,16 @@
                   <%= form.text_field(:assignee, placeholder: 'GitHub username') %>
                   <%= form.submit('Assign') %>
                 <% end %>
+
+                <%=
+                  form_with(
+                    url: plan_my_stuff.project_item_path(@project.number, item.id),
+                    method: :delete,
+                    local: true,
+                  ) do |form|
+                %>
+                  <%= form.submit('Remove from project') %>
+                <% end %>
               </div>
             <% end %>
             <% if items.empty? %>

data/app/views/plan_my_stuff/testing_project_items/new.html.erb

@@ -0,0 +1,10 @@
+<h1>Add Item to <%= @project.title %></h1>
+
+<%= render({ partial: 'plan_my_stuff/partials/flash' }) %>
+
+<%=
+  render({
+    partial: 'plan_my_stuff/testing_projects/partials/items/form',
+    locals: { project: @project },
+  })
+%>

data/app/views/plan_my_stuff/testing_project_items/results/new.html.erb

@@ -0,0 +1,20 @@
+<h1>Fail Item</h1>
+
+<%= render({ partial: 'plan_my_stuff/partials/flash' }) %>
+
+<%= form_with(
+  url: plan_my_stuff.testing_project_item_result_path(@project_number, @item_id),
+  method: :post,
+  local: true,
+) do |form| %>
+  <%= form.hidden_field(:result, value: 'fail') %>
+
+  <div>
+    <%= form.label(:result_notes, 'Result Notes') %>
+    <%= form.text_area(:result_notes, rows: 5, required: true) %>
+  </div>
+
+  <div>
+    <%= form.submit('Submit Failure') %>
+  </div>
+<% end %>

data/app/views/plan_my_stuff/testing_projects/edit.html.erb

@@ -0,0 +1,5 @@
+<h1>Edit Testing Project #<%= @project.number %></h1>
+
+<%= render({ partial: 'plan_my_stuff/partials/flash' }) %>
+
+<%= render({ partial: 'plan_my_stuff/testing_projects/partials/form', locals: { project: @project } }) %>

data/app/views/plan_my_stuff/testing_projects/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Testing Project</h1>
+
+<%= render({ partial: 'plan_my_stuff/partials/flash' }) %>
+
+<%= render({ partial: 'plan_my_stuff/testing_projects/partials/form', locals: { project: @project } }) %>

data/app/views/plan_my_stuff/testing_projects/partials/_form.html.erb

@@ -0,0 +1,40 @@
+<%# locals: (project:) %>
+<%
+  persisted = project.persisted?
+  url =
+    if persisted
+      plan_my_stuff.testing_project_path(project.number)
+    else
+      plan_my_stuff.testing_projects_path
+    end
+%>
+<%= form_with(url: url, method: persisted ? :patch : :post, scope: :testing_project) do |form| %>
+  <div>
+    <%= form.label(:title, 'Title') %>
+    <%= form.text_field(:title, value: project.title, required: true) %>
+  </div>
+
+  <div>
+    <%= form.label(:description, 'Description') %>
+    <%= form.text_field(:description, value: project.description) %>
+  </div>
+
+  <div>
+    <%= form.label(:subject_urls, 'Subject URLs (one per line)') %>
+    <%= form.text_area(:subject_urls, rows: 4, value: Array.wrap(project.metadata&.subject_urls).join("\n")) %>
+  </div>
+
+  <div>
+    <%= form.label(:due_date, 'Due Date') %>
+    <%= form.date_field(:due_date, value: project.metadata&.due_date&.strftime('%F')) %>
+  </div>
+
+  <div>
+    <%= form.label(:deadline_miss_reason, 'Deadline Miss Reason') %>
+    <%= form.text_field(:deadline_miss_reason, value: project.metadata&.deadline_miss_reason) %>
+  </div>
+
+  <div>
+    <%= form.submit(persisted ? 'Update Testing Project' : 'Create Testing Project') %>
+  </div>
+<% end %>

data/app/views/plan_my_stuff/testing_projects/partials/_item.html.erb

@@ -0,0 +1,52 @@
+<%# locals: (item:, project:, statuses:) %>
+<div style="border: 1px solid black; margin: 1em; padding: 0.5em">
+  <% if item.draft? %>
+    <strong><%= item.title %></strong>
+  <% else %>
+    <strong><%= link_to(item.title, plan_my_stuff.issue_path(item.issue.to_param)) %></strong>
+    <small>#<%= item.number %></small>
+  <% end %>
+
+  <%=
+    form_with(
+      url: plan_my_stuff.testing_project_item_status_path(project.number, item.id),
+      method: :patch,
+      local: true,
+    ) do |form|
+  %>
+    <%= form.select(:status, statuses, { selected: item.status }, { onchange: 'this.form.requestSubmit();' }) %>
+  <% end %>
+
+  <% if item.field_values['Testers'].present? %>
+    <div><strong>Testers:</strong> <%= item.field_values['Testers'] %></div>
+  <% end %>
+
+  <% if item.field_values['Watchers'].present? %>
+    <div><strong>Watchers:</strong> <%= item.field_values['Watchers'] %></div>
+  <% end %>
+
+  <% if item.field_values['Due Date'].present? %>
+    <div><strong>Due:</strong> <%= item.field_values['Due Date'] %></div>
+  <% end %>
+
+  <% if item.field_values['Result Notes'].present? %>
+    <div><strong>Notes:</strong> <%= item.field_values['Result Notes'] %></div>
+  <% end %>
+
+  <% if item.field_values['Passed At'].present? %>
+    <div><strong>Passed at:</strong> <%= item.field_values['Passed At'] %></div>
+  <% end %>
+
+  <div>
+    <%=
+      button_to(
+        'Pass',
+        plan_my_stuff.testing_project_item_result_path(project.number, item.id),
+        method: :post,
+        params: { result: 'pass' },
+      )
+    %>
+
+    <%= link_to('Fail', plan_my_stuff.new_testing_project_item_result_path(project.number, item.id)) %>
+  </div>
+</div>

data/app/views/plan_my_stuff/testing_projects/partials/items/_form.html.erb

@@ -0,0 +1,36 @@
+<%# locals: (project:) %>
+<%= form_with(url: plan_my_stuff.testing_project_items_path(project.number), method: :post, local: true) do |form| %>
+  <div>
+    <%= form.label(:title, 'Title') %>
+    <%= form.text_field(:title, required: true) %>
+  </div>
+
+  <div>
+    <%= form.label(:body, 'Body') %>
+    <%= form.text_area(:body, rows: 4) %>
+  </div>
+
+  <div>
+    <%= form.label(:testers, 'Testers (user ids, comma separated)') %>
+    <%= form.text_field(:testers) %>
+  </div>
+
+  <div>
+    <%= form.label(:watchers, 'Watchers (user ids, comma separated)') %>
+    <%= form.text_field(:watchers) %>
+  </div>
+
+  <div>
+    <%= form.label(:pass_mode, 'Pass Mode') %>
+    <%= form.select(:pass_mode, [['All testers must pass', 'all'], ['Any tester can pass', 'any']], { selected: 'all' }) %>
+  </div>
+
+  <div>
+    <%= form.label(:due_date, 'Due Date') %>
+    <%= form.date_field(:due_date) %>
+  </div>
+
+  <div>
+    <%= form.submit('Add Item') %>
+  </div>
+<% end %>