clairo 2.2.0 → 2.2.1

package/dist/cli.js

@@ -1146,25 +1146,45 @@ async function getBoardIssues(auth, boardId, opts) {
 function escapeJql(text) {
   return text.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
-function appendTextSearch(jql, searchText) {
+function createSearchClause(searchText) {
   const escaped = escapeJql(searchText);
-  return `(${jql}) AND text ~ "${escaped}"`;
+  if (/^[A-Z]+-\d+$/i.test(searchText)) {
+    return `(key = "${escaped}" OR text ~ "${escaped}")`;
+  }
+  if (/^\d+$/.test(searchText)) {
+    return `(key ~ "*-${escaped}" OR text ~ "${escaped}")`;
+  }
+  return `text ~ "${escaped}"`;
+}
+function appendTextSearch(jql, searchText) {
+  return `(${jql}) AND ${createSearchClause(searchText)}`;
+}
+function createAssigneeClause(filter) {
+  if (filter === "unassigned") return "assignee is EMPTY";
+  return "assignee = currentUser()";
 }
 async function fetchViewIssues(auth, view, opts) {
-  const { searchText, ...pageOpts } = opts ?? {};
+  const { searchText, assigneeFilter, ...pageOpts } = opts ?? {};
   switch (view.source.type) {
     case "jql": {
-      const jql = searchText ? appendTextSearch(view.source.jql, searchText) : view.source.jql;
+      let jql = view.source.jql;
+      if (searchText) jql = appendTextSearch(jql, searchText);
+      if (assigneeFilter) jql = `(${jql}) AND ${createAssigneeClause(assigneeFilter)}`;
       return searchIssues(auth, jql, pageOpts);
     }
     case "filter": {
       const filterResult = await getFilterJql(auth, view.source.filterId);
       if (!filterResult.success) return filterResult;
-      const jql = searchText ? appendTextSearch(filterResult.data, searchText) : filterResult.data;
+      let jql = filterResult.data;
+      if (searchText) jql = appendTextSearch(jql, searchText);
+      if (assigneeFilter) jql = `(${jql}) AND ${createAssigneeClause(assigneeFilter)}`;
       return searchIssues(auth, jql, pageOpts);
     }
     case "board": {
-      const jql = searchText ? `text ~ "${escapeJql(searchText)}"` : void 0;
+      const clauses = [];
+      if (searchText) clauses.push(createSearchClause(searchText));
+      if (assigneeFilter) clauses.push(createAssigneeClause(assigneeFilter));
+      const jql = clauses.length > 0 ? clauses.join(" AND ") : void 0;
       return getBoardIssues(auth, view.source.boardId, { ...pageOpts, jql });
     }
   }
@@ -3783,6 +3803,7 @@ function JiraIssueDetailView({
   auth,
   myAccountId,
   myDisplayName,
+  onFetchCurrentUser,
   isActive,
   onClose,
   onIssueUpdated,
@@ -3844,16 +3865,27 @@ function JiraIssueDetailView({
     setActionLoading(null);
   };
   const handleAssignToMe = async () => {
-    if (!myAccountId || !myDisplayName) return;
     setActionLoading("Assigning...");
     setActionError(null);
-    const result = await assignIssue(auth, issueKey, myAccountId);
+    let accountId = myAccountId;
+    let displayName = myDisplayName;
+    if (!accountId || !displayName) {
+      const user = await onFetchCurrentUser();
+      if (!user) {
+        setActionError("Failed to get current user");
+        setActionLoading(null);
+        return;
+      }
+      accountId = user.accountId;
+      displayName = user.displayName;
+    }
+    const result = await assignIssue(auth, issueKey, accountId);
     if (result.success) {
-      const assignee = { accountId: myAccountId, displayName: myDisplayName };
+      const assignee = { accountId, displayName };
       setDetail((prev) => prev ? { ...prev, fields: { ...prev.fields, assignee } } : prev);
       onIssueUpdated(issueKey, { assignee });
-      duckEvents.emit("jira:assigned", { ticketKey: issueKey, assignee: myDisplayName });
-      logJiraAssigneeChanged(issueKey, issueSummary, "assigned", myDisplayName);
+      duckEvents.emit("jira:assigned", { ticketKey: issueKey, assignee: displayName });
+      logJiraAssigneeChanged(issueKey, issueSummary, "assigned", displayName);
       onLogUpdated == null ? void 0 : onLogUpdated();
     } else {
       setActionError(result.error);
@@ -3906,7 +3938,7 @@ function JiraIssueDetailView({
       if (input === "s" && !actionLoading) {
         openTransitionPicker();
       }
-      if (input === "a" && !actionLoading && myAccountId) {
+      if (input === "a" && !actionLoading) {
         handleAssignToMe();
       }
       if (input === "A" && !actionLoading) {
@@ -4054,6 +4086,7 @@ function JiraSavedViewBrowserBox({
   auth,
   myAccountId,
   myDisplayName,
+  onFetchCurrentUser,
   isActive,
   onInputModeChange,
   onLogUpdated
@@ -4074,22 +4107,10 @@ function JiraSavedViewBrowserBox({
   const title = "[6] Issues";
   const borderColor = isActive ? "yellow" : void 0;
   const displayTitle = view ? `${title} - ${view.name}` : title;
-  const filteredIssues = useMemo2(() => {
-    if (assigneeFilter === "unassigned") {
-      return issues.filter((issue) => !issue.fields.assignee);
-    }
-    if (assigneeFilter === "me" && myAccountId) {
-      return issues.filter((issue) => {
-        var _a;
-        return ((_a = issue.fields.assignee) == null ? void 0 : _a.accountId) === myAccountId;
-      });
-    }
-    return issues;
-  }, [issues, assigneeFilter, myAccountId]);
   const rows = useMemo2(() => {
-    const groups = groupBySprint(filteredIssues);
+    const groups = groupBySprint(issues);
     return buildRows(groups);
-  }, [filteredIssues]);
+  }, [issues]);
   const navigableIndices = useMemo2(
     () => rows.map((r, i) => r.type === "issue" ? i : -1).filter((i) => i >= 0),
     [rows]
@@ -4104,14 +4125,19 @@ function JiraSavedViewBrowserBox({
   }, [rows, navigableIndices, highlightedIndex]);
   const hasMore = issues.length < total;
   const doFetch = useCallback9(
-    async (search, startAt = 0, append = false) => {
+    async (search, filter, startAt = 0, append = false) => {
       if (!view || !auth) return;
       setLoading(true);
       setError(null);
+      if (!append) {
+        setIssues([]);
+        setTotal(0);
+      }
       const result = await fetchViewIssues(auth, view, {
         startAt,
         maxResults: 50,
-        searchText: search || void 0
+        searchText: search || void 0,
+        assigneeFilter: filter === "all" ? void 0 : filter
       });
       if (result.success) {
         setIssues((prev) => append ? [...prev, ...result.data.issues] : result.data.issues);
@@ -4132,7 +4158,8 @@ function JiraSavedViewBrowserBox({
     if (view && auth) {
       setSearchText("");
       setInputText("");
-      doFetch("");
+      setAssigneeFilter("all");
+      doFetch("", "all");
     } else {
       setIssues([]);
       setTotal(0);
@@ -4176,7 +4203,7 @@ function JiraSavedViewBrowserBox({
           const newSearch = inputText.trim();
           if (newSearch !== searchText) {
             setSearchText(newSearch);
-            doFetch(newSearch);
+            doFetch(newSearch, assigneeFilter);
           }
           return;
         }
@@ -4219,31 +4246,33 @@ function JiraSavedViewBrowserBox({
         return;
       }
       if (input === "u") {
-        setAssigneeFilter((f) => f === "unassigned" ? "all" : "unassigned");
+        const newFilter = assigneeFilter === "unassigned" ? "all" : "unassigned";
+        setAssigneeFilter(newFilter);
+        doFetch(searchText, newFilter);
         setHighlightedIndex(0);
         return;
       }
       if (input === "m") {
-        setAssigneeFilter((f) => f === "me" ? "all" : "me");
+        const newFilter = assigneeFilter === "me" ? "all" : "me";
+        setAssigneeFilter(newFilter);
+        doFetch(searchText, newFilter);
         setHighlightedIndex(0);
         return;
       }
       if (input === "x") {
         setAssigneeFilter("all");
-        if (searchText) {
-          setSearchText("");
-          setInputText("");
-          doFetch("");
-        }
+        setSearchText("");
+        setInputText("");
+        doFetch("", "all");
         setHighlightedIndex(0);
         return;
       }
       if (input === "l" && hasMore) {
-        doFetch(searchText, issues.length, true);
+        doFetch(searchText, assigneeFilter, issues.length, true);
         return;
       }
       if (input === "r") {
-        doFetch(searchText);
+        doFetch(searchText, assigneeFilter);
       }
     },
     { isActive }
@@ -4260,6 +4289,7 @@ function JiraSavedViewBrowserBox({
       auth,
       myAccountId,
       myDisplayName,
+      onFetchCurrentUser,
       isActive,
       onClose: () => setDetailIssue(null),
       onIssueUpdated: handleIssueUpdated,
@@ -4276,7 +4306,7 @@ function JiraSavedViewBrowserBox({
         /* @__PURE__ */ jsxs10(Text11, { dimColor: true, children: [
           " ",
           "(",
-          filteredIssues.length,
+          issues.length,
           "/",
           total,
           ")"
@@ -4290,8 +4320,7 @@ function JiraSavedViewBrowserBox({
         " Loading issues..."
       ] }) }),
       view && error && /* @__PURE__ */ jsx12(Box10, { paddingX: 1, children: /* @__PURE__ */ jsx12(Text11, { color: "red", children: error }) }),
-      view && !loading && !error && issues.length === 0 && /* @__PURE__ */ jsx12(Box10, { paddingX: 1, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: searchText ? "No issues match search" : "No issues found" }) }),
-      view && !loading && !error && filteredIssues.length === 0 && issues.length > 0 && /* @__PURE__ */ jsx12(Box10, { paddingX: 1, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: "No issues match filter" }) }),
+      view && !loading && !error && issues.length === 0 && /* @__PURE__ */ jsx12(Box10, { paddingX: 1, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: hasActiveFilters ? "No issues match filter" : "No issues found" }) }),
       rows.length > 0 && /* @__PURE__ */ jsx12(ScrollView6, { ref: scrollRef, children: rows.map((row, rowIdx) => {
         if (row.type === "header") {
           const stateLabel = row.state === "active" ? " (active)" : "";
@@ -4456,6 +4485,7 @@ function JiraBrowserView({
   const [myDisplayName, setMyDisplayName] = useState17(null);
   const [inputModeActive, setInputModeActive] = useState17(false);
   const lastRepoRef = useRef7(null);
+  const fetchingUserRef = useRef7(false);
   const auth = useMemo3(() => {
     if (!repo.repoPath || !isJiraConfigured(repo.repoPath)) return null;
     const siteUrl = getJiraSiteUrl(repo.repoPath);
@@ -4473,18 +4503,21 @@ function JiraBrowserView({
       setSelectedViewId(loaded[0].id);
     }
   }, [repo.repoPath]);
-  useEffect13(() => {
-    if (!auth) {
-      setMyAccountId(null);
-      return;
+  const fetchCurrentUser = useCallback10(async () => {
+    if (myAccountId && myDisplayName) {
+      return { accountId: myAccountId, displayName: myDisplayName };
     }
-    getCurrentUser(auth).then((result) => {
-      if (result.success) {
-        setMyAccountId(result.data.accountId);
-        setMyDisplayName(result.data.displayName);
-      }
-    });
-  }, [auth == null ? void 0 : auth.siteUrl, auth == null ? void 0 : auth.email]);
+    if (!auth || fetchingUserRef.current) return null;
+    fetchingUserRef.current = true;
+    const result = await getCurrentUser(auth);
+    fetchingUserRef.current = false;
+    if (result.success) {
+      setMyAccountId(result.data.accountId);
+      setMyDisplayName(result.data.displayName);
+      return { accountId: result.data.accountId, displayName: result.data.displayName };
+    }
+    return null;
+  }, [auth, myAccountId, myDisplayName]);
   useEffect13(() => {
     onModalChange == null ? void 0 : onModalChange(modal.isOpen || inputModeActive);
   }, [modal.isOpen, inputModeActive, onModalChange]);
@@ -4547,7 +4580,7 @@ function JiraBrowserView({
       if (input === "5") onFocusedBoxChange("saved-views");
       if (input === "6") onFocusedBoxChange("browser");
     },
-    { isActive: isActive && !modal.isOpen }
+    { isActive: isActive && !modal.isOpen && !inputModeActive }
   );
   if (modal.type === "add") {
     return /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", flexGrow: 1, children: /* @__PURE__ */ jsx14(
@@ -4586,6 +4619,7 @@ function JiraBrowserView({
         auth,
         myAccountId,
         myDisplayName,
+        onFetchCurrentUser: fetchCurrentUser,
         isActive: isActive && focusedBox === "browser",
         onInputModeChange: setInputModeActive,
         onLogUpdated

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clairo",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "MIT",
   "repository": {
     "type": "git",