fix(tabs): clarify custom PR state filters

Author: pynickle

app/components/dashboard/tabs-settings/TabsEditorPanel.vue

@@ -64,6 +64,8 @@ const {
   useAutoSubtitle,
   setActiveSource,
   setNewTabGroup,
+  setSearchType,
+  setQueryState,
   toggleScope,
   addLabel,
   handleLabelEnter,
@@ -206,7 +208,7 @@ const {
                   : {}
               "
               type="button"
-              @click="newTab.query.type = option.value"
+              @click="setSearchType(option.value)"
             >
               <component
                 :is="filterIconMap[option.value]?.icon"
@@ -234,7 +236,7 @@ const {
                   : {}
               "
               type="button"
-              @click="newTab.query.state = option.value"
+              @click="setQueryState(option.value)"
             >
               <component
                 :is="filterIconMap[option.value]?.icon"

app/composables/useCustomTabSettingsOptions.ts

@@ -7,6 +7,7 @@ import {
 import type {
   CustomTabArchived,
   CustomTabDraft,
+  CustomTabMerged,
   CustomTabOrder,
   CustomTabQuery,
   CustomTabReview,
@@ -32,6 +33,8 @@ export interface CustomTabToggleOption<T extends string> {
   value: T;
 }
 
+export type CustomTabEditorState = CustomTabState | 'merged';
+
 export const customTabSourceOptions: CustomTabSourceOption[] = [
   {
     id: 'github-search',
@@ -57,11 +60,17 @@ export const customTabTypeOptions: Array<CustomTabToggleOption<CustomTabSearchTy
   { labelKey: 'dashboard.tabsSettings.options.pullRequests', value: 'pulls' },
 ];
 
-export const customTabStateOptions: Array<CustomTabToggleOption<CustomTabState | 'any'>> = [
-  { labelKey: 'dashboard.tabsSettings.options.any', value: 'any' },
+export const customTabIssueStateOptions: Array<CustomTabToggleOption<CustomTabState>> = [
   { labelKey: 'dashboard.tabsSettings.options.open', value: 'open' },
   { labelKey: 'dashboard.tabsSettings.options.closed', value: 'closed' },
-  { labelKey: 'dashboard.tabsSettings.options.all', value: 'all' },
+  { labelKey: 'dashboard.tabsSettings.options.allStates', value: 'all' },
+];
+
+export const customTabPullStateOptions: Array<CustomTabToggleOption<CustomTabEditorState>> = [
+  { labelKey: 'dashboard.tabsSettings.options.open', value: 'open' },
+  { labelKey: 'dashboard.tabsSettings.options.closed', value: 'closed' },
+  { labelKey: 'dashboard.tabsSettings.options.merged', value: 'merged' },
+  { labelKey: 'dashboard.tabsSettings.options.allStates', value: 'all' },
 ];
 
 export const customTabScopeOptions: Array<CustomTabToggleOption<CustomTabSearchScope>> = [
@@ -140,6 +149,59 @@ export function createGitHubCustomTabPreviewUrl(query: CustomTabQuery) {
   return createGitHubIssueSearchUrl(query, buildCustomTabSearchQuery(query));
 }
 
+export function getCustomTabEditorState(query: CustomTabQuery): CustomTabEditorState {
+  if (query.type === 'pulls' && query.merged === 'merged') {
+    return 'merged';
+  }
+
+  if (query.state === 'open' || query.state === 'closed' || query.state === 'all') {
+    return query.state;
+  }
+
+  return 'all';
+}
+
+export function applyCustomTabEditorState(
+  query: CustomTabQuery,
+  editorState: CustomTabEditorState
+): CustomTabQuery {
+  const nextQuery: CustomTabQuery = { ...query };
+  const isPullRequest = nextQuery.type === 'pulls';
+  const state: CustomTabState = editorState === 'merged' ? 'closed' : editorState;
+  let merged: CustomTabMerged | undefined;
+
+  nextQuery.state = state;
+
+  if (isPullRequest && editorState === 'merged') {
+    merged = 'merged';
+  } else if (isPullRequest && editorState === 'closed') {
+    merged = 'unmerged';
+  }
+
+  if (merged) {
+    nextQuery.merged = merged;
+  } else {
+    delete nextQuery.merged;
+  }
+
+  return nextQuery;
+}
+
+function getCustomTabStateSummary(query: CustomTabQuery, t: Translate) {
+  const editorState = getCustomTabEditorState(query);
+
+  if (editorState === 'all') {
+    return '';
+  }
+
+  const labelKey =
+    editorState === 'merged'
+      ? 'dashboard.tabsSettings.options.merged'
+      : `dashboard.tabsSettings.options.${editorState}`;
+
+  return t(labelKey);
+}
+
 export function buildCustomTabHumanPreview(query: CustomTabQuery, t: Translate) {
   const chunks = [];
   chunks.push(getCustomTabTypeSummary(query.type ?? 'issues', t));
@@ -154,8 +216,9 @@ export function buildCustomTabHumanPreview(query: CustomTabQuery, t: Translate)
     chunks.push(t('dashboard.tabsSettings.summary.involving', { value: query.involves.trim() }));
   if (query.labels && query.labels.length > 0)
     chunks.push(t('dashboard.tabsSettings.summary.labeled', { value: query.labels.join(', ') }));
-  if (query.state && query.state !== 'any')
-    chunks.push(t('dashboard.tabsSettings.summary.state', { value: query.state }));
+
+  const stateSummary = getCustomTabStateSummary(query, t);
+  if (stateSummary) chunks.push(t('dashboard.tabsSettings.summary.state', { value: stateSummary }));
 
   return t('dashboard.tabsSettings.summary.showing', { value: chunks.join(', ') });
 }
@@ -165,9 +228,8 @@ export function buildCustomTabSummary(query: CustomTabQuery, t: Translate) {
   const type = query.type ?? 'issues';
   chunks.push(getCustomTabTypeSummary(type, t));
 
-  if (query.state && query.state !== 'all') {
-    chunks.push(t('dashboard.tabsSettings.summary.state', { value: query.state }));
-  }
+  const stateSummary = getCustomTabStateSummary(query, t);
+  if (stateSummary) chunks.push(t('dashboard.tabsSettings.summary.state', { value: stateSummary }));
   if (query.repo) chunks.push(t('dashboard.tabsSettings.summary.inRepo', { value: query.repo }));
   if (query.author)
     chunks.push(t('dashboard.tabsSettings.summary.authoredBy', { value: query.author }));

app/composables/useCustomTabs.ts

@@ -2,6 +2,7 @@ import type {
   CustomTab,
   CustomTabArchived,
   CustomTabDraft,
+  CustomTabMerged,
   CustomTabOrder,
   CustomTabQuery,
   CustomTabReview,
@@ -18,6 +19,7 @@ export type {
   CustomTab,
   CustomTabArchived,
   CustomTabDraft,
+  CustomTabMerged,
   CustomTabOrder,
   CustomTabQuery,
   CustomTabReview,

app/composables/useTabsSettingsPage.ts

@@ -5,6 +5,7 @@ import {
   CircleDotIcon,
   CircleMinusIcon,
   FilePenLineIcon,
+  GitMergeIcon,
   GitPullRequestIcon,
   ShieldAlertIcon,
   XCircleIcon,
@@ -27,6 +28,7 @@ import {
   useCustomTabs,
 } from '~/composables/useCustomTabs';
 import {
+  applyCustomTabEditorState,
   buildCustomTabHumanPreview,
   buildCustomTabSearchParts,
   buildCustomTabSearchQuery,
@@ -35,13 +37,16 @@ import {
   createGitHubCustomTabPreviewUrl,
   customTabArchivedOptions,
   customTabDraftOptions,
+  type CustomTabEditorState,
+  getCustomTabEditorState,
+  customTabIssueStateOptions,
   customTabOrderOptions,
+  customTabPullStateOptions,
   customTabReviewOptions,
   customTabScopeOptions,
   customTabSortOptions,
   customTabSourceOptions,
   type CustomTabSourceOption,
-  customTabStateOptions,
   customTabTypeOptions,
   customTabVisibilityOptions,
 } from '~/composables/useCustomTabSettingsOptions';
@@ -103,7 +108,6 @@ export const useTabsSettingsPage = () => {
 
   const sourceOptions = customTabSourceOptions;
   const typeOptions = customTabTypeOptions;
-  const stateOptions = customTabStateOptions;
   const scopeOptions = customTabScopeOptions;
   const sortOptions = customTabSortOptions;
   const orderOptions = customTabOrderOptions;
@@ -120,6 +124,7 @@ export const useTabsSettingsPage = () => {
     pulls: { icon: GitPullRequestIcon, activeColor: 'var(--gitpulse-purple)' },
     open: { icon: CircleDotIcon, activeColor: 'var(--gitpulse-success-solid)' },
     closed: { icon: CircleMinusIcon, activeColor: 'var(--gitpulse-danger-solid)' },
+    merged: { icon: GitMergeIcon, activeColor: 'var(--gitpulse-purple)' },
     draft: { icon: FilePenLineIcon, activeColor: 'var(--gitpulse-warning-solid)' },
     ready: { icon: CheckCircle2Icon, activeColor: 'var(--gitpulse-success-solid)' },
     approved: { icon: CheckCircle2Icon, activeColor: 'var(--gitpulse-success-solid)' },
@@ -159,7 +164,7 @@ export const useTabsSettingsPage = () => {
       commenter: '',
       involves: '',
       milestone: '',
-      state: 'open' as CustomTabState | 'any',
+      state: 'open' as CustomTabEditorState,
       scopes: ['title', 'body'] as CustomTabSearchScope[],
       labels: [] as string[],
       visibility: 'any' as CustomTabVisibility,
@@ -309,6 +314,10 @@ export const useTabsSettingsPage = () => {
     return newTab.query.type === 'pulls';
   });
 
+  const stateOptions = computed(() => {
+    return isPullRequestSearch.value ? customTabPullStateOptions : customTabIssueStateOptions;
+  });
+
   const advancedFilterCount = computed(() => {
     let count = 0;
     if (newTab.query.repo.trim()) count++;
@@ -390,7 +399,7 @@ export const useTabsSettingsPage = () => {
   const buildCurrentQuery = (): CustomTabQuery => {
     const labels = cleanLabels();
 
-    return {
+    const query: CustomTabQuery = {
       text: newTab.query.text.trim() || undefined,
       type: newTab.query.type,
       repo: newTab.query.repo.trim() || undefined,
@@ -402,7 +411,6 @@ export const useTabsSettingsPage = () => {
       commenter: newTab.query.commenter.trim() || undefined,
       involves: newTab.query.involves.trim() || undefined,
       milestone: newTab.query.milestone.trim() || undefined,
-      state: newTab.query.state === 'any' ? undefined : newTab.query.state,
       scopes: newTab.query.scopes.length > 0 ? [...newTab.query.scopes] : undefined,
       labels: labels.length > 0 ? labels : undefined,
       visibility: newTab.query.visibility === 'any' ? undefined : newTab.query.visibility,
@@ -415,6 +423,8 @@ export const useTabsSettingsPage = () => {
       order: newTab.query.order,
       perPage: newTab.query.perPage,
     };
+
+    return applyCustomTabEditorState(query, newTab.query.state);
   };
 
   const searchQueryParts = computed(() => {
@@ -559,6 +569,17 @@ export const useTabsSettingsPage = () => {
     newTab.query.scopes = [...newTab.query.scopes, scope];
   };
 
+  const setSearchType = (type: CustomTabSearchType) => {
+    newTab.query.type = type;
+    if (type !== 'pulls' && newTab.query.state === 'merged') {
+      newTab.query.state = 'closed';
+    }
+  };
+
+  const setQueryState = (state: CustomTabEditorState) => {
+    newTab.query.state = state;
+  };
+
   const addLabel = (label: string) => {
     const normalized = label.trim();
     if (!normalized || newTab.query.labels.includes(normalized)) {
@@ -755,7 +776,7 @@ export const useTabsSettingsPage = () => {
     newTab.groupId = tab.groupId;
     newTab.source = tab.source ?? 'github-search';
 
-    const q = tab.query ?? {};
+    const q: CustomTabQuery = tab.query ?? {};
     newTab.query.text = q.text ?? '';
     newTab.query.type = q.type ?? 'issues';
     newTab.query.repo = q.repo ?? '';
@@ -767,7 +788,7 @@ export const useTabsSettingsPage = () => {
     newTab.query.commenter = q.commenter ?? '';
     newTab.query.involves = q.involves ?? '';
     newTab.query.milestone = q.milestone ?? '';
-    newTab.query.state = q.state ?? 'open';
+    newTab.query.state = getCustomTabEditorState(q);
     newTab.query.scopes = q.scopes ?? ['title', 'body'];
     newTab.query.labels = q.labels ?? [];
     newTab.query.visibility = q.visibility ?? 'any';
@@ -990,6 +1011,8 @@ export const useTabsSettingsPage = () => {
     confirmDeleteGroup,
     setActiveSource,
     setNewTabGroup,
+    setSearchType,
+    setQueryState,
     toggleScope,
     addLabel,
     handleLabelEnter,

i18n/locales/en.json

@@ -448,7 +448,9 @@
         "any": "Any",
         "open": "Open",
         "closed": "Closed",
+        "merged": "Merged",
         "all": "All",
+        "allStates": "All states",
         "title": "Title",
         "body": "Body",
         "comments": "Comments",

i18n/locales/zh-cn.json

@@ -448,7 +448,9 @@
         "any": "任意",
         "open": "开启",
         "closed": "关闭",
+        "merged": "已合并",
         "all": "全部",
+        "allStates": "全部状态",
         "title": "标题",
         "body": "正文",
         "comments": "评论",