completion-kit 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e0435edbf9ccffb90715ab2d16fca2d158ad8e81767d550c3290c61a18de5ef
-  data.tar.gz: 365c545d14c7e9795f822cbda48d88327d70ea2b825276a4cb3b5e57b3ca2f6d
+  metadata.gz: 693a2c9c76ea04ca616b00a76556f2aeee15c38ca6290ef968d2b9c83eb23e83
+  data.tar.gz: 6baf88740c80fe3102fff0f5d934f66357e74b62f3ac8da07b0c1d0069a3911d
 SHA512:
-  metadata.gz: 046de8a9141dcd65497cde60b4fe5fae8cae31c7813f1c973469e4294a531292414d035979e1594e56829a0c3e81fd13eacd6d59221da9b8009a0f29574f38ba
-  data.tar.gz: 913f8ccbf9a907c958a29bd8e6af9c272d3fb55e4b1dd526c51dc4fc310fa20a06901818665adc09fa2ce440f141feb0d751f84b3a2bcaf2938c6183ff78cd9c
+  metadata.gz: 3e5d34d55848f1480b01a5459025936c3d27e18f4b907a1dc98ca4081510dcbbe247fcdc88f05721a7452bf0d4adc0d78270c9ff08a9fba57dd616fc6b2c254b
+  data.tar.gz: 4d12110ac0998d0f4640c89854f39ce2bdee3eae205910a4bc4a583eeda25ed1a2ac886d89da3cc185b6d4d42773d799101545c0c12ef56bd5b7cfc910bef106

data/app/assets/stylesheets/completion_kit/application.css

@@ -2259,6 +2259,18 @@ label.ck-checkbox[hidden] {
   outline-offset: 2px;
 }
 
+.ck-delete-action {
+  margin-top: 1rem;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 0.5rem;
+}
+
+.ck-delete-action .ck-field-hint {
+  margin: 0;
+}
+
 .ck-icon-btn--spinning svg {
   animation: ck-spin 0.8s linear infinite;
 }

data/app/views/completion_kit/datasets/_form.html.erb

@@ -31,23 +31,6 @@
     <%= render "completion_kit/tags/picker", record: dataset, param_namespace: :dataset %>
 
     <div class="ck-actions">
-      <% if dataset.persisted? %>
-        <% runs_n = dataset.runs.count %>
-        <% responses_n = CompletionKit::Response.where(run_id: dataset.runs.select(:id)).count %>
-        <% confirm = if runs_n.zero?
-             "Delete \"#{dataset.name}\"? It has no runs."
-           else
-             "Delete \"#{dataset.name}\"? Cascades through #{pluralize(runs_n, 'run')} and #{pluralize(responses_n, 'response')} (and their reviews) that used this dataset."
-           end %>
-        <%= button_to dataset_path(dataset), method: :delete,
-              form_class: "inline-block",
-              class: "ck-icon-btn",
-              title: "Delete dataset",
-              "aria-label": "Delete dataset",
-              data: { turbo_confirm: confirm } do %>
-          <%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %>
-        <% end %>
-      <% end %>
       <%= link_to "Cancel", datasets_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(dataset.persisted? ? "Save dataset" : "Create dataset", class: ck_button_classes(:dark)) %>
     </div>
@@ -81,3 +64,14 @@ document.addEventListener('turbo:load', ckDatasetHeaderPreview);
 ckDatasetHeaderPreview();
   </script>
 <% end %>
+
+<% if dataset.persisted? %>
+  <% runs_n = dataset.runs.count %>
+  <% responses_n = CompletionKit::Response.where(run_id: dataset.runs.select(:id)).count %>
+  <% confirm = if runs_n.zero?
+       "Delete \"#{dataset.name}\"? It has no runs."
+     else
+       "Delete \"#{dataset.name}\"? Cascades through #{pluralize(runs_n, 'run')} and #{pluralize(responses_n, 'response')} (and their reviews) that used this dataset."
+     end %>
+  <%= render "completion_kit/shared/delete_action", path: dataset_path(dataset), label: "Delete dataset", confirm: confirm %>
+<% end %>

data/app/views/completion_kit/metric_groups/_form.html.erb

@@ -80,22 +80,16 @@
     </script>
 
     <div class="ck-actions">
-      <% if metric_group.persisted? %>
-        <% members_n = metric_group.metrics.count %>
-        <% confirm = members_n.zero? ?
-             "Delete \"#{metric_group.name}\"? It has no members." :
-             "Delete \"#{metric_group.name}\"? Removes this grouping. #{pluralize(members_n, 'member metric')} #{members_n == 1 ? 'is' : 'are'} kept." %>
-        <%= button_to metric_group_path(metric_group), method: :delete,
-              form_class: "inline-block",
-              class: "ck-icon-btn",
-              title: "Delete metric group",
-              "aria-label": "Delete metric group",
-              data: { turbo_confirm: confirm } do %>
-          <%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %>
-        <% end %>
-      <% end %>
       <%= link_to "Cancel", metrics_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(metric_group.persisted? ? "Save metric group" : "Create metric group", class: ck_button_classes(:dark)) %>
     </div>
   </div>
 <% end %>
+
+<% if metric_group.persisted? %>
+  <% members_n = metric_group.metrics.count %>
+  <% confirm = members_n.zero? ?
+       "Delete \"#{metric_group.name}\"? It has no members." :
+       "Delete \"#{metric_group.name}\"? Removes this grouping. #{pluralize(members_n, 'member metric')} #{members_n == 1 ? 'is' : 'are'} kept." %>
+  <%= render "completion_kit/shared/delete_action", path: metric_group_path(metric_group), label: "Delete metric group", confirm: confirm %>
+<% end %>

data/app/views/completion_kit/metrics/_form.html.erb

@@ -254,24 +254,18 @@
     <%= render "completion_kit/tags/picker", record: metric, param_namespace: :metric %>
 
     <div class="ck-actions">
-      <% if metric.persisted? %>
-        <% groups_n = metric.metric_groups.count %>
-        <% reviews_n = metric.reviews.count %>
-        <% parts = [] %>
-        <% parts << "in #{pluralize(groups_n, 'metric group')} (removed from each)" if groups_n > 0 %>
-        <% parts << "scored in #{pluralize(reviews_n, 'review')} (scores kept, link cleared)" if reviews_n > 0 %>
-        <% confirm = parts.empty? ? "Delete \"#{metric.name}\"? It's not in use." : "Delete \"#{metric.name}\"? It's #{parts.to_sentence}." %>
-        <%= button_to metric_path(metric), method: :delete,
-              form_class: "inline-block",
-              class: "ck-icon-btn ck-icon-btn--form",
-              title: "Delete metric",
-              "aria-label": "Delete metric",
-              data: { turbo_confirm: confirm } do %>
-          <%= heroicon_tag "trash", variant: :outline, size: 24, "aria-hidden": "true" %>
-        <% end %>
-      <% end %>
       <%= link_to "Cancel", metrics_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(metric.persisted? ? "Save metric" : "Create metric", class: ck_button_classes(:dark)) %>
     </div>
   </div>
 <% end %>
+
+<% if metric.persisted? %>
+  <% groups_n = metric.metric_groups.count %>
+  <% reviews_n = metric.reviews.count %>
+  <% parts = [] %>
+  <% parts << "in #{pluralize(groups_n, 'metric group')} (removed from each)" if groups_n > 0 %>
+  <% parts << "scored in #{pluralize(reviews_n, 'review')} (scores kept, link cleared)" if reviews_n > 0 %>
+  <% confirm = parts.empty? ? "Delete \"#{metric.name}\"? It's not in use." : "Delete \"#{metric.name}\"? It's #{parts.to_sentence}." %>
+  <%= render "completion_kit/shared/delete_action", path: metric_path(metric), label: "Delete metric", confirm: confirm %>
+<% end %>

data/app/views/completion_kit/prompts/_form.html.erb

@@ -11,7 +11,7 @@
   <% end %>
 
   <% if prompt.persisted? && prompt.runs.exists? %>
-    <p class="ck-version-note">Editing <%= prompt.version_label %> — it has runs, so saving creates a new version of this prompt.</p>
+    <p class="ck-version-note">Editing <%= prompt.version_label %>. It has runs, so saving creates a new version of this prompt.</p>
   <% end %>
 
   <div class="ck-card ck-form-card">
@@ -39,7 +39,7 @@
       <% available = CompletionKit::ApiConfig.available_models(scope: :generation) %>
       <% if available.any? %>
         <div class="ck-select-with-action">
-          <%= form.select :llm_model, ck_grouped_models(available, prompt.llm_model), { include_blank: "— Select a model —" }, { class: "ck-input", id: "prompt_llm_model" } %>
+          <%= form.select :llm_model, ck_grouped_models(available, prompt.llm_model), { include_blank: "Select a model" }, { class: "ck-input", id: "prompt_llm_model" } %>
           <% ck_refreshing = CompletionKit::ProviderCredential.discovery_in_progress? %>
           <button type="button" class="ck-icon-btn<%= ' ck-icon-btn--spinning' if ck_refreshing %>" title="Refresh models" <%= 'disabled' if ck_refreshing %> onclick="ckRefreshModels()"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="16" height="16"><path fill-rule="evenodd" d="M13.836 2.477a.75.75 0 0 1 .75.75v3.182a.75.75 0 0 1-.75.75h-3.182a.75.75 0 0 1 0-1.5h1.37l-.84-.841a4.5 4.5 0 0 0-7.08.681.75.75 0 0 1-1.264-.808 6 6 0 0 1 9.44-.908l.84.84V3.227a.75.75 0 0 1 .75-.75Zm-.911 7.5A.75.75 0 0 1 13.199 11a6 6 0 0 1-9.44.908l-.84-.84v1.68a.75.75 0 0 1-1.5 0V9.567a.75.75 0 0 1 .75-.75h3.182a.75.75 0 0 1 0 1.5h-1.37l.84.841a4.5 4.5 0 0 0 7.08-.681.75.75 0 0 1 1.024-.274Z" clip-rule="evenodd"/></svg></button>
         </div>
@@ -58,25 +58,19 @@
     <%= render "completion_kit/tags/picker", record: prompt, param_namespace: :prompt %>
 
     <div class="ck-actions">
-      <% if prompt.persisted? %>
-        <% runs_n = prompt.runs.count %>
-        <% responses_n = prompt.responses.count %>
-        <% confirm = if runs_n.zero?
-             "Delete \"#{prompt.display_name}\"? This version has no runs."
-           else
-             "Delete \"#{prompt.display_name}\"? Cascades through #{pluralize(runs_n, 'run')} and #{pluralize(responses_n, 'response')} (and their reviews). Other versions of this prompt are untouched."
-           end %>
-        <%= button_to prompt_path(prompt), method: :delete,
-              form_class: "inline-block",
-              class: "ck-icon-btn",
-              title: "Delete prompt",
-              "aria-label": "Delete prompt",
-              data: { turbo_confirm: confirm } do %>
-          <%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %>
-        <% end %>
-      <% end %>
       <%= link_to "Cancel", prompts_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(prompt.persisted? ? "Save prompt" : "Create prompt", class: ck_button_classes(:dark), disabled: available.empty?) %>
     </div>
   </div>
 <% end %>
+
+<% if prompt.persisted? %>
+  <% runs_n = prompt.runs.count %>
+  <% responses_n = prompt.responses.count %>
+  <% confirm = if runs_n.zero?
+       "Delete \"#{prompt.display_name}\"? This version has no runs."
+     else
+       "Delete \"#{prompt.display_name}\"? Cascades through #{pluralize(runs_n, 'run')} and #{pluralize(responses_n, 'response')} (and their reviews). Other versions of this prompt are untouched."
+     end %>
+  <%= render "completion_kit/shared/delete_action", path: prompt_path(prompt), label: "Delete prompt", confirm: confirm %>
+<% end %>

data/app/views/completion_kit/provider_credentials/_form.html.erb

@@ -43,20 +43,11 @@
 <% end %>
 
 <% if provider_credential.persisted? %>
-  <% if provider_credential.in_use? %>
-    <p class="ck-field-hint"><%= provider_credential.in_use_message %></p>
-  <% else %>
-    <div class="ck-actions">
-      <%= button_to provider_credential_path(provider_credential), method: :delete,
-            form_class: "inline-block",
-            class: "ck-icon-btn",
-            title: "Delete provider",
-            "aria-label": "Delete provider",
-            data: { turbo_confirm: "Delete the #{provider_credential.display_provider} provider and its discovered models? This can't be undone." } do %>
-        <%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %>
-      <% end %>
-    </div>
-  <% end %>
+  <%= render "completion_kit/shared/delete_action",
+        path: provider_credential_path(provider_credential),
+        label: "Delete provider",
+        confirm: "Delete the #{provider_credential.display_provider} provider and its discovered models? This can't be undone.",
+        blocked_reason: (provider_credential.in_use_message if provider_credential.in_use?) %>
 <% end %>
 
 <% if provider_credential.persisted? %>

data/app/views/completion_kit/shared/_delete_action.html.erb

@@ -0,0 +1,18 @@
+<%# locals: (path:, label:, confirm:, blocked_reason: nil) %>
+<div class="ck-delete-action">
+  <% if blocked_reason.present? %>
+    <button type="button" class="<%= ck_button_classes(:red, variant: :outline) %>" disabled aria-disabled="true">
+      <%= heroicon_tag "trash", variant: :outline, size: 15, "aria-hidden": "true" %>
+      <%= label %>
+    </button>
+    <p class="ck-field-hint"><%= blocked_reason %></p>
+  <% else %>
+    <%= button_to path, method: :delete,
+          form_class: "inline-block",
+          class: ck_button_classes(:red, variant: :outline),
+          data: { turbo_confirm: confirm } do %>
+      <%= heroicon_tag "trash", variant: :outline, size: 15, "aria-hidden": "true" %>
+      <%= label %>
+    <% end %>
+  <% end %>
+</div>

data/app/views/completion_kit/tags/_form.html.erb

@@ -17,24 +17,18 @@
     </div>
 
 <div class="ck-actions">
-      <% if tag.persisted? %>
-        <% applied_n = tag.taggings.count %>
-        <% confirm = if applied_n.zero?
-             "Delete \"#{tag.name}\"? It's not currently applied to anything."
-           else
-             "Delete \"#{tag.name}\"? It's currently applied to #{pluralize(applied_n, 'item')} — they'll lose this tag."
-           end %>
-        <%= button_to tag_path(tag), method: :delete,
-              form_class: "inline-block",
-              class: "ck-icon-btn",
-              title: "Delete tag",
-              "aria-label": "Delete tag",
-              data: { turbo_confirm: confirm } do %>
-          <%= heroicon_tag "trash", variant: :outline, size: 16, "aria-hidden": "true" %>
-        <% end %>
-      <% end %>
       <%= link_to "Cancel", tags_path, class: ck_button_classes(:light, variant: :outline), tabindex: "0" %>
       <%= form.submit(tag.persisted? ? "Save tag" : "Create tag", class: ck_button_classes(:dark)) %>
     </div>
   </div>
 <% end %>
+
+<% if tag.persisted? %>
+  <% applied_n = tag.taggings.count %>
+  <% confirm = if applied_n.zero?
+       "Delete \"#{tag.name}\"? It's not currently applied to anything."
+     else
+       "Delete \"#{tag.name}\"? It's currently applied to #{pluralize(applied_n, 'item')}. They'll lose this tag."
+     end %>
+  <%= render "completion_kit/shared/delete_action", path: tag_path(tag), label: "Delete tag", confirm: confirm %>
+<% end %>

data/lib/completion_kit/version.rb

@@ -1,3 +1,3 @@
 module CompletionKit
-  VERSION = "0.26.1"
+  VERSION = "0.26.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: completion-kit
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - Damien Bastin
@@ -421,6 +421,7 @@ files:
 - app/views/completion_kit/runs/new.html.erb
 - app/views/completion_kit/runs/show.html.erb
 - app/views/completion_kit/shared/_branded_select.html.erb
+- app/views/completion_kit/shared/_delete_action.html.erb
 - app/views/completion_kit/shared/_settings_nav.html.erb
 - app/views/completion_kit/suggestions/_scoreboard.html.erb
 - app/views/completion_kit/suggestions/_state.html.erb