organizations 0.4.2 → 0.5.0

data/lib/generators/organizations/upgrade/templates/add_verified_joining_to_organizations.rb.erb

@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+# Upgrades organizations <= 0.4.x to 0.5.0 ("Verified Joining").
+# Additive only: no existing columns/rows are touched.
+class AddVerifiedJoiningToOrganizations < ActiveRecord::Migration<%= migration_version %>
+  def change
+    # ⚠️ If your user model is NOT `User` (config.user_class), adjust every
+    # `to_table: :users` below (and `foreign_key: true` on user references)
+    # to your user table before migrating.
+    _primary_key_type, foreign_key_type = primary_and_foreign_key_types
+    adapter = connection.adapter_name.downcase
+
+    # === Membership provenance ===
+
+    add_column :organizations_memberships, :joined_via, :string
+    add_column :organizations_memberships, :verified_email, :string
+    add_column :organizations_memberships, :verified_email_normalized, :string
+    add_column :organizations_memberships, :verified_at, :datetime
+
+    # One proven email address => one membership per organization.
+    # NULLs never collide in unique indexes on every supported adapter, so
+    # existing (unverified) memberships are unconstrained.
+    add_index :organizations_memberships, [ :organization_id, :verified_email_normalized ],
+              unique: true, name: "index_org_memberships_verified_email_unique"
+
+    # === Invitation metadata parity ===
+
+    add_column :organizations_invitations, :metadata, json_column_type,
+               null: json_column_null, default: json_column_default
+    add_column :organizations_invitations, :membership_metadata, json_column_type,
+               null: json_column_null, default: json_column_default
+
+    # === Email domains (exact-match joining) ===
+
+    create_table :organizations_domains, id: primary_key_type_setting do |t|
+      t.references :organization, null: false, type: foreign_key_type, foreign_key: { to_table: :organizations_organizations }
+      t.string :domain, null: false
+      t.send(json_column_type, :membership_metadata, null: json_column_null, default: json_column_default)
+      t.send(json_column_type, :metadata, null: json_column_null, default: json_column_default)
+
+      t.timestamps
+    end
+
+    add_index :organizations_domains, [ :organization_id, :domain ], unique: true
+    add_index :organizations_domains, :domain
+
+    # === Join codes ("PINs") ===
+
+    create_table :organizations_join_codes, id: primary_key_type_setting do |t|
+      t.references :organization, null: false, type: foreign_key_type, foreign_key: { to_table: :organizations_organizations }
+      t.string :code, null: false
+      t.string :label
+      t.boolean :requires_verified_domain_email, null: false, default: false
+      t.boolean :auto_approve, null: false, default: true
+      t.datetime :expires_at
+      t.integer :max_uses
+      t.integer :uses_count, null: false, default: 0
+      t.datetime :revoked_at
+      t.references :created_by, null: true, type: foreign_key_type, foreign_key: { to_table: :users }
+      t.send(json_column_type, :membership_metadata, null: json_column_null, default: json_column_default)
+      t.send(json_column_type, :metadata, null: json_column_null, default: json_column_default)
+
+      t.timestamps
+    end
+
+    add_index :organizations_join_codes, :code, unique: true
+
+    # === Allowlist / roster entries ===
+
+    create_table :organizations_allowlist_entries, id: primary_key_type_setting do |t|
+      t.references :organization, null: false, type: foreign_key_type, foreign_key: { to_table: :organizations_organizations }
+      t.string :email, null: false
+      t.string :email_normalized, null: false
+      t.string :source
+      t.send(json_column_type, :membership_metadata, null: json_column_null, default: json_column_default)
+      t.datetime :claimed_at
+      t.references :claimed_by, null: true, type: foreign_key_type, foreign_key: { to_table: :users }
+      t.send(json_column_type, :metadata, null: json_column_null, default: json_column_default)
+
+      t.timestamps
+    end
+
+    add_index :organizations_allowlist_entries, [ :organization_id, :email_normalized ], unique: true
+
+    # === Join requests ===
+
+    create_table :organizations_join_requests, id: primary_key_type_setting do |t|
+      t.references :organization, null: false, type: foreign_key_type, foreign_key: { to_table: :organizations_organizations }
+      t.references :user, null: false, type: foreign_key_type, foreign_key: true
+      t.string :status, null: false, default: "pending"
+      t.string :joined_via
+      t.references :join_code, null: true, type: foreign_key_type, foreign_key: { to_table: :organizations_join_codes }
+      t.string :message
+      t.string :verification_email
+      t.string :verification_email_normalized
+      t.string :verification_code_digest
+      t.datetime :verification_sent_at
+      t.datetime :verification_expires_at
+      t.integer :verification_attempts, null: false, default: 0
+      t.integer :verification_sends_count, null: false, default: 0
+      t.datetime :verified_at
+      t.references :decided_by, null: true, type: foreign_key_type, foreign_key: { to_table: :users }
+      t.datetime :decided_at
+      t.datetime :expires_at
+      t.send(json_column_type, :metadata, null: json_column_null, default: json_column_default)
+
+      t.timestamps
+    end
+
+    add_index :organizations_join_requests, :status
+
+    # One OPEN request per (organization, user); decided history never blocks
+    if adapter.include?("postgresql") || adapter.include?("sqlite")
+      reversible do |dir|
+        dir.up do
+          # ONE line on purpose: the SQLite schema dumper only recovers a
+          # partial index's WHERE clause from single-line index SQL — a
+          # multi-line statement dumps as a FULL unique index, and databases
+          # provisioned from schema.rb (db:schema:load, test DBs) silently
+          # lose the partial-index invariant.
+          execute "CREATE UNIQUE INDEX index_org_join_requests_pending_unique " \
+                  "ON organizations_join_requests (organization_id, user_id) WHERE status = 'pending'"
+        end
+        dir.down do
+          execute "DROP INDEX IF EXISTS index_org_join_requests_pending_unique"
+        end
+      end
+    elsif adapter.include?("mysql")
+      reversible do |dir|
+        dir.up do
+          execute <<-SQL
+            ALTER TABLE organizations_join_requests
+            ADD COLUMN pending_user_key VARCHAR(255)
+            GENERATED ALWAYS AS (
+              CASE
+                WHEN status = 'pending' THEN CONCAT(organization_id, '-', user_id)
+                ELSE NULL
+              END
+            ) STORED
+          SQL
+        end
+        dir.down do
+          execute "ALTER TABLE organizations_join_requests DROP COLUMN pending_user_key"
+        end
+      end
+      add_index :organizations_join_requests, :pending_user_key, unique: true, name: "index_org_join_requests_pending_unique"
+    else
+      add_index :organizations_join_requests, [ :organization_id, :user_id ], name: "index_org_join_requests_on_org_and_user"
+    end
+  end
+
+  private
+
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][ :primary_key_type ]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
+
+  def primary_key_type_setting
+    primary_and_foreign_key_types.first
+  end
+
+  def json_column_type
+    return :jsonb if connection.adapter_name.downcase.include?('postgresql')
+    :json
+  end
+
+  # MySQL 8+ doesn't allow default values on JSON columns.
+  def json_column_default
+    return nil if connection.adapter_name.downcase.include?('mysql')
+    {}
+  end
+
+  def json_column_null
+    connection.adapter_name.downcase.include?('mysql')
+  end
+end

data/lib/generators/organizations/upgrade/upgrade_generator.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "rails/generators/base"
+require "rails/generators/active_record"
+
+module Organizations
+  module Generators
+    # Upgrades an existing organizations install (<= 0.4.x) to 0.5.0
+    # ("Verified Joining"): new tables for domains, join codes, allowlist
+    # entries and join requests, plus provenance columns on memberships and
+    # metadata columns on invitations.
+    #
+    # Fresh installs don't need this — `rails g organizations:install`
+    # already includes everything.
+    #
+    #   rails g organizations:upgrade
+    #   rails db:migrate
+    #
+    class UpgradeGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+
+      source_root File.expand_path("templates", __dir__)
+      desc "Add the verified-joining tables/columns (organizations 0.5.0) to an existing install"
+
+      def self.next_migration_number(dir)
+        ActiveRecord::Generators::Base.next_migration_number(dir)
+      end
+
+      def create_migration_file
+        migration_template "add_verified_joining_to_organizations.rb.erb",
+                           File.join(db_migrate_path, "add_verified_joining_to_organizations.rb"),
+                           migration_version: migration_version
+      end
+
+      def display_post_upgrade_message
+        say "\n✅ organizations verified-joining migration created.", :green
+        say "\nNext steps:"
+        say "  1. Run 'rails db:migrate'."
+        say "  2. See the README's \"Verified joining\" section for the new API"
+        say "     (domains, join codes, allowlists, join requests)."
+      end
+
+      private
+
+      def migration_version
+        "[#{ActiveRecord::VERSION::STRING.to_f}]"
+      end
+    end
+  end
+end

data/lib/generators/organizations/views/templates/organizations/invitations/_form.html.erb

@@ -0,0 +1,51 @@
+<% suggested_email = ::Faker::Internet.email(name: ::Faker::Name.name, domain: 'example.com') %>
+<%= form_with(model: @invitation, url: organization_invitations_path, local: true, class: "space-y-6") do |form| %>
+  <%= hidden_field_tag :return_to, @return_to %>
+  <% if @invitation.errors.any? %>
+    <div class="rounded-lg bg-red-50 p-4 border border-red-200">
+      <div class="flex">
+        <div class="flex-shrink-0">
+          <%= heroicon "x-circle", variant: :solid, options: { class: "h-5 w-5 text-red-400" } %>
+        </div>
+        <div class="ml-3">
+          <h3 class="text-sm font-medium text-red-800">Could not send invitation:</h3>
+          <div class="mt-2 text-sm text-red-700">
+            <ul class="list-disc pl-5 space-y-1">
+              <% @invitation.errors.full_messages.each do |message| %>
+                <li><%= message %></li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+
+  <div>
+    <%= form.label :email, "Email address", class: "block text-sm font-medium text-gray-700 mb-1" %>
+    <%= form.email_field :email,
+      required: true,
+      autofocus: true,
+      value: @invitation.email.presence || suggested_email,
+      placeholder: "colleague@company.com",
+      class: "block w-full rounded-lg border-gray-300 shadow-sm focus:border-slate-500 focus:ring-slate-500 sm:text-sm" %>
+    <p class="mt-1 text-xs text-gray-500">They'll receive an email invitation to join this organization.</p>
+  </div>
+
+  <div>
+    <%= form.label :role, "Role", class: "block text-sm font-medium text-gray-700 mb-1" %>
+    <%= form.select :role,
+      Organizations::Roles::HIERARCHY.reject { |role| role == :owner }.map { |role| [role.to_s.capitalize, role] },
+      { selected: @invitation.role || :member },
+      required: true,
+      class: "block w-full rounded-lg border-gray-300 shadow-sm focus:border-slate-500 focus:ring-slate-500 sm:text-sm" %>
+    <p class="mt-1 text-xs text-gray-500">Choose the permission level for this member.</p>
+  </div>
+
+  <div class="flex items-center justify-end gap-3 pt-4">
+    <%= link_to "Cancel", "javascript:history.back()",
+      class: "inline-flex items-center rounded-lg bg-white px-4 py-2 text-sm font-semibold text-gray-700 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50" %>
+    <%= form.submit "Send Invitation",
+      class: "inline-flex items-center gap-2 rounded-lg bg-slate-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-500 cursor-pointer" %>
+  </div>
+<% end %>

data/lib/generators/organizations/views/templates/organizations/invitations/index.html.erb

@@ -0,0 +1,112 @@
+<div class="mb-8 flex justify-between items-center">
+  <div>
+    <h1 class="text-2xl font-bold text-gray-900">Invitations</h1>
+    <p class="mt-1 text-sm text-gray-500">Manage organization invitations and resend or revoke pending invites.</p>
+  </div>
+  <%= link_to new_organization_invitation_path,
+    class: "inline-flex items-center gap-2 rounded-lg bg-slate-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-500" do %>
+    <%= heroicon "plus", variant: :mini, options: { class: "h-4 w-4" } %>
+    Invite Member
+  <% end %>
+</div>
+
+<% if @invitations.blank? %>
+  <div class="bg-gray-50 rounded-xl border-2 border-dashed border-gray-200 p-12 text-center">
+    <%= heroicon "envelope", variant: :outline, options: { class: "mx-auto h-12 w-12 text-gray-400" } %>
+    <h3 class="mt-2 text-sm font-semibold text-gray-900">No invitations</h3>
+    <p class="mt-1 text-sm text-gray-500">Invite members to join your organization.</p>
+    <div class="mt-6">
+      <%= link_to new_organization_invitation_path,
+        class: "inline-flex items-center gap-2 rounded-lg bg-slate-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-500" do %>
+        <%= heroicon "plus", variant: :mini, options: { class: "h-4 w-4" } %>
+        Send Invitation
+      <% end %>
+    </div>
+  </div>
+<% else %>
+  <div class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
+    <table class="min-w-full divide-y divide-gray-200">
+      <thead class="bg-gray-50">
+        <tr>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Email</th>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Role</th>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Status</th>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Invited By</th>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Expires</th>
+          <th scope="col" class="px-6 py-3 text-right text-xs font-medium text-gray-500 uppercase tracking-wider">Actions</th>
+        </tr>
+      </thead>
+      <tbody class="bg-white divide-y divide-gray-200">
+        <% @invitations.each do |invitation| %>
+          <tr class="hover:bg-gray-50">
+            <td class="px-6 py-4 whitespace-nowrap">
+              <div class="flex items-center gap-3">
+                <span class="inline-flex h-8 w-8 items-center justify-center rounded-full bg-gray-200 text-gray-600 font-medium text-sm">
+                  <%= invitation.email.first.upcase %>
+                </span>
+                <span class="text-sm font-medium text-gray-900"><%= invitation.email %></span>
+              </div>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap">
+              <span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium
+                <%= case invitation.role
+                    when 'admin' then 'bg-purple-100 text-purple-800'
+                    when 'member' then 'bg-blue-100 text-blue-800'
+                    else 'bg-gray-100 text-gray-800'
+                    end %>">
+                <%= invitation.role.capitalize %>
+              </span>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap">
+              <span class="inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium
+                <%= case invitation.status.to_s
+                    when 'pending' then 'bg-amber-100 text-amber-800'
+                    when 'accepted' then 'bg-emerald-100 text-emerald-800'
+                    when 'declined', 'revoked' then 'bg-red-100 text-red-800'
+                    when 'expired' then 'bg-gray-100 text-gray-800'
+                    else 'bg-gray-100 text-gray-800'
+                    end %>">
+                <%= invitation.status.to_s.capitalize %>
+              </span>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
+              <%= invitation.invited_by&.respond_to?(:email) ? invitation.invited_by.email : "-" %>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
+              <% if invitation.expires_at %>
+                <% if invitation.expires_at > Time.current %>
+                  in <%= distance_of_time_in_words(Time.current, invitation.expires_at) %>
+                <% else %>
+                  <span class="text-red-600">Expired</span>
+                <% end %>
+              <% else %>
+                Never
+              <% end %>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap text-right">
+              <% if invitation.pending? %>
+                <div class="flex items-center justify-end gap-2">
+                  <%= button_to resend_organization_invitation_path(invitation),
+                    method: :post,
+                    class: "inline-flex items-center gap-1 rounded-md bg-white px-2.5 py-1.5 text-xs font-semibold text-gray-700 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50" do %>
+                    <%= heroicon "arrow-path", variant: :mini, options: { class: "h-3.5 w-3.5" } %>
+                    Resend
+                  <% end %>
+                  <%= button_to organization_invitation_path(invitation),
+                    method: :delete,
+                    data: { turbo_confirm: "Revoke this invitation?" },
+                    class: "inline-flex items-center gap-1 rounded-md bg-red-50 px-2.5 py-1.5 text-xs font-medium text-red-700 hover:bg-red-100" do %>
+                    <%= heroicon "x-mark", variant: :mini, options: { class: "h-3.5 w-3.5" } %>
+                    Revoke
+                  <% end %>
+                </div>
+              <% else %>
+                <span class="text-sm text-gray-400 italic">No actions</span>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>

data/lib/generators/organizations/views/templates/organizations/invitations/new.html.erb

@@ -0,0 +1,10 @@
+<div class="max-w-lg mx-auto">
+  <div class="mb-8">
+    <h1 class="text-2xl font-bold text-gray-900">Invite a Member</h1>
+    <p class="mt-1 text-sm text-gray-500">Send an invitation by email. The member will join after accepting the link.</p>
+  </div>
+
+  <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-6">
+    <%= render "form" %>
+  </div>
+</div>

data/lib/generators/organizations/views/templates/organizations/invitations/show.html.erb

@@ -0,0 +1,99 @@
+<div class="flex min-h-[60vh] items-center justify-center px-4">
+  <div class="max-w-lg w-full">
+    <div class="bg-white rounded-2xl shadow-xl border border-gray-100 overflow-hidden">
+      <%# Header with organization branding %>
+      <div class="px-8 py-10 text-center bg-gradient-to-br from-emerald-500 to-emerald-600">
+        <div class="mx-auto h-20 w-20 rounded-2xl bg-white/20 backdrop-blur flex items-center justify-center mb-5 shadow-lg">
+          <span class="text-3xl font-bold text-white"><%= @invitation.organization.name.first.upcase %></span>
+        </div>
+        <h1 class="text-2xl font-bold text-white mb-2">You're Invited!</h1>
+        <p class="text-emerald-100">Join <strong class="text-white"><%= @invitation.organization.name %></strong></p>
+      </div>
+
+      <div class="p-8">
+        <%# Role badge %>
+        <div class="flex justify-center mb-6">
+          <span class="inline-flex items-center gap-2 rounded-full px-4 py-2 text-sm font-semibold
+            <%= case @invitation.role
+                when 'owner' then 'bg-amber-100 text-amber-800'
+                when 'admin' then 'bg-purple-100 text-purple-800'
+                when 'member' then 'bg-blue-100 text-blue-800'
+                else 'bg-gray-100 text-gray-800'
+                end %>">
+            <%= heroicon "user-circle", variant: :solid, options: { class: "h-5 w-5" } %>
+            You'll join as <%= @invitation.role.capitalize %>
+          </span>
+        </div>
+
+        <%# Invited by info %>
+        <div class="text-center mb-8">
+          <p class="text-sm text-gray-500">
+            Invited by
+            <span class="font-medium text-gray-700"><%= @invitation.invited_by&.respond_to?(:email) ? @invitation.invited_by.email : "a team member" %></span>
+          </p>
+        </div>
+
+        <% if @invitation.expired? %>
+          <div class="rounded-xl bg-red-50 p-5 border border-red-200">
+            <div class="flex items-center justify-center gap-3 text-red-800">
+              <%= heroicon "clock", variant: :solid, options: { class: "h-6 w-6 text-red-500" } %>
+              <div>
+                <p class="font-semibold">Invitation Expired</p>
+                <p class="text-sm text-red-600">Ask the sender to send a new invitation.</p>
+              </div>
+            </div>
+          </div>
+        <% elsif @invitation.accepted? %>
+          <div class="rounded-xl bg-emerald-50 p-5 border border-emerald-200">
+            <div class="flex items-center justify-center gap-3 text-emerald-800">
+              <%= heroicon "check-circle", variant: :solid, options: { class: "h-6 w-6 text-emerald-500" } %>
+              <div>
+                <p class="font-semibold">Already Accepted</p>
+                <p class="text-sm text-emerald-600">This invitation has already been accepted.</p>
+              </div>
+            </div>
+          </div>
+        <% else %>
+          <% if @user_is_logged_in && @user_email_matches %>
+            <%= button_to accept_invitation_path(@invitation.token),
+              method: :post,
+              class: "w-full inline-flex items-center justify-center gap-3 rounded-xl bg-emerald-600 px-6 py-4 text-base font-bold text-white shadow-lg hover:bg-emerald-500 hover:shadow-xl transition-all cursor-pointer" do %>
+              <%= heroicon "check-circle", variant: :solid, options: { class: "h-6 w-6" } %>
+              Accept & Join Team
+            <% end %>
+            <p class="mt-4 text-center text-xs text-gray-400">
+              You'll be redirected to the organization dashboard
+            </p>
+          <% elsif @user_is_logged_in %>
+            <div class="rounded-xl bg-amber-50 p-5 border border-amber-200 mb-6">
+              <div class="flex items-start gap-3">
+                <%= heroicon "exclamation-triangle", variant: :solid, options: { class: "h-6 w-6 text-amber-500 flex-shrink-0" } %>
+                <div>
+                  <p class="font-semibold text-amber-800">Email Mismatch</p>
+                  <p class="text-sm text-amber-700 mt-1">
+                    This invitation was sent to <strong><%= @invitation.email %></strong>,
+                    but you're signed in as a different user.
+                  </p>
+                </div>
+              </div>
+            </div>
+          <% else %>
+            <p class="text-center text-sm text-gray-600 mb-6">
+              Sign in or register with <strong class="text-gray-900"><%= @invitation.email %></strong> to accept.
+            </p>
+            <%= button_to accept_invitation_path(@invitation.token),
+              method: :post,
+              class: "w-full inline-flex items-center justify-center gap-3 rounded-xl bg-emerald-600 px-6 py-4 text-base font-bold text-white shadow-lg hover:bg-emerald-500 hover:shadow-xl transition-all" do %>
+              Continue
+              <%= heroicon "arrow-right", variant: :solid, options: { class: "h-6 w-6" } %>
+            <% end %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+
+    <p class="mt-8 text-center text-sm text-gray-400">
+      <%= link_to "← Back to home", main_app.root_path, class: "text-gray-500 hover:text-gray-700 transition-colors" %>
+    </p>
+  </div>
+</div>

data/lib/generators/organizations/views/templates/organizations/memberships/index.html.erb

@@ -0,0 +1,87 @@
+<div class="mb-8">
+  <h1 class="text-2xl font-bold text-gray-900">Members</h1>
+  <p class="mt-1 text-sm text-gray-500">Manage organization member roles and remove members.</p>
+</div>
+
+<% if @memberships.blank? %>
+  <div class="bg-gray-50 rounded-xl border-2 border-dashed border-gray-200 p-12 text-center">
+    <%= heroicon "users", variant: :outline, options: { class: "mx-auto h-12 w-12 text-gray-400" } %>
+    <h3 class="mt-2 text-sm font-semibold text-gray-900">No members</h3>
+    <p class="mt-1 text-sm text-gray-500">Invite members to your organization.</p>
+  </div>
+<% else %>
+  <div class="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
+    <table class="min-w-full divide-y divide-gray-200">
+      <thead class="bg-gray-50">
+        <tr>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Member</th>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Role</th>
+          <th scope="col" class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Joined</th>
+          <th scope="col" class="px-6 py-3 text-right text-xs font-medium text-gray-500 uppercase tracking-wider">Actions</th>
+        </tr>
+      </thead>
+      <tbody class="bg-white divide-y divide-gray-200">
+        <% @memberships.each do |membership| %>
+          <% is_current_user = membership.user_id == current_user.id %>
+          <tr class="<%= is_current_user ? 'bg-slate-50' : 'hover:bg-gray-50' %>">
+            <td class="px-6 py-4 whitespace-nowrap">
+              <div class="flex items-center gap-3">
+                <span class="inline-flex h-10 w-10 items-center justify-center rounded-full <%= is_current_user ? 'bg-slate-600 text-white' : 'bg-gray-200 text-gray-600' %> font-medium">
+                  <%= membership.user.email.first.upcase %>
+                </span>
+                <div>
+                  <div class="text-sm font-medium text-gray-900 flex items-center gap-2">
+                    <%= membership.user.respond_to?(:name) && membership.user.name.present? ? membership.user.name : membership.user.email %>
+                    <% if is_current_user %>
+                      <span class="inline-flex items-center rounded-full bg-slate-100 px-2 py-0.5 text-xs font-medium text-slate-700">You</span>
+                    <% end %>
+                  </div>
+                  <div class="text-sm text-gray-500"><%= membership.user.email %></div>
+                </div>
+              </div>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap">
+              <span class="inline-flex items-center rounded-md px-2 py-1 text-xs font-medium
+                <%= case membership.role
+                    when 'owner' then 'bg-amber-100 text-amber-800'
+                    when 'admin' then 'bg-purple-100 text-purple-800'
+                    when 'member' then 'bg-blue-100 text-blue-800'
+                    else 'bg-gray-100 text-gray-800'
+                    end %>">
+                <%= membership.role.capitalize %>
+              </span>
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
+              <%= time_ago_in_words(membership.created_at) %> ago
+            </td>
+            <td class="px-6 py-4 whitespace-nowrap text-right">
+              <% if is_current_user %>
+                <span class="text-sm text-gray-400 italic">Current user</span>
+              <% elsif membership.role == 'owner' %>
+                <span class="text-sm text-gray-400 italic">Organization owner</span>
+              <% else %>
+                <div class="flex items-center justify-end gap-2">
+                  <%= form_with(model: membership, url: membership_path(membership), method: :patch, local: true, class: "flex items-center gap-2") do |form| %>
+                    <%= form.select :role,
+                      Organizations::Roles::HIERARCHY.reject { |r| r == :owner }.map { |role| [role.to_s.capitalize, role] },
+                      { selected: membership.role },
+                      class: "rounded-md border-gray-300 text-sm focus:border-slate-500 focus:ring-slate-500" %>
+                    <%= form.submit "Update",
+                      class: "inline-flex items-center rounded-md bg-white px-2.5 py-1.5 text-xs font-semibold text-gray-700 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 cursor-pointer" %>
+                  <% end %>
+
+                  <%= button_to membership_path(membership),
+                    method: :delete,
+                    data: { turbo_confirm: "Remove #{membership.user.email} from the organization?" },
+                    class: "inline-flex items-center rounded-md bg-red-50 px-2 py-1.5 text-xs font-medium text-red-700 hover:bg-red-100" do %>
+                    <%= heroicon "trash", variant: :mini, options: { class: "h-4 w-4" } %>
+                  <% end %>
+                </div>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>

data/lib/generators/organizations/views/templates/organizations/organizations/_form.html.erb

@@ -0,0 +1,39 @@
+<%# Shared organization form used by new/edit. %>
+<% suggested_company_name = @organization.persisted? ? nil : "#{::Faker::Company.name} #{::Faker::Company.suffix}" %>
+<%= form_with(model: @organization, local: true, class: "space-y-6") do |form| %>
+  <% if @organization.errors.any? %>
+    <div class="rounded-lg bg-red-50 p-4 border border-red-200">
+      <div class="flex">
+        <div class="flex-shrink-0">
+          <%= heroicon "x-circle", variant: :solid, options: { class: "h-5 w-5 text-red-400" } %>
+        </div>
+        <div class="ml-3">
+          <h3 class="text-sm font-medium text-red-800">Could not save organization:</h3>
+          <div class="mt-2 text-sm text-red-700">
+            <ul class="list-disc pl-5 space-y-1">
+              <% @organization.errors.full_messages.each do |message| %>
+                <li><%= message %></li>
+              <% end %>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+
+  <div>
+    <%= form.label :name, "Organization name", class: "block text-sm font-medium text-gray-700 mb-1" %>
+    <%= form.text_field :name,
+      required: true,
+      autofocus: true,
+      value: @organization.name.presence || suggested_company_name,
+      placeholder: "Acme Inc.",
+      class: "block w-full rounded-lg border-gray-300 shadow-sm focus:border-slate-500 focus:ring-slate-500 sm:text-sm" %>
+  </div>
+
+  <div class="flex items-center justify-end gap-3 pt-4">
+    <%= link_to "Cancel", (@organization.persisted? ? organization_path(@organization) : organizations_path),
+      class: "inline-flex items-center rounded-lg bg-white px-4 py-2 text-sm font-semibold text-gray-700 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50" %>
+    <%= form.submit class: "inline-flex items-center rounded-lg bg-slate-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-slate-500 cursor-pointer" %>
+  </div>
+<% end %>

data/lib/generators/organizations/views/templates/organizations/organizations/edit.html.erb

@@ -0,0 +1,10 @@
+<div class="max-w-lg mx-auto">
+  <div class="mb-8">
+    <h1 class="text-2xl font-bold text-gray-900">Edit Organization</h1>
+    <p class="mt-1 text-sm text-gray-500">Update organization details.</p>
+  </div>
+
+  <div class="bg-white rounded-xl shadow-sm border border-gray-200 p-6">
+    <%= render "form" %>
+  </div>
+</div>