From 5bff65aa691ed9c112867b25770839d81de04bcb Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 13 Jul 2021 19:22:39 +0300
Subject: [PATCH] FIX: Do not show invalid option in flair chooser (#13725)

Both of the commits in this PR are meant to fix the problem of invalid
option being shown in the flair chooser. An invalid option can be shown
if at some point it was a valid one - a group with a flair that was
later changed by an admin and flair was removed. The other option an
invalid option can be selected is if the user had a primary group when
the migration ran and copied the same value to the flair_group_id
column.

* FIX: Set flair_group_id only if group has flair

Follow up to 4ba93aac667f8e50ffb63635bb4e42ff34dcd58e.

* FIX: Do not show invalid option in flair chooser

If selected flair group became unavailable because the flair was removed
then the option would still be selected and visible as an ID only.
---
 .../addon/components/flair-chooser.js         | 19 +++++++++++++++++++
 ...20210713092503_set_users_flair_group_id.rb |  5 ++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/select-kit/addon/components/flair-chooser.js b/app/assets/javascripts/select-kit/addon/components/flair-chooser.js
index 96e912e0959..f8eabd01246 100644
--- a/app/assets/javascripts/select-kit/addon/components/flair-chooser.js
+++ b/app/assets/javascripts/select-kit/addon/components/flair-chooser.js
@@ -1,3 +1,4 @@
+import { computed } from "@ember/object";
 import ComboBoxComponent from "select-kit/components/combo-box";
 
 export default ComboBoxComponent.extend({
@@ -11,4 +12,22 @@ export default ComboBoxComponent.extend({
   modifyComponentForRow() {
     return "flair-row";
   },
+
+  selectedContent: computed(
+    "value",
+    "content.[]",
+    "selectKit.noneItem",
+    function () {
+      const content = (this.content || []).findBy(
+        this.selectKit.valueProperty,
+        this.value
+      );
+
+      if (content) {
+        return this.selectKit.modifySelection(content);
+      } else {
+        return this.selectKit.noneItem;
+      }
+    }
+  ),
 });
diff --git a/db/migrate/20210713092503_set_users_flair_group_id.rb b/db/migrate/20210713092503_set_users_flair_group_id.rb
index fdcd573a902..00ba41b0b72 100644
--- a/db/migrate/20210713092503_set_users_flair_group_id.rb
+++ b/db/migrate/20210713092503_set_users_flair_group_id.rb
@@ -5,7 +5,10 @@ class SetUsersFlairGroupId < ActiveRecord::Migration[6.1]
     execute <<~SQL
       UPDATE users
       SET flair_group_id = primary_group_id
-      WHERE flair_group_id IS NULL
+      FROM groups
+      WHERE users.primary_group_id = groups.id AND
+            users.flair_group_id IS NULL AND
+            (groups.flair_icon IS NOT NULL OR groups.flair_upload_id IS NOT NULL)
     SQL
   end
 end