Rework org status: remove program status, merged affiliated-since, 3-value status

[maebeale]

🤖 suggested review level: 5 Inspect 🔬 substantive display logic (affiliation-period merging, mirrored in JS) plus a data migration that remaps + drops OrganizationStatus records

What is the goal of this PR and why is this important?

Three related cleanups to org data that only made sense together:

• Program status (New/Reinstate/Ongoing) is event-relative, so it's removed from the org-wide index column and edit form (per-event version lives on the profile in Add Event abbreviation and surface it in compact/event contexts #1995).
• "Affiliated since" now reflects the real shape of an org's affiliation history — merged periods with gaps — instead of one flat Mon YYYY – Mon YYYY range.
• The org status vocabulary is trimmed from six event-flavored values to Active / Formerly active / Unknown.

How did you approach the change?

• Removals: the index "Program" column, the orphaned Organization.program_statuses_by_id, and the edit-form "Program status" block.
• AffiliationPeriods service merges affiliation intervals into periods: a lone ongoing period → "Mon YYYY" (this year) or its start year; multi-period lists are year-only → "2010-2012, 2026". Falls back to org.start_date, then blank. Applied on show / index / edit; the edit form's live JS preview mirrors the same formatting.
• Status simplification: constant + a data migration remaps existing statuses (Reinstate→Active, Inactive/Suspended→Formerly active, Pending→Unknown) then deletes the retired records. The affiliation status-sync callback and seeds follow the new names.

Anything else to add?

• The DB organization_status search filter is kept (real field).
• Screenshots to follow.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[maebeale]

🤖 From Claude: Deliberately computed in-memory (over the already-loaded affiliations) rather than reusing the DB-backed Organization#facilitator_status_on, so classifying a paginated page of ~9 events doesn't fire 2 queries per event. Same classification rule, just no N+1.

[maebeale]

🤖 From Claude: Falls back to a truncated title when abbreviation is blank so existing events still render a sensible chip. Chips are gated behind manage? to keep program status admin-only, matching how it was treated on the old index column.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[maebeale]

🤖 From Claude: The load-bearing decisions to eyeball: Reinstate folds into Active (per request), Inactive/Suspended into Formerly active, Pending into Unknown. down recreates the retired records but cannot restore per-org mappings — a merge is inherently lossy.

[maebeale]

🤖 From Claude: This is a hand-kept mirror of AffiliationPeriods (app/services/affiliation_periods.rb) so the edit-form live preview matches the server render. If the Ruby formatting rules change, change both.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[Copilot]

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

[Copilot]

Pull request overview

Copilot reviewed 27 out of 27 changed files in this pull request and generated no new comments.

Suppressed comments (4)

app/views/organizations/_form.html.erb:344

• 🤖 From Copilot: blocker: The org form no longer provides data-affiliation-dates-target="affiliationsContainer", but affiliation_dates_controller (and existing system specs) rely on this target to find .nested-fields and attach listeners / locate rows. Restoring the target keeps the existing behavior working without reintroducing the old UI fields.

        <div class="p-3" data-controller="paginated-fields" data-paginated-fields-per-page-value="10">

app/views/organizations/organizations_results.html.erb:13

• 🤖 From Copilot: should-fix: The PR description says the index column is "Affiliated since" (now merged periods), but the results table header is now "Program since" and the affiliated-since display no longer appears in the index. If this change is intentional, the PR description (and any UX expectations) should be updated; otherwise consider restoring the affiliated-since column or renaming this header to match the intended display.

            <th class="px-4 py-2 text-left text-sm font-semibold text-gray-700">Program since</th>

app/decorators/organization_decorator.rb:94

• 🤖 From Copilot: should-fix: program_since_display currently filters facilitator affiliations with Ruby select, which forces loading all affiliations when a relation is passed and can be wasteful compared to the existing .facilitators scope. Using the scope when available preserves the "pass a preloaded collection" API while avoiding unnecessary objects/IO.

  def program_since_display(affiliations = object.affiliations)
    AffiliationPeriods.label(affiliations.select(&:facilitator?)) || ""
  end

app/views/organizations/_form.html.erb:1

• 🤖 From Copilot: blocker: Removing the affiliation-dates Stimulus controller from the org form leaves affiliation-dates#recalculate actions in app/views/affiliations/_fields.html.erb without a matching controller (console errors) and breaks system specs that wait for [data-affiliation-dates-ready]. Re-add the controller on this form (you can keep serverAffiliatedSince true to avoid touching the server-rendered "Affiliated since" field).

This issue also appears on line 344 of the same file.

<%= simple_form_for(@organization, html: { data: { controller: "affiliation-facilitator-warning" } }) do |f| %>

[Copilot]

Pull request overview

Copilot reviewed 27 out of 27 changed files in this pull request and generated no new comments.

Suppressed comments (2)

app/controllers/organizations_controller.rb:14

• 🤖 From Copilot: should-fix: Eager-loading :affiliations for the org index results can pull a lot of data (all affiliation columns for every org in the page) just to compute the “Program since” label. You can avoid the heavier preload by fetching only facilitator affiliations for the current page and passing them into the decorator.

      base_scope = authorized_scope(Organization.includes(
        :windows_type, :organization_status, :sectors, :addresses, :affiliations,
        { categorizable_items: { category: :category_type } },
        logo_attachment: :blob
      ))

app/decorators/organization_decorator.rb:94

• 🤖 From Copilot: should-fix: program_since_display always filters facilitator affiliations in Ruby, which forces loading all affiliations when the association isn’t already loaded (e.g., on org show). Consider using the SQL facilitators scope when possible to avoid unnecessary record loads.

  def program_since_display(affiliations = object.affiliations)
    AffiliationPeriods.label(affiliations.select(&:facilitator?)) || ""
  end

[Copilot]

Pull request overview

Copilot reviewed 27 out of 27 changed files in this pull request and generated 1 comment.

Suppressed comments (2)

app/views/organizations/_form.html.erb:344

• 🤖 From Copilot: blocker: The affiliation editor container no longer has the affiliationsContainer target, so affiliation-dates can’t attach listeners / compute visible rows (and specs that locate rows via this target will fail).

        <div class="p-3" data-controller="paginated-fields" data-paginated-fields-per-page-value="10">

app/services/affiliation_periods.rb:62

• 🤖 From Copilot: should-fix: AffiliationPeriods claims “touching intervals collapse into one period”, but the merge logic only merges when next_start <= finish (overlap), not when an interval starts the day after a prior one ends, so back-to-back affiliations will be shown as separate periods.

  # A nil end is ongoing and swallows every later interval.
  def overlaps?(period, next_start)
    period[1].nil? || next_start <= period[1]
  end

[Copilot]

Pull request overview

Copilot reviewed 27 out of 27 changed files in this pull request and generated no new comments.

Suppressed comments (2)

app/views/organizations/_form.html.erb:344

• blocker: The org edit system spec locates affiliation rows via data-affiliation-dates-target="affiliationsContainer"; after removing it, the warning flow tests (and the affiliation-dates controller if re-enabled) can’t find the nested affiliation fields reliably.

        <div class="p-3" data-controller="paginated-fields" data-paginated-fields-per-page-value="10">

app/views/organizations/_form.html.erb:1

• blocker: This form no longer mounts the affiliation-dates Stimulus controller, but existing system specs (and any JS that waits on data-affiliation-dates-ready) assume it runs on the org edit form. Either update those specs/UX expectations, or re-add the controller here (and set serverAffiliatedSince so it won’t overwrite the server-rendered merged periods).

<%= simple_form_for(@organization, html: { data: { controller: "affiliation-facilitator-warning" } }) do |f| %>

[Copilot]

Pull request overview

Copilot reviewed 27 out of 27 changed files in this pull request and generated no new comments.

Suppressed comments (3)

app/services/affiliation_periods.rb:62

• 🤖 From Copilot: should-fix: overlaps? currently only merges when the next interval starts on/before the prior end date; adjacent intervals (end on 2020-01-31, next starts 2020-02-01) are treated as a gap even though the docstring says “touching intervals collapse”. This will split what looks like continuous affiliation history into multiple periods.

  # A nil end is ongoing and swallows every later interval.
  def overlaps?(period, next_start)
    period[1].nil? || next_start <= period[1]
  end

app/views/organizations/organizations_results.html.erb:26

• 🤖 From Copilot: should-fix: This label uses the raw status name, so orgs with OrganizationStatus = "Unknown" will display "Unknown" instead of the intended user-facing "Never active" (per OrganizationDecorator#organization_status_label).

                <% status_label = organization.published? ? nil : organization.organization_status&.name %>

app/decorators/organization_decorator.rb:94

• 🤖 From Copilot: should-fix: program_since_display filters facilitator affiliations in Ruby (select(&:facilitator?)), which forces loading all affiliations on pages that didn’t preload them (e.g., org show/edit) and can be unnecessarily expensive for orgs with many non-facilitator affiliations.

  def program_since_display(affiliations = object.affiliations)
    AffiliationPeriods.label(affiliations.select(&:facilitator?)) || ""
  end

[Copilot]

Pull request overview

Copilot reviewed 27 out of 27 changed files in this pull request and generated no new comments.

Suppressed comments (3)

app/services/affiliation_periods.rb:62

• 🤖 From Copilot: should-fix: The docstring says “touching intervals collapse”, but overlaps? only merges when next_start <= end_date. Since Affiliation.active_on treats end_date as inclusive, back-to-back intervals (next starts the day after the previous end) will be split into separate periods unexpectedly.

  def overlaps?(period, next_start)
    period[1].nil? || next_start <= period[1]
  end

app/decorators/organization_decorator.rb:94

• 🤖 From Copilot: should-fix: program_since_display filters facilitator affiliations in Ruby (select(&:facilitator?)), which forces loading all affiliations and duplicates the SQL rule already encoded in Affiliation.facilitators. Using the scope when available keeps behavior consistent and avoids unnecessary record loading.

  def program_since_display(affiliations = object.affiliations)
    AffiliationPeriods.label(affiliations.select(&:facilitator?)) || ""
  end

app/views/organizations/_form.html.erb:1

• 🤖 From Copilot: nit: The PR description says the org edit form has a live JS preview that mirrors the server formatting, but this change removes the affiliation-dates Stimulus controller from the org form, so affiliation/program “since” values won’t update live while editing affiliations. Either update the PR description or reintroduce an equivalent live preview if that’s still a requirement.

<%= simple_form_for(@organization, html: { data: { controller: "affiliation-facilitator-warning" } }) do |f| %>

[Copilot]

Pull request overview

Copilot reviewed 27 out of 27 changed files in this pull request and generated no new comments.

Suppressed comments (4)

app/views/organizations/_form.html.erb:1

• 🤖 From Copilot: should-fix: The PR description says the org edit form’s live JS preview mirrors the new merged-period formatting, but the org form no longer attaches the affiliation-dates Stimulus controller, so the “Affiliated since” / “Program since” displays won’t update when editing nested affiliations.

<%= simple_form_for(@organization, html: { data: { controller: "affiliation-facilitator-warning" } }) do |f| %>

app/controllers/organizations_controller.rb:14

• 🤖 From Copilot: should-fix: organizations_results now calls organization.all_sectors / age-group aggregations (which load through people.includes(...)), but the index query only eager-loads :affiliations/direct :sectors; this will add N+1 queries per org row for people + taggings.

      base_scope = authorized_scope(Organization.includes(
        :windows_type, :organization_status, :sectors, :addresses, :affiliations,
        { categorizable_items: { category: :category_type } },
        logo_attachment: :blob
      ))

app/views/organizations/organizations_results.html.erb:23

• 🤖 From Copilot: should-fix: This fragment cache key doesn’t include inputs that drive the rendered sectors/age groups (notably affiliated people’s primary taggings), so the index row can stay stale after those associations change.

            <% cache [organization, @program_since_display[organization.id], organization.organization_status_id, @active_people_counts[organization.id], current_user.super_user?] do %>

app/frontend/javascript/controllers/affiliation_dates_controller.js:8

• 🤖 From Copilot: nit: serverAffiliatedSince was added as a Stimulus value, but there are no views setting data-*-server-affiliated-since-value, and the org form no longer uses this controller; consider removing this value/branch or wiring it up so the intent is clear.

  static targets = ["affiliatedSince", "facilitatorSince", "affiliationsContainer"]
  // Orgs render "Affiliated since" server-side as merged periods (AffiliationPeriods),
  // so the controller leaves that field alone; the person form keeps the live single
  // Mon YYYY – Mon YYYY range.
  static values = { serverAffiliatedSince: Boolean }

[Copilot]

Pull request overview

Copilot reviewed 24 out of 24 changed files in this pull request and generated 1 comment.

Suppressed comments (2)

app/controllers/organizations_controller.rb:14

• should-fix: The organizations index now renders organization.all_sectors / all_primary_age_groups, which pulls affiliated people’s taggings; the index scope currently doesn’t eager-load people + their sectorable_items/categorizable_items, so the results frame will issue per-row queries. Preload the associations in the index includes(...) to avoid N+1s.

      base_scope = authorized_scope(Organization.includes(
        :windows_type, :organization_status, :sectors, :addresses, :affiliations,
        { categorizable_items: { category: :category_type } },
        logo_attachment: :blob
      ))

app/models/organization.rb:287

• should-fix: affiliated_sectors always calls people.includes(...), which forces a fresh query even when people (and nested taggings) were already eager-loaded by the caller (e.g. the organizations index). Prefer using the already-loaded association when available to avoid redundant queries.

  # Only affiliated people's PRIMARY sector (a person has at most one) — their
  # non-primary sectors don't roll up to the org.
  def affiliated_sectors
    people.includes(sectorable_items: :sector)
          .flat_map { |person| person.sectorable_items.filter_map { |item| item.sector if item.is_primary? } }