Merge branch 'release'

Author: b41ex

.github/workflows/ci-workflow.yml

@@ -1,4 +1,4 @@
-name: Frontend & Docker CI Workflow 
+name: build & unit test, build Docker image, run E2E tests 
 
 on:
   push:
@@ -11,13 +11,17 @@ on:
     tags:
       - '**'
   delete:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    paths-ignore:
+      - 'docs/**' 
 
-jobs:
-  call-frontend-ci-workflow:
+jobs:  
+  build-and-unit-test:
     uses: netcracker/qubership-apihub-ci/.github/workflows/frontend-ci.yaml@main
-  call-docker-ci-workflow:
-    needs: call-frontend-ci-workflow
-    if: github.event_name == 'push'
+  build-docker-image:
+    needs: build-and-unit-test
+    if: (github.event_name == 'push') || (github.event_name == 'pull_request')
     uses: netcracker/qubership-apihub-ci/.github/workflows/docker-ci.yml@main
     with:
       name: qubership-apihub-ui
@@ -26,6 +30,20 @@ jobs:
       platforms: linux/amd64,linux/arm64
       labels: |
         maintainer=qubership
-        npm-package-version=${{ needs.call-frontend-ci-workflow.outputs.package_version }}
+        npm-package-version=${{ needs.build-and-unit-test.outputs.package_version }}
     secrets:
       NPMRC: ${{ secrets.NPMRC }}
+  run-e2e-tests:
+    uses: netcracker/qubership-apihub-ci/.github/workflows/run-e2e-tests.yml@main
+    needs: build-docker-image
+    if: github.event_name == 'pull_request'
+    with:
+      postman-collections-run: false
+      apihub-ui-image-tag: ${{ needs.build-docker-image.outputs.image_tag }}      
+      # apihub-backend-image-tag: dev
+      # apihub-build-task-consumer-image-tag: dev
+    secrets:
+      APIHUB_ACCESS_TOKEN: ${{ secrets.APIHUB_ACCESS_TOKEN }}
+      APIHUB_ADMIN_EMAIL: ${{ secrets.APIHUB_ADMIN_EMAIL }}
+      APIHUB_ADMIN_PASSWORD: ${{ secrets.APIHUB_ADMIN_PASSWORD }}
+      JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}   

docs/Portal User Guide.md

@@ -1257,28 +1257,32 @@ For example, you have 3 operations - GET /api/v1/packages, GET /api/v1/package/{
 
 When you specify value of the parameter, there is an option "Recalculate groups in all published versions". If you select it, then after saving the value of the parameter, the system re-calculates groups for all existing versions of current package. If you do not select recalculate option, then configuration will be applied only for the newly published versions.
 
-**Versions**
+## Versions
 The Versions tab contains a list of all versions published in the current package or dashboard. You can edit status and/or labels of the version, to do this, hover over the row with the required version and click **Edit**.
 
 On the current page you can also delete version (with all its revisions). To do this, hover over the row with the required version and click **Delete**.
 
-**Access Tokens**
-In the Access Tokens tab contains you can generate API key for the current group/package/dashboard. API key does not have a period of life and it must be stored on a client side because it shows only once after generation.
+## Access Tokens
 
-To generate an access token, you need to fill the following fields:
-- Name - unique API key name
+API key allows you to authenticate to APIHUB when using APIHUB API. Unlike a Bearer token or [personal access token](#personal-access-token), an API key does not identify the principal (user). Instead, it is primarily used to identify the calling project—such as an application or website—making the APIHUB API call.
+API key is associated with a specific workspace, group, package, or dashboard, limiting its scope. API key does not have a period of life and it must be stored on a client side because it shows only once after generation.
+
+To generate an API key, fill the following fields:
+- Name - unique API key name.
 - Roles - optional field. This field defines the role(s) (i.e. set of permissions) associated with the API key. Multiple values are allowed. If you do not specify a role, the roles of the user who generated the token will be used by default.
-- Created For - owner of the API key. By default, owner of key is current user.
-Once you fill in the required fields, click the Generate button. The system generates the token and displays it. If you leave the page or reload it, the token is not shown again.
-To delete the generated token, hover over the desired token and click **Revoke**.
+- Created For - owner of the API key. By default, owner of key is current user.  
+
+Once you fill in the required fields, click the **Generate** button. The system generates the token and displays it. If you leave the page or reload it, the token is not shown again.
+
+To delete API key, hover over the API key and click **Revoke**.
 
 
 ## User Access Control 
 User Access Control tab allows you to manage members of group/package/dashboard and their roles. 
 
 - User **role** is an entity with a specific set of permissions. You can always see list of available roles and their permissions if you click on question mark on User Access Control page. Roles have hierarchical structure, so even if you have permission to assign roles to the users, you cannot assign the role which is higher than your own role.
 - **Member** is a user which is added to the package/dashboard/group with some role(s). One member can have multiple roles in this case, the list of permissions from each specified role will be combined for the current user.
-Member's roles are inherited from parent groups and workspaces. If some role was assigned to the user, for example, in the group, then it is impossible to remove this role on the child package/package/dashboard. However you can add additional role on the child package/package/dashboard.
+Member's roles are inherited from parent groups and workspaces. If some role was assigned to the user, for example, in the group, then it is impossible to remove this role on the child package/package/dashboard. However, you can add additional role on the child package/package/dashboard.
 
 To add a new member to the package:
 1. Click **Add User**.
@@ -1292,3 +1296,26 @@ To update the role of an existing member:
 To remove a member from the package/dashboard/group:
 1. Hover over the row of the required member and click **Delete**.
 2. You cannot remove a member from the package the member has at least one inherited role or if member have at least one role that is higher than your own role in the current package/dashboard/group.
+
+# My Profile
+
+My Profile page contains your personal settings of APIHUB. To access this page, click on your username located in the top-right corner of the portal header and select My Profile.
+
+The following tabs are available in the My Profile page:
+
+- **Personal Access Tokens** – allows you to manage your personal access tokens.
+
+## Personal Access Tokens
+
+Personal access tokens are an alternative to using API key or Bearer token for authentication to APIHUB when using APIHUB API. Personal access tokens are designed to access APIHUB resources on your behalf.
+
+To generate a personal access token:
+1. Open Personal Access Tokens tab in My Profile page.
+2. Enter a unique token name and select the expiration date.
+3. Click **Generate** button. The system generates the token and displays it. Copy and store the token securely, as it will only be displayed once. If you leave the page or reload it, the token will no longer be shown.
+
+When a token expires, it becomes inactive and can no longer be used to authenticate to APIHUB.
+
+**Note**: You can have up to 100 personal access tokens. If you already have 100 tokens, you must delete some before generating a new one.
+
+To delete the personal access token, hover over the token and click **Revoke**.

lerna.json

@@ -1,4 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.10.1"
+  "version": "2.11.0"
 }

package-lock.json

@@ -33,12 +33,12 @@
     "@mui/lab": "5.0.0-alpha.120",
     "@mui/material": "5.11.10",
     "@mui/private-theming": "5.11.9",
-    "@netcracker/qubership-apihub-api-diff": "1.0.4",
-    "@netcracker/qubership-apihub-api-doc-viewer": "2.0.6",
-    "@netcracker/qubership-apihub-api-processor": "3.0.6",
+    "@netcracker/qubership-apihub-api-diff": "1.1.0",
+    "@netcracker/qubership-apihub-api-doc-viewer": "2.0.7",
+    "@netcracker/qubership-apihub-api-processor": "3.1.0",
     "@netcracker/qubership-apihub-api-unifier": "1.0.4",
     "@netcracker/qubership-apihub-api-visitor": "1.0.5",
-    "@netcracker/qubership-apihub-apispec-view": "1.0.23",
+    "@netcracker/qubership-apihub-apispec-view": "1.0.24",
     "@netcracker/qubership-apihub-class-view": "1.0.3",
     "@netcracker/qubership-apihub-rest-playground": "1.0.8",
     "@otjs/monaco": "0.2.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-ui-agents",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "license": "Apache-2.0",
   "files": [
     "/dist"

packages/agents/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-ui-editor",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "license": "Apache-2.0",
   "files": [
     "/dist"

packages/editor/package.json

@@ -77,7 +77,7 @@ const PublishProjectVersionPopup: FC<PopupProps> = memo<PopupProps>(({ open, set
 
   const defaultPackageKey = usePackageKey()
   const [versionsFilter, setVersionsFilter] = useState('')
-  const [versions, areVersionsLoading] = usePackageVersions({ packageKey: defaultPackageKey, textFilter: versionsFilter })
+  const { versions, areVersionsLoading } = usePackageVersions({ packageKey: defaultPackageKey, textFilter: versionsFilter })
 
   const previousVersionOptions = usePreviousVersionOptions()
 

packages/editor/src/routes/root/EditorPage/ProjectEditorPage/ProjectEditorToolbar/PublishProjectVersionDialog.tsx

@@ -22,7 +22,7 @@ import { usePackageKey } from '../../usePackage'
 
 export function usePreviousVersionOptions(): VersionKey[] {
   const defaultPackageKey = usePackageKey()
-  const [versions] = usePackageVersions({ packageKey: defaultPackageKey, status: RELEASE_VERSION_STATUS })
+  const { versions } = usePackageVersions({ packageKey: defaultPackageKey, status: RELEASE_VERSION_STATUS })
 
   return useMemo(() => ([
     NO_PREVIOUS_RELEASE_VERSION_OPTION,

packages/editor/src/routes/root/EditorPage/ProjectEditorPage/usePreviousVersionOptions.ts

@@ -1,6 +1,6 @@
 {
   "name": "@netcracker/qubership-apihub-ui-portal",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "license": "Apache-2.0",
   "files": [
     "/dist"