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

Move Console's feature modules outside to be re-usable cross applications #5849

Merged
merged 119 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from 118 commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
9cb7cb4
move applications to ./features
jathushan-r Mar 28, 2024
268e1f4
move wsfed-configurations to ./features
thiva-k Mar 28, 2024
746c432
Move workflow-approvals to ./features
thiva-k Mar 28, 2024
f70b713
Move validation to ./features
thiva-k Mar 28, 2024
ba4b18f
Move access-control to features/admin-access-control-v1
jathushan-r Mar 28, 2024
91f4509
Move userstores to ./features
thiva-k Mar 28, 2024
24fcea2
Move api-resources to features/admin-api-resources-v1
jathushan-r Mar 28, 2024
701a5c8
Move users to ./features
thiva-k Mar 28, 2024
f722aa2
Move application-roles to features/admin-application-roles-v1
jathushan-r Mar 28, 2024
4eec7b1
Move authentication to features/admin-authentication-v1
jathushan-r Mar 28, 2024
5cd9b7d
Move tenants to ./features
thiva-k Mar 28, 2024
478ebdd
Move authentication-flow-builder to features/admin-authentication-flo…
jathushan-r Mar 28, 2024
f086ac8
Move sms-providers to ./features
thiva-k Mar 28, 2024
2b68f50
Move authorization to features/admin-authorization-v1
jathushan-r Mar 28, 2024
c6009fc
Move session-management to ./features
thiva-k Mar 28, 2024
d92253f
Move branding to features/admin-branding-v1
jathushan-r Mar 28, 2024
c0347cb
Move certificates to features/admin-certificates-v1
jathushan-r Mar 28, 2024
c2332e9
Move claims to features/admin-claims-v1
jathushan-r Mar 28, 2024
312bb4e
move server-configurations to ./features
thiva-k Mar 28, 2024
88c6f6e
Move connections to features/admin-connections-v1
jathushan-r Mar 28, 2024
ad09d4f
Move server to ./features
thiva-k Mar 28, 2024
313d820
Move console-settings to features/admin-console-settings-v1
jathushan-r Mar 28, 2024
212de0a
Move core to features/admin-core-v1
jathushan-r Mar 28, 2024
e89a61e
Move secrets to ./features
thiva-k Mar 28, 2024
c08dacd
Move email-and-sms to features/admin-email-and-sms-v1
jathushan-r Mar 28, 2024
be644e7
Move email-management to features/admin-email-management-v1
jathushan-r Mar 28, 2024
9c3f879
Move email-providers to features/admin-email-providers-v1
jathushan-r Mar 28, 2024
74a5980
Move email-templates to features/admin-email-templates-v1
jathushan-r Mar 28, 2024
fdbecc4
Move groups to features/admin-groups-v1
jathushan-r Mar 28, 2024
a6bfab9
Move identity-providers to features/admin-identity-providers-v1
jathushan-r Mar 28, 2024
abcd73f
Move saml2-configuration to ./features
thiva-k Mar 28, 2024
be6fb62
Move roles-v1 to ./features
thiva-k Mar 28, 2024
419c32e
Move identity-verification-providers to features/admin-identity-verif…
jathushan-r Mar 28, 2024
11926e5
Move oidc-scopes to features/admin-oidc-scopes-v1
jathushan-r Mar 28, 2024
8e194bf
Move roles to ./features as roles-v2
thiva-k Mar 28, 2024
022a6c6
Move remote-repository-configuration to ./features
thiva-k Mar 28, 2024
49534a3
Move provisioning to ./features
thiva-k Mar 28, 2024
1778ee0
Move private-key-jwt to ./features
thiva-k Mar 28, 2024
5ff7a5e
Move parent-roles to ./features
thiva-k Mar 28, 2024
d44b9d6
Move organizations to ./features
thiva-k Mar 28, 2024
48dc4b3
Move organization-discovery to ./features
thiva-k Mar 28, 2024
e3dd225
Move org-insights to ./features
thiva-k Mar 28, 2024
a19e124
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 28, 2024
83548d7
Move extensions to ./features
thiva-k Mar 28, 2024
aa0e77f
Move layouts to ./features
thiva-k Mar 28, 2024
ef5409e
Move views to ./features
thiva-k Mar 28, 2024
67fbfbf
Refactor wsfed-configuration paths
thiva-k Mar 28, 2024
79ff0c8
Refactor workflow-approvals paths
thiva-k Mar 28, 2024
a2f3396
Refactor views paths
thiva-k Mar 28, 2024
606791a
Refactor access-control import path
jathushan-r Mar 28, 2024
b67c24b
Refactor applications import path
jathushan-r Mar 28, 2024
a3eca98
Refactor validation paths
thiva-k Mar 28, 2024
4e78d46
Refactor api-resources import path
jathushan-r Mar 28, 2024
62eaa63
Refactor authentication import path
jathushan-r Mar 28, 2024
379edcb
Refactor userstores paths
thiva-k Mar 28, 2024
de44fc5
Refactor authentication-flow-builder import path
jathushan-r Mar 28, 2024
aab3493
Refactor authorization import path
jathushan-r Mar 28, 2024
ebeb9dc
Refactor branding import path
jathushan-r Mar 28, 2024
0e23505
Refactor claims import path
jathushan-r Mar 28, 2024
3ebcb39
Refactor users paths
thiva-k Mar 28, 2024
e66fa46
Refactor tenants paths
thiva-k Mar 28, 2024
14364f9
Refactor sms-providers paths
thiva-k Mar 28, 2024
9e9751a
Refactor connections import path
jathushan-r Mar 28, 2024
072c25c
Refactor session-management paths
thiva-k Mar 28, 2024
704f42b
Refactor console-settings import path
jathushan-r Mar 28, 2024
5204c60
Refactor core import path
jathushan-r Mar 28, 2024
9bb25c3
Refactor email-and-sms import path
jathushan-r Mar 28, 2024
06b2b5e
Fix server-configurations paths
thiva-k Mar 28, 2024
89d740d
Refactor secrets paths
thiva-k Mar 28, 2024
670541c
Refactor email-management import path
jathushan-r Mar 28, 2024
02ad0aa
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 28, 2024
6f0e876
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
jathushan-r Mar 28, 2024
fbd874c
Refactor email-providers import path
jathushan-r Mar 28, 2024
5cce37e
Refactor email-templates import path
jathushan-r Mar 28, 2024
7944061
Refactor saml2-configuration paths
thiva-k Mar 28, 2024
b90e101
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 28, 2024
b92c86c
Refactor groups import path
jathushan-r Mar 28, 2024
73e1a89
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
jathushan-r Mar 28, 2024
002d4f1
Refactor roles paths
thiva-k Mar 28, 2024
b354e02
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 28, 2024
354a232
Refactor roles-v1 paths
thiva-k Mar 28, 2024
35cea9e
Refactor remote-repository-configuration paths
thiva-k Mar 28, 2024
55b9e47
Refactor private-key-jwt paths
thiva-k Mar 28, 2024
872a98a
Refactor identity-providers import path
jathushan-r Mar 28, 2024
4e6a0c5
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
jathushan-r Mar 28, 2024
a546364
Refactor identity-verification-providers import path
jathushan-r Mar 28, 2024
1e777ae
Refactor oidc-scopes import path
jathushan-r Mar 28, 2024
e4870ee
Refactor organizations paths
thiva-k Mar 28, 2024
40eee26
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 28, 2024
041b5eb
Fix import paths inside extensions
jathushan-r Mar 28, 2024
58db9cb
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
jathushan-r Mar 28, 2024
56d6143
Refactor organization-discovery paths
thiva-k Mar 28, 2024
c99f230
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 28, 2024
4c04c27
Refactor org-insights paths
thiva-k Mar 28, 2024
0835338
Fix missed paths in routes.tsx
thiva-k Mar 28, 2024
8917aaa
Refactor extensions import path
jathushan-r Mar 28, 2024
eac9d52
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
jathushan-r Mar 28, 2024
4fb793b
Add package.json
thiva-k Mar 28, 2024
3780324
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 28, 2024
1280717
Refactor extensions,layouts import path
jathushan-r Mar 28, 2024
a54d9f8
Fix import errors
jathushan-r Mar 28, 2024
4efdc5b
Add tsconfig
thiva-k Mar 28, 2024
cb726e2
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 28, 2024
7c64706
Change wrong import
thiva-k Mar 28, 2024
b7d0590
Fix import errors
jathushan-r Mar 28, 2024
46ad1be
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
jathushan-r Mar 28, 2024
78b707a
Fix nested layout dir
jathushan-r Mar 28, 2024
a1c97be
add scripts
jathushan-r Mar 28, 2024
7e842a0
Add package.json to console
thiva-k Mar 29, 2024
5f2c6fd
Edit imports from index, protected-app
thiva-k Mar 29, 2024
fa3c1fe
Fix import paths in app.tsx
jathushan-r Mar 29, 2024
171f828
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
jathushan-r Mar 29, 2024
b8b347e
add features in workspace.json
jathushan-r Mar 29, 2024
58f895a
Add i18n to console extensions
thiva-k Mar 29, 2024
1694b07
Add any type to asgardeo-spa sdk
thiva-k Mar 29, 2024
94af77b
Merge branch 'features-refactor' of https://github.com/thiva-k/identi…
thiva-k Mar 29, 2024
e3e93f7
Change themes relative path
thiva-k Mar 29, 2024
5125dcc
Fix minor lint
thiva-k Mar 29, 2024
00ea371
Add changeset
thiva-k Mar 29, 2024
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ modules/react-components/.cache
modules/react-components/public/themes
apps/*/build/
apps/*/dist/
features/themes/
apps/myaccount/src/main/
apps/console/src/main/
apps/*/cache
Expand Down
1 change: 1 addition & 0 deletions apps/console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"@wso2is/react-components": "^2.1.12",
"@wso2is/theme": "^2.0.71",
"@wso2is/validation": "^2.0.3",
"@wso2is/features": "*",
"axios": "^0.19.2",
"codemirror": "^5.52.0",
"country-language": "^0.1.7",
Expand Down
24 changes: 12 additions & 12 deletions apps/console/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,25 @@ import { useDispatch, useSelector } from "react-redux";
import { StaticContext } from "react-router";
import { Redirect, Route, RouteComponentProps, Router, Switch } from "react-router-dom";
import { Dispatch } from "redux";
import { commonConfig } from "./extensions";
import { useGetAllFeatures } from "./extensions/components/feature-gate/api/feature-gate";
import { featureGateConfig } from "./extensions/configs/feature-gate";
import { AccessControlUtils } from "./features/access-control/configs/access-control";
import { EventPublisher, PreLoader } from "./features/core";
import { ProtectedRoute } from "./features/core/components";
import { Config, DocumentationLinks, getBaseRoutes } from "./features/core/configs";
import { AppConstants } from "./features/core/constants";
import { history } from "./features/core/helpers";
import { commonConfig } from "@wso2is/features/admin-extensions-v1";
import { useGetAllFeatures } from "@wso2is/features/admin-extensions-v1/components/feature-gate/api/feature-gate";
import { featureGateConfig } from "@wso2is/features/admin-extensions-v1/configs/feature-gate";
import { AccessControlUtils } from "@wso2is/features/admin-access-control-v1/configs/access-control";
import { EventPublisher, PreLoader } from "@wso2is/features/admin-core-v1";
import { ProtectedRoute } from "@wso2is/features/admin-core-v1/components";
import { Config, DocumentationLinks, getBaseRoutes } from "@wso2is/features/admin-core-v1/configs";
import { AppConstants } from "@wso2is/features/admin-core-v1/constants";
import { history } from "@wso2is/features/admin-core-v1/helpers";
import {
ConfigReducerStateInterface,
DocumentationLinksInterface,
FeatureConfigInterface,
ServiceResourceEndpointsInterface
} from "./features/core/models";
import { AppState, store } from "./features/core/store";
} from "@wso2is/features/admin-core-v1/models";
import { AppState, store } from "@wso2is/features/admin-core-v1/store";
import "moment/locale/si";
import "moment/locale/fr";
import { OrganizationUtils } from "./features/organizations/utils";
import { OrganizationUtils } from "@wso2is/features/admin-organizations-v1/utils";

/**
* Main App component.
Expand Down
12 changes: 6 additions & 6 deletions apps/console/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import * as ReactDOM from "react-dom";
import { Provider } from "react-redux";
import { BrowserRouter } from "react-router-dom";
import { AsgardeoTheme } from "./branding/theme";
import { AuthenticateUtils } from "./features/authentication";
import { Config, PreLoader, store } from "./features/core";
import { UserPreferencesInterface } from "./features/core/models/user-preferences";
import AppSettingsProvider from "./features/core/providers/app-settings-provider";
import UserPreferencesProvider from "./features/core/providers/user-preferences-provider";
import OrganizationsProvider from "./features/organizations/providers/organizations-provider";
import { AuthenticateUtils } from "@wso2is/features/admin-authentication-v1";
import { Config, PreLoader, store } from "@wso2is/features/admin-core-v1";
import { UserPreferencesInterface } from "@wso2is/features/admin-core-v1/models/user-preferences";
import AppSettingsProvider from "@wso2is/features/admin-core-v1/providers/app-settings-provider";
import UserPreferencesProvider from "@wso2is/features/admin-core-v1/providers/user-preferences-provider";
import OrganizationsProvider from "@wso2is/features/admin-organizations-v1/providers/organizations-provider";
import { ProtectedApp } from "./protected-app";

// Set the runtime config in the context.
Expand Down
22 changes: 11 additions & 11 deletions apps/console/src/protected-app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ import React, {
import { I18nextProvider } from "react-i18next";
import { useDispatch, useSelector } from "react-redux";
import { Dispatch } from "redux";
import { commonConfig } from "./extensions";
import useTenantTier from "./extensions/components/subscription/api/subscription";
import { TenantTier } from "./extensions/components/subscription/models/subscription";
import { SubscriptionProvider } from "./extensions/components/subscription/providers/subscription-provider";
import useSignIn from "./features/authentication/hooks/use-sign-in";
import { commonConfig } from "@wso2is/features/admin-extensions-v1";
import useTenantTier from "@wso2is/features/admin-extensions-v1/components/subscription/api/subscription";
import { TenantTier } from "@wso2is/features/admin-extensions-v1/components/subscription/models/subscription";
import { SubscriptionProvider } from "@wso2is/features/admin-extensions-v1/components/subscription/providers/subscription-provider";
import useSignIn from "@wso2is/features/admin-authentication-v1/hooks/use-sign-in";
import {
AppState,
AppUtils,
Expand All @@ -78,15 +78,15 @@ import {
setFilteredDevelopRoutes,
setSanitizedDevelopRoutes,
store
} from "./features/core";
import { AppConstants } from "./features/core/constants";
import { history } from "./features/core/helpers";
import useRoutes from "./features/core/hooks/use-routes";
import useOrganizationSwitch from "./features/organizations/hooks/use-organization-switch";
} from "@wso2is/features/admin-core-v1";
import { AppConstants } from "@wso2is/features/admin-core-v1/constants";
import { history } from "@wso2is/features/admin-core-v1/helpers";
import useRoutes from "@wso2is/features/admin-core-v1/hooks/use-routes";
import useOrganizationSwitch from "@wso2is/features/admin-organizations-v1/hooks/use-organization-switch";
import {
GovernanceCategoryForOrgsInterface,
useGovernanceConnectorCategories
} from "./features/server-configurations";
} from "@wso2is/features/admin-server-configurations-v1";

const App: LazyExoticComponent<FunctionComponent> = lazy(() => import("./app"));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import { PermissionsInterface } from "@wso2is/access-control";
import { hasRequiredScopes } from "@wso2is/core/helpers";
import { FeatureConfigInterface } from "../../core";
import { FeatureConfigInterface } from "../../admin-core-v1";
import { AccessControlConstants } from "../constants/access-control";

export class AccessControlUtils {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import { AxiosError, AxiosRequestConfig, AxiosResponse } from "axios";
import useRequest, {
RequestErrorInterface,
RequestResultInterface
} from "../../core/hooks/use-request";
import { store } from "../../core/store";
} from "../../admin-core-v1/hooks/use-request";
import { store } from "../../admin-core-v1/store";
import { APIResourceInterface, APIResourcePermissionInterface, APIResourcesListInterface, UpdatedAPIResourceInterface }
from "../models";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import { HttpMethods } from "@wso2is/core/models";
import useRequest, { RequestConfigInterface, RequestErrorInterface, RequestResultInterface }
from "../../core/hooks/use-request";
import { store } from "../../core/store";
from "../../admin-core-v1/hooks/use-request";
import { store } from "../../admin-core-v1/store";
import { AuthorizedAPIListItemInterface } from "../models/api-resources";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
} from "@wso2is/react-components";
import React, { FunctionComponent, ReactElement } from "react";
import { useTranslation } from "react-i18next";
import { FeatureConfigInterface } from "../../../core";
import { FeatureConfigInterface } from "../../../admin-core-v1";
import {
APIResourcePanesCommonPropsInterface
} from "../../models";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import { useTranslation } from "react-i18next";
import { useDispatch } from "react-redux";
import { Dispatch } from "redux";
import { Divider } from "semantic-ui-react";
import { AccessControlConstants } from "../../../access-control/constants/access-control";
import { FeatureConfigInterface, history } from "../../../core";
import { AccessControlConstants } from "../../../admin-access-control-v1/constants/access-control";
import { FeatureConfigInterface, history } from "../../../admin-core-v1";
import { deleteAPIResource } from "../../api/api-resources";
import { APIResourcesConstants } from "../../constants/api-resources-constants";
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import React, { FunctionComponent, ReactElement, useEffect, useState } from "rea
import { useTranslation } from "react-i18next";
import { Icon, Input } from "semantic-ui-react";
import { PermissionListAPIResource } from "./permission-list-api-resource";
import { FeatureConfigInterface, getEmptyPlaceholderIllustrations } from "../../../core";
import { FeatureConfigInterface, getEmptyPlaceholderIllustrations } from "../../../admin-core-v1";
import { APIResourcePanesCommonPropsInterface, APIResourcePermissionInterface } from "../../models";
import { AddAPIResourcePermission } from "../wizard";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
import React, { FunctionComponent, ReactElement, ReactNode, SyntheticEvent, useState } from "react";
import { useTranslation } from "react-i18next";
import { Header, Icon, Label, SemanticICONS } from "semantic-ui-react";
import { FeatureConfigInterface, getEmptyPlaceholderIllustrations } from "../../../core";
import { FeatureConfigInterface, getEmptyPlaceholderIllustrations } from "../../../admin-core-v1";
import { APIResourcePanesCommonPropsInterface, APIResourcePermissionInterface } from "../../models";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { useTranslation } from "react-i18next";
import { useDispatch, useSelector } from "react-redux";
import { Dispatch } from "redux";
import { Header, Icon, Label, SemanticICONS } from "semantic-ui-react";
import { AppState, FeatureConfigInterface, UIConstants, getEmptyPlaceholderIllustrations, history } from "../../core";
import { AppState, FeatureConfigInterface, UIConstants, getEmptyPlaceholderIllustrations, history } from "../../admin-core-v1";
import { deleteAPIResource } from "../api";
import { APIResourcesConstants } from "../constants";
import { APIResourceInterface } from "../models";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { useTranslation } from "react-i18next";
import { useDispatch } from "react-redux";
import { Dispatch } from "redux";
import { AuthorizationAPIResource, GeneralAPIResource, PermissionAPIResource } from "./api-resource-panes";
import { FeatureConfigInterface } from "../../core";
import { FeatureConfigInterface } from "../../admin-core-v1";
import { deleteScopeFromAPIResource, updateAPIResource } from "../api";
import { APIResourceInterface, UpdatedAPIResourceInterface } from "../models";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Hint } from "@wso2is/react-components";
import React, { FunctionComponent, ReactElement } from "react";
import { Trans, useTranslation } from "react-i18next";
import { Grid } from "semantic-ui-react";
import { FeatureConfigInterface } from "../../../../core";
import { FeatureConfigInterface } from "../../../../admin-core-v1";
import { getAPIResourcePermissions } from "../../../api";
import { APIResourcesConstants } from "../../../constants";
import { APIResourcePermissionInterface } from "../../../models";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { DocumentationLink, Message, useDocumentation } from "@wso2is/react-comp
import React, { FunctionComponent, ReactElement } from "react";
import { Trans, useTranslation } from "react-i18next";
import { useSelector } from "react-redux";
import { AppState, FeatureConfigInterface } from "../../../../core";
import { AppState, FeatureConfigInterface } from "../../../../admin-core-v1";
import { AuthorizationAPIResourceInterface } from "../../../models";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import React, { FunctionComponent, MutableRefObject, ReactElement, useRef } from
import { Trans, useTranslation } from "react-i18next";
import { useSelector } from "react-redux";
import { Grid } from "semantic-ui-react";
import { AppState, FeatureConfigInterface } from "../../../../core";
import { AppState, FeatureConfigInterface } from "../../../../admin-core-v1";
import { getAPIResourcesForIdenitifierValidation } from "../../../api";
import { APIResourcesConstants } from "../../../constants";
import { APIResourcesListInterface, BasicAPIResourceInterface } from "../../../models";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { useTranslation } from "react-i18next";
import { Grid, Header } from "semantic-ui-react";
import { PermissionMappingList } from "./permission-mapping-list";
import { PermissionMappingListItem } from "./permission-mapping-list-item";
import { FeatureConfigInterface } from "../../../../core";
import { FeatureConfigInterface } from "../../../../admin-core-v1";
import { APIResourcePermissionInterface } from "../../../models";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Hint } from "@wso2is/react-components";
import React, { FunctionComponent, ReactElement } from "react";
import { Trans, useTranslation } from "react-i18next";
import { Grid } from "semantic-ui-react";
import { FeatureConfigInterface } from "../../../../core";
import { FeatureConfigInterface } from "../../../../admin-core-v1";
import { getAPIResourcePermissions } from "../../../api";
import { APIResourcesConstants } from "../../../constants";
import { APIResourcePermissionInterface, PermissionMappingInterface } from "../../../models";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
import React, { FunctionComponent, ReactElement, ReactNode, SyntheticEvent, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Divider, Header, Label, SemanticICONS } from "semantic-ui-react";
import { FeatureConfigInterface } from "../../../../core";
import { FeatureConfigInterface } from "../../../../admin-core-v1";
import { APIResourcePermissionInterface, PermissionMappingInterface } from "../../../models";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { useDispatch } from "react-redux";
import { Dispatch } from "redux";
import { Grid, Icon, Modal } from "semantic-ui-react";
import { AddAPIResourceAuthorization, AddAPIResourceBasic, AddAPIResourcePermissions } from "./add-api-resource-steps";
import { history } from "../../../core";
import { history } from "../../../admin-core-v1";
import { createAPIResource } from "../../api";
import { getAPIResourceWizardStepIcons } from "../../configs";
import { APIResourcesConstants } from "../../constants";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

import { FunctionComponent, SVGProps } from "react";
import { ReactComponent as AuthorizeIcon } from
"../../../themes/default/assets/images/icons/account-policy-icon.svg";
import { ReactComponent as DocumentIcon } from "../../../themes/default/assets/images/icons/document-icon.svg";
import { ReactComponent as KeyIcon } from "../../../themes/default/assets/images/icons/key-icon.svg";
"../../themes/default/assets/images/icons/account-policy-icon.svg";
import { ReactComponent as DocumentIcon } from "../../themes/default/assets/images/icons/document-icon.svg";
import { ReactComponent as KeyIcon } from "../../themes/default/assets/images/icons/key-icon.svg";

export const getAPIResourceWizardStepIcons = (): {
general: FunctionComponent<SVGProps<SVGSVGElement>>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* under the License.
*/

import { AppConstants } from "../../core";
import { AppConstants } from "../../admin-core-v1";

/**
* Class containing API resources constants.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import React, { FunctionComponent, ReactElement, useEffect, useState } from "rea
import { useTranslation } from "react-i18next";
import { useDispatch, useSelector } from "react-redux";
import { Dispatch } from "redux";
import { AppState, FeatureConfigInterface,getEmptyPlaceholderIllustrations, history } from "../../core";
import { AppState, FeatureConfigInterface,getEmptyPlaceholderIllustrations, history } from "../../admin-core-v1";
import { useAPIResourceDetails } from "../api";
import { EditAPIResource } from "../components";
import { APIResourceType, APIResourcesConstants } from "../constants";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
FeatureConfigInterface,
getEmptyPlaceholderIllustrations,
history
} from "../../core";
} from "../../admin-core-v1";
import { useAPIResources } from "../api";
import { APIResourcesList } from "../components";
import { APIResourceCategories, APIResourceType, APIResourcesConstants } from "../constants";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import {
FeatureConfigInterface,
getEmptyPlaceholderIllustrations,
history
} from "../../core";
} from "../../admin-core-v1";
import { useAPIResources } from "../api";
import { APIResourcesList } from "../components";
import { AddAPIResource } from "../components/wizard";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/

import { hasRequiredScopes } from "@wso2is/core/helpers";
import { FeatureConfigInterface } from "../../core";
import { FeatureConfigInterface } from "../../admin-core-v1";
import { APIResourceCategories, APIResourcesConstants } from "../constants/api-resources-constants";

export class APIResourceUtils {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ import AssignGroupWizard from "./assign-group-wizard";
import {
updateApplicationRoleMappedGroups,
useApplicationRoleMappedGroups
} from "../../../extensions/components/application/api";
} from "../../admin-extensions-v1/components/application/api";
import {
ApplicationRoleGroupInterface,
ApplicationRoleGroupsUpdatePayloadInterface
} from "../../../extensions/components/application/models";
import { UIConstants } from "../../core";
import { CONSUMER_USERSTORE } from "../../userstores/constants";
} from "../../admin-extensions-v1/components/application/models";
import { UIConstants } from "../../admin-core-v1";
import { CONSUMER_USERSTORE } from "../../admin-userstores-v1/constants";

interface ApplicationRoleGroupsProps extends IdentifiableComponentInterface {
appId: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ import { Dispatch } from "redux";
import { Grid, Header, Icon, Input } from "semantic-ui-react";
import {
useApplicationRoleInvitedUserGroups, useDescendantsOfSubOrg
} from "../../../extensions/components/application/api";
} from "../../admin-extensions-v1/components/application/api";
import {
ApplicationRoleGroupInterface, DescendantDataInterface
} from "../../../extensions/components/application/models";
import { UIConstants } from "../../core";
import { CONSUMER_USERSTORE } from "../../userstores/constants";
} from "../../admin-extensions-v1/components/application/models";
import { UIConstants } from "../../admin-core-v1";
import { CONSUMER_USERSTORE } from "../../admin-userstores-v1/constants";

interface ApplicationRoleGroupsProps extends IdentifiableComponentInterface {
appId: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import React, { Fragment, ReactElement, useState } from "react";
import { useTranslation } from "react-i18next";
import { Accordion, Grid } from "semantic-ui-react";
import RolesList from "./roles-list";
import { ApplicationRoleInterface } from "../../../extensions/components/groups/models";
import { AppConstants, getEmptyPlaceholderIllustrations, history } from "../../core";
import { ApplicationRoleInterface } from "../../admin-extensions-v1/components/groups/models";
import { AppConstants, getEmptyPlaceholderIllustrations, history } from "../../admin-core-v1";

interface ApplicationRolesListProps extends LoadableComponentInterface, IdentifiableComponentInterface {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import { Grid, Modal } from "semantic-ui-react";
import {
ApplicationRoleGroupInterface,
ApplicationRoleGroupsAPIResponseInterface
} from "../../../extensions/components/application/models";
import { getGroupList } from "../../groups/api";
} from "../../admin-extensions-v1/components/application/models";
import { getGroupList } from "../../admin-groups-v1/api";

/**
* Interface which captures create group props.
Expand Down
Loading
Loading