Skip to content

Commit

Permalink
Merge pull request #5849 from thiva-k/features-refactor
Browse files Browse the repository at this point in the history
Features refactor
  • Loading branch information
brionmario committed Mar 29, 2024
2 parents e87d770 + 00ea371 commit 62a65a1
Show file tree
Hide file tree
Showing 2,088 changed files with 11,007 additions and 2,631 deletions.
5 changes: 5 additions & 0 deletions .changeset/eighty-pants-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@wso2is/console": minor
---

Refactor features into root
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.13",
"@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

0 comments on commit 62a65a1

Please sign in to comment.