Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix circular dependencies - Pt. 02 #7332

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5ea1d83
Remove index files in `@wso2is/admin.core.v1` module
pavinduLakshan Jan 19, 2025
d5dab7d
Fix broken imports
pavinduLakshan Jan 19, 2025
500c99a
Fix broken imports
pavinduLakshan Jan 19, 2025
d613bf0
Fix broken imports
pavinduLakshan Jan 19, 2025
2f5cac8
Fix broken imports
pavinduLakshan Jan 19, 2025
0e78b49
Fix broken imports
pavinduLakshan Jan 19, 2025
a56b0c4
Fix broken imports
pavinduLakshan Jan 20, 2025
1957163
Fix broken imports
pavinduLakshan Jan 20, 2025
3f4b3a4
Fix broken imports
pavinduLakshan Jan 20, 2025
2861b11
Fix broken imports
pavinduLakshan Jan 21, 2025
493dd36
Fix broken imports
pavinduLakshan Jan 21, 2025
ebcc1f9
Fix broken imports
pavinduLakshan Jan 22, 2025
d190103
Fix broken imports
pavinduLakshan Jan 23, 2025
26aa83d
Fix broken imports
pavinduLakshan Jan 23, 2025
2d476dd
Fix broken imports
pavinduLakshan Jan 23, 2025
2d69872
Fix broken imports
pavinduLakshan Jan 23, 2025
fdbf385
Fix broken imports
pavinduLakshan Jan 23, 2025
b539f14
Fix broken imports
pavinduLakshan Jan 23, 2025
fd77ef8
Fix broken imports
pavinduLakshan Jan 23, 2025
76b7561
Fix broken imports
pavinduLakshan Jan 23, 2025
18fce43
🦋 Add changeset
pavinduLakshan Jan 23, 2025
5240f76
Fix broken imports
pavinduLakshan Jan 23, 2025
c08dbfa
Update extension config import
pavinduLakshan Jan 23, 2025
fce0c47
Update imports
pavinduLakshan Jan 23, 2025
8a4c524
Add changeset
pavinduLakshan Jan 26, 2025
5f7df90
Fix broken imports
pavinduLakshan Jan 27, 2025
b3104d8
Fix incorrect constant import
pavinduLakshan Jan 27, 2025
f4313f4
Merge branch 'master' into fix_circular_deps_pt2
pavinduLakshan Jan 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
75 changes: 75 additions & 0 deletions .changeset/itchy-trains-think.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
---
"@wso2is/admin.identity-verification-providers.v1": patch
"@wso2is/admin.remote-repository-configuration.v1": patch
"@wso2is/admin.alternative-login-identifier.v1": patch
"@wso2is/admin.authentication-flow-builder.v1": patch
"@wso2is/admin.organization-discovery.v1": patch
"@wso2is/admin.application-templates.v1": patch
"@wso2is/admin.policy-administration.v1": patch
"@wso2is/admin.server-configurations.v1": patch
"@wso2is/admin.saml2-configuration.v1": patch
"@wso2is/admin.username-validation.v1": patch
"@wso2is/admin.wsfed-configuration.v1": patch
"@wso2is/admin.identity-providers.v1": patch
"@wso2is/admin.session-management.v1": patch
"@wso2is/admin.workflow-approvals.v1": patch
"@wso2is/admin.application-roles.v1": patch
"@wso2is/admin.remote-userstores.v1": patch
"@wso2is/admin.console-settings.v1": patch
"@wso2is/admin.email-management.v1": patch
"@wso2is/admin.email-providers.v1": patch
"@wso2is/admin.email-templates.v1": patch
"@wso2is/admin.private-key-jwt.v1": patch
"@wso2is/admin.administrators.v1": patch
"@wso2is/admin.authentication.v1": patch
"@wso2is/admin.push-providers.v1": patch
"@wso2is/admin.api-resources.v1": patch
"@wso2is/admin.api-resources.v2": patch
"@wso2is/admin.authorization.v1": patch
"@wso2is/admin.email-and-sms.v1": patch
"@wso2is/admin.impersonation.v1": patch
"@wso2is/admin.login-flow.ai.v1": patch
"@wso2is/admin.organizations.v1": patch
"@wso2is/admin.sms-providers.v1": patch
"@wso2is/admin.sms-templates.v1": patch
"@wso2is/admin.template-core.v1": patch
"@wso2is/admin.applications.v1": patch
"@wso2is/admin.certificates.v1": patch
"@wso2is/admin.feature-gate.v1": patch
"@wso2is/admin.org-insights.v1": patch
"@wso2is/admin.provisioning.v1": patch
"@wso2is/admin.subscription.v1": patch
"@wso2is/admin.branding.ai.v1": patch
"@wso2is/admin.connections.v1": patch
"@wso2is/admin.oidc-scopes.v1": patch
"@wso2is/admin.extensions.v1": patch
"@wso2is/admin.userstores.v1": patch
"@wso2is/admin.validation.v1": patch
"@wso2is/common.branding.v1": patch
"@wso2is/admin.branding.v1": patch
"@wso2is/admin.actions.v1": patch
"@wso2is/admin.secrets.v1": patch
"@wso2is/admin.tenants.v1": patch
"@wso2is/admin.claims.v1": patch
"@wso2is/admin.groups.v1": patch
"@wso2is/react-components": patch
"@wso2is/admin.roles.v1": patch
"@wso2is/admin.roles.v2": patch
"@wso2is/admin.rules.v1": patch
"@wso2is/admin.users.v1": patch
"@wso2is/admin.core.v1": patch
"@wso2is/admin.home.v1": patch
"@wso2is/admin.logs.v1": patch
"@wso2is/common.ai.v1": patch
"@wso2is/dynamic-forms": patch
"@wso2is/unit-testing": patch
"@wso2is/identity-apps-core": patch
"@wso2is/myaccount": patch
"@wso2is/theme": patch
"@wso2is/console": patch
"@wso2is/form": patch
"@wso2is/i18n": patch
"@wso2is/features": patch
---

Remove barrel files from @wso2is/admin.core.v1 module
23 changes: 15 additions & 8 deletions apps/console/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,26 @@

import { BasicUserInfo, DecodedIDTokenPayload, useAuthContext } from "@asgardeo/auth-react";
import { AccessControlProvider, AllFeatureInterface, FeatureGateInterface } from "@wso2is/access-control";
import { EventPublisher, PreLoader } from "@wso2is/admin.core.v1";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components";
import { Config, DocumentationLinks } from "@wso2is/admin.core.v1/configs";
import { AppConstants } from "@wso2is/admin.core.v1/constants";
import { history } from "@wso2is/admin.core.v1/helpers";
import { PreLoader } from "@wso2is/admin.core.v1/components/pre-loader";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components/protected-route";
import { Config } from "@wso2is/admin.core.v1/configs/app";
import { DocumentationLinks } from "@wso2is/admin.core.v1/configs/documentation";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { history } from "@wso2is/admin.core.v1/helpers/history";
import useResourceEndpoints from "@wso2is/admin.core.v1/hooks/use-resource-endpoints";
import {
ConfigReducerStateInterface,
DocumentationLinksInterface,
FeatureConfigInterface,
ServiceResourceEndpointsInterface
} from "@wso2is/admin.core.v1/models";
} from "@wso2is/admin.core.v1/models/config";

import {
DocumentationLinksInterface
} from "@wso2is/admin.core.v1/models/documentation";
import {
ConfigReducerStateInterface
} from "@wso2is/admin.core.v1/models/reducer-state";
import { AppState } from "@wso2is/admin.core.v1/store";
import { EventPublisher } from "@wso2is/admin.core.v1/utils/event-publisher";
import { commonConfig } from "@wso2is/admin.extensions.v1";
import { featureGateConfig } from "@wso2is/admin.extensions.v1/configs/feature-gate";
import useGetAllFeatures from "@wso2is/admin.feature-gate.v1/api/use-get-all-features";
Expand Down
2 changes: 1 addition & 1 deletion apps/console/src/configs/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
UserGroupIcon
} from "@oxygen-ui/react-icons";
import { getSidePanelIcons } from "@wso2is/admin.core.v1/configs/ui";
import { AppConstants } from "@wso2is/admin.core.v1/constants";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { commonConfig } from "@wso2is/admin.extensions.v1";
import FeatureFlagConstants from "@wso2is/admin.feature-gate.v1/constants/feature-flag-constants";
import FeatureGateConstants from "@wso2is/admin.feature-gate.v1/constants/feature-gate-constants";
Expand Down
10 changes: 7 additions & 3 deletions apps/console/src/hooks/use-routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@ import { history } from "@wso2is/admin.core.v1/helpers/history";
import useGlobalVariables from "@wso2is/admin.core.v1/hooks/use-global-variables";
import { FeatureConfigInterface, RouteConfigInterface } from "@wso2is/admin.core.v1/models/config";
import {
AppState,
setDeveloperVisibility,
AppState
} from "@wso2is/admin.core.v1/store";
import {
setDeveloperVisibility
} from "@wso2is/admin.core.v1/store/actions/acess-control";
import {
setFilteredDevelopRoutes,
setSanitizedDevelopRoutes
} from "@wso2is/admin.core.v1/store";
} from "@wso2is/admin.core.v1/store/actions/routes";
import { AppUtils } from "@wso2is/admin.core.v1/utils/app-utils";
import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
import { RouteInterface } from "@wso2is/core/models";
Expand Down
4 changes: 3 additions & 1 deletion apps/console/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ import { AuthProvider } from "@asgardeo/auth-react";
import { loader } from "@monaco-editor/react";
import { ThemeProvider } from "@oxygen-ui/react/theme";
import { AuthenticateUtils } from "@wso2is/admin.authentication.v1";
import { Config, PreLoader, store } from "@wso2is/admin.core.v1";
import { PreLoader } from "@wso2is/admin.core.v1/components/pre-loader";
import { Config } from "@wso2is/admin.core.v1/configs/app";
import { UserPreferencesInterface } from "@wso2is/admin.core.v1/models/user-preferences";
import { AppConfigProvider } from "@wso2is/admin.core.v1/providers/app-config-provider";
import AppSettingsProvider from "@wso2is/admin.core.v1/providers/app-settings-provider";
import GlobalVariablesProvider from "@wso2is/admin.core.v1/providers/global-variables-provider";
import UserPreferencesProvider from "@wso2is/admin.core.v1/providers/user-preferences-provider";
import { store } from "@wso2is/admin.core.v1/store";
import OrganizationsProvider from "@wso2is/admin.organizations.v1/providers/organizations-provider";
import { ContextUtils } from "@wso2is/core/utils";
import React, { ReactElement, useEffect, useState } from "react";
Expand Down
11 changes: 6 additions & 5 deletions apps/console/src/layouts/app-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
* under the License.
*/

import { AppState, AppUtils, PreLoader } from "@wso2is/admin.core.v1";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components";
import { getEmptyPlaceholderIllustrations } from "@wso2is/admin.core.v1/configs";
import { AppConstants } from "@wso2is/admin.core.v1/constants";
import { store } from "@wso2is/admin.core.v1/store";
import { PreLoader } from "@wso2is/admin.core.v1/components/pre-loader";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components/protected-route";
import { getEmptyPlaceholderIllustrations } from "@wso2is/admin.core.v1/configs/ui";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { AppState, store } from "@wso2is/admin.core.v1/store";
import { AppUtils } from "@wso2is/admin.core.v1/utils/app-utils";
import { RouteInterface } from "@wso2is/core/models";
import { CommonUtils } from "@wso2is/core/utils";
import {
Expand Down
6 changes: 3 additions & 3 deletions apps/console/src/layouts/auth-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* under the License.
*/

import { PreLoader } from "@wso2is/admin.core.v1";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components";
import { AppConstants } from "@wso2is/admin.core.v1/constants";
import { PreLoader } from "@wso2is/admin.core.v1/components/pre-loader";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components/protected-route";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { RouteInterface } from "@wso2is/core/models";
import { AuthLayout as AuthLayoutSkeleton } from "@wso2is/react-components";
import React, { FunctionComponent, ReactElement, Suspense, useEffect, useState } from "react";
Expand Down
24 changes: 11 additions & 13 deletions apps/console/src/layouts/dashboard-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,18 @@ import Navbar, { NavbarItems } from "@oxygen-ui/react/Navbar";
import Snackbar from "@oxygen-ui/react/Snackbar";
import { FeatureStatus, useCheckFeatureStatus } from "@wso2is/access-control";
import { getProfileInformation } from "@wso2is/admin.authentication.v1/store";
import {
AppConstants,
AppState,
AppUtils,
ConfigReducerStateInterface,
FeatureConfigInterface,
ProtectedRoute,
RouteUtils,
UIConstants,
getEmptyPlaceholderIllustrations,
history
} from "@wso2is/admin.core.v1";
import Header from "@wso2is/admin.core.v1/components/header";
import { CommonUtils as ConsoleCommonUtils } from "@wso2is/admin.core.v1/utils";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components/protected-route";
import { getEmptyPlaceholderIllustrations } from "@wso2is/admin.core.v1/configs/ui";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { UIConstants } from "@wso2is/admin.core.v1/constants/ui-constants";
import { history } from "@wso2is/admin.core.v1/helpers/history";
import { FeatureConfigInterface } from "@wso2is/admin.core.v1/models/config";
import { ConfigReducerStateInterface } from "@wso2is/admin.core.v1/models/reducer-state";
import { AppState } from "@wso2is/admin.core.v1/store";
import { AppUtils } from "@wso2is/admin.core.v1/utils/app-utils";
import { CommonUtils as ConsoleCommonUtils } from "@wso2is/admin.core.v1/utils/common-utils";
import { RouteUtils } from "@wso2is/admin.core.v1/utils/route-utils";
import { applicationConfig } from "@wso2is/admin.extensions.v1";
import FeatureGateConstants from "@wso2is/admin.feature-gate.v1/constants/feature-gate-constants";
import { FeatureStatusLabel } from "@wso2is/admin.feature-gate.v1/models/feature-status";
Expand Down
18 changes: 8 additions & 10 deletions apps/console/src/layouts/default-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,16 @@ import Tooltip from "@oxygen-ui/react/Tooltip";
import { ArrowLeftIcon } from "@oxygen-ui/react-icons";
import { FeatureAccessConfigInterface, useRequiredScopes } from "@wso2is/access-control";
import { getProfileInformation } from "@wso2is/admin.authentication.v1/store";
import {
AppConstants,
AppState,
AppUtils,
FeatureConfigInterface,
ProtectedRoute,
RouteUtils,
UIConstants,
getEmptyPlaceholderIllustrations
} from "@wso2is/admin.core.v1";
import Header from "@wso2is/admin.core.v1/components/header";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components/protected-route";
import { getEmptyPlaceholderIllustrations } from "@wso2is/admin.core.v1/configs/ui";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { UIConstants } from "@wso2is/admin.core.v1/constants/ui-constants";
import { history } from "@wso2is/admin.core.v1/helpers/history";
import { FeatureConfigInterface } from "@wso2is/admin.core.v1/models/config";
import { AppState } from "@wso2is/admin.core.v1/store";
import { AppUtils } from "@wso2is/admin.core.v1/utils/app-utils";
import { RouteUtils } from "@wso2is/admin.core.v1/utils/route-utils";
import { applicationConfig } from "@wso2is/admin.extensions.v1";
import { AlertInterface, ProfileInfoInterface, RouteInterface } from "@wso2is/core/models";
import { initializeAlertSystem } from "@wso2is/core/store";
Expand Down
4 changes: 2 additions & 2 deletions apps/console/src/layouts/error-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* under the License.
*/

import { ProtectedRoute } from "@wso2is/admin.core.v1/components";
import { AppConstants } from "@wso2is/admin.core.v1/constants";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components/protected-route";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { RouteInterface } from "@wso2is/core/models";
import { ContentLoader, ErrorLayout as ErrorLayoutSkeleton } from "@wso2is/react-components";
import React, { FunctionComponent, PropsWithChildren, ReactElement, Suspense, useEffect, useState } from "react";
Expand Down
16 changes: 7 additions & 9 deletions apps/console/src/layouts/full-screen-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@
* under the License.
*/

import {
AppConstants,
AppState,
AppUtils,
FeatureConfigInterface,
ProtectedRoute,
RouteUtils,
getEmptyPlaceholderIllustrations
} from "@wso2is/admin.core.v1";
import { ProtectedRoute } from "@wso2is/admin.core.v1/components/protected-route";
import { getEmptyPlaceholderIllustrations } from "@wso2is/admin.core.v1/configs/ui";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { FeatureConfigInterface } from "@wso2is/admin.core.v1/models/config";
import { AppState } from "@wso2is/admin.core.v1/store";
import { AppUtils } from "@wso2is/admin.core.v1/utils/app-utils";
import { RouteUtils } from "@wso2is/admin.core.v1/utils/route-utils";
import { RouteInterface } from "@wso2is/core/models";
import { RouteUtils as CommonRouteUtils, CommonUtils } from "@wso2is/core/utils";
import {
Expand Down
23 changes: 9 additions & 14 deletions apps/console/src/protected-app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,17 @@ import {
useAuthContext
} from "@asgardeo/auth-react";
import useSignIn from "@wso2is/admin.authentication.v1/hooks/use-sign-in";
import {
AppState,
AppUtils,
Config,
DeploymentConfigInterface,
HttpUtils,
PreLoader,
UIConfigInterface,
setFilteredDevelopRoutes,
setSanitizedDevelopRoutes,
store
} from "@wso2is/admin.core.v1";
import { AppConstants } from "@wso2is/admin.core.v1/constants";
import { PreLoader } from "@wso2is/admin.core.v1/components/pre-loader";
import { Config } from "@wso2is/admin.core.v1/configs/app";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { MultitenantConstants } from "@wso2is/admin.core.v1/constants/multitenant-constants";
import { history } from "@wso2is/admin.core.v1/helpers";
import { history } from "@wso2is/admin.core.v1/helpers/history";
import useUIConfig from "@wso2is/admin.core.v1/hooks/use-ui-configs";
import { DeploymentConfigInterface, UIConfigInterface } from "@wso2is/admin.core.v1/models/config";
import { AppState, store } from "@wso2is/admin.core.v1/store";
import { setFilteredDevelopRoutes, setSanitizedDevelopRoutes } from "@wso2is/admin.core.v1/store/actions/routes";
import { AppUtils } from "@wso2is/admin.core.v1/utils/app-utils";
import { HttpUtils } from "@wso2is/admin.core.v1/utils/http-utils";
import { commonConfig } from "@wso2is/admin.extensions.v1";
import useOrganizationSwitch from "@wso2is/admin.organizations.v1/hooks/use-organization-switch";
import useGetTenantTier from "@wso2is/admin.subscription.v1/api/use-get-tenant-tier";
Expand Down
9 changes: 9 additions & 0 deletions apps/console/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import CompressionPlugin from "compression-webpack-plugin";
import history from "connect-history-api-fallback";
import CopyWebpackPlugin from "copy-webpack-plugin";
import ESLintPlugin from "eslint-webpack-plugin";
import ForkTsCheckerWebpackPlugin from "fork-ts-checker-webpack-plugin";
import HtmlWebpackPlugin from "html-webpack-plugin";
import JsonMinimizerPlugin from "json-minimizer-webpack-plugin";
import webpack, {
Expand Down Expand Up @@ -161,6 +162,14 @@ module.exports = (config: WebpackOptionsNormalized, context: NxWebpackContextInt
config.plugins.splice(indexHtmlWebpackPluginIndex, 1);
}

config.plugins.push(
new ForkTsCheckerWebpackPlugin({
typescript: {
memoryLimit: 4096
}
})
);

if (isProduction && !isDeployedOnExternalStaticServer) {
config.plugins.push(
(new HtmlWebpackPlugin({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import InputAdornment from "@oxygen-ui/react/InputAdornment";
import { SelectChangeEvent } from "@oxygen-ui/react/Select";
import Typography from "@oxygen-ui/react/Typography";
import { FeatureAccessConfigInterface, useRequiredScopes } from "@wso2is/access-control";
import { AppState } from "@wso2is/admin.core.v1";
import { AppState } from "@wso2is/admin.core.v1/store";
import { IdentifiableComponentInterface } from "@wso2is/core/models";
import { FinalFormField, SelectFieldAdapter, TextFieldAdapter } from "@wso2is/form/src";
import { Hint } from "@wso2is/react-components";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import Alert from "@oxygen-ui/react/Alert";
import AlertTitle from "@oxygen-ui/react/AlertTitle";
import Button from "@oxygen-ui/react/Button";
import { UIConstants } from "@wso2is/admin.core.v1";
import { CertificateViewModal } from "@wso2is/admin.core.v1/components/certificate-view-modal";
import { UIConstants } from "@wso2is/admin.core.v1/constants/ui-constants";
import { CertificateManagementConstants } from "@wso2is/core/constants";
import { CertificateValidity, DisplayCertificate, IdentifiableComponentInterface } from "@wso2is/core/models";
import { CertificateManagementUtils } from "@wso2is/core/utils";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import { FeatureAccessConfigInterface, useRequiredScopes } from "@wso2is/access-control";
import { AppState } from "@wso2is/admin.core.v1";
import { AppState } from "@wso2is/admin.core.v1/store";
import { IdentifiableComponentInterface } from "@wso2is/core/models";
import { FinalFormField, TextFieldAdapter } from "@wso2is/form/src";
import { Hint } from "@wso2is/react-components";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Box from "@oxygen-ui/react/Box";
import Button from "@oxygen-ui/react/Button";
import Skeleton from "@oxygen-ui/react/Skeleton";
import { FeatureAccessConfigInterface, useRequiredScopes } from "@wso2is/access-control";
import { AppState } from "@wso2is/admin.core.v1";
import { AppState } from "@wso2is/admin.core.v1/store";
import useGetRulesMeta from "@wso2is/admin.rules.v1/api/use-get-rules-meta";
import { RuleExecuteCollectionWithoutIdInterface, RuleWithoutIdInterface } from "@wso2is/admin.rules.v1/models/rules";
import { getRuleInstanceValue } from "@wso2is/admin.rules.v1/providers/rules-provider";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import FormLabel from "@oxygen-ui/react/FormLabel";
import Skeleton from "@oxygen-ui/react/Skeleton";
import Typography from "@oxygen-ui/react/Typography";
import { FeatureAccessConfigInterface, useRequiredScopes } from "@wso2is/access-control";
import { AppState } from "@wso2is/admin.core.v1";
import { AppState } from "@wso2is/admin.core.v1/store";
import { IdentifiableComponentInterface } from "@wso2is/core/models";
import {
FinalForm,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
*/

import { FeatureAccessConfigInterface, Show, useRequiredScopes } from "@wso2is/access-control";
import { AppConstants, AppState, history } from "@wso2is/admin.core.v1";
import { AppConstants } from "@wso2is/admin.core.v1/constants/app-constants";
import { history } from "@wso2is/admin.core.v1/helpers/history";
import { AppState } from "@wso2is/admin.core.v1/store";
import { AlertInterface, AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models";
import { addAlert } from "@wso2is/core/store";
import {
Expand Down
Loading
Loading