fixed(sheet): problem solved!

Author: gemini2035

src/components/editor/operator/sheet/SheetGroup.tsx

@@ -74,23 +74,20 @@ const SheetGroup = ({
         opers: otherOperators,
       })
     return result
-  }, [existedOperators])
+  }, [existedOperators, existedGroups])
 
   const checkGroupExisted = (target: string) =>
     !!existedGroups.find((item) => item.name === target)
-  const checkGroupPinned = (
-    target: Group,
-    ignoreKey: string[] = ignoreKeyDic,
-  ) => {
+  const checkGroupPinned = (target: Group, ignoreKey?: string[]) => {
     const checkTarget = favGroups.find((item) => item.name === target.name)
     if (checkTarget) {
       return isEqualWith(
         checkTarget,
-        omit(target, ignoreKey),
+        omit(target, [...(ignoreKey || ignoreKeyDic)]),
         ({ opers: aOpers }, { opers: bOpers }) =>
           isEqual(
-            aOpers.map((item) => omit(item, ignoreKeyDic)),
-            bOpers.map((item) => omit(item, ignoreKeyDic)),
+            aOpers.map((item) => omit(item, [...(ignoreKey || ignoreKeyDic)])),
+            bOpers.map((item) => omit(item, [...(ignoreKey || ignoreKeyDic)])),
           ),
       )
     } else {

src/components/editor/operator/sheet/SheetOperator.tsx

@@ -1,7 +1,7 @@
 import { Button, Divider, H4, H5, H6, Intent } from '@blueprintjs/core'
 
 import clsx from 'clsx'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { UseFieldArrayRemove } from 'react-hook-form'
 
 import { AppToaster } from 'components/Toaster'
@@ -89,14 +89,17 @@ const SheetOperator = ({
     [selectedProf, existedOperators],
   )
 
-  const checkOperatorSelected = (target: string) => {
-    if (existedOperators.find((item) => item.name === target)) return true
-    else
-      return !!existedGroups
-        .map((item) => item.opers)
-        .flat()
-        .find((item) => item?.name === target)
-  }
+  const checkOperatorSelected = useCallback(
+    (target: string) => {
+      if (existedOperators.find((item) => item.name === target)) return true
+      else
+        return !!existedGroups
+          .map((item) => item.opers)
+          .flat()
+          .find((item) => item?.name === target)
+    },
+    [existedOperators, existedGroups],
+  )
 
   const operatorsGroupedBySubProf = useMemo(() => {
     if (selectedSubProf.id === 'all') return operatorsGroupedByProf
@@ -108,7 +111,7 @@ const SheetOperator = ({
       return operatorsGroupedByProf.filter(
         (item) => item.subProf === selectedSubProf.id,
       )
-  }, [selectedSubProf, operatorsGroupedByProf])
+  }, [selectedSubProf, operatorsGroupedByProf, checkOperatorSelected])
 
   const eventHandleProxy: OperatorEventHandleType = (type, value) => {
     switch (type) {

src/store/useFavGroups.ts

@@ -3,45 +3,22 @@ import { atomWithStorage } from 'jotai/utils'
 import { omit } from 'lodash-es'
 
 import { CopilotDocV1 } from '../models/copilot.schema'
-import { authAtom } from './auth'
 
-const DEFAULTGROUPUSER = 'none_login_user'
-export const ignoreKeyDic = ['_id', 'id']
+export const ignoreKeyDic = ['_id', 'id'] as const
 type Group = CopilotDocV1.Group
-interface FavGroupState {
-  userId: string
-  favGroups: Group[]
-}
-const favGroupCoreAtom = atomWithStorage<FavGroupState[]>(
+type FavGroup = Omit<Group, typeof ignoreKeyDic[number]>
+
+const favGroupCoreAtom = atomWithStorage<FavGroup[]>(
   'maa-copilot-fav-groups',
   [],
 )
 
 export const favGroupAtom = atom(
-  (get) =>
-    get(favGroupCoreAtom).find(
-      (item) => item.userId === (get(authAtom).userId || DEFAULTGROUPUSER),
-    )?.favGroups || ([] as Group[]),
+  (get) => get(favGroupCoreAtom),
   (_get, set, favGroups: Group[]) => {
-    const omitFavGroup = favGroups.map((item) =>
-      omit(item, ignoreKeyDic),
-    ) as Group[]
-    const { userId = DEFAULTGROUPUSER } = _get(authAtom)
-    const oldFavGroup = [..._get(favGroupCoreAtom)]
-    const existedFavGroupIndex = oldFavGroup.findIndex(
-      (item) => item.userId === userId,
+    set(
+      favGroupCoreAtom,
+      favGroups.map((item) => omit(item, ...ignoreKeyDic)),
     )
-    if (existedFavGroupIndex === -1)
-      set(favGroupCoreAtom, [
-        ...oldFavGroup,
-        { userId, favGroups: omitFavGroup },
-      ])
-    else {
-      oldFavGroup.splice(existedFavGroupIndex, 1, {
-        userId,
-        favGroups: omitFavGroup,
-      })
-      set(favGroupCoreAtom, oldFavGroup)
-    }
   },
 )