permission_forge 0.14.1 → 0.15.0

data/app/views/permission_forge/resources/show.html.erb

@@ -2,21 +2,21 @@
 <% resource = @resource %>
 <% pf_audit_preload_last_changes([resource, *(@tab == 'rules' ? @rules : [])]) %>
 <% muting = set.is_muting %>
-<% locked = pf_locked_record?(set) || pf_locked_record?(resource) %>
+<% locked = pf_locked?(resource) %>
 <% label = pf_resource_label(resource) %>
 <% plural = pf_resource_plural(resource.name) %>
 <% base = "pf[resources][#{resource.id}]" %>
-<% content_for :pf_title, "#{label} · #{set.name}" %>
+<% content_for :pf_title, "#{label} · #{pf_record_name(set)}" %>
 <%= pf_breadcrumb([t('permission_forge.nav.permission_sets'), permission_forge.permission_sets_path],
-                  [set.name, permission_forge.permission_set_path(set)], label) %>
+                  [pf_record_name(set), permission_forge.permission_set_path(set)], label) %>
 
 <% if muting %>
   <div class="pf-banner pf-banner--muting" role="note">
     <span class="pf-banner__glyph" aria-hidden="true">⊘</span>
-    <div class="pf-banner__body"><span><b><%= t('permission_forge.ui.badges.muting') %>.</b> <%= t('.muting_note', set: set.name) %></span></div>
+    <div class="pf-banner__body"><span><b><%= t('permission_forge.ui.badges.muting') %>.</b> <%= t('.muting_note', set: pf_record_name(set)) %></span></div>
   </div>
 <% end %>
-<%= render 'permission_forge/shared/mode_banners', record: (pf_locked_record?(resource) ? resource : set), muting: false,
+<%= render 'permission_forge/shared/mode_banners', record: resource, muting: false,
            duplicate_path: permission_forge.duplicate_permission_set_path(set) %>
 <%= pf_help_banner('resource', term: t('.help_term'), text: t('.help_text', model: resource.name)) %>
 
@@ -27,7 +27,7 @@
       submit button on the page — a bulk "Set to" button, proposing that level for the ticked rows.
       Out of sight but rendered, not `hidden`: Safari before 16.4 skips a display:none button
       when it picks the default button (webkit.org/b/247545) and would press a bulk button. %>
-  <button type="submit" class="pf-sr-only" tabindex="-1" aria-hidden="true"><%= t('permission_forge.shared.savebar.review') %></button>
+  <button type="submit" class="pf-sr-only" tabindex="-1" aria-hidden="true" <%= 'disabled' if locked %>><%= t('permission_forge.shared.savebar.review') %></button>
 <% end %>
 
 <div class="pf-page-header">

data/app/views/permission_forge/settings/_row.html.erb

@@ -16,7 +16,7 @@
   </div>
   <div class="pf-setting__value">
     <%= pf_setting_value(row) %>
-    <span class="pf-fs-12 pf-text-3"><%= t('.default', value: pf_setting_default(row)) %></span>
+    <span class="pf-fs-12 pf-text-3"><%= t('.default_html', value: tag.code(pf_setting_default(row), class: 'pf-mono')) %></span>
   </div>
   <details class="pf-setting__how" <%= 'open' if focused %>>
     <summary class="pf-btn pf-btn--sm"><%= t('.how_to_change') %></summary>
@@ -32,7 +32,7 @@
         <li>2. <%= t('.step_deploy') %></li>
         <li>3. <%= t('.step_reload') %></li>
       </ol>
-      <%= link_to t('.docs', key: key), "#{PermissionForge.configuration.admin_docs_url}##{key}", class: 'pf-fs-12', target: '_blank', rel: 'noopener noreferrer' %>
+      <%= link_to t('.docs_html', key: tag.code(key)), "#{PermissionForge.configuration.admin_docs_url}##{key}", class: 'pf-fs-12', target: '_blank', rel: 'noopener noreferrer' %>
     </div>
   </details>
 </div>

data/app/views/permission_forge/settings/show.html.erb

@@ -24,8 +24,17 @@
       <%= link_to t('.how_to_fix'), permission_forge.settings_path(focus: row.key, anchor: "set-#{row.key}"), class: 'pf-btn pf-btn--sm' %>
     </div>
   <% end %>
+  <%# Home's items count here too: Settings never says the setup looks good while Home warns. %>
+  <% attention = @catalog.attention_count %>
+  <% if attention.positive? %>
+    <div class="pf-card__row pf-card__row--top">
+      <span class="pf-text-warn" aria-hidden="true">⚠</span>
+      <span class="pf-grow"><%= t('.attention', count: attention) %></span>
+      <%= link_to t('.open_home'), permission_forge.root_path, class: 'pf-btn pf-btn--sm' %>
+    </div>
+  <% end %>
   <div class="pf-card__row">
-    <span class="pf-text-grant">✓ <%= t('.secure_count', count: @catalog.secure_count) %></span>
+    <span class="pf-text-grant">✓ <%= @catalog.healthy? ? t('.secure_count', count: @catalog.secure_count) : t('.secure_count_set', count: @catalog.secure_count) %></span>
   </div>
 </section>
 

data/app/views/permission_forge/shared/_across_sets.html.erb

@@ -3,27 +3,26 @@
 <% if rows.empty? %>
   <p class="pf-fs-13 pf-text-3"><%= t('.none') %></p>
 <% else %>
+  <% chain = rows.map { |row| row[:resource].name }.uniq %>
   <div class="pf-listbox">
     <% rows.each do |row| %>
       <% set = row[:set] %>
       <% field = row[:field] %>
-      <% level = field && PermissionForge::Admin::FieldLevel.level_of(field, muting: set.is_muting) %>
+      <% level_model = PermissionForge::Admin::FieldLevel %>
+      <%# No row: a Muting Permission Set is on Unchanged (it mutes nothing), as on its Fields tab. %>
+      <% level = field ? level_model.level_of(field, muting: set.is_muting) : level_model.unconfigured_level(muting: set.is_muting) %>
       <%= link_to permission_forge.permission_set_resource_field_path(set, row[:resource].name, key),
                   class: 'pf-option', 'aria-current': (local_assigns[:current_set] == set ? 'true' : nil) do %>
         <span class="pf-option__main">
           <span class="pf-row pf-row--tight">
             <% if set.is_muting %><span class="pf-text-restrict" aria-hidden="true">⊘</span><% end %>
-            <span class="pf-fw-600"><%= set.name %></span>
+            <%# "<set> · <Model>" when the set holds more than one Resource of the chain (B#35). %>
+            <span class="pf-fw-600"><%= pf_set_entry_name(set, row[:resource].name, chain) %></span>
             <%= pf_off_badge unless row[:in_effect] %>
           </span>
         </span>
-        <% if level.nil? %>
-          <%= pf_level_badge('none', label: t('permission_forge.ui.badges.not_configured')) %>
-        <% elsif set.is_muting %>
-          <%= pf_level_badge(level == 'hide' ? 'muted' : level, label: (t('.muted_hidden') if level == 'hide')) %>
-        <% else %>
-          <%= pf_level_badge(level, strategy: (field.mask_strategy if level == 'masked')) %>
-        <% end %>
+        <%# The set's level, worded as its Fields tab and the field drawer word it. %>
+        <%= pf_level_badge(level || 'none', strategy: (field.mask_strategy if %w[masked mask].include?(level))) %>
         <span class="pf-option__aside"><%= pf_people_text(row[:people]) %></span>
       <% end %>
     <% end %>

data/app/views/permission_forge/shared/_audit_events.html.erb

@@ -21,9 +21,9 @@
                         title: t('permission_forge.audit_log.filter_actor') %>
             <span aria-hidden="true">·</span>
             <span><%= pf_audit_source_label(event.source) %></span>
-            <% if event.reason.present? %>
+            <% if (reason = pf_audit_reason(event)) %>
               <span aria-hidden="true">·</span>
-              <span class="pf-audit-event__reason"><%= t('permission_forge.audit_log.reason_inline', reason: event.reason) %></span>
+              <span class="pf-audit-event__reason"><%= t('permission_forge.audit_log.reason_inline', reason: reason) %></span>
             <% end %>
           </div>
         </div>

data/app/views/permission_forge/shared/_audit_footer.html.erb

@@ -1,15 +1,26 @@
 <footer class="pf-audit-footer">
   <% if PermissionForge.configuration.audit_trail_enabled %>
     <% last_event = pf_audit_last_change(record) %>
+    <% creations = pf_audit_creations([record]) unless @pf_creations&.covers?(record) %>
+    <% creation = pf_audit_creation_event(record, creations) %>
+    <%# "Unknown" is said once: an edit by nobody known after a creation by nobody known names no actor again. %>
+    <% unknown_twice = pf_audit_unknown_actor?(creation) && pf_audit_unknown_actor?(last_event) %>
     <%= prefix %>
-    <%= t('.created', created_by: pf_person_name(record.try(:created_by)), created_at: pf_date(record.created_at)) %>
+    <%= t('.created', created_by: pf_audit_creator(record, creations), created_at: pf_date(record.created_at)) %>
     ·
-    <% if last_event %>
+    <% if unknown_twice %>
+      <%= t('.edited_at', updated_at: pf_relative(last_event.occurred_at)) %>
+      · <%= link_to t('.history'), pf_audit_log_path(record_type: last_event.record_type, record_id: last_event.record_id) %>
+    <% elsif last_event %>
       <%= t('.edited', updated_by: pf_audit_actor_name(last_event), updated_at: pf_relative(last_event.occurred_at)) %>
       · <%= link_to t('.history'), pf_audit_log_path(record_type: last_event.record_type, record_id: last_event.record_id) %>
     <% else %>
       <%= t('.edited', updated_by: pf_person_name(record.try(:updated_by)), updated_at: pf_relative(record.updated_at)) %>
     <% end %>
+    <%# "Unknown" is the audit log's own name for an event with no actor; say where it comes from. %>
+    <% if pf_audit_unknown_actor?(last_event) || pf_audit_unknown_actor?(creation) %>
+      <span class="pf-audit-footer__hint"><%= pf_audit_unknown_actor_hint %></span>
+    <% end %>
   <% else %>
     <%= t('.disabled') %> <%= pf_setting_link('audit_trail_enabled') %>
   <% end %>

data/app/views/permission_forge/shared/_crud_cell.html.erb

@@ -3,16 +3,16 @@
 <% form_attr = local_assigns[:form] ? { form: form } : {} %>
 <% requires = local_assigns[:requires] %>
 <label class="pf-cell<%= ' pf-cell--muting' if muting %><%= ' pf-cell--lg' if local_assigns[:size] == :lg %>"
-       title="<%= t('.needs_read') if requires && !muting %>">
+       title="<%= t('permission_forge.ui.needs_read_first') if requires && !muting %>">
   <%= tag.input(type: 'hidden', name: name, value: '0', **form_attr) %>
   <%= tag.input(type: 'checkbox', name: name, value: '1', checked: checked, disabled: locked,
                 'aria-label': aria, data: { pf_flag: flag, pf_requires: (muting ? nil : requires), pf_locked: (locked || nil) }, **form_attr) %>
   <% if muting %>
-    <span class="pf-cell__on"><span class="pf-cell__glyph" aria-hidden="true">⊘</span><%= t('.muted') %></span>
-    <span class="pf-cell__off"><span class="pf-cell__glyph" aria-hidden="true">–</span><%= t('.unchanged') %></span>
+    <span class="pf-cell__on"><%= pf_state_parts(pf_state(:crud, :muted)) %></span>
+    <span class="pf-cell__off"><%= pf_state_parts(pf_state(:crud, :unchanged)) %></span>
   <% else %>
-    <span class="pf-cell__on"><span class="pf-cell__glyph" aria-hidden="true">✓</span><%= t('.allowed') %></span>
-    <span class="pf-cell__off"><span class="pf-cell__glyph" aria-hidden="true">–</span><%= t('.no') %></span>
-    <span class="pf-cell__needs"><span class="pf-cell__glyph" aria-hidden="true">–</span><%= t('.needs_read_short') %></span>
+    <span class="pf-cell__on"><%= pf_state_parts(pf_state(:crud, :allowed)) %></span>
+    <span class="pf-cell__off"><%= pf_state_parts(pf_state(:crud, :no)) %></span>
+    <span class="pf-cell__needs"><%= pf_state_parts(pf_state(:crud, :needs_read)) %></span>
   <% end %>
 </label>

data/app/views/permission_forge/shared/_mode_banners.html.erb

@@ -8,7 +8,7 @@
     </div>
   </div>
 <% end %>
-<% if pf_locked_record?(record) %>
+<% if pf_locked?(record) %>
   <div class="pf-banner" role="note">
     <span class="pf-banner__glyph" aria-hidden="true"><%= pf_lock_icon %></span>
     <div class="pf-banner__body">

data/app/views/permission_forge/shared/_savebar.html.erb

@@ -1,5 +1,7 @@
-<%# Unsaved-changes bar: the submit area of a batched-edit form (form="id"). %>
-<div id="<%= id %>" class="pf-savebar" role="region" aria-label="<%= t('.label') %>" data-pf-dirty="false">
+<%# Unsaved-changes bar: the submit area of a batched-edit form (form="id").
+    `quiet: true` — the page's own controls apply at once, so with JS the bar shows only once
+    something joined to the form (the header) has changed; without JS it stays, as the only way to save that. %>
+<div id="<%= id %>" class="pf-savebar<%= ' pf-savebar--quiet' if local_assigns[:quiet] %>" role="region" aria-label="<%= t('.label') %>" data-pf-dirty="false">
   <div class="pf-savebar__text">
     <span class="pf-savebar__count pf-savebar__count--dirty" data-pf-dirty-count
           data-pf-one="<%= t('.count.one', count: '%{count}') %>" data-pf-other="<%= t('.count.other', count: '%{count}') %>"></span>