Remove index files in admin.administrators.v1 module

.changeset/hungry-camels-move.md

@@ -0,0 +1,6 @@
+---
+"@wso2is/admin.console-settings.v1": patch
+"@wso2is/admin.administrators.v1": patch
+---
+
+Remove index files in admin.administrators.v1 module

features/admin.administrators.v1/components/guests/onboarded-guest-user-list.tsx

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-import { FeatureStatus, useCheckFeatureStatus } from "@wso2is/access-control";
+import { FeatureStatus, useCheckFeatureStatus, useRequiredScopes } from "@wso2is/access-control";
 import {
     AppState,
     FeatureConfigInterface,
@@ -44,7 +44,7 @@ import {
 import { UserManagementUtils } from "@wso2is/admin.users.v1/utils";
 import { UserstoreConstants } from "@wso2is/core/constants";
 import { IdentityAppsApiException } from "@wso2is/core/exceptions";
-import { getUserNameWithoutDomain, hasRequiredScopes, isFeatureEnabled } from "@wso2is/core/helpers";
+import { getUserNameWithoutDomain, isFeatureEnabled } from "@wso2is/core/helpers";
 import {
     AlertLevels,
     IdentifiableComponentInterface,
@@ -68,7 +68,7 @@ import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
 import { Dispatch } from "redux";
 import { Header, Icon, Label, ListItemProps, SemanticICONS } from "semantic-ui-react";
-import { AdministratorConstants } from "../../constants";
+import { AdministratorConstants } from "../../constants/users";
 
 /**
  * Prop types for the onboarded collaborator users list component.
@@ -185,14 +185,16 @@ export const OnboardedGuestUsersList: React.FunctionComponent<OnboardedGuestUser
     const { t } = useTranslation();
     const dispatch: Dispatch = useDispatch();
 
+    const hasUserUpdatePermissions: boolean = useRequiredScopes(featureConfig?.users?.scopes?.update);
+    const hasUserDeletePermissions: boolean = useRequiredScopes(featureConfig?.users?.scopes?.delete);
+
     const [ showDeleteConfirmationModal, setShowDeleteConfirmationModal ] = useState<boolean>(false);
     const [ deletingUser, setDeletingUser ] = useState<UserBasicInterface | UserRoleInterface>(undefined);
     const [ alert, setAlert, alertComponent ] = useConfirmationModalAlert();
     const [ usersList, setUsersList ] = useState<UserListInterface | InternalAdminUserListInterface>({});
     const [ loading, setLoading ] = useState(false);
 
     const authenticatedUser: string = useSelector((state: AppState) => state?.auth?.username);
-    const allowedScopes: string = useSelector((state: AppState) => state?.auth?.allowedScopes);
     const isPrivilegedUser: boolean = useSelector((state: AppState) => state.auth.isPrivilegedUser);
 
     const saasFeatureStatus : FeatureStatus = useCheckFeatureStatus(FeatureGateConstants.SAAS_FEATURES_IDENTIFIER);
@@ -491,7 +493,7 @@ export const OnboardedGuestUsersList: React.FunctionComponent<OnboardedGuestUser
                         : "PRIMARY";
 
                     return (
-                        !hasRequiredScopes(featureConfig?.users, featureConfig?.users?.scopes?.update, allowedScopes)
+                        !hasUserUpdatePermissions
                     || !isFeatureEnabled(featureConfig?.users,
                         UserManagementConstants.FEATURE_DICTIONARY.get("USER_UPDATE"))
                     || readOnlyUserStores?.includes(userStore.toString())
@@ -508,7 +510,7 @@ export const OnboardedGuestUsersList: React.FunctionComponent<OnboardedGuestUser
                         : "PRIMARY";
 
                     return (
-                        !hasRequiredScopes(featureConfig?.users, featureConfig?.users?.scopes?.update, allowedScopes)
+                        !hasUserUpdatePermissions
                     || !isFeatureEnabled(featureConfig?.users,
                         UserManagementConstants.FEATURE_DICTIONARY.get("USER_UPDATE"))
                     || readOnlyUserStores?.includes(userStore.toString())
@@ -530,7 +532,7 @@ export const OnboardedGuestUsersList: React.FunctionComponent<OnboardedGuestUser
                 return !isFeatureEnabled(featureConfig?.users,
                     UserManagementConstants.FEATURE_DICTIONARY.get("USER_DELETE"))
                     || isPrivilegedUser
-                    || !hasRequiredScopes(featureConfig?.users, featureConfig?.users?.scopes?.delete, allowedScopes)
+                    || !hasUserDeletePermissions
                     || readOnlyUserStores?.includes(userStore.toString())
                     || (adminType === AdminAccountTypes.EXTERNAL
                     && (getUserNameWithoutDomain(user?.userName) === realmConfigs?.adminUser

features/admin.administrators.v1/pages/administrator-edit.tsx

@@ -54,8 +54,8 @@ import { useDispatch, useSelector } from "react-redux";
 import { AnyAction } from "redux";
 import { ThunkDispatch } from "redux-thunk";
 import { Icon } from "semantic-ui-react";
-import { EditGuestUser } from "../components";
-import { AdministratorConstants } from "../constants";
+import { EditGuestUser } from "../components/guests/edit-guest-user";
+import { AdministratorConstants } from "../constants/users";
 
 /**
  * Admin User Edit page.

features/admin.administrators.v1/pages/administrator-settings.tsx

@@ -29,7 +29,7 @@ import { Dispatch } from "redux";
 import { Checkbox, CheckboxProps, Icon, Message } from "semantic-ui-react";
 import { updateOrganizationConfigV2 } from "../api/updateOrganizationConfigV2";
 import { useOrganizationConfigV2 } from "../api/useOrganizationConfigV2";
-import { AdministratorConstants } from "../constants";
+import { AdministratorConstants } from "../constants/users";
 import { OrganizationInterface, UseOrganizationConfigType } from "../models/organization";
 
 /**

features/admin.administrators.v1/pages/administrators.tsx

@@ -102,11 +102,12 @@ import {
     TabProps
 } from "semantic-ui-react";
 import { useOrganizationConfigV2 } from "../api/useOrganizationConfigV2";
-import { GuestUsersList, OnboardedGuestUsersList } from "../components";
-import { AdministratorConstants } from "../constants";
+import { GuestUsersList } from "../components/guests/guest-users-list";
+import { OnboardedGuestUsersList } from "../components/guests/onboarded-guest-user-list";
+import { AdministratorConstants } from "../constants/users";
 import { UseOrganizationConfigType } from "../models/organization";
 import { isAdminUser, isOwner } from "../utils/administrators";
-import { AddAdministratorWizard } from "../wizard";
+import { AddAdministratorWizard } from "../wizard/add-administrator-wizard";
 
 /**
  * Props for the Users page.

features/admin.administrators.v1/wizard/add-administrator-wizard.tsx

@@ -53,7 +53,7 @@ import { Grid, Icon, Modal } from "semantic-ui-react";
 import {
     AddAdminUserBasic
 } from "./steps/admin-user-basic";
-import { InternalAdminFormDataInterface } from "../models";
+import { InternalAdminFormDataInterface } from "../models/invite";
 import { isAdminUser } from "../utils/administrators";
 
 interface AddUserWizardPropsInterface extends IdentifiableComponentInterface, TestableComponentInterface {

features/admin.administrators.v1/wizard/steps/admin-user-basic.tsx

@@ -57,8 +57,8 @@ import React, { FormEvent, ReactElement, useCallback, useEffect, useMemo, useSta
 import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
 import { Divider, DropdownProps, Grid, Header } from "semantic-ui-react";
-import { AdministratorConstants } from "../../constants";
-import { InternalAdminFormDataInterface } from "../../models";
+import { AdministratorConstants } from "../../constants/users";
+import { InternalAdminFormDataInterface } from "../../models/invite";
 import { isAdminUser, isCollaboratorUser } from "../../utils/administrators";
 
 /**

features/admin.console-settings.v1/components/console-roles/console-roles-edit/console-roles-edit.tsx

@@ -21,7 +21,7 @@ import Radio from "@oxygen-ui/react/Radio";
 import RadioGroup from "@oxygen-ui/react/RadioGroup";
 import { FeatureStatus, useCheckFeatureStatus, useRequiredScopes } from "@wso2is/access-control";
 import { useOrganizationConfigV2 } from "@wso2is/admin.administrators.v1/api/useOrganizationConfigV2";
-import { UseOrganizationConfigType } from "@wso2is/admin.administrators.v1/models";
+import { UseOrganizationConfigType } from "@wso2is/admin.administrators.v1/models/organization";
 import { AppState, OrganizationType, store } from "@wso2is/admin.core.v1";
 import { userstoresConfig } from "@wso2is/admin.extensions.v1/configs/userstores";
 import FeatureGateConstants from "@wso2is/admin.feature-gate.v1/constants/feature-gate-constants";