From 894b32a96c5e6b163c2e97480fc65a56eb91eafd Mon Sep 17 00:00:00 2001 From: Benn Oshrin Date: Wed, 19 Nov 2025 16:30:09 -0500 Subject: [PATCH] Remove obsolete statuses from StatusEnum (CFM-7) --- app/resources/locales/en_US/enumeration.po | 18 ------------------ app/src/Lib/Enum/StatusEnum.php | 16 +--------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/app/resources/locales/en_US/enumeration.po b/app/resources/locales/en_US/enumeration.po index 61c13ea04..e3311f6df 100644 --- a/app/resources/locales/en_US/enumeration.po +++ b/app/resources/locales/en_US/enumeration.po @@ -633,9 +633,6 @@ msgstr "Set" msgid "StatusEnum.A" msgstr "Active" -msgid "StatusEnum.C" -msgstr "Confirmed" - msgid "StatusEnum.D" msgstr "Archived" @@ -645,9 +642,6 @@ msgstr "Duplicate" msgid "StatusEnum.GP" msgstr "Grace Period" -msgid "StatusEnum.I" -msgstr "Invited" - msgid "StatusEnum.LK" msgstr "Locked" @@ -657,27 +651,15 @@ msgstr "Denied" msgid "StatusEnum.P" msgstr "Pending" -msgid "StatusEnum.PA" -msgstr "Pending Approval" - -msgid "StatusEnum.PC" -msgstr "Pending Confirmation" - msgid "StatusEnum.PS" msgstr "Pending Activation" msgid "StatusEnum.S" msgstr "Suspended" -msgid "StatusEnum.X" -msgstr "Declined" - msgid "StatusEnum.XP" msgstr "Expired" -msgid "StatusEnum.Y" -msgstr "Approved" - msgid "SuspendableStatusEnum.A" msgstr "Active" diff --git a/app/src/Lib/Enum/StatusEnum.php b/app/src/Lib/Enum/StatusEnum.php index 4664329f7..dd88ee768 100644 --- a/app/src/Lib/Enum/StatusEnum.php +++ b/app/src/Lib/Enum/StatusEnum.php @@ -31,22 +31,15 @@ class StatusEnum extends StandardEnum { const Active = 'A'; - const Approved = 'Y'; // Archived was Deleted in v4, so we reuse "D" to simplify upgrading const Archived = 'D'; - const Confirmed = 'C'; - const Denied = 'N'; const Duplicate = 'D2'; const Expired = 'XP'; const GracePeriod = 'GP'; - const Invited = 'I'; const Locked = 'LK'; const Pending = 'P'; const PendingActivation = 'PS'; - const PendingApproval = 'PA'; - const PendingConfirmation = 'PC'; const Suspended = 'S'; - const Declined = 'X'; /** * Map a status value to its "preference" or "rank" for status recalculation. @@ -75,18 +68,11 @@ public static function rank(string $status): int { self::Suspended => 13, self::Expired => 12, - // Then invitation statuses - self::Approved => 11, - self::PendingApproval => 10, - self::Confirmed => 9, - self::PendingConfirmation => 8, - self::Invited => 7, + // Then pending statuses self::PendingActivation => 6, self::Pending => 5, // It's not clear this is used for anything // Denied and Declined are below expired since other roles are more likely to have been used - self::Denied => 4, - self::Declined => 3, // Finally, we generally don't want Archived or Duplicate unless all roles are deleted or duplicates self::Archived => 2,