shiplog 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f17beb628a8bf038407c3a1b0e5caa404db7f51eba9472dbf507df7da84431
-  data.tar.gz: da38c5e1bc625bcae2ed31ef037db2440bc94a612760c11cc842cb91b02cdf28
+  metadata.gz: 58c17b51ed2b752958414ce03688b5c055681502c6ac9304c2238aab2144e521
+  data.tar.gz: 50ceed3676ed0cb48cb4d8aa3da190456aced0347d62404d3cfa4d095c4cd69e
 SHA512:
-  metadata.gz: 588b5d5e87c63b828d0a75ef4aa01591efec6c94a954622d3ad2e36a6cf88deeb46ae72b19b0f865828606f147dfcdb2b6d30f34ce75741acc23543f9a853d15
-  data.tar.gz: d6a7f52d6df8768e5586a47bbded5e5b867dfaac2ec07e85fd0ac86b37b0a8e4a275db62f7893a1ea8b0f607027924cc50bb4925ff2efb41c9b10e4158bd1a95
+  metadata.gz: 875076c4feb976490743235f4f56355548518640b15c1fbdb0183afaec7161617a93acb5f199741a6b94c5206d20623aa95b1f9cb63eed5b3823a8190373ab5f
+  data.tar.gz: a16a92cb22802351b8074211400ca12e3ae28f572efffc5fd07fc63fb081a8a27b9c5aa8f530595ebf2f8e53bf5b3a88e62ebcd1f5a24898fb3e2751db602238

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.1.1 (2026-10-26)
+
+### Added
+
+- Approve, discard and restore update the inbox in place, without a reload. Without JavaScript they still redirect back to the same filtered list.
+- Admins can switch a changelog entry between New feature and Improvement.
+
+### Fixed
+
+- Pull requests whose title starts with a topic (`Importers: …`) are no longer mistaken for a non-changelog Conventional Commits type and skipped; only known types such as `chore:` or `ci:` are.
+- Roadmap drafts are written in the future tense ("You'll be able to…") instead of as if the feature had already shipped, and no longer turn implementation details from the issue into promises such as dates, prices, refunds or limits.
+- Host layouts can render records that the host app routes, such as Active Storage avatars passed to `image_tag`, `link_to` or `url_for`, inside Shiplog's public and admin pages instead of raising `Can't resolve image into URL`.
+- Admin actions return to the filtered list they started from: approving, discarding, restoring or saving an entry keeps the status, kind and page of the inbox.
+- The roadmap board's drag and drop keeps working after Turbo Drive navigation in host apps that use it.
+
 ## 0.1.0 (2026-10-26)
 
 Initial release.

data/README.md

@@ -215,7 +215,7 @@ end
 ## How changelog entries are produced
 
 - **Features**: a public top-level issue closed as completed that has at least one merged linked pull request on itself or a sub-issue. The issue form sections (`### Problem`, `### Before`, `### After`), sub-issue titles and linked pull request titles are given to the rewriter. Only issues closed in the last 90 days are drafted, so a first sync doesn't flood the inbox. The release date is the newest merge date.
-- **Small changes**: the weekly scan looks at pull requests merged, and stored commits made, since the last scan (seven days on the first run). Commits are only considered when they are on the default branch and have no pull request, and their conventional-commit type (`feat:`, `fix(scope):`, ...) must be in `commit_types`. Pull requests are skipped when their title carries a type outside `commit_types`; untyped titles are left for the rewriter to judge. Bot authors are recorded as `name[bot]`, so the default `excluded_authors` pattern matches them.
+- **Small changes**: the weekly scan looks at pull requests merged, and stored commits made, since the last scan (seven days on the first run). Commits are only considered when they are on the default branch and have no pull request, and their conventional-commit type (`feat:`, `fix(scope):`, ...) must be in `commit_types`. Pull requests are skipped when their title starts with a Conventional Commits type (`chore:`, `ci:`, `docs:`, ...) outside `commit_types`; a topic prefix such as `Importers:` is not a type; untyped titles are left for the rewriter to judge. Bot authors are recorded as `name[bot]`, so the default `excluded_authors` pattern matches them.
 - **Exclusions**: pull requests with an excluded label or an excluded author, commits from excluded authors, pull requests that belong to a feature's issue tree (the feature entry covers them), and anything that already has an entry.
 
 ## Approval workflow

data/app/controllers/shiplog/admin/application_controller.rb

@@ -3,6 +3,8 @@ module Shiplog
     # Parent controller of the admin. The parent class is resolved when this file loads, so
     # `config.admin_parent_controller` must be set in an initializer (config/initializers/shiplog.rb).
     class ApplicationController < Shiplog.config.admin_parent_controller.constantize
+      include InboxFilters
+
       protect_from_forgery with: :exception
 
       helper Shiplog::FrontendHelper
@@ -15,7 +17,7 @@ module Shiplog
       before_action :authorize_admin
 
       rescue_from Shiplog::Entry::InvalidTransition do
-        redirect_to edit_entry_path(params[:entry_id]), alert: t("shiplog.admin.entries.invalid_transition")
+        respond_inline_error(t("shiplog.admin.entries.invalid_transition"), edit_entry_path(params[:entry_id], inbox_filter_params))
       end
 
       private

data/app/controllers/shiplog/admin/entries/approvals_controller.rb

@@ -5,9 +5,9 @@ module Shiplog
         def create
           entry = Entry.find(params[:entry_id])
           entry.approve!(by: current_admin_name)
-          redirect_to root_path, notice: t("shiplog.admin.entries.approved")
+          respond_inline(entry, :approved)
         rescue ActiveRecord::RecordInvalid => error
-          redirect_to edit_entry_path(entry), alert: error.record.errors.full_messages.to_sentence
+          respond_inline_error(error.record.errors.full_messages.to_sentence, edit_entry_path(entry, inbox_filter_params))
         end
       end
     end

data/app/controllers/shiplog/admin/entries/discards_controller.rb

@@ -6,12 +6,12 @@ module Shiplog
 
         def create
           @entry.discard!(reason: params[:reason].to_s.strip.presence)
-          redirect_to root_path, notice: t("shiplog.admin.entries.discarded")
+          respond_inline(@entry, :discarded)
         end
 
         def destroy
           @entry.restore!
-          redirect_to root_path, notice: t("shiplog.admin.entries.restored")
+          respond_inline(@entry, :restored)
         end
 
         private

data/app/controllers/shiplog/admin/entries/rewrites_controller.rb

@@ -5,7 +5,7 @@ module Shiplog
         def create
           entry = Entry.find(params[:entry_id])
           RewriteEntryJob.perform_later(entry.id, force: true)
-          redirect_to edit_entry_path(entry), notice: t("shiplog.admin.entries.rewrite_queued")
+          redirect_to edit_entry_path(entry, inbox_filter_params), notice: t("shiplog.admin.entries.rewrite_queued")
         end
       end
     end

data/app/controllers/shiplog/admin/entries_controller.rb

@@ -7,8 +7,8 @@ module Shiplog
       before_action :set_entry, only: %i[edit update]
 
       def index
-        @status = Entry.statuses.key(params[:status].to_s) || "draft"
-        @kind = Entry.kinds.key(params[:kind].to_s)
+        @status = inbox_filter_params[:status] || "draft"
+        @kind = inbox_filter_params[:kind]
         @page = page_number
         scope = Entry.where(status: @status)
         scope = scope.where(kind: @kind) if @kind
@@ -24,10 +24,14 @@ module Shiplog
 
       def update
         if @entry.update(entry_params)
-          redirect_to root_path, notice: t("shiplog.admin.entries.saved")
+          redirect_to root_path(inbox_filter_params), notice: t("shiplog.admin.entries.saved")
         else
           render :edit, status: :unprocessable_content
         end
+      rescue ActiveRecord::RecordNotUnique
+        # Two concurrent kind switches can both pass the validation; the unique index has the last word.
+        @entry.errors.add(:changelog_kind, :taken)
+        render :edit, status: :unprocessable_content
       end
 
       private
@@ -44,7 +48,7 @@ module Shiplog
       end
 
       def entry_params
-        params.expect(entry: %i[title body released_on])
+        params.expect(entry: %i[title body released_on changelog_kind])
       end
 
       def page_number

data/app/controllers/shiplog/admin/inbox_filters.rb

@@ -0,0 +1,55 @@
+module Shiplog
+  module Admin
+    # The drafts inbox state (status, kind, page) carried through every action that leaves the list, so
+    # the admin lands back on the same filtered list. Values are rebuilt from a whitelist and never taken
+    # from a URL or the Referer, so they cannot be used for an open redirect.
+    module InboxFilters
+      extend ActiveSupport::Concern
+
+      MAX_PAGE = 100_000
+
+      included do
+        helper_method :inbox_filter_params
+      end
+
+      # Only present, valid values: { status:, kind:, page: } with any unknown or invalid key dropped.
+      def inbox_filter_params
+        @inbox_filter_params ||= { status: inbox_status, kind: inbox_kind, page: inbox_page }.compact
+      end
+
+      private
+        # Inline (script) requests get the re-rendered row; plain requests redirect back to the filtered list.
+        def respond_inline(entry, message_key)
+          message = t("shiplog.admin.entries.#{message_key}")
+          return redirect_to(root_path(inbox_filter_params), notice: message) unless request.format.json?
+
+          render json: { row: render_inbox_row(entry), matches_filter: inbox_match?(entry), message: message }
+        end
+
+        def respond_inline_error(message, fallback)
+          return render(json: { error: message }, status: :unprocessable_content) if request.format.json?
+
+          redirect_to fallback, alert: message
+        end
+
+        def render_inbox_row(entry)
+          render_to_string(partial: "shiplog/admin/entries/entry_row", formats: :html, locals: { entry: })
+        end
+
+        # Mirrors EntriesController#index: drafts unless a status was given, any kind unless one was.
+        def inbox_match?(entry)
+          entry.status == (inbox_filter_params[:status] || "draft") &&
+            (inbox_filter_params[:kind].nil? || entry.kind == inbox_filter_params[:kind])
+        end
+
+        def inbox_status = Entry.statuses.key(params[:status].to_s) && params[:status].to_s
+
+        def inbox_kind = Entry.kinds.key(params[:kind].to_s) && params[:kind].to_s
+
+        def inbox_page
+          page = Integer(params[:page].to_s, 10, exception: false)
+          page.clamp(1, MAX_PAGE) if page&.positive?
+        end
+    end
+  end
+end

data/app/controllers/shiplog/frontends_controller.rb

@@ -4,7 +4,8 @@ module Shiplog
     ASSETS = {
       "shiplog.css" => { path: ASSET_DIRECTORY.join("shiplog.css"), type: "text/css" },
       "admin.css" => { path: ASSET_DIRECTORY.join("admin.css"), type: "text/css" },
-      "board.js" => { path: ASSET_DIRECTORY.join("board.js"), type: "text/javascript" }
+      "board.js" => { path: ASSET_DIRECTORY.join("board.js"), type: "text/javascript" },
+      "inbox.js" => { path: ASSET_DIRECTORY.join("inbox.js"), type: "text/javascript" }
     }.freeze
 
     # The version segment busts caches; stale versions are 404 so they are never cached as the current file.

data/app/frontend/shiplog/admin.css

@@ -70,8 +70,15 @@
   .shiplog-admin .shiplog-admin__flash { border: 1px solid var(--sa-border); border-radius: 0.375rem; padding: 0.5rem 0.75rem; }
   .shiplog-admin .shiplog-admin__flash--alert { border-color: #cf222e; }
 
+  .shiplog-admin .shiplog-admin__live { border: 1px solid var(--sa-border); border-radius: 0.375rem; padding: 0.5rem 0.75rem; }
+  .shiplog-admin .shiplog-admin__live[hidden] { display: none; }
+  .shiplog-admin .shiplog-admin__live--alert { border-color: #cf222e; }
+
   .shiplog-admin .shiplog-admin__title { font-size: 1.5rem; margin: 0 0 1rem; }
   .shiplog-admin .shiplog-admin__muted { color: var(--sa-muted); font-size: 0.875rem; }
+  .shiplog-admin .shiplog-entry-row { transition: opacity 0.2s; }
+  .shiplog-admin .shiplog-entry-row--leaving { opacity: 0; }
+  @media (prefers-reduced-motion: reduce) { .shiplog-admin .shiplog-entry-row { transition: none; } }
   .shiplog-admin .shiplog-admin__empty { color: var(--sa-muted); }
 
   .shiplog-admin .shiplog-admin-filters { display: flex; flex-wrap: wrap; gap: 0.5rem 2rem; margin-bottom: 1rem; }

data/app/frontend/shiplog/board.js

@@ -1,6 +1,9 @@
-const board = document.querySelector("[data-board-url]")
+// Idempotent: runs now and again on turbo:load (inert without Turbo), binding each board once.
+const init = () => {
+  const board = document.querySelector("[data-board-url]")
+  if (!board || board.dataset.shiplogBound) return
+  board.dataset.shiplogBound = "true"
 
-if (board) {
   // Host layouts may not render csrf_meta_tags, so the board element carries the token as a fallback.
   const csrfToken = document.querySelector("meta[name=csrf-token]")?.content ?? board.dataset.csrfToken
   let dragged = null
@@ -75,3 +78,6 @@ if (board) {
     save(list, dragged).catch(() => window.location.reload())
   })
 }
+
+init()
+document.addEventListener("turbo:load", init)

data/app/frontend/shiplog/inbox.js

@@ -0,0 +1,78 @@
+// Idempotent: runs now and again on turbo:load (inert without Turbo), binding each container once.
+const init = () => {
+  const inbox = document.querySelector("[data-shiplog-inbox]")
+  if (!inbox || inbox.dataset.shiplogBound) return
+  inbox.dataset.shiplogBound = "true"
+
+  // Host layouts may not render csrf_meta_tags, so the container carries the token as a fallback.
+  const csrfToken = document.querySelector("meta[name=csrf-token]")?.content ?? inbox.dataset.csrfToken
+  const status = inbox.querySelector("[data-shiplog-status]")
+  const reducedMotion = window.matchMedia("(prefers-reduced-motion: reduce)")
+
+  const announce = (text, alert = false) => {
+    status.textContent = text
+    status.classList.toggle("shiplog-admin__live--alert", alert)
+    status.setAttribute("role", alert ? "alert" : "status")
+    status.hidden = false
+  }
+
+  const showEmptyState = () => {
+    const empty = document.createElement("p")
+    empty.className = "shiplog-admin__empty"
+    empty.textContent = inbox.dataset.emptyText
+    inbox.querySelector("table").replaceWith(empty)
+  }
+
+  const removeRow = (row) => {
+    const done = () => {
+      row.remove()
+      if (!inbox.querySelector(".shiplog-entry-row")) showEmptyState()
+    }
+    if (reducedMotion.matches) return done()
+    row.classList.add("shiplog-entry-row--leaving")
+    row.addEventListener("transitionend", done, { once: true })
+    setTimeout(() => row.isConnected && done(), 400)
+  }
+
+  const replaceRow = (row, html) => {
+    const template = document.createElement("template")
+    template.innerHTML = html.trim()
+    row.replaceWith(template.content.firstElementChild)
+  }
+
+  // Bubbling submit on the container runs before Turbo's document-level listener.
+  inbox.addEventListener("submit", async (event) => {
+    const form = event.target.closest("form[data-shiplog-inline]")
+    if (!form) return
+    event.preventDefault()
+
+    const row = form.closest(".shiplog-entry-row")
+    const title = row.querySelector("a").textContent.trim()
+    const button = event.submitter ?? form.querySelector("button")
+    button.disabled = true
+    try {
+      // Rails reads a hidden _method field (button_to), so the request itself is always a POST.
+      const response = await fetch(form.action, {
+        method: "POST",
+        headers: { "Accept": "application/json", "X-CSRF-Token": csrfToken },
+        body: new FormData(form)
+      })
+      if (response.status !== 200 && response.status !== 422) throw new Error(response.status)
+
+      const data = await response.json()
+      if (response.status === 422) {
+        button.disabled = false
+        return announce(`${title}: ${data.error}`, true)
+      }
+      announce(`${title}: ${data.message}`)
+      if (data.matches_filter) replaceRow(row, data.row)
+      else removeRow(row)
+    } catch (error) {
+      // Network or server failure: fall back to a normal form submission.
+      form.submit()
+    }
+  })
+}
+
+init()
+document.addEventListener("turbo:load", init)

data/app/helpers/shiplog/host_routes_helper.rb

@@ -3,6 +3,12 @@ module Shiplog
   # the host's own helpers (root_path, new_user_session_path, ...) are undefined there. This forwards
   # any unknown *_path / *_url call to main_app when the host app defines it. Helpers the engine
   # defines itself (roadmap_path, board_path, ...) are real methods and always win.
+  #
+  # Polymorphic URLs get the same treatment. Rails registers `resolve` mappings (Active Storage's
+  # VariantWithRecord, ...) on the host's routes only, so image_tag(record), url_for(record),
+  # link_to(label, record) and polymorphic_path/url(record) would otherwise fall through to
+  # record.to_model. When the engine has no mapping for the record's class but main_app does, the
+  # call is delegated to main_app. Engine mappings keep precedence.
   module HostRoutesHelper
     def method_missing(name, ...)
       if shiplog_host_route?(name)
@@ -16,8 +22,39 @@ module Shiplog
       shiplog_host_route?(name) || super
     end
 
+    def polymorphic_url(record_or_hash_or_array, options = {})
+      return super unless shiplog_host_mapping?(record_or_hash_or_array)
+
+      main_app.polymorphic_url(record_or_hash_or_array, options)
+    end
+
+    def polymorphic_path(record_or_hash_or_array, options = {})
+      return super unless shiplog_host_mapping?(record_or_hash_or_array)
+
+      main_app.polymorphic_path(record_or_hash_or_array, options)
+    end
+
+    def url_for(options = nil)
+      return super unless shiplog_host_mapping?(options)
+
+      _generate_paths_by_default ? polymorphic_path(options) : polymorphic_url(options)
+    end
+
     private
 
+    def shiplog_host_mapping?(record)
+      return false if record.nil? || record.is_a?(Hash) || record.is_a?(Array) || record.is_a?(String) ||
+        record.is_a?(Symbol) || record.is_a?(Class) || record.is_a?(ActionController::Parameters)
+      return false unless respond_to?(:main_app, true)
+
+      model = record.respond_to?(:to_model) ? record.to_model : record
+      # Odd objects (to_model returning something without a model_name) are left to Rails' own error.
+      return false if record.respond_to?(:to_model) && !model.respond_to?(:model_name)
+
+      name = record.respond_to?(:to_model) ? model.model_name.name : record.class.name
+      !_routes.polymorphic_mappings.key?(name) && main_app._routes.polymorphic_mappings.key?(name)
+    end
+
     def shiplog_host_route?(name)
       name.end_with?("_path", "_url") && respond_to?(:main_app, true) && main_app.respond_to?(name)
     end

data/app/models/shiplog/change_candidates.rb

@@ -1,6 +1,8 @@
 module Shiplog
   class ChangeCandidates
     COMMIT_TYPE = /\A(\w+)(\([^)]*\))?!?:/
+    # The Conventional Commits types; "Importers: ..." is a topic prefix, not a type.
+    CONVENTIONAL_TYPES = %w[feat fix perf refactor chore docs test ci build style revert deps].freeze
 
     def initialize(repository:, since:, before:)
       @repository = repository
@@ -30,8 +32,8 @@ module Shiplog
 
       # Untyped PR titles stay in; the rewriter decides whether customers would notice.
       def excluded_type?(pull_request)
-        type = pull_request.title[COMMIT_TYPE, 1]
-        type.present? && !Shiplog.config.commit_types.include?(type)
+        type = pull_request.title[COMMIT_TYPE, 1]&.downcase
+        CONVENTIONAL_TYPES.include?(type) && !Shiplog.config.commit_types.include?(type)
       end
 
       def eligible_commit?(commit)

data/app/models/shiplog/drafter.rb

@@ -52,7 +52,7 @@ module Shiplog
     end
 
     def self.shipped_candidates
-      drafted = Entry.feature.where(subject_type: Issue.name).select(:subject_id)
+      drafted = Entry.where(kind: Entry::CHANGELOG_KINDS, subject_type: Issue.name).select(:subject_id)
       Issue.publicly_labeled.where(state: "closed", state_reason: "completed", closed_at: FEATURE_LOOKBACK.ago..)
         .where.not(id: drafted)
         .includes(:parent).reject { |issue| issue.parent&.public? }

data/app/models/shiplog/entry.rb

@@ -7,7 +7,19 @@ module Shiplog
     enum :kind, %w[roadmap feature change].index_by(&:itself), validate: true
     enum :status, %w[draft approved discarded].index_by(&:itself), default: "draft", validate: true
 
+    CHANGELOG_KINDS = %w[feature change].freeze
+
     validates :released_on, presence: true, if: -> { approved? && !roadmap? }
+    validate :kind_change_allowed, on: :update
+    validate :kind_free_for_subject, on: :update
+
+    def changelog_kind = kind
+
+    # Switches a changelog entry between "feature" and "change". Roadmap entries never convert, and
+    # anything other than those two values is ignored.
+    def changelog_kind=(value)
+      self.kind = value if CHANGELOG_KINDS.include?(kind) && CHANGELOG_KINDS.include?(value)
+    end
 
     def self.digest_for(subject)
       Digest::SHA256.hexdigest([ subject.title, subject.body ].join("\n"))
@@ -35,6 +47,18 @@ module Shiplog
 
     private
 
+    def kind_free_for_subject
+      return unless will_save_change_to_kind? && self.class.where(subject_type:, subject_id:, kind:).where.not(id:).exists?
+
+      errors.add(:changelog_kind, :taken)
+    end
+
+    def kind_change_allowed
+      return unless will_save_change_to_kind?
+
+      errors.add(:kind, :invalid) unless CHANGELOG_KINDS.include?(kind_in_database) && CHANGELOG_KINDS.include?(kind)
+    end
+
     def require_status!(action, from:)
       raise InvalidTransition, "Cannot #{action} an entry that is #{status}" unless status == from
     end

data/app/models/shiplog/rewriter/prompt.rb

@@ -7,7 +7,7 @@ module Shiplog
         You write release notes for %<product_name>s, used by %<audience>s.
         Tone: %<tone>s
         Rewrite the following %<kind_label>s for customers who are not developers.
-        Explain what changes for them, not how it was built. Never mention code, tables, refactors, gems, or internal names.
+        Explain what changes for them, not how it was built. Never mention code, tables, refactors, gems, or internal names.%<kind_rules>s
         Title: at most 8 words. Body: 1–3 short sentences (features may use up to 2 short paragraphs).
         Reply with JSON only: {"title": "...", "body": "...", "customer_facing": true|false}
         Set customer_facing to false if a customer would not notice this change.
@@ -17,6 +17,16 @@ module Shiplog
         </source>
       PROMPT
 
+      KIND_RULES = {
+        "roadmap" => <<~RULES.squish.freeze,
+          This is NOT available yet: it is planned work that has not been built. Write in the future tense ("You'll be able to…", "We're working on…").
+          Never use "now", "is available", "has been added" or "you can now".
+          Describe the outcome for the customer, not specifics that could change: no dates, prices, refunds, guarantees or exact limits, and do not turn implementation details from the source into promises.
+        RULES
+        "feature" => 'This feature has already shipped: present or past tense is right ("You can now…").',
+        "change" => ""
+      }.freeze
+
       MAX_BODY_CHARS = 4_000
       MAX_ITEM_CHARS = 200
       MAX_LIST_ITEMS = 20
@@ -33,7 +43,7 @@ module Shiplog
 
         config = Shiplog.config
         format(TEMPLATE, product_name: config.product_name, audience: config.audience, tone: config.tone,
-          kind_label: KIND_LABELS.fetch(@entry.kind), context: render_context)
+          kind_label: KIND_LABELS.fetch(@entry.kind), kind_rules: KIND_RULES.fetch(@entry.kind).then { |rules| rules.empty? ? rules : "\n#{rules}" }, context: render_context)
       end
 
       private

data/app/views/shiplog/admin/entries/_entry_row.html.erb

@@ -1,6 +1,6 @@
-<tr class="shiplog-entry-row">
+<tr class="shiplog-entry-row" id="shiplog-entry-<%= entry.id %>">
   <td>
-    <%= link_to entry_heading(entry), edit_entry_path(entry) %>
+    <%= link_to entry_heading(entry), edit_entry_path(entry, inbox_filter_params) %>
     <%= render "shiplog/admin/entries/badges", entry: %>
     <% if entry.discarded? && entry.discard_reason.present? %>
       <div class="shiplog-admin__muted"><%= entry.discard_reason %></div>
@@ -11,11 +11,11 @@
     <%= shiplog_github_link(source_reference(entry.subject), entry.subject.url) %>
   </td>
   <td class="shiplog-admin-table__actions">
-    <%= link_to t("shiplog.admin.entries.edit"), edit_entry_path(entry), class: "shiplog-button" %>
+    <%= link_to t("shiplog.admin.entries.edit"), edit_entry_path(entry, inbox_filter_params), class: "shiplog-button" %>
     <% if entry.draft? %>
-      <%= button_to t("shiplog.admin.entries.approve"), entry_approval_path(entry), class: "shiplog-button shiplog-button--primary" %>
+      <%= button_to t("shiplog.admin.entries.approve"), entry_approval_path(entry, inbox_filter_params), class: "shiplog-button shiplog-button--primary", form: { data: { shiplog_inline: true } } %>
     <% elsif entry.discarded? %>
-      <%= button_to t("shiplog.admin.entries.restore"), entry_discard_path(entry), method: :delete, class: "shiplog-button" %>
+      <%= button_to t("shiplog.admin.entries.restore"), entry_discard_path(entry, inbox_filter_params), method: :delete, class: "shiplog-button", form: { data: { shiplog_inline: true } } %>
     <% end %>
   </td>
 </tr>

data/app/views/shiplog/admin/entries/edit.html.erb

@@ -8,7 +8,7 @@
   <div class="shiplog-admin-split">
     <section class="shiplog-admin-panel">
       <h2><%= t("shiplog.admin.entries.public_text") %></h2>
-      <%= form_with model: @entry, url: entry_path(@entry), method: :patch, class: "shiplog-admin-form" do |form| %>
+      <%= form_with model: @entry, url: entry_path(@entry, inbox_filter_params), method: :patch, class: "shiplog-admin-form" do |form| %>
         <% if @entry.errors.any? %>
           <div class="shiplog-admin__flash shiplog-admin__flash--alert" role="alert">
             <%= @entry.errors.full_messages.to_sentence %>
@@ -22,6 +22,12 @@
           <%= form.label :body, t("shiplog.admin.entries.fields.body") %>
           <%= form.text_area :body, rows: 8 %>
         </p>
+        <% if Shiplog::Entry::CHANGELOG_KINDS.include?(@entry.kind) %>
+          <p>
+            <%= form.label :changelog_kind, t("shiplog.admin.entries.fields.category") %>
+            <%= form.select :changelog_kind, Shiplog::Entry::CHANGELOG_KINDS.map { |kind| [ t("shiplog.admin.entries.category_options.#{kind}"), kind ] } %>
+          </p>
+        <% end %>
         <p>
           <%= form.label :released_on, t("shiplog.admin.entries.fields.released_on") %>
           <%= form.date_field :released_on %>
@@ -31,16 +37,16 @@
 
       <div class="shiplog-admin-actions">
         <% if @entry.draft? %>
-          <%= button_to t("shiplog.admin.entries.approve"), entry_approval_path(@entry), class: "shiplog-button shiplog-button--primary" %>
-          <%= form_with url: entry_discard_path(@entry), class: "shiplog-admin-inline-form" do |form| %>
+          <%= button_to t("shiplog.admin.entries.approve"), entry_approval_path(@entry, inbox_filter_params), class: "shiplog-button shiplog-button--primary" %>
+          <%= form_with url: entry_discard_path(@entry, inbox_filter_params), class: "shiplog-admin-inline-form" do |form| %>
             <%= form.label :reason, t("shiplog.admin.entries.fields.reason") %>
             <%= form.text_field :reason %>
             <%= form.submit t("shiplog.admin.entries.discard"), class: "shiplog-button" %>
           <% end %>
         <% elsif @entry.discarded? %>
-          <%= button_to t("shiplog.admin.entries.restore"), entry_discard_path(@entry), method: :delete, class: "shiplog-button" %>
+          <%= button_to t("shiplog.admin.entries.restore"), entry_discard_path(@entry, inbox_filter_params), method: :delete, class: "shiplog-button" %>
         <% end %>
-        <%= button_to t("shiplog.admin.entries.regenerate"), entry_rewrite_path(@entry), class: "shiplog-button" %>
+        <%= button_to t("shiplog.admin.entries.regenerate"), entry_rewrite_path(@entry, inbox_filter_params), class: "shiplog-button" %>
         <% if @entry.approved? %>
           <p class="shiplog-admin__muted"><%= t("shiplog.admin.entries.regenerate_warning") %></p>
         <% end %>
@@ -57,5 +63,5 @@
     </aside>
   </div>
 
-  <p><%= link_to t("shiplog.admin.entries.back"), root_path %></p>
+  <p><%= link_to t("shiplog.admin.entries.back"), entries_filter_path(**inbox_filter_params) %></p>
 <% end %>

data/app/views/shiplog/admin/entries/index.html.erb

@@ -18,6 +18,8 @@
     </ul>
   </nav>
 
+  <div data-shiplog-inbox data-empty-text="<%= t("shiplog.admin.entries.empty") %>" data-csrf-token="<%= form_authenticity_token %>">
+  <p class="shiplog-admin__live" role="status" aria-live="polite" data-shiplog-status hidden></p>
   <% if @entries.empty? %>
     <p class="shiplog-admin__empty"><%= t("shiplog.admin.entries.empty") %></p>
   <% else %>
@@ -35,6 +37,8 @@
       </tbody>
     </table>
   <% end %>
+  </div>
+  <%= shiplog_javascript_tag "inbox" %>
 
   <nav class="shiplog-admin-pagination" aria-label="<%= t("shiplog.admin.entries.pagination") %>">
     <% if @page > 1 %>

data/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+  activerecord:
+    attributes:
+      shiplog/entry:
+        changelog_kind: Category
   shiplog:
     columns:
       in_progress: In progress
@@ -56,6 +60,9 @@ en:
         public_text: Public text
         source: GitHub source
         back: Back to drafts
+        category_options:
+          feature: New feature
+          change: Improvement
         statuses:
           draft: Drafts
           approved: Approved
@@ -73,6 +80,7 @@ en:
           title: Title
           body: Text
           released_on: Released on
+          category: Category
           reason: Reason
       board:
         title: Roadmap board

data/lib/shiplog/version.rb

@@ -1,3 +1,3 @@
 module Shiplog
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shiplog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Trackberry
@@ -45,6 +45,7 @@ files:
 - app/controllers/shiplog/admin/entries/discards_controller.rb
 - app/controllers/shiplog/admin/entries/rewrites_controller.rb
 - app/controllers/shiplog/admin/entries_controller.rb
+- app/controllers/shiplog/admin/inbox_filters.rb
 - app/controllers/shiplog/admin/syncs_controller.rb
 - app/controllers/shiplog/application_controller.rb
 - app/controllers/shiplog/changelogs_controller.rb
@@ -54,6 +55,7 @@ files:
 - app/controllers/shiplog/webhooks_controller.rb
 - app/frontend/shiplog/admin.css
 - app/frontend/shiplog/board.js
+- app/frontend/shiplog/inbox.js
 - app/frontend/shiplog/shiplog.css
 - app/helpers/shiplog/admin/entries_helper.rb
 - app/helpers/shiplog/application_helper.rb