Skip to content

Commit

Permalink
Merge branch 'master' of github.com:wso2/identity-apps into linked-ac…
Browse files Browse the repository at this point in the history
…counts-oidc
  • Loading branch information
savindi7 committed Aug 26, 2024
2 parents 9df5af6 + 0813e5b commit 2f32a7d
Show file tree
Hide file tree
Showing 207 changed files with 8,724 additions and 1,182 deletions.
484 changes: 484 additions & 0 deletions apps/console/CHANGELOG.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.identity.apps</groupId>
<artifactId>identity-apps-console</artifactId>
<version>2.24.2-SNAPSHOT</version>
<version>2.26.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion apps/console/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<groupId>org.wso2.identity.apps</groupId>
<artifactId>identity-apps-console</artifactId>
<packaging>pom</packaging>
<version>2.24.2-SNAPSHOT</version>
<version>2.26.6-SNAPSHOT</version>
<name>WSO2 Identity Server Console - Parent</name>
<description>WSO2 Identity Server Console Parent</description>

Expand Down
2 changes: 1 addition & 1 deletion apps/console/java/webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.identity.apps</groupId>
<artifactId>identity-apps-console</artifactId>
<version>2.24.2-SNAPSHOT</version>
<version>2.26.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
98 changes: 50 additions & 48 deletions apps/console/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@wso2is/console",
"version": "2.24.1",
"version": "2.26.5",
"description": "WSO2 Identity Server Console",
"author": "WSO2",
"license": "Apache-2.0",
Expand Down Expand Up @@ -47,55 +47,57 @@
"@oxygen-ui/react": "^1.13.6",
"@oxygen-ui/react-icons": "^1.13.6",
"@wso2is/access-control": "^3.0.20",
"@wso2is/admin.actions.v1": "^1.0.16",
"@wso2is/admin.administrators.v1": "^2.22.1",
"@wso2is/admin.alternative-login-identifier.v1": "^1.0.17",
"@wso2is/admin.api-resources.v1": "^2.20.129",
"@wso2is/admin.api-resources.v2": "^2.20.129",
"@wso2is/admin.applications.v1": "^2.23.17",
"@wso2is/admin.authentication.v1": "^2.20.129",
"@wso2is/admin.authorization.v1": "^2.20.54",
"@wso2is/admin.branding.v1": "^2.20.129",
"@wso2is/admin.certificates.v1": "^2.20.129",
"@wso2is/admin.claims.v1": "^2.20.129",
"@wso2is/admin.connections.v1": "^2.21.59",
"@wso2is/admin.console-settings.v1": "^2.20.129",
"@wso2is/admin.core.v1": "^2.26.1",
"@wso2is/admin.email-and-sms.v1": "^2.20.129",
"@wso2is/admin.email-management.v1": "^2.20.129",
"@wso2is/admin.email-providers.v1": "^2.20.129",
"@wso2is/admin.extensions.v1": "^2.24.2",
"@wso2is/admin.groups.v1": "^2.20.129",
"@wso2is/admin.home.v1": "^1.0.2",
"@wso2is/admin.identity-verification-providers.v1": "^2.20.129",
"@wso2is/admin.logs.v1": "^1.0.4",
"@wso2is/admin.oidc-scopes.v1": "^2.20.129",
"@wso2is/admin.org-insights.v1": "^2.20.129",
"@wso2is/admin.organization-discovery.v1": "^2.20.129",
"@wso2is/admin.organizations.v1": "^2.21.22",
"@wso2is/admin.private-key-jwt.v1": "^2.20.129",
"@wso2is/admin.remote-repository-configuration.v1": "^2.20.129",
"@wso2is/admin.impersonation.v1": "^1.1.71",
"@wso2is/admin.roles.v1": "^2.20.129",
"@wso2is/admin.roles.v2": "^2.20.129",
"@wso2is/admin.saml2-configuration.v1": "^2.20.129",
"@wso2is/admin.secrets.v1": "^2.20.129",
"@wso2is/admin.server-configurations.v1": "^2.21.71",
"@wso2is/admin.server.v1": "^2.20.129",
"@wso2is/admin.session-management.v1": "^2.20.129",
"@wso2is/admin.sms-providers.v1": "^2.20.129",
"@wso2is/admin.tenants.v1": "^2.21.1",
"@wso2is/admin.username-validation.v1": "^1.0.17",
"@wso2is/admin.users.v1": "^2.21.1",
"@wso2is/admin.validation.v1": "^2.20.129",
"@wso2is/admin.userstores.v1": "^2.20.129",
"@wso2is/admin.workflow-approvals.v1": "^2.20.129",
"@wso2is/admin.wsfed-configuration.v1": "^2.20.129",
"@wso2is/admin.actions.v1": "^1.0.25",
"@wso2is/admin.administrators.v1": "^2.23.5",
"@wso2is/admin.alternative-login-identifier.v1": "^1.0.26",
"@wso2is/admin.api-resources.v1": "^2.20.138",
"@wso2is/admin.api-resources.v2": "^2.20.138",
"@wso2is/admin.applications.v1": "^2.23.26",
"@wso2is/admin.authentication.v1": "^2.20.138",
"@wso2is/admin.authorization.v1": "^2.20.55",
"@wso2is/admin.branding.v1": "^2.20.138",
"@wso2is/admin.certificates.v1": "^2.20.138",
"@wso2is/admin.claims.v1": "^2.20.138",
"@wso2is/admin.connections.v1": "^2.21.68",
"@wso2is/admin.console-settings.v1": "^2.20.138",
"@wso2is/admin.core.v1": "^2.27.8",
"@wso2is/admin.email-and-sms.v1": "^2.20.138",
"@wso2is/admin.email-management.v1": "^2.20.138",
"@wso2is/admin.email-providers.v1": "^2.20.138",
"@wso2is/admin.extensions.v1": "^2.24.11",
"@wso2is/admin.groups.v1": "^2.20.138",
"@wso2is/admin.home.v1": "^1.0.11",
"@wso2is/admin.identity-verification-providers.v1": "^2.20.138",
"@wso2is/admin.logs.v1": "^1.0.13",
"@wso2is/admin.oidc-scopes.v1": "^2.20.138",
"@wso2is/admin.org-insights.v1": "^2.20.138",
"@wso2is/admin.organization-discovery.v1": "^2.20.138",
"@wso2is/admin.organizations.v1": "^2.21.31",
"@wso2is/admin.private-key-jwt.v1": "^2.20.138",
"@wso2is/admin.remote-repository-configuration.v1": "^2.20.138",
"@wso2is/admin.impersonation.v1": "^1.1.80",
"@wso2is/admin.remote-userstores.v1": "^1.0.5",
"@wso2is/admin.roles.v1": "^2.20.138",
"@wso2is/admin.roles.v2": "^2.21.5",
"@wso2is/admin.saml2-configuration.v1": "^2.20.138",
"@wso2is/admin.secrets.v1": "^2.20.138",
"@wso2is/admin.server-configurations.v1": "^2.21.80",
"@wso2is/admin.server.v1": "^2.20.138",
"@wso2is/admin.session-management.v1": "^2.20.138",
"@wso2is/admin.sms-providers.v1": "^2.20.138",
"@wso2is/admin.subscription.v1": "^1.0.8",
"@wso2is/admin.tenants.v1": "^2.21.10",
"@wso2is/admin.username-validation.v1": "^1.0.26",
"@wso2is/admin.users.v1": "^2.21.10",
"@wso2is/admin.validation.v1": "^2.20.138",
"@wso2is/admin.userstores.v1": "^2.20.138",
"@wso2is/admin.workflow-approvals.v1": "^2.20.138",
"@wso2is/admin.wsfed-configuration.v1": "^2.20.138",
"@wso2is/core": "^2.0.60",
"@wso2is/dynamic-forms": "^2.0.95",
"@wso2is/form": "^2.1.3",
"@wso2is/forms": "^2.0.50",
"@wso2is/i18n": "^2.5.22",
"@wso2is/i18n": "^2.5.23",
"@wso2is/react-components": "^2.4.2",
"@wso2is/theme": "^2.1.0",
"@wso2is/validation": "^2.0.9",
Expand Down Expand Up @@ -137,8 +139,8 @@
"styled-components": "^4.4.1",
"swr": "^2.0.0",
"uuid": "^8.3.0",
"@wso2is/admin.application-templates.v1": "^1.0.17",
"@wso2is/admin.template-core.v1": "^1.0.17"
"@wso2is/admin.application-templates.v1": "^1.0.26",
"@wso2is/admin.template-core.v1": "^1.0.26"
},
"devDependencies": {
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
Expand Down
9 changes: 4 additions & 5 deletions apps/console/src/protected-app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ import { MultitenantConstants } from "@wso2is/admin.core.v1/constants/multitenan
import { history } from "@wso2is/admin.core.v1/helpers";
import useUIConfig from "@wso2is/admin.core.v1/hooks/use-ui-configs";
import { commonConfig } from "@wso2is/admin.extensions.v1";
import useTenantTier from "@wso2is/admin.extensions.v1/components/subscription/api/subscription";
import { TenantTier } from "@wso2is/admin.extensions.v1/components/subscription/models/subscription";
import { SubscriptionProvider }
from "@wso2is/admin.extensions.v1/components/subscription/providers/subscription-provider";
import useOrganizationSwitch from "@wso2is/admin.organizations.v1/hooks/use-organization-switch";
import useGetTenantTier from "@wso2is/admin.subscription.v1/api/use-get-tenant-tier";
import { TenantTier } from "@wso2is/admin.subscription.v1/models/tenant-tier";
import SubscriptionProvider from "@wso2is/admin.subscription.v1/providers/subscription-provider";
import { CONSUMER_USERSTORE } from "@wso2is/admin.userstores.v1/constants/user-store-constants";
import {
AppConstants as CommonAppConstants } from "@wso2is/core/constants";
Expand Down Expand Up @@ -108,7 +107,7 @@ export const ProtectedApp: FunctionComponent<AppPropsInterface> = (): ReactEleme

const { setUIConfig } = useUIConfig();

const { data: tenantTier } = useTenantTier();
const { data: tenantTier } = useGetTenantTier();

const { filterRoutes } = useRoutes();

Expand Down
73 changes: 73 additions & 0 deletions apps/myaccount/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,78 @@
# @wso2is/myaccount

## 2.7.140

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.139

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.138

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.137

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.136

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.135

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.134

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.133

### Patch Changes

- Updated dependencies [[`087a548e2f5c4565b6da489ff1632154c566772f`](https://github.com/wso2/identity-apps/commit/087a548e2f5c4565b6da489ff1632154c566772f)]:
- @wso2is/i18n@2.5.23
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.132

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/common[email protected]

## 2.7.131

### Patch Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.identity.apps</groupId>
<artifactId>identity-apps-myaccount</artifactId>
<version>2.7.132-SNAPSHOT</version>
<version>2.7.141-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion apps/myaccount/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<groupId>org.wso2.identity.apps</groupId>
<artifactId>identity-apps-myaccount</artifactId>
<packaging>pom</packaging>
<version>2.7.132-SNAPSHOT</version>
<version>2.7.141-SNAPSHOT</version>
<name>WSO2 Identity Server MyAccount - Parent</name>
<description>WSO2 Identity Server MyAccount Parent</description>

Expand Down
2 changes: 1 addition & 1 deletion apps/myaccount/java/webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.wso2.identity.apps</groupId>
<artifactId>identity-apps-myaccount</artifactId>
<version>2.7.132-SNAPSHOT</version>
<version>2.7.141-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions apps/myaccount/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@wso2is/myaccount",
"version": "2.7.131",
"version": "2.7.140",
"description": "WSO2 Identity Server My Account",
"author": "WSO2",
"license": "Apache-2.0",
Expand Down Expand Up @@ -42,11 +42,11 @@
"@oxygen-ui/react": "^1.13.6",
"@oxygen-ui/react-icons": "^1.13.6",
"@wso2is/access-control": "^3.0.20",
"@wso2is/admin.organizations.v1": "^2.21.22",
"@wso2is/common.branding.v1": "^2.20.129",
"@wso2is/admin.organizations.v1": "^2.21.31",
"@wso2is/common.branding.v1": "^2.20.138",
"@wso2is/core": "^2.0.60",
"@wso2is/forms": "^2.0.50",
"@wso2is/i18n": "^2.5.22",
"@wso2is/i18n": "^2.5.23",
"@wso2is/react-components": "^2.4.2",
"@wso2is/theme": "^2.1.0",
"@wso2is/validation": "^2.0.9",
Expand Down
7 changes: 7 additions & 0 deletions features/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @wso2is/features

## 2.21.63

### Patch Changes

- Updated dependencies [[`087a548e2f5c4565b6da489ff1632154c566772f`](https://github.com/wso2/identity-apps/commit/087a548e2f5c4565b6da489ff1632154c566772f)]:
- @wso2is/i18n@2.5.23

## 2.21.62

### Patch Changes
Expand Down
75 changes: 75 additions & 0 deletions features/admin.actions.v1/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,80 @@
# @wso2is/admin.actions.v1

## 1.0.25

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.24

### Patch Changes

- [#6811](https://github.com/wso2/identity-apps/pull/6811) [`fa4abc1547b12fa195310a289365bee4ae8e3ff2`](https://github.com/wso2/identity-apps/commit/fa4abc1547b12fa195310a289365bee4ae8e3ff2) Thanks [@ashanthamara](https://github.com/ashanthamara)! - Fix data-componentids in actions component

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.23

### Patch Changes

- Updated dependencies [[`1d8f2a9b051645e69100e76bf49b452fc0ff0f8e`](https://github.com/wso2/identity-apps/commit/1d8f2a9b051645e69100e76bf49b452fc0ff0f8e)]:
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.22

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.21

### Patch Changes

- Updated dependencies [[`b2af4ec80a8e2d58b82ef855636ef4fb51d442b5`](https://github.com/wso2/identity-apps/commit/b2af4ec80a8e2d58b82ef855636ef4fb51d442b5)]:
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.20

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.19

### Patch Changes

- Updated dependencies []:
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.18

### Patch Changes

- Updated dependencies [[`087a548e2f5c4565b6da489ff1632154c566772f`](https://github.com/wso2/identity-apps/commit/087a548e2f5c4565b6da489ff1632154c566772f)]:
- @wso2is/i18n@2.5.23
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.17

### Patch Changes

- Updated dependencies [[`6fd5b32c01294438785c9f6ac9ad15ad310036f8`](https://github.com/wso2/identity-apps/commit/6fd5b32c01294438785c9f6ac9ad15ad310036f8)]:
- @wso2is/admin[email protected]
- @wso2is/admin[email protected]

## 1.0.16

### Patch Changes
Expand Down
Loading

0 comments on commit 2f32a7d

Please sign in to comment.