Merge remote-tracking branch 'upstream/master' into ft_branding_page_…

…variants # Conflicts: # features/admin.branding.v1/constants/custom-text-preference-constants.ts
wso2 · May 14, 2024 · 272d4e3 · 272d4e3
2 parents 41428b0 + ce2b732
commit 272d4e3
Show file tree

Hide file tree

Showing 318 changed files with 22,187 additions and 32,676 deletions.
diff --git a/.changeset/quick-pears-impress.md b/.changeset/quick-pears-impress.md
@@ -0,0 +1,6 @@
+---
+"@wso2is/features": minor
+"@wso2is/console": patch
+---
+
+Add SMS OTP configurations for the password recovery connector edit page.
diff --git a/.changeset/six-penguins-clean.md b/.changeset/six-penguins-clean.md
@@ -0,0 +1,7 @@
+---
+"@wso2is/identity-apps-core": minor
+"@wso2is/i18n": minor
+"@wso2is/features": patch
+---
+
+Adds sms otp support to password recovery flows.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -302,7 +302,8 @@ module.exports = {
                     // [1] https://eslint.org/docs/latest/rules/no-restricted-imports#group
                     // [2] https://stackoverflow.com/q/68126222/8810941
                     "apps/**/*",
-                    "modules/**/*"
+                    "modules/**/*",
+                    "features/**/*"
                 ]
             }
         ],

diff --git a/.github/workflows/pr-builder.yml b/.github/workflows/pr-builder.yml
@@ -9,7 +9,6 @@ on:
     paths-ignore:
       - "**.md"
       - "LICENSE"
-  workflow_dispatch:
 
 # Avoid running multiple builds for the same PR.
 concurrency:
@@ -27,7 +26,7 @@ jobs:
     strategy:
       matrix:
         node-version: [ lts/* ]
-        pnpm-version: [ latest ]
+        pnpm-version: [ 8.7.4 ]
     steps:
       - name: ⬇️ Checkout
         id: checkout
@@ -91,7 +90,7 @@ jobs:
     strategy:
       matrix:
         node-version: [ lts/* ]
-        pnpm-version: [ latest ]
+        pnpm-version: [ 8.7.4 ]
     steps:
       - name: ⬇️ Checkout
         id: checkout
@@ -145,13 +144,12 @@ jobs:
 
   test:
     name: 👾 Unit Test (TESTING)
-    if: false
     needs: [ lint, typecheck ]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [ lts/* ]
-        pnpm-version: [ latest ]
+        pnpm-version: [ 8.7.4 ]
     steps:
       - name: ⬇️ Checkout
         id: checkout
@@ -193,9 +191,13 @@ jobs:
 
       - name: 🃏 Run Jest & Collect Coverage
         id: run-jest-test-and-coverage
-        run: pnpm test:unit:coverage
+        # TODO: Update the command to "test:unit:coverage" once the coverage command related issues
+        # are sorted out
+        run: pnpm test:unit
 
       - name: 🤖 Aggregate Test Coverage
+        # TODO: Enable this step once the coverage command related issues are fixed
+        if: false
         id: aggregate-coverage-reports
         run: |
           pnpm test:unit:coverage:aggregate
@@ -204,14 +206,14 @@ jobs:
 
   build:
     name: 🚧 Build
-    needs: [ typecheck ]
+    needs: [ test, typecheck ]
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [ lts/* ]
         maven-version: [ 3.8.6 ]
         java-version: [ 1.8 ]
-        pnpm-version: [ latest ]
+        pnpm-version: [ 8.7.4 ]
     steps:
       - name: ⬇️ Checkout
         id: checkout

diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
@@ -44,7 +44,7 @@ jobs:
                 node-version: [lts/*]
                 maven-version: [3.8.6]
                 java-version: [1.8]
-                pnpm-version: [latest]
+                pnpm-version: [8.7.4]
         steps:
             - name: ⬇️ Checkout
               id: checkout

diff --git a/.gitignore b/.gitignore
@@ -118,10 +118,6 @@ identity-apps-core/apps/*/src/main/webapp/libs/themes
 identity-apps-core/apps/*/src/main/webapp/extensions/layouts
 identity-apps-core/apps/*/src/main/webapp/includes/layouts
 
-# Integration test module.
-tests/output/
-tests/dist/
-
 .classpath
 .settings
 .factorypath

diff --git a/apps/console/CHANGELOG.md b/apps/console/CHANGELOG.md
@@ -1,5 +1,160 @@
 # @wso2is/console
 
+## 2.18.4
+
+### Patch Changes
+
+- Updated dependencies [[`45230ac3693311e287bd85c66c77ea96a90fa71f`](https://github.com/wso2/identity-apps/commit/45230ac3693311e287bd85c66c77ea96a90fa71f), [`e66c06769768ae564a68fb9b40c6b8add8ade58c`](https://github.com/wso2/identity-apps/commit/e66c06769768ae564a68fb9b40c6b8add8ade58c)]:
+  - @wso2is/features@2.18.4
+
+## 2.18.3
+
+### Patch Changes
+
+- Updated dependencies [[`931c4df0ca2166d5d57eac06624d173b0adc8889`](https://github.com/wso2/identity-apps/commit/931c4df0ca2166d5d57eac06624d173b0adc8889)]:
+  - @wso2is/features@2.18.3
+
+## 2.18.2
+
+### Patch Changes
+
+- Updated dependencies [[`77c1b97834932cfc3cec372d4005d3d5e1de1e46`](https://github.com/wso2/identity-apps/commit/77c1b97834932cfc3cec372d4005d3d5e1de1e46), [`9beedd16003ce305af2a7497652fd35dcd787814`](https://github.com/wso2/identity-apps/commit/9beedd16003ce305af2a7497652fd35dcd787814)]:
+  - @wso2is/features@2.18.2
+  - @wso2is/theme@2.0.82
+  - @wso2is/react-components@2.2.1
+  - @wso2is/dynamic-forms@2.0.59
+  - @wso2is/form@2.0.60
+
+## 2.18.1
+
+### Patch Changes
+
+- Updated dependencies [[`c2866febec26052bb1c27c11d6534d80a0bf163a`](https://github.com/wso2/identity-apps/commit/c2866febec26052bb1c27c11d6534d80a0bf163a)]:
+  - @wso2is/features@2.18.1
+
+## 2.18.0
+
+### Minor Changes
+
+- [#6217](https://github.com/wso2/identity-apps/pull/6217) [`5670d713f4bc6ee962a858b8f9c91f9c2e4b6f13`](https://github.com/wso2/identity-apps/commit/5670d713f4bc6ee962a858b8f9c91f9c2e4b6f13) Thanks [@JayaShakthi97](https://github.com/JayaShakthi97)! - Add support to display custom outbound provisioning connectors
+
+### Patch Changes
+
+- Updated dependencies [[`2f26bd622b68d20836b718db7735794470882b22`](https://github.com/wso2/identity-apps/commit/2f26bd622b68d20836b718db7735794470882b22), [`ecd8c4c52baa9286cce6441bf3428c2f371b9576`](https://github.com/wso2/identity-apps/commit/ecd8c4c52baa9286cce6441bf3428c2f371b9576), [`5670d713f4bc6ee962a858b8f9c91f9c2e4b6f13`](https://github.com/wso2/identity-apps/commit/5670d713f4bc6ee962a858b8f9c91f9c2e4b6f13)]:
+  - @wso2is/features@2.18.0
+
+## 2.17.6
+
+### Patch Changes
+
+- [#6227](https://github.com/wso2/identity-apps/pull/6227) [`ad005f630a54d3606ccd2719819b9429fa18b66c`](https://github.com/wso2/identity-apps/commit/ad005f630a54d3606ccd2719819b9429fa18b66c) Thanks [@kayathiri4](https://github.com/kayathiri4)! - Hide Organization creator in the sub org's user list in old runtime
+
+## 2.17.5
+
+### Patch Changes
+
+- Updated dependencies [[`0bc46b679cb17b58e93a2896f1a4a12437d7b975`](https://github.com/wso2/identity-apps/commit/0bc46b679cb17b58e93a2896f1a4a12437d7b975), [`35beeca02117863c7f0e362d0539b8319ab2d2a0`](https://github.com/wso2/identity-apps/commit/35beeca02117863c7f0e362d0539b8319ab2d2a0)]:
+  - @wso2is/features@2.17.5
+
+## 2.17.4
+
+### Patch Changes
+
+- Updated dependencies [[`9c1fcee2598632c01e2b4cdee15e38a36b24e62f`](https://github.com/wso2/identity-apps/commit/9c1fcee2598632c01e2b4cdee15e38a36b24e62f)]:
+  - @wso2is/features@2.17.4
+
+## 2.17.3
+
+### Patch Changes
+
+- Updated dependencies [[`4bcb6efd50e85a3e5b7b045e8f16d0c43aa98f9a`](https://github.com/wso2/identity-apps/commit/4bcb6efd50e85a3e5b7b045e8f16d0c43aa98f9a), [`53c2ce76e7875421529bc58a9b117dbe92bae057`](https://github.com/wso2/identity-apps/commit/53c2ce76e7875421529bc58a9b117dbe92bae057)]:
+  - @wso2is/features@2.17.3
+
+## 2.17.2
+
+### Patch Changes
+
+- Updated dependencies [[`1161a8b83249f2a4b2074fa6e9f9462556184f75`](https://github.com/wso2/identity-apps/commit/1161a8b83249f2a4b2074fa6e9f9462556184f75)]:
+  - @wso2is/features@2.17.2
+
+## 2.17.1
+
+### Patch Changes
+
+- [#6213](https://github.com/wso2/identity-apps/pull/6213) [`c7d98e3dce516f9b5c4d6e8f7b4b464600513584`](https://github.com/wso2/identity-apps/commit/c7d98e3dce516f9b5c4d6e8f7b4b464600513584) Thanks [@brionmario](https://github.com/brionmario)! - [Temp] Revert https://github.com/wso2/identity-apps/pull/6183/files
+
+- Updated dependencies [[`c6727a6a0b18f3f8e440ce1e3c9218df5d407476`](https://github.com/wso2/identity-apps/commit/c6727a6a0b18f3f8e440ce1e3c9218df5d407476), [`c7d98e3dce516f9b5c4d6e8f7b4b464600513584`](https://github.com/wso2/identity-apps/commit/c7d98e3dce516f9b5c4d6e8f7b4b464600513584)]:
+  - @wso2is/features@2.17.1
+
+## 2.17.0
+
+### Minor Changes
+
+- [#6135](https://github.com/wso2/identity-apps/pull/6135) [`84979a7505525ba134771c988750dca9ce0159d5`](https://github.com/wso2/identity-apps/commit/84979a7505525ba134771c988750dca9ce0159d5) Thanks [@JayaShakthi97](https://github.com/JayaShakthi97)! - Move session refresh logic to Application level
+
+### Patch Changes
+
+- Updated dependencies [[`84979a7505525ba134771c988750dca9ce0159d5`](https://github.com/wso2/identity-apps/commit/84979a7505525ba134771c988750dca9ce0159d5)]:
+  - @wso2is/react-components@2.2.0
+  - @wso2is/features@2.17.0
+  - @wso2is/core@2.0.45
+  - @wso2is/dynamic-forms@2.0.58
+  - @wso2is/form@2.0.59
+  - @wso2is/access-control@3.0.5
+  - @wso2is/forms@2.0.35
+  - @wso2is/i18n@2.2.17
+
+## 2.16.20
+
+### Patch Changes
+
+- Updated dependencies [[`f99d54c605a6b66ca819c3a5d8c84faa14d4dc5a`](https://github.com/wso2/identity-apps/commit/f99d54c605a6b66ca819c3a5d8c84faa14d4dc5a), [`66d927c6c19200543ca59d83480c5ce10ec514c8`](https://github.com/wso2/identity-apps/commit/66d927c6c19200543ca59d83480c5ce10ec514c8)]:
+  - @wso2is/features@2.16.17
+
+## 2.16.19
+
+### Patch Changes
+
+- Updated dependencies [[`4301300b2e55cc54430994c2da348df9f4df9f9b`](https://github.com/wso2/identity-apps/commit/4301300b2e55cc54430994c2da348df9f4df9f9b)]:
+  - @wso2is/features@2.16.16
+
+## 2.16.18
+
+### Patch Changes
+
+- [#6204](https://github.com/wso2/identity-apps/pull/6204) [`763fc4fc5bbddad49df648a0c51038cc945717bb`](https://github.com/wso2/identity-apps/commit/763fc4fc5bbddad49df648a0c51038cc945717bb) Thanks [@brionmario](https://github.com/brionmario)! - Fix CI build
+
+- Updated dependencies [[`763fc4fc5bbddad49df648a0c51038cc945717bb`](https://github.com/wso2/identity-apps/commit/763fc4fc5bbddad49df648a0c51038cc945717bb)]:
+  - @wso2is/features@2.16.15
+  - @wso2is/access-control@3.0.4
+  - @wso2is/core@2.0.44
+  - @wso2is/dynamic-forms@2.0.57
+  - @wso2is/form@2.0.58
+  - @wso2is/forms@2.0.34
+  - @wso2is/i18n@2.2.16
+  - @wso2is/react-components@2.1.28
+  - @wso2is/theme@2.0.81
+  - @wso2is/validation@2.0.5
+
+## 2.16.17
+
+### Patch Changes
+
+- Updated dependencies [[`6ff4f5724d4deb5d95927c847b3cb4a08d6b9c1e`](https://github.com/wso2/identity-apps/commit/6ff4f5724d4deb5d95927c847b3cb4a08d6b9c1e)]:
+  - @wso2is/features@2.16.14
+
+## 2.16.16
+
+### Patch Changes
+
+- Updated dependencies [[`93751a250f`](https://github.com/wso2/identity-apps/commit/93751a250f63efafafbbbe2f69d773b522d284ee), [`6ec05095ae`](https://github.com/wso2/identity-apps/commit/6ec05095aea46006d918b4b961a449cab50c6013)]:
+  - @wso2is/theme@2.0.80
+  - @wso2is/i18n@2.2.15
+  - @wso2is/features@2.16.13
+  - @wso2is/react-components@2.1.27
+  - @wso2is/dynamic-forms@2.0.56
+  - @wso2is/form@2.0.57
+
 ## 2.16.15
 
 ### Patch Changes

diff --git a/apps/console/java/org.wso2.identity.apps.console.server.feature/pom.xml b/apps/console/java/org.wso2.identity.apps.console.server.feature/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.identity.apps</groupId>
         <artifactId>identity-apps-console</artifactId>
-        <version>2.16.15-SNAPSHOT</version>
+        <version>2.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...le/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2 b/...le/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2
@@ -1818,6 +1818,9 @@
                 {% endfor %}
             {% endif %}
         ],
+        {% if console.ui.is_editing_system_roles_allowed is defined %}
+        "isEditingSystemRolesAllowed": {{ console.ui.is_editing_system_roles_allowed }},
+        {% endif %}
         {% if console.ui.isXacmlConnectorEnabled is defined %}
         "isXacmlConnectorEnabled": {{ console.ui.isXacmlConnectorEnabled }},
         {% endif %}

diff --git a/apps/console/java/pom.xml b/apps/console/java/pom.xml
@@ -24,7 +24,7 @@
     <groupId>org.wso2.identity.apps</groupId>
     <artifactId>identity-apps-console</artifactId>
     <packaging>pom</packaging>
-    <version>2.16.15-SNAPSHOT</version>
+    <version>2.18.5-SNAPSHOT</version>
     <name>WSO2 Identity Server Console - Parent</name>
     <description>WSO2 Identity Server Console Parent</description>
 

diff --git a/apps/console/java/webapp/pom.xml b/apps/console/java/webapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.identity.apps</groupId>
         <artifactId>identity-apps-console</artifactId>
-        <version>2.16.15-SNAPSHOT</version>
+        <version>2.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/apps/console/package.json b/apps/console/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@wso2is/console",
-    "version": "2.16.15",
+    "version": "2.18.4",
     "description": "WSO2 Identity Server Console",
     "author": "WSO2",
     "license": "Apache-2.0",
@@ -48,16 +48,16 @@
         "@mui/utils": "^5.12.3",
         "@oxygen-ui/react": "^1.11.0",
         "@oxygen-ui/react-icons": "^1.11.0",
-        "@wso2is/access-control": "^3.0.3",
-        "@wso2is/core": "^2.0.43",
-        "@wso2is/dynamic-forms": "^2.0.55",
-        "@wso2is/form": "^2.0.56",
-        "@wso2is/forms": "^2.0.33",
-        "@wso2is/i18n": "^2.2.14",
-        "@wso2is/react-components": "^2.1.26",
-        "@wso2is/theme": "^2.0.79",
-        "@wso2is/validation": "^2.0.4",
-        "@wso2is/features": "^2.16.12",
+        "@wso2is/access-control": "^3.0.5",
+        "@wso2is/core": "^2.0.45",
+        "@wso2is/dynamic-forms": "^2.0.59",
+        "@wso2is/form": "^2.0.60",
+        "@wso2is/forms": "^2.0.35",
+        "@wso2is/i18n": "^2.2.17",
+        "@wso2is/react-components": "^2.2.1",
+        "@wso2is/theme": "^2.0.82",
+        "@wso2is/validation": "^2.0.5",
+        "@wso2is/features": "^2.18.4",
         "axios": "^0.19.2",
         "codemirror": "^5.52.0",
         "country-language": "^0.1.7",
@@ -71,8 +71,6 @@
         "js-beautify": "^1.13.0",
         "lodash-es": "^4.17.21",
         "moment": "^2.24.0",
-        "monaco-editor": "^0.48.0",
-        "monaco-editor-webpack-plugin": "^7.1.0",
         "mustache": "^4.2.0",
         "node-forge": "^0.10.0",
         "rc-tree": "^4.0.0-beta.2",