fix: address circular dependency issue

components/organisation-unit-tree/src/organisation-unit-tree-v2/components/index.js

@@ -1,13 +1,14 @@
+import { ManagedOrganisationUnitTree } from './managed-organisation-unit-tree.js'
+export { OrganisationUnitTreeProvider } from './organisation-unit-tree-provider.js'
+
 export { OrganisationUnitNodeChildren } from './organisation-unit-node-children.js'
 export * from './organisation-unit-node-label/index.js'
 export { OrganisationUnitNode } from './organisation-unit-node.js'
 export {
- // TODO: export as `* from` once V2 suffix is removed from tree component
  OrganisationUnitRootContainer,
  OrganisationUnitRootError,
  OrganisationUnitRootFetcher,
  OrganisationUnitRootLoader,
  OrganisationUnitRootNodes,
- OrganisationUnitTree as OrganisationUnitTreeV2,
 } from './organisation-unit-tree/index.js'
-export { OrganisationUnitTreeProvider } from './organisation-unit-tree-provider.js'
+export { ManagedOrganisationUnitTree as OrganisationUnitTreeV2 }

components/organisation-unit-tree/src/organisation-unit-tree-v2/components/managed-organisation-unit-tree.js

@@ -0,0 +1,11 @@
+import React from 'react'
+import { OrganisationUnitTreeProvider } from './organisation-unit-tree-provider.js'
+import { OrganisationUnitTree } from './organisation-unit-tree/index.js'
+
+const ManagedOrganisationUnitTree = (props) => (
+ <OrganisationUnitTreeProvider>
+ <OrganisationUnitTree {...props} />
+ </OrganisationUnitTreeProvider>
+)
+
+export { ManagedOrganisationUnitTree }

components/organisation-unit-tree/src/organisation-unit-tree-v2/components/organisation-unit-tree/organisation-unit-tree.js

@@ -5,7 +5,6 @@ import {
  useOrganisationUnitTree,
  useOrganisationUnitTreeComponents,
 } from '../../hooks/index.js'
-import { OrganisationUnitTreeProvider } from '../organisation-unit-tree-provider.js'
 
 const OrganisationUnitTree = ({
  disabledIds,
@@ -59,12 +58,6 @@ const OrganisationUnitTree = ({
  )
 }
 
-const ManagedOrganisationUnitTree = (props) => (
- <OrganisationUnitTreeProvider>
- <OrganisationUnitTree {...props} />
- </OrganisationUnitTreeProvider>
-)
-
 OrganisationUnitTree.propTypes = {
  rootIds: PropTypes.arrayOf(orgUnitIdPropType).isRequired,
  onChange: PropTypes.func.isRequired,
@@ -76,4 +69,4 @@ OrganisationUnitTree.propTypes = {
  singleSelection: PropTypes.bool,
 }
 
-export { ManagedOrganisationUnitTree as OrganisationUnitTree }
+export { OrganisationUnitTree }