refa: format

Signed-off-by: Rostislav Nagimov <[email protected]>

Author: rostislavnagimov

plugins/tracker-resources/src/components/issues/IssuesView.svelte

@@ -5,7 +5,7 @@
   import { Issue, TrackerEvents } from '@hcengineering/tracker'
   import { IModeSelector, themeStore } from '@hcengineering/ui'
   import { ViewOptions, Viewlet } from '@hcengineering/view'
-  import { FilterBar, SpaceHeader, ViewletContentView, ViewletSettingButton } from '@hcengineering/view-resources'
+  import { FilterBar, SpaceHeader, ViewletContentView, ViewletSettingButton, setFilters, filterStore, createFilter } from '@hcengineering/view-resources'
   import tracker from '../../plugin'
   import CreateIssue from '../CreateIssue.svelte'
   import { get } from 'svelte/store'
@@ -50,60 +50,32 @@
   }
 
   async function restoreTrackerIssueState (): Promise<void> {
-    console.log('[DEBUG_STATE_ISSUES] Restore State: Starting for tab', get(tabIdStore))
+    await tick()
+    await tick()
+
     const tabId = get(tabIdStore)
     if (!tabId) {
-      console.log('[DEBUG_STATE_ISSUES] Restore State: No tabId, skipping.')
       return
     }
-    console.log('[DEBUG_STATE_ISSUES] Restore State: Awaiting ticks for component render.')
-    await tick()
-    await tick()
-    console.log('[DEBUG_STATE_ISSUES] Restore State: Ticks complete, searching tab state.')
+
     const tab = get(tabsStore).find((t) => t._id === tabId)
     if (tab?.uiState) {
-      console.log('[DEBUG_STATE_ISSUES] Restore State: uiState found.', tab.uiState)
       const savedViewletId = tab.uiState.viewletId
       const savedFilterBarQuery = tab.uiState.filterBarState
-      console.log(
-        '[DEBUG_STATE_ISSUES] Restore State: Found saved Viewlet ID:',
-        savedViewletId,
-        'Saved Filter State:',
-        savedFilterBarQuery
-      )
-
-      if (!viewletsReady) {
-        console.log('[DEBUG_STATE_ISSUES] Restore State: Viewlets not yet marked as ready. Exiting to re-trigger.')
-        return
-      }
 
-      if (savedViewletId && viewlets && viewlets.length > 0) {
+      if (viewletsReady && viewlets && viewlets.length > 0) {
         const foundViewlet = viewlets.find((v) => v._id === savedViewletId)
-        if (foundViewlet) {
-          viewlet = foundViewlet
-          console.log('[DEBUG_STATE_ISSUES] Restore State: Viewlet restored to ID:', viewlet?._id)
-        } else {
-          viewlet = viewlets[0]
-          console.log(
-            '[DEBUG_STATE_ISSUES] Restore State: Saved Viewlet not found, set to first available:',
-            viewlet?._id
-          )
-        }
-      } else {
-        console.log('[DEBUG_STATE_ISSUES] Restore State: No saved Viewlet ID or viewlets not ready/empty.')
+        viewlet = foundViewlet || viewlets[0]
       }
+
       if (savedFilterBarQuery) {
-        resultQuery = { ...searchQuery, ...savedFilterBarQuery }
-        console.log('[DEBUG_STATE_ISSUES] Restore State: FilterBar query restored:', resultQuery)
+        resultQuery = { ...savedFilterBarQuery }
       } else {
         resultQuery = { ...searchQuery }
-        console.log('[DEBUG_STATE_ISSUES] Restore State: No saved FilterBar query, set to initial:', resultQuery)
       }
     } else {
       resultQuery = { ...searchQuery }
-      console.log('[DEBUG_STATE_ISSUES] Restore State: No uiState found, set FilterBar to initial:', resultQuery)
     }
-    console.log('[DEBUG_STATE_ISSUES] Restore State: Finished.')
   }
 
   $: {
@@ -178,6 +150,15 @@
       label = res
     })
   }
+
+  $: {
+    if (search && resultQuery.$search !== search) {
+      resultQuery = { ...resultQuery, $search: search }
+    } else if (!search && '$search' in resultQuery) {
+      const { $search, ...rest } = resultQuery
+      resultQuery = rest
+    }
+  }
 </script>
 
 <SpaceHeader
@@ -212,13 +193,7 @@
     />
   </svelte:fragment>
 </SpaceHeader>
-<FilterBar
-  _class={tracker.class.Issue}
-  {space}
-  query={searchQuery}
-  {viewOptions}
-  on:change={(e) => (resultQuery = e.detail)}
-/>
+<FilterBar _class={tracker.class.Issue} {space} bind:query={resultQuery} {viewOptions} />
 <slot name="afterHeader" />
 {#if viewlet && viewOptions}
   <ViewletContentView

plugins/view-resources/src/components/SpaceHeader.svelte

@@ -18,7 +18,7 @@
   export let showLabelSelector = false
   export let modeSelectorProps: IModeSelector | undefined = undefined
   export let adaptive: HeaderAdaptive = 'doubleRow'
-  export let currentTabId: Ref<WorkbenchTab> | undefined = undefined;
+  export let currentTabId: Ref<WorkbenchTab> | undefined = undefined
 
   let scroller: HTMLElement
 </script>
@@ -47,7 +47,7 @@
 
   <svelte:fragment slot="search">
     <SearchInput bind:value={search} collapsed />
-    <FilterButton {_class} {space} currentTabId={currentTabId}/>
+    <FilterButton {_class} {space} {currentTabId} />
   </svelte:fragment>
   <svelte:fragment slot="actions">
     <slot name="actions" />

plugins/view-resources/src/components/filter/FilterButton.svelte

@@ -39,18 +39,18 @@
     }
   })
 
-function load (_class: Ref<Class<Doc>> | undefined): void {
-  const key = getFilterKey(_class, currentTabId);
-  const items = localStorage.getItem(key);
-  if (items !== null) {
-    filterStore.set(JSON.parse(items));
+  function load (_class: Ref<Class<Doc>> | undefined): void {
+    const key = getFilterKey(_class, currentTabId)
+    const items = localStorage.getItem(key)
+    if (items !== null) {
+      filterStore.set(JSON.parse(items))
+    }
   }
-}
 
-function save (_class: Ref<Class<Doc>> | undefined, p: Filter[]): void {
-  const key = getFilterKey(_class, currentTabId);
-  localStorage.setItem(key, JSON.stringify(p));
-}
+  function save (_class: Ref<Class<Doc>> | undefined, p: Filter[]): void {
+    const key = getFilterKey(_class, currentTabId)
+    localStorage.setItem(key, JSON.stringify(p))
+  }
 
   filterStore.subscribe((p) => {
     save(_class, p)
@@ -88,10 +88,10 @@ function save (_class: Ref<Class<Doc>> | undefined, p: Filter[]): void {
   }
 
   onMount(() => {
-    load(_class);
-  });
- $: if (currentTabId) {
-    load(_class);
+    load(_class)
+  })
+  $: if (currentTabId) {
+    load(_class)
   }
 </script>
 

plugins/view-resources/src/filter.ts

@@ -320,25 +320,22 @@ export function createFilter (_class: Ref<Class<Doc>>, key: string, value: any[]
   }
 }
 
-export function getFilterKey (
-  _class: Ref<Class<Doc>> | undefined,
-  tabId?: Ref<WorkbenchTab>
-): string {
-  const loc = getCurrentResolvedLocation();
+export function getFilterKey (_class: Ref<Class<Doc>> | undefined, tabId?: Ref<WorkbenchTab>): string {
+  const loc = getCurrentResolvedLocation()
 
   const urlLoc = {
     path: loc.path.slice(0, 3),
     query: loc.query,
     fragment: loc.fragment
-  };
+  }
 
-  const classIdString = _class ? (_class as any).id || _class.toString() : 'unknown_class';
+  const classIdString = _class != null ? (_class as any).id ?? _class.toString() : 'unknown_class'
 
-  let res = `filter_${tabId || 'global'}_${locationToUrl(urlLoc)}`;
+  let res = `filter_${tabId ?? 'global'}_${locationToUrl(urlLoc)}`
   if (_class !== undefined) {
-    res = res + classIdString;
+    res = res + classIdString
   }
-  return res;
+  return res
 }
 
 /**

plugins/workbench/src/types.ts

@@ -101,18 +101,17 @@ export interface WidgetTab {
 
 /** @public */
 export interface TabUiState {
-  viewletId?: string;
-  filterBarState?: Record<string, any>;
+  viewletId?: string
+  filterBarState?: Record<string, any>
 }
 
-
 /** @public */
 export interface WorkbenchTab extends Preference {
   attachedTo: AccountUuid
   location: string
   isPinned: boolean
   name?: string
-  uiState?: TabUiState;
+  uiState?: TabUiState
 }
 
 /** @public */