From 572a9a4223122080215c9bb4cb835f2ac34504f9 Mon Sep 17 00:00:00 2001
From: Andrei Prigorshnev <a.prigorshnev@gmail.com>
Date: Tue, 2 Apr 2024 00:37:40 +0400
Subject: [PATCH] WIP

---
 .../javascripts/discourse/components/assign-user-form.hbs   | 4 ++--
 assets/javascripts/discourse/components/assign-user-form.js | 6 +-----
 assets/javascripts/discourse/components/assignment.hbs      | 4 ++--
 assets/javascripts/discourse/components/assignment.js       | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/assets/javascripts/discourse/components/assign-user-form.hbs b/assets/javascripts/discourse/components/assign-user-form.hbs
index 78d62a8..99e39c7 100644
--- a/assets/javascripts/discourse/components/assign-user-form.hbs
+++ b/assets/javascripts/discourse/components/assign-user-form.hbs
@@ -1,6 +1,6 @@
 <Assignment
-  @assigneeError={{this.assigneeError}}
   @model={{@model}}
   @note={{@model.note}}
   @status={{@model.status}}
-  @onSubmit={{this.assign}} />
+  @onSubmit={{this.assign}}
+  @showAssigneeError={{this.assigneeError}}/>
diff --git a/assets/javascripts/discourse/components/assign-user-form.js b/assets/javascripts/discourse/components/assign-user-form.js
index d44c05c..f3bcd2a 100644
--- a/assets/javascripts/discourse/components/assign-user-form.js
+++ b/assets/javascripts/discourse/components/assign-user-form.js
@@ -9,9 +9,6 @@ export default class AssignUserForm extends Component {
   @service capabilities;
 
   @tracked assigneeError = false;
-  @tracked
-  assigneeName = this.args.model.username || this.args.model.group_name;
-
   constructor() {
     super(...arguments);
 
@@ -20,8 +17,7 @@ export default class AssignUserForm extends Component {
 
   @action
   async assign() {
-    console.log("ass");
-    if (!this.assigneeName) {
+    if (!(this.args.model.username || this.args.model.group_name)) {
       this.assigneeError = true;
       return;
     }
diff --git a/assets/javascripts/discourse/components/assignment.hbs b/assets/javascripts/discourse/components/assignment.hbs
index cec6637..6892cdc 100644
--- a/assets/javascripts/discourse/components/assignment.hbs
+++ b/assets/javascripts/discourse/components/assignment.hbs
@@ -1,4 +1,4 @@
-<div class="control-group {{if @assigneeError 'assignee-error'}}">
+<div class="control-group {{if @showAssigneeError 'assignee-error'}}">
   <label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
   <AssigneeChooser
     autocomplete="off"
@@ -21,7 +21,7 @@
   }}
   />
 
-  {{#if @assigneeError}}
+  {{#if @showAssigneeError}}
     <span class="error-label">
       {{d-icon "exclamation-triangle"}}
       {{i18n "discourse_assign.assign_modal.choose_assignee"}}
diff --git a/assets/javascripts/discourse/components/assignment.js b/assets/javascripts/discourse/components/assignment.js
index 107ac5c..33adb3a 100644
--- a/assets/javascripts/discourse/components/assignment.js
+++ b/assets/javascripts/discourse/components/assignment.js
@@ -31,7 +31,7 @@ export default class Assignment extends Component {
   @action
   setAssignee([newAssignee]) {
     this.assignee = newAssignee;
-    this.args.assigneeError = false;
+    // this.args.showAssigneeError = false;
 
     if (this.taskActions.allowedGroupsForAssignment.includes(newAssignee)) {
       this.args.model.username = null;