Skip to content

Commit 001984f

Browse files
DonOmalVindulaDonOmalVindula
committed
Merge branch 'master' into fix/30299
2 parents 5cbff80 + 17e6766 commit 001984f

File tree

67 files changed

+388
-3528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+388
-3528
lines changed

‎apps/console/CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# @wso2is/console
22

3+
## 2.54.6
4+
5+
### Patch Changes
6+
7+
- [#8105](https://github.com/wso2/identity-apps/pull/8105) [`0657f736d806026521afa9d909f9daca000be7b2`](https://github.com/wso2/identity-apps/commit/0657f736d806026521afa9d909f9daca000be7b2) Thanks [@JayaShakthi97](https://github.com/JayaShakthi97)! - Fix attributes view for sub organizations
8+
9+
- Updated dependencies [[`0657f736d806026521afa9d909f9daca000be7b2`](https://github.com/wso2/identity-apps/commit/0657f736d806026521afa9d909f9daca000be7b2)]:
10+
- @wso2is/[email protected]
11+
- @wso2is/[email protected]
12+
13+
## 2.54.5
14+
15+
### Patch Changes
16+
17+
- [#8104](https://github.com/wso2/identity-apps/pull/8104) [`f09d6502a5796e8bbddbb0c17b113d3c3dd95360`](https://github.com/wso2/identity-apps/commit/f09d6502a5796e8bbddbb0c17b113d3c3dd95360) Thanks [@savindi7](https://github.com/savindi7)! - Remove unnecessary extension configs in Connections.
18+
19+
* [#8080](https://github.com/wso2/identity-apps/pull/8080) [`54903f70d0f1e8cc35d964b0b16a3c0ee7b1175b`](https://github.com/wso2/identity-apps/commit/54903f70d0f1e8cc35d964b0b16a3c0ee7b1175b) Thanks [@hwupathum](https://github.com/hwupathum)! - Remove in-app privacy pages in Console & My Account
20+
21+
* Updated dependencies [[`f09d6502a5796e8bbddbb0c17b113d3c3dd95360`](https://github.com/wso2/identity-apps/commit/f09d6502a5796e8bbddbb0c17b113d3c3dd95360), [`54903f70d0f1e8cc35d964b0b16a3c0ee7b1175b`](https://github.com/wso2/identity-apps/commit/54903f70d0f1e8cc35d964b0b16a3c0ee7b1175b)]:
22+
- @wso2is/[email protected]
23+
- @wso2is/[email protected]
24+
- @wso2is/[email protected]
25+
- @wso2is/[email protected]
26+
327
## 2.54.4
428

529
### Patch Changes

‎apps/console/java/org.wso2.identity.apps.console.server.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-console</artifactId>
26-
<version>2.54.5-SNAPSHOT</version>
26+
<version>2.54.7-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

‎apps/console/java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-console</artifactId>
2626
<packaging>pom</packaging>
27-
<version>2.54.5-SNAPSHOT</version>
27+
<version>2.54.7-SNAPSHOT</version>
2828
<name>WSO2 Identity Server Console - Parent</name>
2929
<description>WSO2 Identity Server Console Parent</description>
3030

‎apps/console/java/webapp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-console</artifactId>
26-
<version>2.54.5-SNAPSHOT</version>
26+
<version>2.54.7-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

‎apps/console/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "@wso2is/console",
4-
"version": "2.54.4",
4+
"version": "2.54.6",
55
"description": "WSO2 Identity Server Console",
66
"author": "WSO2",
77
"license": "Apache-2.0",
@@ -57,14 +57,14 @@
5757
"@wso2is/admin.authorization.v1": "^2.25.88",
5858
"@wso2is/admin.branding.v1": "^2.29.0",
5959
"@wso2is/admin.certificates.v1": "^2.25.203",
60-
"@wso2is/admin.claims.v1": "^2.27.119",
61-
"@wso2is/admin.connections.v1": "^2.33.93",
60+
"@wso2is/admin.claims.v1": "^2.27.120",
61+
"@wso2is/admin.connections.v1": "^2.33.94",
6262
"@wso2is/admin.console-settings.v1": "^2.25.208",
63-
"@wso2is/admin.core.v1": "^2.43.4",
63+
"@wso2is/admin.core.v1": "^2.43.5",
6464
"@wso2is/admin.email-and-sms.v1": "^2.25.203",
6565
"@wso2is/admin.email-management.v1": "^2.25.204",
6666
"@wso2is/admin.email-providers.v1": "^2.25.203",
67-
"@wso2is/admin.extensions.v1": "^2.37.8",
67+
"@wso2is/admin.extensions.v1": "^2.37.9",
6868
"@wso2is/admin.feature-gate.v1": "^1.6.1",
6969
"@wso2is/admin.groups.v1": "^2.27.118",
7070
"@wso2is/admin.home.v1": "^1.7.2",
@@ -93,15 +93,15 @@
9393
"@wso2is/admin.username-validation.v1": "^1.5.203",
9494
"@wso2is/admin.users.v1": "^2.31.0",
9595
"@wso2is/admin.validation.v1": "^2.27.142",
96-
"@wso2is/admin.userstores.v1": "^2.27.31",
96+
"@wso2is/admin.userstores.v1": "^2.27.32",
9797
"@wso2is/admin.workflow-approvals.v1": "^2.25.203",
9898
"@wso2is/admin.wsfed-configuration.v1": "^2.25.203",
9999
"@wso2is/common.ui.v1": "^0.2.0",
100100
"@wso2is/core": "^2.7.4",
101101
"@wso2is/dynamic-forms": "^2.4.40",
102102
"@wso2is/form": "^2.6.35",
103103
"@wso2is/forms": "^2.3.22",
104-
"@wso2is/i18n": "^2.22.16",
104+
"@wso2is/i18n": "^2.22.17",
105105
"@wso2is/react-components": "^2.9.13",
106106
"@wso2is/theme": "^2.7.6",
107107
"@wso2is/validation": "^2.4.2",

‎apps/console/src/configs/routes.tsx

-9
Original file line numberDiff line numberDiff line change
@@ -1533,15 +1533,6 @@ export const getFullScreenViewRoutes = (): RouteInterface[] => {
15331533
*/
15341534
export const getDefaultLayoutRoutes = (): RouteInterface[] => {
15351535
return [
1536-
{
1537-
component: lazy(() => import("@wso2is/admin.core.v1/pages/privacy")),
1538-
icon: null,
1539-
id: "privacy",
1540-
name: "console:common.sidePanel.privacy",
1541-
path: AppConstants.getPaths().get("PRIVACY"),
1542-
protected: true,
1543-
showOnSidePanel: false
1544-
},
15451536
{
15461537
children: [
15471538
{

‎apps/myaccount/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# @wso2is/myaccount
22

3+
## 2.19.7
4+
5+
### Patch Changes
6+
7+
- [#8080](https://github.com/wso2/identity-apps/pull/8080) [`54903f70d0f1e8cc35d964b0b16a3c0ee7b1175b`](https://github.com/wso2/identity-apps/commit/54903f70d0f1e8cc35d964b0b16a3c0ee7b1175b) Thanks [@hwupathum](https://github.com/hwupathum)! - Remove in-app privacy pages in Console & My Account
8+
9+
- Updated dependencies [[`54903f70d0f1e8cc35d964b0b16a3c0ee7b1175b`](https://github.com/wso2/identity-apps/commit/54903f70d0f1e8cc35d964b0b16a3c0ee7b1175b)]:
10+
- @wso2is/i18n@2.22.17
11+
312
## 2.19.6
413

514
### Patch Changes

‎apps/myaccount/java/org.wso2.identity.apps.myaccount.server.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-myaccount</artifactId>
26-
<version>2.19.7-SNAPSHOT</version>
26+
<version>2.19.8-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

‎apps/myaccount/java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-myaccount</artifactId>
2626
<packaging>pom</packaging>
27-
<version>2.19.7-SNAPSHOT</version>
27+
<version>2.19.8-SNAPSHOT</version>
2828
<name>WSO2 Identity Server MyAccount - Parent</name>
2929
<description>WSO2 Identity Server MyAccount Parent</description>
3030

‎apps/myaccount/java/webapp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.wso2.identity.apps</groupId>
2525
<artifactId>identity-apps-myaccount</artifactId>
26-
<version>2.19.7-SNAPSHOT</version>
26+
<version>2.19.8-SNAPSHOT</version>
2727
<relativePath>../pom.xml</relativePath>
2828
</parent>
2929

‎apps/myaccount/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"name": "@wso2is/myaccount",
4-
"version": "2.19.6",
4+
"version": "2.19.7",
55
"description": "WSO2 Identity Server My Account",
66
"author": "WSO2",
77
"license": "Apache-2.0",
@@ -47,7 +47,7 @@
4747
"@wso2is/common.ui.v1": "^0.2.0",
4848
"@wso2is/core": "^2.7.4",
4949
"@wso2is/forms": "^2.3.23",
50-
"@wso2is/i18n": "^2.22.13",
50+
"@wso2is/i18n": "^2.22.17",
5151
"@wso2is/react-components": "^2.9.12",
5252
"@wso2is/theme": "^2.6.11",
5353
"@wso2is/validation": "^2.4.1",

‎apps/myaccount/src/configs/routes.tsx

+1-12
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,7 @@ import { AppLayout, AuthLayout, DashboardLayout, DefaultLayout, ErrorLayout } fr
2929
*/
3030
export const getDefaultLayoutRoutes = (): RouteInterface[] => {
3131

32-
return [
33-
{
34-
component: lazy(() => import("../pages/privacy")),
35-
exact: true,
36-
icon: null,
37-
id: "privacy",
38-
name: "common:privacy",
39-
path: AppConstants.getPaths().get("PRIVACY"),
40-
protected: true,
41-
showOnSidePanel: false
42-
}
43-
];
32+
return [];
4433
};
4534

4635
/**

‎apps/myaccount/src/pages/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@ export * from "./consent-management";
2222
export * from "./errors";
2323
export * from "./overview";
2424
export * from "./personal-info";
25-
export * from "./privacy";

0 commit comments

Comments
 (0)