RI-6336 - simplified approach for per db setting

Author: KIvanow

redisinsight/ui/src/pages/browser/components/key-list/KeyList.tsx

@@ -284,7 +284,6 @@ const KeyList = forwardRef((props: Props, ref) => {
     dispatch(fetchKeysMetadata(
       itemsToFetch.map(({ name }) => name),
       commonFilterType,
-      shownColumns,
       controller.current?.signal,
       (loadedItems) => onSuccessFetchedMetadata(startIndex, loadedItems),
       () => { rerender({}) }

redisinsight/ui/src/pages/browser/components/virtual-tree/VirtualTree.tsx

@@ -73,7 +73,6 @@ const VirtualTree = (props: Props) => {
 
   const { theme } = useContext(ThemeContext)
   const [rerenderState, rerender] = useState({})
-  const { shownColumns } = useSelector(appContextDbConfig)
   const controller = useRef<Nullable<AbortController>>(null)
   const elements = useRef<any>({})
   const nodes = useRef<TreeNode[]>([])
@@ -146,7 +145,6 @@ const VirtualTree = (props: Props) => {
     dispatch(fetchKeysMetadataTree(
       itemsInit,
       filter,
-      shownColumns,
       controller.current?.signal,
       (loadedItems) =>
         onSuccessFetchedMetadata(loadedItems),

redisinsight/ui/src/pages/browser/modules/key-details/KeyDetails.tsx

@@ -44,7 +44,6 @@ const KeyDetails = (props: Props) => {
 
   const { instanceId } = useParams<{ instanceId: string }>()
   const { viewType } = useSelector(keysSelector)
-  const { shownColumns } = useSelector(appContextDbConfig)
   const { loading, error = '', data } = useSelector(selectedKeySelector)
   const isKeySelected = !isNull(useSelector(selectedKeyDataSelector))
   const { type: keyType } = useSelector(selectedKeyDataSelector) ?? { type: KeyTypes.String }
@@ -56,7 +55,6 @@ const KeyDetails = (props: Props) => {
 
     dispatch(fetchKeyInfo(
       keyProp,
-      shownColumns,
       undefined,
       (data) => {
         if (!data) return

redisinsight/ui/src/slices/browser/keys.ts

@@ -1,6 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { cloneDeep, remove, get, isUndefined } from 'lodash'
 import axios, { AxiosError, CancelTokenSource } from 'axios'
+import { useSelector } from 'react-redux'
 import { apiService, localStorageService } from 'uiSrc/services'
 import {
   ApiEndpoints,
@@ -31,7 +32,7 @@ import { DEFAULT_SEARCH_MATCH, SCAN_COUNT_DEFAULT } from 'uiSrc/constants/api'
 import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent, getAdditionalAddedEventData, getMatchType } from 'uiSrc/telemetry'
 import successMessages from 'uiSrc/components/notifications/success-messages'
 import { IFetchKeyArgs, IKeyPropTypes } from 'uiSrc/constants/prop-types/keys'
-import { resetBrowserTree } from 'uiSrc/slices/app/context'
+import { appContextDbConfig, resetBrowserTree } from 'uiSrc/slices/app/context'
 
 import { CreateListWithExpireDto, } from 'apiSrc/modules/browser/list/dto'
 import { SetStringWithExpireDto } from 'apiSrc/modules/browser/string/dto'
@@ -656,13 +657,11 @@ export function fetchMorePatternKeysAction(oldKeys: IKeyPropTypes[] = [], cursor
 // Asynchronous thunk action
 export function fetchKeyInfo(
   key: RedisResponseBuffer,
-  shownColumns: BrowserColumns[] = [BrowserColumns.Size, BrowserColumns.TTL],
   resetData?: boolean,
   onSuccess?: (data: Nullable<IKeyPropTypes>) => void
 ) {
   return async (dispatch: AppDispatch, stateInit: () => RootState) => {
-    dispatch(defaultSelectedKeyAction())
-
+    const { shownColumns } = stateInit()?.app?.context?.dbConfig
     try {
       const state = stateInit()
       const { encoding } = state.app.info
@@ -729,11 +728,9 @@ export function fetchKeyInfo(
 }
 
 // Asynchronous thunk action
-export function refreshKeyInfoAction(
-  key: RedisResponseBuffer,
-  shownColumns: BrowserColumns[] = [BrowserColumns.Size, BrowserColumns.TTL]
-) {
+export function refreshKeyInfoAction(key: RedisResponseBuffer) {
   return async (dispatch: AppDispatch, stateInit: () => RootState) => {
+    const { shownColumns } = stateInit()?.app?.context?.dbConfig
     dispatch(refreshKeyInfo())
     try {
       const state = stateInit()
@@ -1040,12 +1037,12 @@ export function editKeyTTL(key: RedisResponseBuffer, ttl: number) {
 export function fetchKeysMetadata(
   keys: RedisString[],
   filter: Nullable<KeyTypes>,
-  shownColumns: BrowserColumns[] = [BrowserColumns.Size, BrowserColumns.TTL],
   signal?: AbortSignal,
   onSuccessAction?: (data: GetKeyInfoResponse[]) => void,
   onFailAction?: () => void
 ) {
   return async (_dispatch: AppDispatch, stateInit: () => RootState) => {
+    const { shownColumns } = stateInit()?.app?.context?.dbConfig
     try {
       const state = stateInit()
       const { data } = await apiService.post<GetKeyInfoResponse[]>(
@@ -1077,12 +1074,12 @@ export function fetchKeysMetadata(
 export function fetchKeysMetadataTree(
   keys: RedisString[],
   filter: Nullable<KeyTypes>,
-  shownColumns: BrowserColumns[] = [BrowserColumns.Size, BrowserColumns.TTL],
   signal?: AbortSignal,
   onSuccessAction?: (data: GetKeyInfoResponse[]) => void,
   onFailAction?: () => void
 ) {
   return async (_dispatch: AppDispatch, stateInit: () => RootState) => {
+    const { shownColumns } = stateInit()?.app?.context?.dbConfig
     try {
       const state = stateInit()
       const { data } = await apiService.post<GetKeyInfoResponse[]>(

redisinsight/ui/src/slices/browser/zset.ts

@@ -55,7 +55,7 @@ const zsetSlice = createSlice({
       state.data.members = payload
     },
     // load ZSet members
-    loadZSetMembers: (state, { payload: [sortOrder, resetData = true] }:PayloadAction<[SortOrder, Maybe<boolean>]>) => {
+    loadZSetMembers: (state, { payload: [sortOrder, resetData = true] }: PayloadAction<[SortOrder, Maybe<boolean>]>) => {
       state.loading = true
       state.searching = false
       state.error = ''