Merge remote-tracking branch 'origin/devel' into next/24.12.0

.husky/commit-msg

@@ -1 +1 @@
-npx commitlint --edit $1
+commitlint --edit $1

Jenkinsfile

@@ -5,115 +5,27 @@
  */
 
 // git utils
-int getCommitParentsCount() {
-    return Integer.parseInt(
-        sh(
-            script: """#!/usr/bin/env bash
-                git cat-file -p HEAD | grep -w "parent" | wc -l
-            """,
-            returnStdout: true
-        ).trim()
-    )
-}
-
-boolean gitIsMergeCommit() {
-    return 2 <= getCommitParentsCount()
-}
-
-void gitFixConfigAndRemote() {
-    sh(
-        script: """#!/usr/bin/env bash
-            git config user.email "bot@zextras.com"
-            git config user.name "Tarsier Bot"
-        """
-    )
-    String repoOriginUrl = sh(
-        script: """#!/usr/bin/env bash
-            git remote -v | head -n1 | cut -d\$'\t' -f2 | cut -d\" \" -f1
-        """,
-        returnStdout: true
-    ).trim()
-    String newOriginUrl = repoOriginUrl.replaceFirst("https://github.com/Zextras", "git@github.com:Zextras")
-    sh(
-        script: """#!/usr/bin/env bash
-            git remote set-url origin ${newOriginUrl}
-        """
-    )
-}
-
-void gitUnshallow() {
-    sh(
-      script: """#!/usr/bin/env bash
-        git fetch --unshallow
-      """
-    )
-}
-
-void gitSetup() {
-    gitFixConfigAndRemote()
-    gitUnshallow()
-}
-
-String getCommitVersion() {
-    return sh(
-        script: """#!/usr/bin/env bash
-            git log -1 | grep \'version:\' | sed -n \'s/.*version:\\s*//p\'
-        """,
-        returnStdout: true
-    ).trim()
+String getRepositoryName() {
+    return sh(script: '''#!/bin/bash
+        git remote -v | head -n1 | cut -d$'\t' -f2 | cut -d' ' -f1 | sed -e 's!https://github.com/!!g' -e 's!git@github.com:!!g' -e 's!.git!!g'
+    ''', returnStdout: true).trim()
 }
 
-String getCommitId() {
-    return sh(
-        script: """#!/usr/bin/env bash
-            git rev-parse HEAD
-        """,
-        returnStdout: true
-    ).trim()
+String getLastTag() {
+    return sh(script: '''#!/bin/bash
+        git describe --tags --abbrev=0
+    ''', returnStdout: true).trim()
 }
 
-void gitPush(Map opts = [:]) {
-    def gitOptions = [' ']
-    if (opts.followTags == true) {
-        gitOptions << '--follow-tags'
-    }
-    if (gitOptions.size() > 1) {
-        gitOptions << ' '
+Boolean tagExistsAtHead() {
+    try {
+        sh(script: '''#!/bin/bash
+            git describe --tags --exact-match
+        ''', returnStdout: true)
+        return true
+    } catch (err) {
+        return false
     }
-
-    sh(
-        script: """#!/usr/bin/env bash
-            git push${gitOptions.join(' ')}origin HEAD:${opts.branch}
-        """
-    )
-}
-
-String getOriginUrl() {
-    return sh(
-      script: """#!/usr/bin/env bash
-        git remote -v | head -n1 | cut -d\$'\t' -f2 | cut -d\" \" -f1
-      """,
-      returnStdout: true
-    ).trim()
-}
-
-void openGithubPr(Map args = [:]) {
-    def ownerAndRepo = getOriginUrl().replaceAll("git@github.com:", "").replaceAll(".git", "")
-    echo "Opening PR with https://api.github.com/repos/${ownerAndRepo}/pulls"
-    sh(
-        script: """#!/usr/bin/env bash
-            curl --location https://api.github.com/repos/${ownerAndRepo}/pulls \
-            -X POST \
-            -H 'Accept: application/vnd.github+json' \
-            -H 'Authorization: Bearer ${args.TOKEN}' \
-            -d '{
-                \"title\": \"${args.title}\",
-                \"head\": \"${args.head}\",
-                \"base\": \"${args.base}\",
-                \"maintainer_can_modify\": true
-            }'
-        """
-    )
 }
 
 // Package utils
@@ -127,26 +39,6 @@ String getPackageName() {
     ).trim()
 }
 
-String getPackageDescription() {
-    return sh(
-        script: """#!/usr/bin/env bash
-            cat package.json \
-            | jq --raw-output '.description'
-            """,
-        returnStdout: true
-    ).trim()
-}
-
-String getPackageVersion() {
-    return sh(
-        script: """#!/usr/bin/env bash
-            cat package.json \
-            | jq --raw-output '.version'
-            """,
-        returnStdout: true
-    ).trim()
-}
-
 // node utils
 void nodeCmd(Map args = [:]) {
     final boolean install = (args.install != null) ? args.install : false
@@ -195,14 +87,9 @@ void npmLogin(String npmAuthToken) {
 Boolean isReleaseBranch
 Boolean isDevelBranch
 Boolean isPullRequest
-Boolean isMergeCommit
-Boolean isBumpBuild
 Boolean lcovIsPresent
 // PROJECT DETAILS
 String pkgName
-String pkgVersion
-String pkgVersionFull
-String[] pkgVersionParts
 
 pipeline {
     agent {
@@ -245,18 +132,8 @@ pipeline {
                     echo "isDevelBranch: ${isDevelBranch}"
                     isPullRequest = "${BRANCH_NAME}" ==~ /PR-\d+/
                     echo "isPullRequest: ${isPullRequest}"
-                    isMergeCommit = gitIsMergeCommit()
-                    echo "isMergeCommit: ${isMergeCommit}"
-                    isBumpBuild = isReleaseBranch && isMergeCommit
-                    echo "isBumpBuild: ${isBumpBuild}"
-                    isDevBuild = !isReleaseBranch
-                    echo "isDevBuild: ${isDevBuild}"
                     pkgName = getPackageName()
                     echo "pkgName: ${pkgName}"
-                    pkgDescription = getPackageDescription()
-                    echo "pkgDescription: ${pkgDescription}"
-                    pkgFullVersion = getPackageVersion()
-                    echo "pkgFullVersion: ${pkgFullVersion}"
                     isSonarQubeEnabled = params.RUN_SONARQUBE == true && (isPullRequest || isDevelBranch || isReleaseBranch)
                     echo "isSonarQubeEnabled: ${isSonarQubeEnabled}"
                 }
@@ -436,6 +313,39 @@ pipeline {
                 }
             }
         }
+        stage('Open release to devel pull request') {
+            when {
+                beforeAgent true
+                allOf {
+                    expression { isReleaseBranch == true }
+                    expression { tagExistsAtHead() == true }
+                }
+            }
+            steps {
+                script {
+                    catchError(buildResult: "UNSTABLE", stageResult: "FAILURE") {
+                        String versionBumperBranchName = "version-bumper/${getLastTag()}"
+                        sh(script: """#!/bin/bash
+                            git push origin HEAD:refs/heads/${versionBumperBranchName}
+                        """)
+                        withCredentials([usernamePassword(credentialsId: 'tarsier-bot-pr-token-github', usernameVariable: 'GH_USERNAME', passwordVariable: 'GH_TOKEN')]) {
+                            sh(script: """
+                                curl https://api.github.com/repos/${getRepositoryName()}/pulls \
+                                -X POST \
+                                -H 'Accept: application/vnd.github.v3+json' \
+                                -H 'Authorization: token ${GH_TOKEN}' \
+                                -d '{
+                                    \"title\": \"chore(release): ${getLastTag()}\",
+                                    \"head\": \"${versionBumperBranchName}\",
+                                    \"base\": \"devel\",
+                                    \"maintainer_can_modify\": true
+                                }'
+                            """)
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 

THIRDPARTIES

@@ -15,7 +15,6 @@ MIT License (MIT) applies to:
 @testing-library/react, Copyright (c) 2017 Kent C. Dodds
 @testing-library/user-event, Copyright (c) 2020 Giorgio Polvara
 @types/jest, Copyright (c) Microsoft Corporation.
-@types/lodash, Copyright (c) Microsoft Corporation.
 @types/node, Copyright (c) Microsoft Corporation.
 @types/react-dom, Copyright (c) Microsoft Corporation.
 @types/react, Copyright (c) Microsoft Corporation.
@@ -29,7 +28,6 @@ is-ci, Copyright (c) 2016-2021 Thomas Watson Steen
 jest-environment-jsdom, Copyright (c) Meta Platforms, Inc. and affiliates.
 jest-fail-on-console, Copyright (c) 2022 Valentin Hervieu
 jest, Copyright (c) Meta Platforms, Inc. and affiliates.
-lodash, Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
 react-dom, Copyright (c) Facebook, Inc. and its affiliates.
 react-pdf, Copyright (c) 2017–2023 Wojciech Maj
 react, Copyright (c) Facebook, Inc. and its affiliates.

docs/api/carbonio-ui-preview.imagepreview.md

@@ -9,5 +9,5 @@ Main component for rendering the preview of an image
 **Signature:**
 
 ```typescript
-ImagePreview: import("react").ForwardRefExoticComponent<ImagePreviewProps & import("react").RefAttributes<HTMLDivElement>>
+ImagePreview: React.ForwardRefExoticComponent<ImagePreviewProps & React.RefAttributes<HTMLDivElement>>
 ```

docs/api/carbonio-ui-preview.md

@@ -118,6 +118,15 @@ Description
 </td><td>
 
 
+</td></tr>
+<tr><td>
+
+[VideoPreviewProps](./carbonio-ui-preview.videopreviewprops.md)
+
+
+</td><td>
+
+
 </td></tr>
 </tbody></table>
 
@@ -174,7 +183,7 @@ The context give access to the functions needed to manage multiple previews. It
 
 </td><td>
 
-Show the preview for either an image or a pdf. This component is just a wrapper on the two specific preview components.
+Show the preview for a video, an image or a pdf. This component is just a wrapper on the two specific preview components.
 
 
 </td></tr>

docs/api/carbonio-ui-preview.previewitem.md

@@ -11,11 +11,13 @@ Define an item for the preview. It can be of type 'image' or 'pdf'. The id is re
 ```typescript
 export type PreviewItem = ((MakeOptional<Omit<ImagePreviewProps, 'show'>, 'onClose'> & {
     previewType: 'image';
+}) | (MakeOptional<Omit<VideoPreviewProps, 'show'>, 'onClose'> & {
+    previewType: 'video';
 }) | (MakeOptional<Omit<PdfPreviewProps, 'show'>, 'onClose'> & {
     previewType: 'pdf';
 })) & {
     id: string;
 };
 ```
-**References:** [MakeOptional](./carbonio-ui-preview.makeoptional.md)<!-- -->, [ImagePreviewProps](./carbonio-ui-preview.imagepreviewprops.md)<!-- -->, [PdfPreviewProps](./carbonio-ui-preview.pdfpreviewprops.md)
+**References:** [MakeOptional](./carbonio-ui-preview.makeoptional.md)<!-- -->, [ImagePreviewProps](./carbonio-ui-preview.imagepreviewprops.md)<!-- -->, [VideoPreviewProps](./carbonio-ui-preview.videopreviewprops.md)<!-- -->, [PdfPreviewProps](./carbonio-ui-preview.pdfpreviewprops.md)
 

docs/api/carbonio-ui-preview.previewwrapper.md

@@ -4,7 +4,7 @@
 
 ## PreviewWrapper variable
 
-Show the preview for either an image or a pdf. This component is just a wrapper on the two specific preview components.
+Show the preview for a video, an image or a pdf. This component is just a wrapper on the two specific preview components.
 
 **Signature:**
 

docs/api/carbonio-ui-preview.previewwrapperprops.md

@@ -11,7 +11,9 @@ export type PreviewWrapperProps = (ImagePreviewProps & {
     previewType: 'image';
 }) | (PdfPreviewProps & {
     previewType: 'pdf';
+}) | (VideoPreviewProps & {
+    previewType: 'video';
 });
 ```
-**References:** [ImagePreviewProps](./carbonio-ui-preview.imagepreviewprops.md)<!-- -->, [PdfPreviewProps](./carbonio-ui-preview.pdfpreviewprops.md)
+**References:** [ImagePreviewProps](./carbonio-ui-preview.imagepreviewprops.md)<!-- -->, [PdfPreviewProps](./carbonio-ui-preview.pdfpreviewprops.md)<!-- -->, [VideoPreviewProps](./carbonio-ui-preview.videopreviewprops.md)
 

docs/api/carbonio-ui-preview.videopreviewprops.errorlabel.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@zextras/carbonio-ui-preview](./carbonio-ui-preview.md) &gt; [VideoPreviewProps](./carbonio-ui-preview.videopreviewprops.md) &gt; [errorLabel](./carbonio-ui-preview.videopreviewprops.errorlabel.md)
+
+## VideoPreviewProps.errorLabel property
+
+Label shown when the preview cannot be shown
+
+**Signature:**
+
+```typescript
+errorLabel?: string;
+```