solve 651

src/components/Projekte/TreeContainer/Tree/Root/Projekt/ApFolder/Aps/Folders/Pop/Pop/Folders/Tpop/Tpop/Folders/TpopFeldkontr/index.jsx

@@ -2,7 +2,7 @@ import { useContext } from 'react'
 import { observer } from 'mobx-react-lite'
 
 import Row from '../../../../../../../../../../../../Row'
-import storeContext from '../../../../../../../../../../../../../../../../storeContext'
+import storeContext from '../../../../../../../../../../../../../../../../storeContext' 
 import TpopFeldkontr from './TpopFeldkontr'
 
 const TpopFeldkontrFolder = ({ projekt, ap, pop, tpop, isLoading, count }) => {

src/components/Projekte/TreeContainer/Tree/Root/Projekt/index.jsx

@@ -1,6 +1,6 @@
 import Row from '../../Row'
 import ApberuebersichtFolder from './ApberuebersichtFolder'
-import ApFolder from './ApFolder'
+import ApFolder from './ApFolder' 
 
 const ProjektNode = ({ projekt, projectIsOpen }) => {
   const url = ['Projekte', projekt.id]

src/components/Projekte/TreeContainer/Tree/Root/index.jsx

@@ -9,7 +9,7 @@ import Users from './Users'
 import Messages from './Messages'
 import Werte from './Werte'
 import CurrentIssues from './CurrentIssues'
-import storeContext from '../../../../../storeContext'
+import storeContext from '../../../../../storeContext' 
 
 const TreeRoot = () => {
   const client = useApolloClient()

src/components/Projekte/TreeContainer/Tree/index.jsx

@@ -1,13 +1,9 @@
-// import { useContext } from 'react'
 import styled from '@emotion/styled'
-import { observer } from 'mobx-react-lite'
 
 import Root from './Root'
 import IntoViewScroller from './IntoViewScroller'
 import Menu from './Menu'
 
-// import storeContext from '../../../../storeContext'
-
 const Container = styled.div`
   height: calc(100% - 53px - 8px);
   width: 100%;
@@ -21,10 +17,6 @@ const Container = styled.div`
 `
 
 const TreeComponent = () => {
-  // TODO: needed?
-  // const store = useContext(storeContext)
-  // const { refetcher } = store.tree  const [onlyShowActivePathString, setOnlyShowActivePath] =
-
   return (
     <Container>
       <Root />
@@ -34,4 +26,4 @@ const TreeComponent = () => {
   )
 }
 
-export default observer(TreeComponent)
+export default TreeComponent

src/components/Projekte/TreeContainer/contextmenu/EkfrequenzFolder.jsx

@@ -255,7 +255,6 @@ const EkfrequenzFolder = ({ onClick }) => {
               },
             })
           }),
-          store.tree.incrementRefetcher(),
         )
       } catch (error) {
         console.log({ error })
@@ -273,7 +272,7 @@ const EkfrequenzFolder = ({ onClick }) => {
         },
       })
     },
-    [apId, client, enqueNotification, store.tree, user.name],
+    [apId, client, enqueNotification, user.name],
   )
 
   const [apOptionsError, setApOptionsError] = useState(undefined)

src/components/Projekte/TreeContainer/contextmenu/ErfkritFolder.jsx

@@ -219,7 +219,6 @@ const ErfkritFolder = ({ onClick }) => {
               },
             })
           }),
-          // store.tree.incrementRefetcher(),
         )
       } catch (error) {
         console.log({ error })

src/components/Projekte/TreeContainer/index.jsx

@@ -26,40 +26,40 @@ const CmUserFolder = lazy(() => import('./contextmenu/UserFolder'))
 const CmUser = lazy(() => import('./contextmenu/User'))
 const CmAdresseFolder = lazy(() => import('./contextmenu/AdresseFolder'))
 const CmAdresse = lazy(() => import('./contextmenu/Adresse'))
-const CmTpopApberrelevantGrundWerteFolder = lazy(() =>
-  import('./contextmenu/TpopApberrelevantGrundWerteFolder'),
+const CmTpopApberrelevantGrundWerteFolder = lazy(
+  () => import('./contextmenu/TpopApberrelevantGrundWerteFolder'),
 )
-const CmTpopApberrelevantGrundWerte = lazy(() =>
-  import('./contextmenu/TpopApberrelevantGrundWerte'),
+const CmTpopApberrelevantGrundWerte = lazy(
+  () => import('./contextmenu/TpopApberrelevantGrundWerte'),
 )
-const CmTpopkontrzaehlEinheitWerteFolder = lazy(() =>
-  import('./contextmenu/TpopkontrzaehlEinheitWerteFolder'),
+const CmTpopkontrzaehlEinheitWerteFolder = lazy(
+  () => import('./contextmenu/TpopkontrzaehlEinheitWerteFolder'),
 )
-const CmTpopkontrzaehlEinheitWerte = lazy(() =>
-  import('./contextmenu/TpopkontrzaehlEinheitWerte'),
+const CmTpopkontrzaehlEinheitWerte = lazy(
+  () => import('./contextmenu/TpopkontrzaehlEinheitWerte'),
 )
-const CmEkAbrechnungstypWerteFolder = lazy(() =>
-  import('./contextmenu/EkAbrechnungstypWerteFolder'),
+const CmEkAbrechnungstypWerteFolder = lazy(
+  () => import('./contextmenu/EkAbrechnungstypWerteFolder'),
 )
-const CmEkAbrechnungstypWerte = lazy(() =>
-  import('./contextmenu/EkAbrechnungstypWerte'),
+const CmEkAbrechnungstypWerte = lazy(
+  () => import('./contextmenu/EkAbrechnungstypWerte'),
 )
-const CmApberuebersichtFolder = lazy(() =>
-  import('./contextmenu/ApberuebersichtFolder'),
+const CmApberuebersichtFolder = lazy(
+  () => import('./contextmenu/ApberuebersichtFolder'),
 )
 const CmApberuebersicht = lazy(() => import('./contextmenu/Apberuebersicht'))
 const CmAssozartFolder = lazy(() => import('./contextmenu/AssozartFolder'))
 const CmAssozart = lazy(() => import('./contextmenu/Assozart'))
-const CmEkzaehleinheitFolder = lazy(() =>
-  import('./contextmenu/EkzaehleinheitFolder'),
+const CmEkzaehleinheitFolder = lazy(
+  () => import('./contextmenu/EkzaehleinheitFolder'),
 )
 const CmEkzaehleinheit = lazy(() => import('./contextmenu/Ekzaehleinheit'))
 const CmEkfrequenzFolder = lazy(() => import('./contextmenu/EkfrequenzFolder'))
 const CmEkfrequenz = lazy(() => import('./contextmenu/Ekfrequenz'))
 const CmApartFolder = lazy(() => import('./contextmenu/ApartFolder'))
 const CmApart = lazy(() => import('./contextmenu/Apart'))
-const CmBeobZugeordnetFolder = lazy(() =>
-  import('./contextmenu/BeobZugeordnetFolder'),
+const CmBeobZugeordnetFolder = lazy(
+  () => import('./contextmenu/BeobZugeordnetFolder'),
 )
 const CmApberFolder = lazy(() => import('./contextmenu/ApberFolder'))
 const CmApber = lazy(() => import('./contextmenu/Apber'))
@@ -72,8 +72,8 @@ const CmZielBerFolder = lazy(() => import('./contextmenu/ZielBerFolder'))
 const CmZielBer = lazy(() => import('./contextmenu/Zielber'))
 const CmPopFolder = lazy(() => import('./contextmenu/PopFolder'))
 const CmPop = lazy(() => import('./contextmenu/Pop'))
-const CmPopmassnberFolder = lazy(() =>
-  import('./contextmenu/PopmassnberFolder'),
+const CmPopmassnberFolder = lazy(
+  () => import('./contextmenu/PopmassnberFolder'),
 )
 const CmPopmassnber = lazy(() => import('./contextmenu/Popmassnber'))
 const CmPopberFolder = lazy(() => import('./contextmenu/PopberFolder'))
@@ -85,28 +85,28 @@ const CmTpop = lazy(() => import('./contextmenu/Tpop'))
 const CmTpopberFolder = lazy(() => import('./contextmenu/TpopberFolder'))
 const CmTpopber = lazy(() => import('./contextmenu/Tpopber'))
 const CmBeobZugeordnet = lazy(() => import('./contextmenu/BeobZugeordnet'))
-const CmBeobnichtbeurteilt = lazy(() =>
-  import('./contextmenu/Beobnichtbeurteilt'),
+const CmBeobnichtbeurteilt = lazy(
+  () => import('./contextmenu/Beobnichtbeurteilt'),
 )
-const CmBeobNichtZuzuordnen = lazy(() =>
-  import('./contextmenu/BeobNichtZuzuordnen'),
+const CmBeobNichtZuzuordnen = lazy(
+  () => import('./contextmenu/BeobNichtZuzuordnen'),
 )
-const CmTpopfreiwkontrFolder = lazy(() =>
-  import('./contextmenu/TpopfreiwkontrFolder'),
+const CmTpopfreiwkontrFolder = lazy(
+  () => import('./contextmenu/TpopfreiwkontrFolder'),
 )
 const CmTpopfreiwkontr = lazy(() => import('./contextmenu/Tpopfreiwkontr'))
-const CmTpopfeldkontrFolder = lazy(() =>
-  import('./contextmenu/TpopfeldkontrFolder'),
+const CmTpopfeldkontrFolder = lazy(
+  () => import('./contextmenu/TpopfeldkontrFolder'),
 )
 const CmTpopfeldkontr = lazy(() => import('./contextmenu/Tpopfeldkontr'))
-const CmTpopfeldkontrzaehlFolder = lazy(() =>
-  import('./contextmenu/TpopfeldkontrzaehlFolder'),
+const CmTpopfeldkontrzaehlFolder = lazy(
+  () => import('./contextmenu/TpopfeldkontrzaehlFolder'),
 )
-const CmTpopfeldkontrzaehl = lazy(() =>
-  import('./contextmenu/Tpopfeldkontrzaehl'),
+const CmTpopfeldkontrzaehl = lazy(
+  () => import('./contextmenu/Tpopfeldkontrzaehl'),
 )
-const CmTpopmassnberFolder = lazy(() =>
-  import('./contextmenu/TpopmassnberFolder'),
+const CmTpopmassnberFolder = lazy(
+  () => import('./contextmenu/TpopmassnberFolder'),
 )
 const CmTpopmassnber = lazy(() => import('./contextmenu/Tpopmassnber'))
 const CmTpopmassnFolder = lazy(() => import('./contextmenu/TpopmassnFolder'))
@@ -435,6 +435,7 @@ const TreeContainer = () => {
             menuType,
             client,
             store,
+            jahr,
           })
         },
         closeLowerNodes() {
@@ -501,6 +502,7 @@ const TreeContainer = () => {
             parentId: id,
             client,
             store,
+            queryClient,
           })
         },
         markForCopyingBiotop() {

src/components/Projekte/TreeContainer/openLowerNodes/index.js

@@ -16,6 +16,7 @@ const openLowerNodes = ({
   menuType,
   client,
   store,
+  jahr
 }) => {
   /**
    * 1. load all data
@@ -25,6 +26,14 @@ const openLowerNodes = ({
    * 5. activeNodeArray stays same
    * 6. refresh tree
    */
+  console.log('openLowerNodes', {
+    id,
+    parentId,
+    popId,
+    apId,
+    projId,
+    menuType,
+  })
   switch (menuType) {
     case 'popFolder':
       popFolder({ id, projId, client, store })
@@ -68,6 +77,7 @@ const openLowerNodes = ({
         parentId,
         store,
         client,
+        jahr
       })
       break
     default:

src/components/Projekte/TreeContainer/openLowerNodes/pop/index.js

@@ -87,9 +87,6 @@ const openLowerNodesPop = async ({
 
   // 3. update openNodes
   addOpenNodes(newOpenNodes)
-
-  // 4. refresh tree
-  store.tree.incrementRefetcher()
 }
 
 export default openLowerNodesPop

src/components/Projekte/TreeContainer/openLowerNodes/popFolder/index.js

@@ -109,9 +109,6 @@ const openLowerNodesPopFolder = async ({
 
   // 3. update openNodes
   addOpenNodes(newOpenNodes)
-
-  // 4. refresh tree
-  store.tree.incrementRefetcher()
 }
 
 export default openLowerNodesPopFolder

src/components/Projekte/TreeContainer/openLowerNodes/tpop/index.js

@@ -291,9 +291,6 @@ const openLowerNodesTpop = async ({
 
   // 3. update openNodes
   addOpenNodes(newOpenNodes)
-
-  // 4. refresh tree
-  store.tree.incrementRefetcher()
 }
 
 export default openLowerNodesTpop

src/components/Projekte/TreeContainer/openLowerNodes/tpopFolder/index.js

@@ -306,9 +306,6 @@ const openLowerNodesTpopFolder = async ({
 
   // 3. update
   addOpenNodes(newOpenNodes)
-
-  // 4. refresh tree
-  store.tree.incrementRefetcher()
 }
 
 export default openLowerNodesTpopFolder

src/components/Projekte/TreeContainer/openLowerNodes/tpopfeldkontrFolder/index.js

@@ -89,9 +89,6 @@ const openLowerNodesTpopfeldkontrFolder = async ({
 
   // 3. update openNodes
   addOpenNodes(newOpenNodes)
-
-  // 4. refresh tree
-  store.tree.incrementRefetcher()
 }
 
 export default openLowerNodesTpopfeldkontrFolder

src/components/Projekte/TreeContainer/openLowerNodes/tpopfreiwkontrFolder/index.js

@@ -90,9 +90,6 @@ const openLowerNodesTpopfreiwkontrFolder = async ({
 
   // 3. update openNodes
   addOpenNodes(newOpenNodes)
-
-  // 4. refresh tree
-  store.tree.incrementRefetcher()
 }
 
 export default openLowerNodesTpopfreiwkontrFolder

src/components/Projekte/TreeContainer/openLowerNodes/zielFolder/index.js

@@ -70,9 +70,6 @@ const openLowerNodesZielFolder = async ({
 
   // 3. update openNodes
   addOpenNodes(newOpenNodes)
-
-  // 4. refresh tree
-  store.tree.incrementRefetcher()
 }
 
 export default openLowerNodesZielFolder

src/components/Projekte/TreeContainer/openLowerNodes/zieljahrFolder/index.js

@@ -7,11 +7,11 @@
 import dataGql from './data'
 
 const openLowerNodesZieljahrFolder = async ({
-  id: jahrString,
   parentId: apId,
   projId = '99999999-9999-9999-9999-999999999999',
   client,
   store,
+  jahr: jahrString,
 }) => {
   const tree = store.tree
   const jahr = +jahrString
@@ -63,9 +63,6 @@ const openLowerNodesZieljahrFolder = async ({
 
   // 3. update
   addOpenNodes(newOpenNodes)
-
-  // 4. refresh tree
-  store.tree.incrementRefetcher()
 }
 
 export default openLowerNodesZieljahrFolder

src/modules/copyTo/index.js

@@ -1,4 +1,5 @@
 import { QueryClient } from '@tanstack/react-query'
+import upperFirst from 'lodash/upperFirst'
 /**
  * moves a dataset to a different parent
  * used when copying for instance tpop to other pop in tree
@@ -26,6 +27,7 @@ const copyTo = async ({
   id: idPassed,
   client,
   store,
+  queryClient,
 }) => {
   const { copying, enqueNotification } = store
   let table = tablePassed || copying.table
@@ -250,7 +252,6 @@ const copyTo = async ({
       // do nothing
       break
   }
-  store.tree.incrementRefetcher()
 
   // copy tpop if needed
   if (table === 'pop' && withNextLevel) {
@@ -269,6 +270,13 @@ const copyTo = async ({
       tpopkontrIdTo: newId,
       client,
       store,
+      queryClient,
+    })
+    queryClient.invalidateQueries({
+      queryKey: ['treeTpopFolders'],
+    })
+    queryClient.invalidateQueries({
+      queryKey: ['treeTpopfeldkontr'],
     })
   }
 }

src/modules/copyZaehlOfTpopKontr.js

@@ -7,6 +7,7 @@ const copyZaehlOfTpopKontr = async ({
   tpopkontrIdTo,
   client,
   store,
+  queryClient,
 }) => {
   // 1. fetch all tpopkontrzaehl
   const { data } = await client.query({
@@ -33,6 +34,7 @@ const copyZaehlOfTpopKontr = async ({
       id: zaehl.id,
       client,
       store,
+      queryClient,
     }),
   )
 }

src/modules/createNewPopFromBeob/index.js

@@ -180,7 +180,6 @@ const createNewPopFromBeob = async ({
       'BeobAssignLinesQuery',
     ],
   })
-  store.tree.incrementRefetcher()
 }
 
 export default createNewPopFromBeob