Merge pull request #7296 from pavinduLakshan/fix_circular_deps

wso2 · Jan 10, 2025 · 8bc2c01 · 8bc2c01
2 parents 17228b2 + 5ba1dee
commit 8bc2c01
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/slow-rules-relax.md b/.changeset/slow-rules-relax.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.organizations.v1": patch
+---
+
+Fix incorrect imports
diff --git a/features/admin.organizations.v1/components/add-organization-role-wizard.tsx b/features/admin.organizations.v1/components/add-organization-role-wizard.tsx
@@ -16,7 +16,8 @@
  * under the License.
  */
 
-import { CreateGroupMemberInterface, GroupsInterface, getGroupList } from "@wso2is/admin.groups.v1";
+import { getGroupList } from "@wso2is/admin.groups.v1/api";
+import { CreateGroupMemberInterface, GroupsInterface } from "@wso2is/admin.groups.v1/models/groups";
 import { AssignGroupsUsers } from "@wso2is/admin.roles.v2/components/wizard/assign-groups-users";
 import { getRolesWizardStepIcons } from "@wso2is/admin.roles.v2/configs/ui";
 import { TreeNode } from "@wso2is/admin.roles.v2/models/permission";

diff --git a/...res/admin.organizations.v1/components/edit-organization-role/edit-organization-groups.tsx b/...res/admin.organizations.v1/components/edit-organization-role/edit-organization-groups.tsx
@@ -18,7 +18,7 @@
 
 import { AppState, getEmptyPlaceholderIllustrations } from "@wso2is/admin.core.v1";
 import { getGroupList } from "@wso2is/admin.groups.v1/api";
-import { GroupListInterface, GroupsInterface } from "@wso2is/admin.groups.v1/models";
+import { GroupListInterface, GroupsInterface } from "@wso2is/admin.groups.v1/models/groups";
 import { PRIMARY_USERSTORE } from "@wso2is/admin.userstores.v1/constants";
 import {
     AlertLevels,

diff --git a/features/admin.organizations.v1/pages/organization-roles.tsx b/features/admin.organizations.v1/pages/organization-roles.tsx
@@ -25,7 +25,7 @@ import {
     UIConstants,
     history
 } from "@wso2is/admin.core.v1";
-import { CreateGroupMemberInterface } from "@wso2is/admin.groups.v1/models";
+import { CreateGroupMemberInterface } from "@wso2is/admin.groups.v1/models/groups";
 import { CreateRoleInterface, CreateRoleMemberInterface } from "@wso2is/admin.roles.v2/models/roles";
 import { IdentityAppsError } from "@wso2is/core/errors";
 import { AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models";