Merge branch 'release' into 'master'

Merge 'release' into 'master' See merge request passbolt/passbolt-styleguide!1232
passbolt · Jun 26, 2023 · 18ab99f · 18ab99f
2 parents a8a17c1 + bcc8b6a
commit 18ab99f
Show file tree

Hide file tree

Showing 588 changed files with 12,156 additions and 3,424 deletions.
diff --git a/.gitlab-ci/scripts/bin/publish.sh b/.gitlab-ci/scripts/bin/publish.sh
@@ -15,6 +15,10 @@ echo always-auth=true >> .npmrc
 
 if is_release_candidate "$CI_COMMIT_TAG"; then
   npm publish --tag next
+elif is_release_alpha "$CI_COMMIT_TAG"; then
+  npm publish --tag alpha
+elif is_release_beta "$CI_COMMIT_TAG"; then
+  npm publish --tag beta
 else
   npm publish
 fi
diff --git a/.gitlab-ci/scripts/lib/version-check.sh b/.gitlab-ci/scripts/lib/version-check.sh
@@ -13,6 +13,22 @@ function is_release_candidate () {
   return 0
 }
 
+function is_release_alpha () {
+  local version=$1
+  if [[ ! $version =~ [0-9]+\.[0-9]+\.[0-9]+-alpha\.[0-9]+ ]];then
+    return 1
+  fi
+  return 0
+}
+
+function is_release_beta () {
+  local version=$1
+  if [[ ! $version =~ [0-9]+\.[0-9]+\.[0-9]+-beta\.[0-9]+ ]];then
+    return 1
+  fi
+  return 0
+}
+
 function validate_config_version_and_api_tag () {
   local version_file="$1"
   local version
@@ -22,5 +38,4 @@ function validate_config_version_and_api_tag () {
     echo "Version number in version.php does not match the tag: $PASSBOLT_VERSION"
     return 1
   fi
-}
-
+}
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -18,7 +18,7 @@ module.exports = {
     "builder": "webpack5",
     "disableTelemetry": true,
   },
-  "staticDirs": ['../src'],
+  "staticDirs": ['../src', {from: '../src', to: '/webAccessibleResources' }],
   "env": (config) => ({
     ...config,
     ORIGIN_URL: 'https://passbolt.github.io/passbolt_styleguide',

diff --git a/.storybook/preview.js b/.storybook/preview.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import AppContext from '../src/react-extension/contexts/AppContext';
+import AppContext from '../src/shared/context/AppContext/AppContext';
 import MockTranslationProvider from "../src/react-extension/test/mock/components/Internationalisation/MockTranslationProvider";
 
 // Mock jest.fn to be able to use jest test data mock in storybook.

diff --git a/demo/api-app/mock/request/mockGetRecoverSettings.js b/demo/api-app/mock/request/mockGetRecoverSettings.js
@@ -11,13 +11,14 @@
  * @link          https://www.passbolt.com Passbolt(tm)
  * @since         3.0.0
  */
+import {TEST_ROLE_USER_ID} from "../../../../src/shared/models/entity/role/role.test.data";
 
 export default () => {
   return {
     body: {
       user: {
         "id": "f848277c-5398-58f8-a82a-72397af2d450",
-        "role_id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+        "role_id": TEST_ROLE_USER_ID,
         "username": "ada@passbolt.com",
         "first_name": "Ada",
         "last_name": "Lovelace",
@@ -52,7 +53,7 @@ export default () => {
         },
         "groups_users": [],
         "role": {
-          "id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+          "id": TEST_ROLE_USER_ID,
           "name": "user",
           "description": "Logged in user",
           "created": "2012-07-04T13:39:25+00:00",

diff --git a/demo/api-app/mock/request/mockGetRequestLoggedInUser.js b/demo/api-app/mock/request/mockGetRequestLoggedInUser.js
@@ -1,6 +1,8 @@
 /**
  * return LoggedInUser get request fetch
  */
+import {TEST_ROLE_ADMIN_ID} from "../../../../src/shared/models/entity/role/role.test.data";
+
 export default () => {
   return {
     "header": {
@@ -15,7 +17,7 @@ export default () => {
     },
     "body": {
       "id": "d57c10f5-639d-5160-9c81-8a0c6c4ec856",
-      "role_id": "0d51c3a8-5e67-5e3d-882f-e1868966d817",
+      "role_id": TEST_ROLE_ADMIN_ID,
       "username": "admin@passbolt.com",
       "active": true,
       "deleted": false,
@@ -108,7 +110,7 @@ export default () => {
         }
       ],
       "role": {
-        "id": "0d51c3a8-5e67-5e3d-882f-e1868966d817",
+        "id": TEST_ROLE_ADMIN_ID,
         "name": "admin",
         "description": "Organization administrator",
         "created": "2012-07-04T13:39:25+00:00",

diff --git a/demo/api-app/mock/request/mockGetRequestSimulateSynchronize.js b/demo/api-app/mock/request/mockGetRequestSimulateSynchronize.js
@@ -1,6 +1,8 @@
 /**
  * return LoggedInUser get request fetch
  */
+import {TEST_ROLE_USER_ID} from "../../../../src/shared/models/entity/role/role.test.data";
+
 export default () => {
   return {
     "header": {
@@ -122,7 +124,7 @@ export default () => {
                 }
               }
             },
-            "role_id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+            "role_id": TEST_ROLE_USER_ID,
             "deleted": false,
             "created": "2020-11-11T09:14:12+00:00",
             "modified": "2020-11-11T09:14:12+00:00",
@@ -171,7 +173,7 @@ export default () => {
                 }
               }
             },
-            "role_id": "a58de6d3-f52c-5080-b79b-a601a647ac85",
+            "role_id": TEST_ROLE_USER_ID,
             "deleted": false,
             "created": "2020-11-11T09:14:12+00:00",
             "modified": "2020-11-11T09:14:12+00:00",