Merge pull request #1989 from frappe/develop

chore(release): dev to main
frappe · Sep 19, 2024 · 71ce071 · 71ce071
2 parents 34c4b11 + a149e7e
commit 71ce071
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/desk/src/components/AssignmentModal.vue b/desk/src/components/AssignmentModal.vue
@@ -9,9 +9,8 @@
     <template #body-content>
       <SearchComplete
         class="form-control"
-        value="1"
-        search-field="is_active"
         doctype="HD Agent"
+        :custom-filters="customFilters"
         :reset-input="true"
         @change="
           (option) => {
@@ -58,7 +57,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, computed } from "vue";
 import { createResource } from "frappe-ui";
 import { UserAvatar, SearchComplete } from "@/components";
 import { useUserStore } from "@/stores/user";
@@ -117,4 +116,13 @@ const removeCurrentAssignee = (value) => {
     },
   });
 };
+
+const customFilters = computed(() => {
+  const filters = {};
+  filters["is_active"] = ["=", 1];
+  if (Boolean(props.assignees?.length)) {
+    filters["name"] = ["not in", [...props.assignees.map((a) => a.name)]];
+  }
+  return filters;
+});
 </script>
diff --git a/desk/src/components/SearchComplete.vue b/desk/src/components/SearchComplete.vue
@@ -57,6 +57,11 @@ const props = defineProps({
     required: false,
     default: false,
   },
+  customFilters: {
+    type: Object,
+    required: false,
+    default: {},
+  },
 });
 
 const r = createListResource({
@@ -66,6 +71,7 @@ const r = createListResource({
   fields: [props.labelField, props.searchField, props.valueField],
   filters: {
     [props.searchField]: ["like", `%${props.value}%`],
+    ...props.customFilters,
   },
   onSuccess: () => {
     selection.value = props.value
@@ -86,6 +92,7 @@ function onUpdateQuery(query: string) {
   r.update({
     filters: {
       [props.searchField]: ["like", `%${query}%`],
+      ...props.customFilters,
     },
   });