remove dual panel slice

ui2/src/app/store.ts

@@ -9,15 +9,13 @@ import tagsReducer from "@/features/tags/tagsSlice"
 import uiReducer from "@/features/ui/uiSlice"
 import usersReducer from "@/features/users/usersSlice"
 import currentUserReducer from "@/slices/currentUser"
-import dualPanelReducer from "@/slices/dualPanel/dualPanel"
 import {configureStore} from "@reduxjs/toolkit"
 import {listenerMiddleware} from "./listenerMiddleware"
 
 export const store = configureStore({
   reducer: {
     auth: authSliceReducer,
     currentUser: currentUserReducer,
-    dualPanel: dualPanelReducer,
     tags: tagsReducer,
     groups: groupsReducer,
     users: usersReducer,

ui2/src/components/DualPanel/ToggleSecondaryPanel.tsx

@@ -1,8 +1,4 @@
 import {useAppDispatch, useAppSelector} from "@/app/hooks"
-import {
-  selectMainPanel,
-  selectSecondaryPanel
-} from "@/slices/dualPanel/dualPanel"
 import {ActionIcon} from "@mantine/core"
 import {IconColumns2, IconX} from "@tabler/icons-react"
 import {useContext} from "react"
@@ -20,16 +16,10 @@ import {
 
 export default function ToggleSecondaryPanel() {
   const mode: PanelMode = useContext(PanelContext)
-  const mainPanel = useAppSelector(selectMainPanel)
-  const secondaryPanel = useAppSelector(selectSecondaryPanel)
   const dispatch = useAppDispatch()
   const nodeID = useAppSelector(s => selectCurrentNodeID(s, mode))
   const ctype = useAppSelector(s => selectCurrentNodeCType(s, mode))
 
-  if (mainPanel) {
-    // mainPanel is always there
-  }
-
   const onClick = () => {
     dispatch(secondaryPanelOpened(ctype == "folder" ? "commander" : "viewer"))
     dispatch(
@@ -38,13 +28,11 @@ export default function ToggleSecondaryPanel() {
   }
 
   if (mode == "main") {
-    if (!secondaryPanel) {
-      return (
-        <ActionIcon size="lg" onClick={onClick} variant="default">
-          <IconColumns2 size={18} />
-        </ActionIcon>
-      )
-    }
+    return (
+      <ActionIcon size="lg" onClick={onClick} variant="default">
+        <IconColumns2 size={18} />
+      </ActionIcon>
+    )
 
     return <></>
   }

ui2/src/features/document/components/Page/Page.tsx

@@ -2,7 +2,6 @@ import {useAppSelector} from "@/app/hooks"
 import PanelContext from "@/contexts/PanelContext"
 import {useGetPageImageQuery} from "@/features/document/apiSlice"
 import {selectZoomFactor} from "@/features/ui/uiSlice"
-import {selectDocumentCurrentPage} from "@/slices/dualPanel/dualPanel"
 import {ClientPage, PanelMode} from "@/types"
 import {Skeleton, Stack} from "@mantine/core"
 import {useContext, useEffect, useRef} from "react"
@@ -15,7 +14,7 @@ type Args = {
 export default function Page({page}: Args) {
   const {currentData, data, isFetching} = useGetPageImageQuery(page.id)
   const mode: PanelMode = useContext(PanelContext)
-  const currentPage = useAppSelector(s => selectDocumentCurrentPage(s, mode))
+  const currentPage = 1
   const targetRef = useRef<HTMLImageElement | null>(null)
   const zoomFactor = useAppSelector(s => selectZoomFactor(s, mode))
 

ui2/src/features/document/components/Thumbnail/Thumbnail.tsx

@@ -29,7 +29,6 @@ import {
   viewerSelectionPageAdded,
   viewerSelectionPageRemoved
 } from "@/features/ui/uiSlice"
-import {setCurrentPage} from "@/slices/dualPanel/dualPanel"
 import type {ClientPage, DroppedThumbnailPosition, PanelMode} from "@/types"
 
 import {contains_every} from "@/utils"
@@ -80,7 +79,7 @@ export default function Thumbnail({page}: Args) {
   }, [draggedPages?.length])
 
   const onClick = () => {
-    dispatch(setCurrentPage({mode, page: page.number}))
+    //dispatch(setCurrentPage({mode, page: page.number}))
   }
 
   const onLocalDragOver = (event: React.DragEvent<HTMLDivElement>) => {

ui2/src/features/search/components/OpenInOtherPanelCheckbox.tsx

@@ -1,15 +1,16 @@
 import {useDispatch} from "react-redux"
 
+import {searchResultItemTargetUpdated} from "@/features/ui/uiSlice"
 import {Checkbox} from "@mantine/core"
-import {updateSearchResultItemTarget} from "@/slices/dualPanel/dualPanel"
 
 export default function OpenInOtherPanelCheckbox() {
   const dispatch = useDispatch()
 
   const onChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const targetPanel = event.currentTarget.checked ? "secondary" : "main"
-    dispatch(updateSearchResultItemTarget(targetPanel))
+    const inOtherPanel = Boolean(event.currentTarget.checked)
+    dispatch(searchResultItemTargetUpdated(inOtherPanel))
   }
+
   return (
     <Checkbox onChange={onChange} defaultChecked label="Open in other panel" />
   )

ui2/src/features/search/components/SearchResultItem.tsx

@@ -57,13 +57,14 @@ export default function SearchResultItem({item, onClick}: Args) {
     <Stack my={"lg"} pt={"sm"} gap="xs">
       <Breadcrumb
         onClick={onClick}
-        // for documents breadcrumb also indicates page number
+        // for documents breadcrumb also indicates
+        // page number (if page number > 1)
         pageNumber={item.page_number}
         items={nodeDetails?.breadcrumb}
       />
       <Group className={classes.item} onClick={onLocalClickDocumentItem}>
         <div className={classes.title}>{item.title}</div>
-        <Tags items={nodeDetails.tags} maxItems={8} />
+        <Tags items={nodeDetails?.tags} maxItems={8} />
       </Group>
     </Stack>
   )

ui2/src/features/search/components/SearchResults.tsx

@@ -8,12 +8,14 @@ import {
   useGetPaginatedSearchResultsQuery
 } from "@/features/search/apiSlice"
 import {
+  currentNodeChanged,
   searchResultsLastPageSizeUpdated,
+  selectOpenResultItemInOtherPanel,
   selectSearchContentHeight,
   selectSearchLastPageSize,
   selectSearchQuery
 } from "@/features/ui/uiSlice"
-import {SearchResultNode} from "@/types"
+import {NType, SearchResultNode} from "@/types"
 import {skipToken} from "@reduxjs/toolkit/query"
 import ActionButtons from "./ActionButtons"
 import SearchResultItems from "./SearchResultItems"
@@ -28,6 +30,7 @@ export default function SearchResults() {
   const dispatch = useAppDispatch()
   const height = useAppSelector(selectSearchContentHeight)
   const query = useAppSelector(selectSearchQuery)
+  const openItemInOtherPanel = useAppSelector(selectOpenResultItemInOtherPanel)
   const {data, isLoading, isFetching} = useGetPaginatedSearchResultsQuery({
     qs: query!,
     page_number: page,
@@ -52,7 +55,17 @@ export default function SearchResults() {
     }
   }, [data?.items])
 
-  const onClick = () => {}
+  const onClick = (node: NType, pageNumber?: number) => {
+    if (openItemInOtherPanel) {
+      dispatch(
+        currentNodeChanged({id: node.id, ctype: node.ctype, panel: "secondary"})
+      )
+    } else {
+      dispatch(
+        currentNodeChanged({id: node.id, ctype: node.ctype, panel: "main"})
+      )
+    }
+  }
 
   const onPageNumberChange = (page: number) => {
     setPage(page)

ui2/src/features/ui/uiSlice.ts

@@ -317,6 +317,12 @@ const uiSlice = createSlice({
       }
       state.currentNodeMain = undefined
     },
+    searchResultItemTargetUpdated(state, action: PayloadAction<boolean>) {
+      if (state.search) {
+        /* in which panel will search result item open ? */
+        state.search.openResultItemInOtherPanel = action.payload
+      }
+    },
     currentNodeChanged(state, action: PayloadAction<CurrentNodeArgs>) {
       const payload = action.payload
       if (payload.panel == "main") {
@@ -610,6 +616,7 @@ export const {
   This happens when user clicks enter in search field
   in the header */
   mainPanelSwitchedToSearchResults,
+  searchResultItemTargetUpdated,
   secondaryPanelClosed,
   secondaryPanelOpened,
   commanderSelectionNodeAdded,
@@ -802,6 +809,9 @@ export const selectSearchQuery = (state: RootState) => state.ui.search?.query
 export const selectSearchLastPageSize = (state: RootState): number =>
   state.ui.searchLastPageSize || PAGINATION_DEFAULT_ITEMS_PER_PAGES
 
+export const selectOpenResultItemInOtherPanel = (state: RootState) =>
+  state.ui.search?.openResultItemInOtherPanel
+
 /* Load initial collapse state value from cookie */
 function initial_collapse_value(): boolean {
   const collapsed = Cookies.get(NAVBAR_COLLAPSED_COOKIE) as BooleanString