Skip to content

Commit

Permalink
Merge pull request #7313 from JeethJJ/policy-administration-feature
Browse files Browse the repository at this point in the history
UI for the XACML Connector
  • Loading branch information
JeethJJ authored Jan 17, 2025
2 parents 1a48c43 + 563925f commit ba4fe33
Show file tree
Hide file tree
Showing 116 changed files with 4,198 additions and 466 deletions.
66 changes: 66 additions & 0 deletions .changeset/new-teachers-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
---
"@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.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.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.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.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.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/identity-apps-core": patch
"@wso2is/myaccount": patch
"@wso2is/console": patch
"@wso2is/i18n": patch
"@wso2is/features": patch
---

Bump oxygen version
10 changes: 10 additions & 0 deletions .changeset/witty-ants-allow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@wso2is/admin.policy-administration.v1": major
"@wso2is/react-components": patch
"@wso2is/admin.core.v1": patch
"@wso2is/console": patch
"@wso2is/i18n": patch
"@wso2is/features": patch
---

Introduce policyAdministration UI.
5 changes: 3 additions & 2 deletions apps/console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.actions.v1": "^1.7.40",
"@wso2is/admin.administrators.v1": "^2.29.83",
Expand Down Expand Up @@ -77,6 +77,7 @@
"@wso2is/admin.private-key-jwt.v1": "^2.25.83",
"@wso2is/admin.remote-repository-configuration.v1": "^2.25.83",
"@wso2is/admin.impersonation.v1": "^1.6.83",
"@wso2is/admin.policy-administration.v1": "^0.0.0",
"@wso2is/admin.remote-userstores.v1": "^1.7.39",
"@wso2is/admin.roles.v1": "^2.25.83",
"@wso2is/admin.roles.v2": "^2.27.27",
Expand Down
25 changes: 25 additions & 0 deletions apps/console/src/configs/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,31 @@ export const getAppViewRoutes = (): RouteInterface[] => {
protected: true,
showOnSidePanel: true
},
{
category: "console:common.sidePanel.policyAdministration",
children: [
{
component: lazy(() => import("@wso2is/admin.policy-administration.v1/pages/edit-policy")),
exact: true,
id: "editPolicy",
name: "Edit Policy",
path: AppConstants.getPaths().get("EDIT_POLICY"),
protected: true,
showOnSidePanel: false
}
],
component: lazy(() => import("@wso2is/admin.policy-administration.v1/pages/policy-administration")),
exact: true,
icon: {
icon: getSidePanelIcons().policyAdministration
},
id: "policyAdministration",
name: "Policy Administration",
order: 30,
path: AppConstants.getPaths().get("POLICY_ADMINISTRATION"),
protected: true,
showOnSidePanel: true
},
{
category: "console:develop.features.sidePanel.categories.application",
children: [
Expand Down
1 change: 1 addition & 0 deletions apps/console/src/public/deployment.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,7 @@
"scopes": {
"create": [],
"delete": [],
"feature": [],
"read": [],
"update": []
}
Expand Down
4 changes: 2 additions & 2 deletions apps/myaccount/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"@babel/polyfill": "^7.0.0",
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.organizations.v1": "^2.26.83",
"@wso2is/common.branding.v1": "^2.25.56",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.actions.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dependencies": {
"@asgardeo/auth-react": "^5.1.2",
"@mui/material": "^5.13.0",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.core.v1": "^2.35.21",
"@wso2is/admin.extensions.v1": "^2.36.8",
Expand Down
2 changes: 1 addition & 1 deletion features/admin.administrators.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.applications.v1": "^2.30.83",
"@wso2is/admin.authentication.v1": "workspace:^2.25.83",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@wso2is/admin.applications.v1": "^2.30.83",
"@wso2is/admin.claims.v1": "^2.26.42",
"@wso2is/admin.core.v1": "^2.35.21",
Expand Down
2 changes: 1 addition & 1 deletion features/admin.api-resources.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/core": "^2.5.5",
"@wso2is/form": "^2.6.12",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.api-resources.v2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/core": "^2.5.5",
"@wso2is/form": "^2.6.12",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.applications.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.api-resources.v2": "^2.25.83",
"@wso2is/admin.authentication-flow-builder.v1": "^2.24.83",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ const ScriptEditorPanel = (props: PropsWithChildren<ScriptEditorPanelPropsInterf
</div>
<div className="secret-selection-menu-wrapper">
{ secretMgtFeatureConfig?.enabled &&
hasSecretReadPermissions && (
hasSecretReadPermissions && (
<SecretSelectionDropdown
open={ isSecretSelectionDropdownOpen }
onClose={ () => setIsSecretSelectionDropdownOpen(false) }
Expand Down
4 changes: 2 additions & 2 deletions features/admin.authentication-flow-builder.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/core": "^2.5.5",
"@wso2is/react-components": "^2.8.19",
"@wso2is/admin.applications.v1": "^2.30.83",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.authorization.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/core": "^2.5.5",
"@wso2is/dynamic-forms": "^2.4.19",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.branding.ai.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.branding.v1": "^2.27.56",
"@wso2is/admin.core.v1": "^2.35.21",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.branding.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.branding.ai.v1": "^2.26.83",
"@wso2is/admin.core.v1": "^2.35.21",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.certificates.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.core.v1": "^2.35.21",
"@wso2is/core": "^2.5.5",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.claims.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.claims.v1": "^2.26.42",
"@wso2is/admin.core.v1": "^2.35.21",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.connections.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.applications.v1": "^2.30.83",
"@wso2is/admin.claims.v1": "^2.26.42",
Expand Down
4 changes: 2 additions & 2 deletions features/admin.console-settings.v1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@mui/material": "^5.13.0",
"@mui/system": "^5.12.3",
"@mui/utils": "^5.12.3",
"@oxygen-ui/react": "^2.2.0",
"@oxygen-ui/react-icons": "^2.2.0",
"@oxygen-ui/react": "^2.3.0",
"@oxygen-ui/react-icons": "^2.3.0",
"@wso2is/access-control": "^3.3.9",
"@wso2is/admin.administrators.v1": "^2.29.83",
"@wso2is/admin.applications.v1": "^2.30.83",
Expand Down
3 changes: 3 additions & 0 deletions features/admin.core.v1/configs/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { getScopesResourceEndpoints } from "@wso2is/admin.oidc-scopes.v1";
import { getInsightsResourceEndpoints } from "@wso2is/admin.org-insights.v1/config/org-insights";
import { getOrganizationsResourceEndpoints } from "@wso2is/admin.organizations.v1/configs";
import { OrganizationUtils } from "@wso2is/admin.organizations.v1/utils";
import { getPolicyAdministrationResourceEndpoints } from "@wso2is/admin.policy-administration.v1/configs";
import { getRemoteFetchConfigResourceEndpoints } from "@wso2is/admin.remote-repository-configuration.v1";
import { getRolesResourceEndpoints } from "@wso2is/admin.roles.v2/configs/endpoints";
import { getSecretsManagementEndpoints } from "@wso2is/admin.secrets.v1/configs/endpoints";
Expand Down Expand Up @@ -211,6 +212,7 @@ export class Config {
I18nConstants.APPLICATION_TEMPLATES_NAMESPACE,
I18nConstants.ACTIONS_NAMESPACE,
I18nConstants.TENANTS_NAMESPACE,
I18nConstants.POLICY_ADMINISTRATION_NAMESPACE,
I18nConstants.REMOTE_USER_STORES_NAMESPACE
],
preload: []
Expand Down Expand Up @@ -270,6 +272,7 @@ export class Config {
...getApplicationTemplatesResourcesEndpoints(this.resolveServerHost()),
...getActionsResourceEndpoints(this.resolveServerHost()),
...getSmsTemplateResourceEndpoints(this.resolveServerHost()),
...getPolicyAdministrationResourceEndpoints(this.resolveServerHost()),
CORSOrigins: `${ this.getDeploymentConfig()?.serverHost }/api/server/v1/cors/origins`,
// TODO: Remove this endpoint and use ID token to get the details
me: `${ this.getDeploymentConfig()?.serverHost }/scim2/Me`,
Expand Down
2 changes: 2 additions & 0 deletions features/admin.core.v1/configs/ui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ export const getTechnologyLogos = (): GetTechnologyLogosInterface => {
*/
export type GetSidePanelIconsInterface = {
adminAdvisoryBanner: FunctionComponent | ReactNode,
policyAdministration: FunctionComponent | ReactNode,
administrators: FunctionComponent | ReactNode,
apiResources: FunctionComponent | ReactNode,
applicationRoles: FunctionComponent | ReactNode,
Expand Down Expand Up @@ -294,6 +295,7 @@ export const getSidePanelIcons = (): GetSidePanelIconsInterface => {
return {
adminAdvisoryBanner: AdminAdvisoryBannerIcon,
administrators: AdminOutlineIcon,
policyAdministration: AdminOutlineIcon,
apiResources: CloudConnectionOutlineIcon,
appLogs: IDPMetadataIcon,
applicationRoles: ApplicationRolesIcon,
Expand Down
4 changes: 3 additions & 1 deletion features/admin.core.v1/constants/app-constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ export class AppConstants {
`${ AppConstants.getAdminViewBasePath()}/actions/pre-issue-access-token` ],
[ "TENANTS", `${AppConstants.getDefaultLayoutBasePath()}/organizations` ],
[ "EDIT_TENANT", `${AppConstants.getDefaultLayoutBasePath()}/organizations/:id` ],
[ "SYSTEM_SETTINGS", `${AppConstants.getDefaultLayoutBasePath()}/organizations/system-settings` ]
[ "SYSTEM_SETTINGS", `${AppConstants.getDefaultLayoutBasePath()}/organizations/system-settings` ],
[ "POLICY_ADMINISTRATION", `${AppConstants.getAdminViewBasePath()}/policy-administration` ],
[ "EDIT_POLICY", `${AppConstants.getAdminViewBasePath()}/policy-administration/edit-policy/:id` ]
]);

return paths;
Expand Down
7 changes: 7 additions & 0 deletions features/admin.core.v1/constants/i18n-constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@ export class I18nConstants {
*/
public static readonly REMOTE_USER_STORES_NAMESPACE: string = I18nModuleConstants.REMOTE_USER_STORES_NAMESPACE;


/**
* Policy Administration namespace.
*/
public static readonly POLICY_ADMINISTRATION_NAMESPACE: string = I18nModuleConstants.POLICY_ADMINISTRATION_NAMESPACE;

/**
* Locations of the I18n namespaces.
*/
Expand Down Expand Up @@ -327,6 +333,7 @@ export class I18nConstants {
[ I18nConstants.IMPERSONATION_CONFIGURATION_NAMESPACE, "portals" ],
[ I18nConstants.ACTIONS_NAMESPACE, "portals" ],
[ I18nConstants.TENANTS_NAMESPACE, "portals" ],
[ I18nConstants.POLICY_ADMINISTRATION_NAMESPACE, "portals" ],
[ I18nConstants.REMOTE_USER_STORES_NAMESPACE, "portals" ]
]);

Expand Down
5 changes: 3 additions & 2 deletions features/admin.core.v1/models/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { ConnectionResourceEndpointsInterface } from "@wso2is/admin.connections.
import { GroupsResourceEndpointsInterface } from "@wso2is/admin.groups.v1/models/endpoints";
import { ScopesResourceEndpointsInterface } from "@wso2is/admin.oidc-scopes.v1";
import { OrganizationResourceEndpointsInterface } from "@wso2is/admin.organizations.v1/models";
import { PolicyAdministrationEndpointsInterface } from "@wso2is/admin.policy-administration.v1/models/endpoints";
import { RolesResourceEndpointsInterface } from "@wso2is/admin.roles.v2/models/endpoints";
import { SecretsManagementEndpoints } from "@wso2is/admin.secrets.v1/models/endpoints";
import { ServerConfigurationsResourceEndpointsInterface } from "@wso2is/admin.server-configurations.v1";
Expand Down Expand Up @@ -575,8 +576,8 @@ export interface ServiceResourceEndpointsInterface extends ClaimResourceEndpoint
ExtensionTemplatesEndpointsInterface,
ApplicationsTemplatesEndpointsInterface,
SMSTemplateResourceEndpointsInterface,
ActionsResourceEndpointsInterface {

ActionsResourceEndpointsInterface,
PolicyAdministrationEndpointsInterface {
CORSOrigins: string;
// TODO: Remove this endpoint and use ID token to get the details
me: string;
Expand Down
Loading

0 comments on commit ba4fe33

Please sign in to comment.