feat(invite): refactor to be able to edit the list

.github/copilot-instructions.md

@@ -9,8 +9,8 @@ AstralRaidLeader is a **World of Warcraft (Retail) addon** written in Lua. It ma
 | File | Purpose |
 |---|---|
 | `AstralRaidLeader.lua` | Core logic: event handling, auto-promote, guild rank resolution, consumable audit, death tracking, slash commands |
-| `AstralRaidLeader_Options.lua` | In-game settings window (760×500 custom frame) |
-| `AstralRaidLeader_Deaths.lua` | Death recap window (640×430 custom frame) |
+| `AstralRaidLeader_Options.lua` | In-game settings window (760×560 custom frame) |
+| `AstralRaidLeader_Deaths.lua` | Death recap window (520×430 custom frame) |
 | `AstralRaidLeader.toc` | Addon manifest; load order is `.lua` → `_Options.lua` → `_Deaths.lua` |
 
 The addon namespace is exposed as `_G["AstralRaidLeader"]` and referenced as `ARL` in every file.
@@ -102,7 +102,7 @@ The addon namespace is exposed as `_G["AstralRaidLeader"]` and referenced as `AR
 ### Options Window (`AstralRaidLeader_Options.lua`)
 
 ```
-frame (760×500, DIALOG strata, level 100)
+frame (760×560, DIALOG strata, level 100)
 ├── header (TOPLEFT 7,-7 → TOPRIGHT -30,-7, height 28, level+8)
 │   ├── headerDivider (bottom edge texture)
 │   └── titleText (OVERLAY FontString, centered)
@@ -122,15 +122,15 @@ frame (760×500, DIALOG strata, level 100)
 - `panels[3]` – Guild Ranks
 - `panels[4]` – Consumables
 - `panels[5]` – Deaths settings
-- `panels[6]` – Raid Groups (import, dropdown select, auto-apply toggle, preview, apply)
-- `panels[7]` – Raid Groups Settings (output/apply behavior toggles)
+- `panels[6]` – Raid Groups (dropdown + apply/delete/clear, Import/Editor mode tabs, shared text area, save/import buttons, all raid-group toggles)
+- `panels[7]` – Reserved/unused (settings merged into panel 6)
 
 **Main tab → sub-tabs mapping** is defined in `MAIN_TABS` and drives `SelectMainTab` / `SelectSubTab`.
 
 ### Death Recap Window (`AstralRaidLeader_Deaths.lua`)
 
 ```
-frame (640×430, DIALOG strata, level 110)
+frame (520×430, DIALOG strata, level 110)
 ├── header (same pattern as Options)
 ├── topCloseButton
 ├── dragRegion
@@ -256,3 +256,4 @@ Sets muted text color on `cb.Text`, brightens on hover. Idempotent via `cb._arlS
 14. **Auto-apply invite spam** — when auto-applying on member join, do not re-send invites for every roster update; subgroup apply can run without invite side effects.
 15. **Raid layout selector implementation** — panel 6 uses Blizzard `UIDropDownMenuTemplate`, not a custom button list. Preserve click-anywhere-to-open behavior and left-aligned selected-text styling.
 16. **Difficulty mismatch behavior** — applying a raid layout must fail with a clear message when current raid difficulty does not match the layout's imported difficulty.
+17. **Raid Groups panel merge** — do not reintroduce a separate Settings sub-tab/panel for raid groups; keep mode tabs and all raid-group toggles inside panel 6.

AstralRaidLeader.lua

@@ -90,6 +90,10 @@ local function CanManageRaidSubgroups()
         or (UnitIsGroupAssistant and UnitIsGroupAssistant("player"))
 end
 
+-- Forward declarations used by raid-layout helpers before death-tracking setup.
+local currentEncounterName = ""
+local currentEncounterID = 0
+
 -- Shared UI helpers consumed by the options and death-recap windows.
 ARL.UI = ARL.UI or {}
 
@@ -264,6 +268,9 @@ end
 -- Raid layout import / apply
 -- ============================================================
 
+local NormalizeDifficultyToken
+local GetCurrentRaidDifficultyInfo
+
 local function GetRaidLayoutKey(profile)
     return string.format(
         "%s::%s::%s",
@@ -357,6 +364,127 @@ local function GetRaidLayoutPreviewLines(profile)
     return lines
 end
 
+local function BuildRaidLayoutProfile(input)
+    if type(input) ~= "table" then
+        return nil, "Raid layout data is invalid."
+    end
+
+    local encounterID = tonumber(input.encounterID)
+    if not encounterID or encounterID <= 0 then
+        return nil, "Encounter ID must be a positive number."
+    end
+
+    local encounterName = Trim(input.name)
+    if encounterName == "" then
+        return nil, "Encounter name cannot be empty."
+    end
+
+    local difficultyToken = NormalizeDifficultyToken(input.difficulty)
+    local difficulty = difficultyToken ~= "" and difficultyToken or Trim(input.difficulty)
+    if difficulty == "" then
+        difficulty = "Unknown"
+    end
+
+    local invitelist = {}
+    local seenNames = {}
+    for _, rawName in ipairs(input.invitelist or {}) do
+        local cleanName = Trim(rawName)
+        local key = cleanName:lower()
+        if cleanName ~= "" and not seenNames[key] then
+            seenNames[key] = true
+            invitelist[#invitelist + 1] = cleanName
+        end
+    end
+
+    local profile = {
+        encounterID = encounterID,
+        difficulty = difficulty,
+        name = encounterName,
+        invitelist = invitelist,
+    }
+    profile.key = GetRaidLayoutKey(profile)
+
+    return profile, nil
+end
+
+local function BuildRaidLayoutImportText(profile)
+    local invitelist = profile and profile.invitelist or {}
+    local inviteText = #invitelist > 0 and table.concat(invitelist, " ") or ""
+    return string.format(
+        "EncounterID: %d; Difficulty: %s; Name: %s;\ninvitelist: %s;",
+        tonumber(profile.encounterID) or 0,
+        Trim(profile.difficulty),
+        Trim(profile.name),
+        inviteText
+    )
+end
+
+local function BuildCurrentRaidInvitelist()
+    local invitelist = {}
+    local seen = {}
+    for raidIndex = 1, MAX_RAID_MEMBERS do
+        local name = GetRaidRosterInfo(raidIndex)
+        if name and name ~= "" then
+            local key = name:lower()
+            if not seen[key] then
+                seen[key] = true
+                invitelist[#invitelist + 1] = name
+            end
+        end
+    end
+    return invitelist
+end
+
+local function BuildNewRaidLayoutTemplate(seedFromCurrentRaid)
+    local encounterID = tonumber(currentEncounterID) or 0
+    if encounterID <= 0 then
+        encounterID = 1
+    end
+
+    local encounterName = Trim(currentEncounterName)
+    if encounterName == "" then
+        encounterName = "New Layout"
+    end
+
+    local _, currentDifficultyName = GetCurrentRaidDifficultyInfo()
+    local difficulty = NormalizeDifficultyToken(currentDifficultyName)
+    if difficulty == "" then
+        difficulty = Trim(currentDifficultyName)
+    end
+    if difficulty == "" then
+        difficulty = "normal"
+    end
+
+    local profile = {
+        encounterID = encounterID,
+        difficulty = difficulty,
+        name = encounterName,
+        invitelist = seedFromCurrentRaid and BuildCurrentRaidInvitelist() or {},
+    }
+
+    local normalized, err = BuildRaidLayoutProfile(profile)
+    if not normalized then
+        return nil, err
+    end
+    return normalized, nil
+end
+
+local function ExportRaidLayoutToImportText(query)
+    local _, profile = GetRaidLayoutProfileByQuery(query)
+    if not profile then
+        return false, "Raid layout not found."
+    end
+    return true, BuildRaidLayoutImportText(profile)
+end
+
+local function BuildNewRaidLayoutImportText(seedFromCurrentRaid)
+    local profile, err = BuildNewRaidLayoutTemplate(seedFromCurrentRaid)
+    if not profile then
+        return false, err
+    end
+    return true, BuildRaidLayoutImportText(profile)
+end
+
 local function ParseRaidLayoutImport(text)
     local normalized = Trim((text or ""):gsub("\r\n", "\n"):gsub("\r", "\n"))
     if normalized == "" then
@@ -384,7 +512,7 @@ local function ParseRaidLayoutImport(text)
             end
         end
 
-        if encounterID and encounterID > 0 and encounterName ~= "" and #inviteList > 0 then
+        if encounterID and encounterID > 0 and encounterName ~= "" then
             local profile = {
                 encounterID = encounterID,
                 difficulty = difficulty ~= "" and difficulty or "Unknown",
@@ -426,6 +554,69 @@ local function UpsertRaidLayoutProfile(profile)
     return true, #ARL.db.raidLayouts
 end
 
+local function SaveRaidLayoutProfile(profile, options)
+    if not ARL.db then
+        return false, "Not fully loaded yet. Please wait a moment."
+    end
+
+    local normalized, err = BuildRaidLayoutProfile(profile)
+    if not normalized then
+        return false, err
+    end
+
+    options = type(options) == "table" and options or {}
+    local overwrite = options.overwrite and true or false
+    local targetKey = Trim(options.targetKey)
+
+    if overwrite then
+        if targetKey == "" then
+            return false, "Select a saved raid layout to overwrite."
+        end
+
+        local targetIndex = FindRaidLayoutIndexByKey(targetKey)
+        if not targetIndex then
+            return false, "Selected raid layout to overwrite was not found."
+        end
+
+        local conflictIndex = FindRaidLayoutIndexByKey(normalized.key)
+        if conflictIndex and conflictIndex ~= targetIndex then
+            return false,
+                "Another saved layout already uses that encounter/difficulty/name. Use Save New with a different name."
+        end
+
+        ARL.db.raidLayouts[targetIndex] = normalized
+        ARL.db.activeRaidLayoutKey = normalized.key
+        return true, {
+            profile = normalized,
+            overwritten = true,
+            previousKey = targetKey,
+        }
+    end
+
+    if FindRaidLayoutIndexByKey(normalized.key) then
+        return false,
+            "A raid layout with that encounter/difficulty/name already exists. Use Overwrite Selected instead."
+    end
+
+    ARL.db.raidLayouts[#ARL.db.raidLayouts + 1] = normalized
+    ARL.db.activeRaidLayoutKey = normalized.key
+    return true, {
+        profile = normalized,
+        overwritten = false,
+    }
+end
+
+local function SaveRaidLayoutFromImportText(text, options)
+    local profiles, err = ParseRaidLayoutImport(text)
+    if not profiles then
+        return false, err
+    end
+    if #profiles ~= 1 then
+        return false, "Editor save expects exactly one encounter block."
+    end
+    return SaveRaidLayoutProfile(profiles[1], options)
+end
+
 local function ImportRaidLayouts(text)
     if not ARL.db then
         return false, "Not fully loaded yet. Please wait a moment."
@@ -596,7 +787,7 @@ local RAID_DIFFICULTY_IDS = {
     mythic = { [16] = true },
 }
 
-local function NormalizeDifficultyToken(value)
+NormalizeDifficultyToken = function(value)
     local token = Trim(value):lower()
     token = token:gsub("%s+", "")
 
@@ -615,7 +806,7 @@ local function NormalizeDifficultyToken(value)
     return token
 end
 
-local function GetCurrentRaidDifficultyInfo()
+GetCurrentRaidDifficultyInfo = function()
     local raidDifficultyID = 0
     if _G.GetRaidDifficultyID then
         raidDifficultyID = tonumber(_G.GetRaidDifficultyID()) or 0
@@ -874,6 +1065,9 @@ local function ApplyRaidLayoutProfile(profile, options)
     if not targetState then
         return false, err
     end
+    if (targetState.importedCount or 0) == 0 then
+        return false, "Raid layout has no listed players. Add at least one name before applying."
+    end
 
     options = type(options) == "table" and options or nil
     local shouldInviteMissing = options and options.inviteMissing
@@ -1347,6 +1541,9 @@ ARL.GetRaidLayoutPreviewLines = GetRaidLayoutPreviewLines
 ARL.SetActiveRaidLayoutByQuery = SetActiveRaidLayoutByQuery
 ARL.DeleteRaidLayoutByQuery = DeleteRaidLayoutByQuery
 ARL.ApplyRaidLayoutByQuery = ApplyRaidLayoutByQuery
+ARL.ExportRaidLayoutToImportText = ExportRaidLayoutToImportText
+ARL.BuildNewRaidLayoutImportText = BuildNewRaidLayoutImportText
+ARL.SaveRaidLayoutFromImportText = SaveRaidLayoutFromImportText
 ARL.ContinueRaidLayoutApply = ContinueRaidLayoutApply
 
 
@@ -1454,8 +1651,6 @@ end)
 -- ============================================================
 
 -- Per-session state (not persisted).
-local currentEncounterName   = ""
-local currentEncounterID     = 0
 local WIPE_FINALIZE_MAX_RETRIES = 8
 local WIPE_FINALIZE_RETRY_DELAY = 0.5