studio-engine 0.49.0 → 0.50.0

data/lib/studio/sidebar_sections.rb

@@ -15,6 +15,11 @@
 # Sections flagged admin: true resolve only for admin? viewers, so the
 # trigger and panel stay invisible to everyone else even when the host
 # declares nothing but admin links.
+#
+# THE ENGINE PREPENDS ONE SECTION OF ITS OWN — "You", linking to /profile. The
+# engine ships that page, so it ships the way in rather than asking five apps to
+# declare the same entry and watch them drift. See `standard` below for the two
+# gates it carries.
 module Studio
   module SidebarSections
     module_function
@@ -22,9 +27,48 @@ module Studio
     def resolve(declared, view)
       sections = declared.respond_to?(:call) ? declared.call(view) : declared
       admin = view.respond_to?(:admin?) && view.admin?
-      Array(sections).map { |section| symbolize(section) }
-                     .reject { |section| section[:admin] && !admin }
-                     .map { |section| section.merge(links: Array(section[:links]).map { |link| symbolize(link) }) }
+      (standard(view) + Array(sections))
+        .map { |section| symbolize(section) }
+        .reject { |section| section[:admin] && !admin }
+        .map { |section| section.merge(links: Array(section[:links]).map { |link| symbolize(link) }) }
+    end
+
+    # What the ENGINE puts in every app's sidebar, ahead of whatever the host
+    # declared. The engine ships /profile, so it ships the way in — otherwise
+    # every consumer writes the same entry and they drift in wording and emoji.
+    #
+    # PREPENDED, not appended: it is the viewer's own account, the thing nearest
+    # to them, and the operator asked for it at the top.
+    #
+    # TWO GATES, and both are load-bearing:
+    #
+    #   * the route must be drawn. An app that set draw_profile_routes = false
+    #     would otherwise be handed a menu item pointing at a route that does not
+    #     exist — a 404 from its own navigation.
+    #   * the viewer must be signed in. /profile requires authentication, so
+    #     offering it to a signed-out visitor bounces them to the login page from
+    #     something that looked like navigation. Same shape as the `admin:` rule
+    #     below, which already drops sections a viewer may not see.
+    #
+    # A view that answers neither predicate (a bare context in a unit test) gets
+    # nothing, which is the safe direction: a missing link is visible and
+    # fixable, a link to nowhere is the bug.
+    def standard(view)
+      return [] unless profile_link?(view)
+
+      [{ title: "You", links: [
+        { label: "Profile", href: view.profile_path, emoji: "👤",
+          desc: "Your name, email and photo" }
+      ] }]
+    end
+
+    def profile_link?(view)
+      return false unless defined?(Studio) && Studio.respond_to?(:draw_profile_routes)
+      return false unless Studio.draw_profile_routes
+      return false unless view.respond_to?(:profile_path)
+      return false unless view.respond_to?(:logged_in?) && view.logged_in?
+
+      true
     end
 
     def symbolize(hash)

data/lib/studio/version.rb

@@ -1,3 +1,3 @@
 module Studio
-  VERSION = "0.49.0"
+  VERSION = "0.50.0"
 end

data/lib/studio.rb

@@ -613,8 +613,8 @@ module Studio
   # the view, keys symbolize, admin-only rows drop for non-admin viewers, and
   # rows this host's user model cannot serve drop entirely. `nil` config resolves
   # to the standard page.
-  def self.profile_sections_for(view)
-    ProfileSections.resolve(profile_sections, view)
+  def self.profile_sections_for(view, page: nil)
+    ProfileSections.resolve(profile_sections, view, page: page)
   end
 
   def self.env_truthy?(value)
@@ -683,14 +683,13 @@ module Studio
       # both would delete someone's photo every time they edited their name.
       if Studio.draw_profile_routes
         get    "profile",        to: "studio/profiles#show",   as: :profile
+        get    "profile/edit",   to: "studio/profiles#edit",   as: :edit_profile
         patch  "profile",        to: "studio/profiles#update"
         patch  "profile/avatar", to: "studio/profiles#avatar", as: :profile_avatar
         # DELETE, because unlinking removes an identity. Linking is not drawn
         # here: it is OmniAuth's own /auth/:provider, which the middleware owns.
-        patch  "profile/email",  to: "studio/profiles#email", as: :profile_email
         delete "profile/google", to: "studio/profiles#unlink_google",
                as: :profile_unlink_google
-
       end
 
       resources :error_logs, only: [:index, :show]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: studio-engine
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Alex McRitchie
@@ -338,10 +338,19 @@ files:
 - app/views/studio/newsletter_mailer/subscribed.text.erb
 - app/views/studio/profile_mailer/email_change_notification.html.erb
 - app/views/studio/profile_mailer/email_change_notification.text.erb
-- app/views/studio/profiles/_avatar_section.html.erb
-- app/views/studio/profiles/_email_section.html.erb
-- app/views/studio/profiles/_first_name_section.html.erb
+- app/views/studio/profiles/_birthday_fields.html.erb
+- app/views/studio/profiles/_editable_identity.html.erb
+- app/views/studio/profiles/_email_fields.html.erb
+- app/views/studio/profiles/_form_script.html.erb
 - app/views/studio/profiles/_google_section.html.erb
+- app/views/studio/profiles/_identity.html.erb
+- app/views/studio/profiles/_identity_body.html.erb
+- app/views/studio/profiles/_identity_mini.html.erb
+- app/views/studio/profiles/_identity_styles.html.erb
+- app/views/studio/profiles/_name_fields.html.erb
+- app/views/studio/profiles/_pencil_icon.html.erb
+- app/views/studio/profiles/_save_bar.html.erb
+- app/views/studio/profiles/edit.html.erb
 - app/views/studio/profiles/show.html.erb
 - app/views/style/_modal_specimen.html.erb
 - app/views/style/_modals.html.erb

data/app/views/studio/profiles/_avatar_section.html.erb

@@ -1,93 +0,0 @@
-<%# Profile photo row — lifted from turf-monster's /account, which is the
-    interaction the operator wants standardized: click the avatar, hover reveals
-    an "Update" cap, pick a file, crop it square, and it saves immediately. No
-    Save button, no visible file field.
-
-    Locals: user (required).
-
-    HOW IT HANGS TOGETHER
-      imageUploadHost()      the engine's crop-then-immediate-save x-data factory
-                             (studio/modals/_image_upload). onFileSelected() reads
-                             the picked file and opens the crop modal; the modal
-                             dispatches the cropped Blob back on
-                             'crop-photo-confirmed'; applyCrop() drops it into the
-                             hidden form's file input and submits with a saving
-                             card.
-      profileModals          the PAGE-SCOPED Alpine store mounted by show.html.erb.
-                             Not the shared "modals" store — see below.
-      profile_avatar_path    its own endpoint, because an attachment param
-                             submitted empty PURGES the attachment.
-
-    WHY THE PAGE-SCOPED STORE AND NOT `modals`. turf's copy opens on
-    Alpine.store('modals') — the app's shared modal host — which works there
-    because turf's layout mounts one and registers crop-photo in it. Two of the
-    five consumers (mcritchie-industries, moms-app) render NO shared host at all,
-    and the two that do would each have to add a crop-photo registration to their
-    layout before this row worked. An engine page cannot ask that. show.html.erb
-    mounts studio/modals/_scoped_host instead, so the page brings its own modals
-    and this row behaves identically in every app. /admin/emails already does
-    exactly this.
-
-    WHY onCropConfirmed AND NOT applyCrop DIRECTLY. turf's call site binds
-    `applyCrop($event.detail.blob)`, which predates the owner guard. Every
-    imageUploadHost on a page hears the same window event, so a page that later
-    grows a second uploader (a host row with its own image) would have both
-    hosts save the same crop. onCropConfirmed() checks the owner token first and
-    is a strict improvement at the same call cost.
-
-    ON THE INLINE PIXEL SIZES. Same reason turf gives: the exact circle geometry
-    is expressed inline rather than through w-24/h-24, because a size utility
-    only exists if something already emitted it into the compiled bundle. The
-    classes used here (group-hover:opacity-100, rounded-full, object-cover,
-    absolute inset-0) already ship in other engine partials.
-%>
-<div x-data="imageUploadHost({
-       store: 'profileModals',
-       aspectRatio: 1,
-       filename: 'avatar.png',
-       saving: 'Saving photo…',
-       toast: false
-     })"
-     @crop-photo-confirmed.window="onCropConfirmed($event.detail)"
-     class="flex flex-col items-center">
-
-  <%# Auto-submitted once a crop is confirmed. Hidden because the person never
-      touches it — applyCrop() writes the cropped File onto fileInput and calls
-      submitFormWithProgress on form. %>
-  <%= form_with url: profile_avatar_path, method: :patch, scope: :profile,
-                html: { multipart: true, "x-ref": "form", class: "hidden" } do %>
-    <input type="file" name="profile[avatar]" x-ref="fileInput">
-  <% end %>
-
-  <%# The real picker. Opened by the avatar button; never shown. %>
-  <input type="file" x-ref="filePicker" @change="onFileSelected($event)"
-         accept="<%= Studio::ProfileImage::ALLOWED_CONTENT_TYPES.join(",") %>" class="hidden">
-
-  <%# The clickable avatar. A BUTTON rather than turf's <div @click>: a div is
-      unreachable by keyboard and invisible to a screen reader, so the only way
-      to change your photo would be a mouse. Same visual, and it focuses. %>
-  <button type="button"
-          @click="$refs.filePicker.click()"
-          aria-label="Change your profile photo"
-          style="width: 96px; height: 96px;"
-          class="relative rounded-full cursor-pointer group overflow-hidden mb-3 flex-shrink-0 p-0 border-0 bg-transparent">
-    <% if user.avatar.attached? %>
-      <%= image_tag user.avatar, class: "rounded-full object-cover",
-                    style: "width: 96px; height: 96px;", alt: user.display_name %>
-    <% else %>
-      <div class="rounded-full flex items-center justify-center font-bold text-white text-3xl"
-           style="width: 96px; height: 96px; background-color: <%= user.avatar_color %>">
-        <%= user.avatar_initials %>
-      </div>
-    <% end %>
-
-    <%# The hover cap. group-hover reveals it on pointer; focus-within is the
-        keyboard equivalent, so a tabbing user sees the same affordance. %>
-    <span class="absolute inset-0 rounded-full flex items-center justify-center opacity-0 group-hover:opacity-100 group-focus:opacity-100 transition-opacity duration-200"
-          style="background: rgba(0,0,0,0.5)">
-      <span class="text-white text-xs font-bold">Update</span>
-    </span>
-  </button>
-
-  <div class="text-xl font-bold text-heading"><%= user.display_name %></div>
-</div>

data/app/views/studio/profiles/_email_section.html.erb

@@ -1,55 +0,0 @@
-<%# Email row.
-
-    Locals: user (required).
-
-    DIRECT CHANGE from any signed-in session (operator's call, 2026-08-14). The
-    earlier build mailed a confirmation link to the current address and applied
-    the change only when someone clicked it; the session is the authority now.
-    The row therefore saves what you type, and the copy says so plainly rather
-    than implying a pending step that no longer exists.
-
-    THE GOOGLE EXCEPTION. An account with a linked Google identity cannot change
-    its email here — Google is the authoritative source for that address, and
-    letting the two drift means the next OAuth sign-in either re-links to a
-    stranger's row or cannot find its own. The locked branch renders NO form at
-    all — there is nothing to type into and nothing to submit — and
-    ProfilesController#email refuses the request independently anyway, because a
-    missing form is a courtesy and anyone can POST.
-
-    Gated on a real delta for the same reason the name row is — an empty field,
-    or the address you already have, is not a change.
-%>
-<% locked = Studio::OauthIdentity.google_linked?(user) %>
-<% current = user.email.to_s.strip %>
-
-<% if locked %>
-  <p class="text-sm text-secondary mb-1">Current address</p>
-  <p class="text-heading font-semibold mb-3 break-all"><%= user.email %></p>
-  <div class="rounded-lg p-3 flex items-start gap-2" style="background: var(--color-surface-alt);">
-    <span aria-hidden="true">🔒</span>
-    <p class="text-muted text-xs">
-      This comes from your linked Google account. Unlink Google below if you want to change it.
-    </p>
-  </div>
-<% else %>
-  <%= form_with url: profile_email_path, method: :patch, scope: :profile,
-                data: { turbo: false },
-                html: { "x-data": "{ current: #{current.downcase.to_json}, value: #{current.to_json} }" },
-                class: "flex flex-wrap items-end gap-3" do |form| %>
-    <div class="flex-1 min-w-0" style="min-width: 14rem;">
-      <label class="block text-sm text-secondary mb-2 font-medium" for="profile_email">Email</label>
-      <%= form.email_field :email, value: user.email, autocomplete: "email",
-                           placeholder: "you@example.com", class: "input-field",
-                           "x-model": "value" %>
-    </div>
-    <%= form.submit "Update",
-                    class: "btn btn-primary",
-                    ":disabled": "value.trim() === '' || value.trim().toLowerCase() === current",
-                    ":class": "(value.trim() === '' || value.trim().toLowerCase() === current) && 'opacity-50 cursor-not-allowed'" %>
-  <% end %>
-  <% if current.present? %>
-    <p class="text-muted text-xs mt-2">
-      We'll let <span class="font-semibold"><%= user.email %></span> know it changed, and sign out your other devices.
-    </p>
-  <% end %>
-<% end %>

data/app/views/studio/profiles/_first_name_section.html.erb

@@ -1,42 +0,0 @@
-<%# First-name row.
-
-    Locals: user (required).
-
-    PREFILLED, with the Update button to the right of the input and DISABLED
-    until the value actually differs (operator's call, 2026-08-14). A blank field
-    made you retype a name you had already set just to see what it was, and an
-    always-live Save invited a no-op write that flashed "Name updated." over a
-    change nobody made.
-
-    The delta is computed against the value the server rendered, and both sides
-    are trimmed — leading or trailing whitespace is not a change, and the
-    controller trims on the way in too, so the button agrees with what the server
-    would actually do.
-
-    NO-JS FALLBACK: the button carries no `disabled` attribute in the markup;
-    Alpine adds it on init. A page whose JS never ran therefore gets a working,
-    always-enabled Save rather than a control it can never turn on — the server
-    re-checks anyway.
-
-    This row only renders when the host's user model answers `first_name`
-    (Studio::ProfileSections drops it otherwise), so nothing here re-checks.
-%>
-<%= form_with url: profile_path, method: :patch, scope: :profile,
-              data: { turbo: false },
-              html: { "x-data": "{ initial: #{user.first_name.to_s.strip.to_json}, value: #{user.first_name.to_s.strip.to_json} }" },
-              class: "flex flex-wrap items-end gap-3" do |form| %>
-  <div class="flex-1 min-w-0" style="min-width: 12rem;">
-    <label class="block text-sm text-secondary mb-2 font-medium" for="profile_first_name">First name</label>
-    <%= form.text_field :first_name,
-                        value: user.first_name,
-                        maxlength: Studio::FIRST_NAME_MAX_LENGTH,
-                        autocomplete: "given-name",
-                        placeholder: "What should we call you?",
-                        class: "input-field",
-                        "x-model": "value" %>
-  </div>
-  <%= form.submit "Update",
-                  class: "btn btn-primary",
-                  ":disabled": "value.trim() === initial.trim()",
-                  ":class": "value.trim() === initial.trim() && 'opacity-50 cursor-not-allowed'" %>
-<% end %>