diff --git a/.env.sample b/.env.sample index c9124d7d98..ca3679e526 100644 --- a/.env.sample +++ b/.env.sample @@ -1,4 +1,4 @@ -NUXEO_WEB_UI_VERSION=3.0.22-SNAPSHOT +NUXEO_WEB_UI_VERSION=3.1.5-SNAPSHOT NUXEO_VERSION=master NUXEO_PACKAGES=nuxeo-drive nuxeo-liveconnect nuxeo-template-rendering NUXEO_DEV_MODE=true diff --git a/.github/workflows/a11y.yaml b/.github/workflows/a11y.yaml index da1cabb535..91736ea90a 100644 --- a/.github/workflows/a11y.yaml +++ b/.github/workflows/a11y.yaml @@ -3,12 +3,12 @@ name: A11y on: pull_request: branches: - - maintenance-3.0.x + - maintenance-3.1.x workflow_call: inputs: branch: description: 'The current branch' - default: maintenance-3.0.x + default: maintenance-3.1.x type: string required: false secrets: @@ -18,50 +18,62 @@ on: PACKAGES_AUTH_USER: description: 'PACKAGES_AUTH_USER' required: true - PACKAGES_AUTH_TOKEN: + PACKAGES_AUTH_TOKEN: description: 'PACKAGES_AUTH_TOKEN' required: true env: - REFERENCE_BRANCH: maintenance-3.0.x + REFERENCE_BRANCH: maintenance-3.1.x NPM_REPOSITORY: https://packages.nuxeo.com/repository/npm-public/ - BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.0.x' }} + BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }} jobs: a11y: - runs-on: ubuntu-latest + runs-on: [self-hosted, master] steps: - - uses: actions/checkout@v2 - with: - ref: ${{ env.BRANCH_NAME }} + - uses: actions/checkout@v2 + with: + ref: ${{ env.BRANCH_NAME }} - - run: git config user.name "nuxeo-web-ui-jx-bot" && git config user.email "ui+jx-bot@nuxeo.com" + - run: git config user.name "nuxeo-webui-jx-bot" && git config user.email "webui@hyland.com" - - uses: actions/setup-node@v3 - with: - registry-url: ${{ env.NPM_REPOSITORY }} - node-version: 14 - scope: '@nuxeo' + - uses: actions/setup-node@v3 + with: + registry-url: ${{ env.NPM_REPOSITORY }} + node-version: 18 + scope: '@nuxeo' - - uses: actions/setup-java@v2 - with: - distribution: 'zulu' - java-version: '11' + - name: Install Web UI + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} + run: | + npm install + pushd packages/nuxeo-web-ui-ftest + npm install + popd + pushd packages/nuxeo-designer-catalog + npm install + popd - - name: 'Update settings.xml with server configuration' - run: | - echo ' - - - maven-internal - ${{ secrets.PACKAGES_AUTH_USER }} - ${{ secrets.PACKAGES_AUTH_TOKEN }} - - - ' > ~/.m2/settings.xml + - uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '17' - - name: Web UI build - run: mvn -B -ntp install + - name: 'Update settings.xml with server configuration' + run: | + echo ' + + + maven-internal + ${{ secrets.PACKAGES_AUTH_USER }} + ${{ secrets.PACKAGES_AUTH_TOKEN }} + + + ' > ~/.m2/settings.xml - - name: A11y checks - run: mvn -B -ntp -f plugin/a11y install + - name: Web UI build + run: mvn -B -ntp install + + - name: A11y checks + run: mvn -B -ntp -f plugin/a11y install diff --git a/.github/workflows/catalog.yaml b/.github/workflows/catalog.yaml index 22569c2454..ac4108bd55 100644 --- a/.github/workflows/catalog.yaml +++ b/.github/workflows/catalog.yaml @@ -7,11 +7,11 @@ on: inputs: target_platform: description: 'The Nuxeo server target platform to build the catalog for.' - default: '11.3' + default: '2023.0' required: true branch_name: description: 'The name of the Nuxeo Web UI branch to generate the catalog for.' - default: 'maintenance-3.0.x' + default: 'maintenance-3.1.x' required: true classifier: description: 'Classifier to name a custom version of the catalog (used for testing purposes).' @@ -31,31 +31,31 @@ jobs: steps: - uses: actions/checkout@v3 - - run: git config --global user.name "nuxeo-web-ui-jx-bot" && git config --global user.email "ui+jx-bot@nuxeo.com" + - run: git config --global user.name "nuxeo-webui-jx-bot" && git config --global user.email "webui@hyland.com" - uses: actions/setup-node@v3 with: - node-version: 10 + node-version: 14 - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: 'Update settings.xml with server configuration' run: | echo ' - nos-team + maven-internal external:* - https://nexus-jx.nos.build.nuxeo.com/repository/maven-group/ + https://packages.nuxeo.com/repository/maven-internal/ nos-team - nuxeo-web-ui-jx-bot + nuxeo-webui-jx-bot ${{ secrets.WEBUI_JX_BOT_GITHUB_ACTIONS_TOKEN }} @@ -75,13 +75,16 @@ jobs: ' > ~/.m2/settings.xml + + - name: Install libxml2-utils (xmllint) + run: sudo apt-get update && sudo apt-get install -y libxml2-utils - name: Setup parameters (release) if: github.event_name == 'release' working-directory: packages/nuxeo-designer-catalog run: | echo "BRANCH_NAME=v${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV - echo "TARGET_PLATFORM=11.3" >> $GITHUB_ENV + echo "TARGET_PLATFORM=2023.0" >> $GITHUB_ENV - name: Setup parameters (workflow_dispatch) if: github.event_name == 'workflow_dispatch' @@ -103,8 +106,9 @@ jobs: - name: Bundle the catalog run: | + sudo chmod +r pom.xml + CATALOG_VERSION=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml)${{ github.event.inputs.classifier }} pushd packages/nuxeo-designer-catalog/data/applications/nuxeo/${{ env.TARGET_PLATFORM }} - CATALOG_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout -f nuxeo-web-ui/pom.xml)${{ github.event.inputs.classifier }} echo "CATALOG_VERSION=$CATALOG_VERSION" >> $GITHUB_ENV CATALOG_NAME=$ARTIFACT_ID-$CATALOG_VERSION.zip echo "CATALOG_NAME=$CATALOG_NAME" >> $GITHUB_ENV @@ -144,8 +148,8 @@ jobs: GH_TOKEN: ${{ secrets.WEBUI_JX_BOT_GITHUB_ACTIONS_TOKEN }} run: | git checkout -b designer-catalog-update-$CATALOG_VERSION - mvn versions:set-property -Dproperty=view.designer.catalog.11.3 -DnewVersion=$CATALOG_VERSION + mvn versions:set-property -Dproperty=view.designer.catalog.2023.0 -DnewVersion=$CATALOG_VERSION git add . git commit -m "Update Designer catalog with version $CATALOG_VERSION" git push origin designer-catalog-update-$CATALOG_VERSION - gh pr create --base master --fill + gh pr create --base master --fill \ No newline at end of file diff --git a/.github/workflows/clean.yaml b/.github/workflows/clean.yaml index cb5c574208..70d75b2b3a 100644 --- a/.github/workflows/clean.yaml +++ b/.github/workflows/clean.yaml @@ -4,17 +4,17 @@ on: pull_request: types: [closed, unlabeled] branches: - - maintenance-3.0.x + - maintenance-3.1.x workflow_dispatch: inputs: branch_name: description: 'The name of the branch to preview.' - default: 'maintenance-3.0.x' + default: 'maintenance-3.1.x' required: true caller_id: description: 'run identifier' - default: 'maintenance-3.0.x' + default: 'maintenance-3.1.x' type: string required: false @@ -59,4 +59,4 @@ jobs: - name: Cleanup preview namespace continue-on-error: true run: | - kubectl delete ns ${PREVIEW_NAMESPACE} + kubectl delete ns ${PREVIEW_NAMESPACE} \ No newline at end of file diff --git a/.github/workflows/cross-repo.yaml b/.github/workflows/cross-repo.yaml index ab22812041..85302b1ba5 100644 --- a/.github/workflows/cross-repo.yaml +++ b/.github/workflows/cross-repo.yaml @@ -7,7 +7,7 @@ on: inputs: branch_name: description: 'The name of the branch to build.' - default: 'maintenance-3.0.x' + default: 'maintenance-3.1.x' required: true sauce_labs: description: 'Run unit tests on Sauce Labs?' @@ -40,12 +40,12 @@ on: required: false caller_id: description: 'run identifier' - default: 'maintenance-3.0.x' + default: 'maintenance-3.1.x' type: string required: false env: - REFERENCE_BRANCH: maintenance-3.0.x + REFERENCE_BRANCH: maintenance-3.1.x NPM_REPOSITORY: https://packages.nuxeo.com/repository/npm-public/ jobs: @@ -71,7 +71,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Determine nuxeo-web-ui branch to use uses: nuxeo/ui-team-gh-actions/get-branch@ca09d5c52a62e297502d3572c36d813be927982a @@ -103,6 +103,9 @@ jobs: pushd packages/nuxeo-web-ui-ftest npm install popd + pushd plugin/a11y + npm install + popd pushd packages/nuxeo-designer-catalog npm install popd @@ -167,7 +170,7 @@ jobs: ' > ~/.m2/settings.xml - + - name: Nuxeo package build and Ftests env: RUN_ALL: ${{ github.event.inputs.run_all }} @@ -225,4 +228,4 @@ jobs: name: packages path: | plugin/web-ui/marketplace/target/nuxeo-web-ui-marketplace-*.zip - plugin/itests/marketplace/target/nuxeo-web-ui-marketplace-itests-*.zip + plugin/itests/marketplace/target/nuxeo-web-ui-marketplace-itests-*.zip \ No newline at end of file diff --git a/.github/workflows/crowdin.yaml b/.github/workflows/crowdin.yaml index 02ff8f8326..106850308e 100644 --- a/.github/workflows/crowdin.yaml +++ b/.github/workflows/crowdin.yaml @@ -6,10 +6,10 @@ on: schedule: - cron: '0 0 * * *' - # Sync when a commit is done on maintenance-3.0.x + # Sync when a commit is done on maintenance-3.1.x push: branches: - - maintenance-3.0.x + - maintenance-3.1.x paths: - 'i18n/messages.json' @@ -25,7 +25,7 @@ jobs: uses: actions/checkout@v3 - name: Crowdin Action - uses: crowdin/github-action@1.4.9 + uses: crowdin/github-action@v1 with: # Tokens project_id: ${{ secrets.CROWDIN_PROJECT_ID }} @@ -52,8 +52,8 @@ jobs: download_translations: true # User properties - github_user_name: nuxeo-web-ui-jx-bot - github_user_email: ui+jx-bot@nuxeo.com + github_user_name: nuxeo-webui-jx-bot + github_user_email: webui@hyland.com env: - GITHUB_TOKEN: ${{ secrets.WEBUI_JX_BOT_GITHUB_ACTIONS_TOKEN }} + GITHUB_TOKEN: ${{ secrets.WEBUI_JX_BOT_GITHUB_ACTIONS_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/ftest.yaml b/.github/workflows/ftest.yaml index ef95a8aeaa..335f9d0a9b 100644 --- a/.github/workflows/ftest.yaml +++ b/.github/workflows/ftest.yaml @@ -3,12 +3,12 @@ name: Functional tests on: pull_request: branches: - - maintenance-3.0.x + - maintenance-3.1.x workflow_call: inputs: branch: description: 'The current branch' - default: maintenance-3.0.x + default: maintenance-3.1.x type: string required: false secrets: @@ -23,9 +23,9 @@ on: required: true env: - REFERENCE_BRANCH: maintenance-3.0.x + REFERENCE_BRANCH: maintenance-3.1.x NPM_REPOSITORY: https://packages.nuxeo.com/repository/npm-public/ - BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.0.x' }} + BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }} jobs: ftests: @@ -39,11 +39,12 @@ jobs: with: registry-url: ${{ env.NPM_REPOSITORY }} scope: '@nuxeo' + node-version: 18 - uses: actions/setup-java@v2 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Determine nuxeo-elements branch to link id: pick_nuxeo_elements_branch @@ -94,6 +95,19 @@ jobs: popd popd + - name: add .npmrc + run: | + pushd /tmp/_temp/ + ls + rm .npmrc + touch .npmrc + popd + echo ' + packages.nuxeo.com/repository/npm-public/:_auth=${NODE_AUTH_TOKEN} + @nuxeo:registry=https://packages.nuxeo.com/repository/npm-public/ + always-auth=true + ' >> /tmp/_temp/.npmrc + - name: Link elements to Web UI run: | npm install --no-package-lock --@nuxeo:registry="${{ env.NPM_REPOSITORY }}" nuxeo-elements/core/${ELEMENTS_CORE} @@ -149,4 +163,4 @@ jobs: name: packages path: | plugin/web-ui/marketplace/target/nuxeo-web-ui-marketplace-*.zip - plugin/itests/marketplace/target/nuxeo-web-ui-marketplace-itests-*.zip + plugin/itests/marketplace/target/nuxeo-web-ui-marketplace-itests-*.zip \ No newline at end of file diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 89dfa685fb..d8be124e3d 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -3,12 +3,12 @@ name: Lint on: pull_request: branches: - - maintenance-3.0.x + - maintenance-3.1.x workflow_call: inputs: branch: description: 'The current branch' - default: maintenance-3.0.x + default: maintenance-3.1.x type: string required: false secrets: @@ -17,7 +17,7 @@ on: required: true env: - BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.0.x' }} + BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }} jobs: lint: @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-node@v3 with: registry-url: 'https://packages.nuxeo.com/repository/npm-public/' - node-version: 14 + node-version: 18 scope: '@nuxeo' - name: Install @@ -39,4 +39,4 @@ jobs: run: npm install - name: Lint - run: npm run lint + run: npm run lint \ No newline at end of file diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index cdd35334af..83a8a200df 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -3,145 +3,158 @@ name: Main on: push: branches: - - maintenance-3.0.x + - maintenance-3.1.x # Manually trigger the workflow workflow_dispatch: - + jobs: lint: - uses: nuxeo/nuxeo-web-ui/.github/workflows/lint.yaml@maintenance-3.0.x + uses: nuxeo/nuxeo-web-ui/.github/workflows/lint.yaml@maintenance-3.1.x secrets: NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} test: - uses: nuxeo/nuxeo-web-ui/.github/workflows/test.yaml@maintenance-3.0.x + uses: nuxeo/nuxeo-web-ui/.github/workflows/test.yaml@maintenance-3.1.x secrets: NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }} with: - branch: maintenance-3.0.x - - a11y: - uses: nuxeo/nuxeo-web-ui/.github/workflows/a11y.yaml@maintenance-3.0.x - secrets: - NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} - PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }} - PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }} - with: - branch: maintenance-3.0.x - - ftest: - uses: nuxeo/nuxeo-web-ui/.github/workflows/ftest.yaml@maintenance-3.0.x - secrets: - NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} - PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }} - PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }} - with: - branch: maintenance-3.0.x + branch: maintenance-3.1.x + + #================================================================================================================== + # this line of code has been commented on due to some driver issues, we will resume it once WEBUI-1266 is resolved. + #================================================================================================================== + # a11y: + # uses: nuxeo/nuxeo-web-ui/.github/workflows/a11y.yaml@maintenance-3.1.x + # secrets: + # NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} + # PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }} + # PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }} + # with: + # branch: maintenance-3.1.x + #================================================================================================================== + + #================================================================================================================== + # this line of code has been commented on due to some driver issues, we will resume it once WEBUI-1267 is resolved. + #================================================================================================================== + # ftest: + # uses: nuxeo/nuxeo-web-ui/.github/workflows/ftest.yaml@maintenance-3.1.x + # secrets: + # NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} + # PACKAGES_AUTH_USER: ${{ secrets.PACKAGES_AUTH_USER }} + # PACKAGES_AUTH_TOKEN: ${{ secrets.PACKAGES_AUTH_TOKEN }} + # with: + # branch: maintenance-3.1.x + #================================================================================================================== build: - needs: [ lint, test, a11y, ftest ] - runs-on: [ self-hosted, master ] + needs: [lint, test] + runs-on: [self-hosted, master] steps: - - uses: actions/checkout@v2 - - - run: git config user.name "nuxeo-web-ui-jx-bot" && git config user.email "ui+jx-bot@nuxeo.com" - - - uses: actions/setup-node@v3 - with: - registry-url: 'https://packages.nuxeo.com/repository/npm-public/' - scope: '@nuxeo' - - - name: Prepare environment - run: | - echo "BRANCH_NAME=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV - echo "PACKAGE_VERSION=$(npx -c 'echo "$npm_package_version"')" >> $GITHUB_ENV - - - name: Get prerelease version - run: | - git fetch origin --tags - RC_VERSION=$(git tag --sort=taggerdate --list "v${PACKAGE_VERSION/-SNAPSHOT}*" | tail -1 | tr -d '\n') - echo "VERSION=$(npx semver -i prerelease --preid rc ${RC_VERSION:-$PACKAGE_VERSION} | tr -d '\n')" >> $GITHUB_ENV - - - name: Update versions - run: | - find . -type f -not -path "./node_modules/*" -regex ".*\.\(yaml\|sample\|xml\)" -exec sed -i 's/'"$PACKAGE_VERSION"'/'"$VERSION"'/g' {} \; - - # set padded version to build package for connect preprod - PADDED=$(printf '%03d' $(echo $VERSION | sed -r s/[0-9]+\.[0-9]+\.[0-9]+-rc\.\([0-9]+\)/\\1/g)) - PADDED_VERSION=$(echo $VERSION | sed -E "s/([0-9]+\.[0-9]+\.[0-9]+-rc\.)[0-9]+/\\1$PADDED/g") - echo "PADDED_VERSION=$PADDED_VERSION" >> $GITHUB_ENV - sed -i -e 's/\${project.version}/'"$PADDED_VERSION"'/g' plugin/web-ui/marketplace/pom.xml - - npm version ${VERSION} --no-git-tag-version - pushd packages/nuxeo-web-ui-ftest - npm version ${VERSION} --no-git-tag-version - popd - - - name: Install - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - run: | - npm install - pushd packages/nuxeo-web-ui-ftest - npm install - popd - pushd packages/nuxeo-designer-catalog - npm install - popd - - - name: 'Update settings.xml with server configuration' - run: | - echo ' - - - maven-internal - ${{ secrets.PACKAGES_AUTH_USER }} - ${{ secrets.PACKAGES_AUTH_TOKEN }} - - - ' > ~/.m2/settings.xml - - - name: Nuxeo package build - run: | - mvn -ntp install -DskipInstall - mvn -B -nsu -ntp -f plugin/itests/addon install - mvn -B -nsu -ntp -f plugin/itests/marketplace install - - - name: Archive packages - uses: actions/upload-artifact@v2 - with: - name: packages - path: | - plugin/web-ui/marketplace/target/nuxeo-web-ui-marketplace-*.zip - plugin/itests/marketplace/target/nuxeo-web-ui-marketplace-itests-*.zip - - - name: Tag - run: | - git add package-lock.json packages/nuxeo-web-ui-ftest/package-lock.json - git commit -a -m "Release ${VERSION}" - git tag -a v${VERSION} -m "Release ${VERSION}" - git push origin v${VERSION} - - - name: Publish Nuxeo packages - env: - CONNECT_PREPROD_URL: https://nos-preprod-connect.nuxeocloud.com/nuxeo - run: | - PACKAGE="plugin/web-ui/marketplace/target/nuxeo-web-ui-marketplace-${PADDED_VERSION}.zip" - STATUS_CODE=`curl -i --silent --output publish-req.output -w "%{http_code}" -u "${{ secrets.CONNECT_PREPROD_AUTH }}" -F package=@$PACKAGE "$CONNECT_PREPROD_URL/site/marketplace/upload?batch=true"` - cat publish-req.output - if [[ "$STATUS_CODE" != "200" ]] - then - exit 1 - else - exit 0 - fi - - - name: Publish Web UI FTest framework - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - run: | - pushd packages/nuxeo-web-ui-ftest/ - npm publish --@nuxeo:registry=https://packages.nuxeo.com/repository/npm-public/ --tag SNAPSHOT - popd + - uses: actions/checkout@v2 + + - run: git config user.name "nuxeo-webui-jx-bot" && git config user.email "webui@hyland.com" + + - uses: actions/setup-node@v3 + with: + registry-url: 'https://packages.nuxeo.com/repository/npm-public/' + scope: '@nuxeo' + + - uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '17' + + - name: Prepare environment + run: | + echo "BRANCH_NAME=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV + echo "PACKAGE_VERSION=$(npx -c 'echo "$npm_package_version"')" >> $GITHUB_ENV + + - name: Get prerelease version + run: | + git fetch origin --tags + RC_VERSION=$(git tag --sort=taggerdate --list "v${PACKAGE_VERSION/-SNAPSHOT}*" | tail -1 | tr -d '\n') + echo "VERSION=$(npx semver -i prerelease --preid rc ${RC_VERSION:-$PACKAGE_VERSION} | tr -d '\n')" >> $GITHUB_ENV + + - name: Update versions + run: | + find . -type f -not -path "./node_modules/*" -regex ".*\.\(yaml\|sample\|xml\)" -exec sed -i 's/'"$PACKAGE_VERSION"'/'"$VERSION"'/g' {} \; + + # set padded version to build package for connect preprod + PADDED=$(printf '%03d' $(echo $VERSION | sed -r s/[0-9]+\.[0-9]+\.[0-9]+-rc\.\([0-9]+\)/\\1/g)) + PADDED_VERSION=$(echo $VERSION | sed -E "s/([0-9]+\.[0-9]+\.[0-9]+-rc\.)[0-9]+/\\1$PADDED/g") + echo "PADDED_VERSION=$PADDED_VERSION" >> $GITHUB_ENV + sed -i -e 's/\${project.version}/'"$PADDED_VERSION"'/g' plugin/web-ui/marketplace/pom.xml + + npm version ${VERSION} --no-git-tag-version + pushd packages/nuxeo-web-ui-ftest + npm version ${VERSION} --no-git-tag-version + popd + + - name: Install + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + run: | + npm install + pushd packages/nuxeo-web-ui-ftest + npm install + popd + pushd packages/nuxeo-designer-catalog + npm install + popd + + - name: 'Update settings.xml with server configuration' + run: | + echo ' + + + maven-internal + ${{ secrets.PACKAGES_AUTH_USER }} + ${{ secrets.PACKAGES_AUTH_TOKEN }} + + + ' > ~/.m2/settings.xml + + - name: Nuxeo package build + run: | + mvn -ntp install -DskipInstall + mvn -B -nsu -ntp -f plugin/itests/addon install + mvn -B -nsu -ntp -f plugin/itests/marketplace install + + - name: Archive packages + uses: actions/upload-artifact@v2 + with: + name: packages + path: | + plugin/web-ui/marketplace/target/nuxeo-web-ui-marketplace-*.zip + plugin/itests/marketplace/target/nuxeo-web-ui-marketplace-itests-*.zip + + - name: Tag + run: | + git add package-lock.json packages/nuxeo-web-ui-ftest/package-lock.json + git commit -a -m "Release ${VERSION}" + git tag -a v${VERSION} -m "Release ${VERSION}" + git push origin v${VERSION} + + - name: Publish Nuxeo packages + env: + CONNECT_PREPROD_URL: https://nos-preprod-connect.nuxeocloud.com/nuxeo + run: | + PACKAGE="plugin/web-ui/marketplace/target/nuxeo-web-ui-marketplace-${PADDED_VERSION}.zip" + STATUS_CODE=`curl -i --silent --output publish-req.output -w "%{http_code}" -u "${{ secrets.CONNECT_PREPROD_AUTH }}" -F package=@$PACKAGE "$CONNECT_PREPROD_URL/site/marketplace/upload?batch=true"` + cat publish-req.output + if [[ "$STATUS_CODE" != "200" ]] + then + exit 1 + else + exit 0 + fi + + - name: Publish Web UI FTest framework + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + run: | + pushd packages/nuxeo-web-ui-ftest/ + npm publish --@nuxeo:registry=https://packages.nuxeo.com/repository/npm-public/ --tag SNAPSHOT + popd \ No newline at end of file diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 5c8ef97767..8c37224573 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -4,17 +4,17 @@ on: pull_request: types: [opened, synchronize, reopened, labeled] branches: - - maintenance-3.0.x + - maintenance-3.1.x workflow_dispatch: inputs: branch_name: description: 'The name of the branch to preview.' - default: 'maintenance-3.0.x' + default: 'maintenance-3.1.x' required: true caller_id: description: 'run identifier' - default: 'maintenance-3.0.x' + default: 'maintenance-3.1.x' type: string required: false @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' @@ -63,7 +63,7 @@ jobs: with: repository: nuxeo/nuxeo-web-ui branch: ${BRANCH_NAME} - default-branch: maintenance-3.0.x + default-branch: maintenance-3.1.x - uses: actions/checkout@v3 with: @@ -80,7 +80,7 @@ jobs: with: repository: nuxeo/nuxeo-elements branch: ${BRANCH_NAME} - default-branch: maintenance-3.0.x + default-branch: maintenance-3.1.x - name: Checkout the nuxeo-elements repo uses: actions/checkout@v2 @@ -194,4 +194,4 @@ jobs: steps: - name: "Result: ${{ needs.preview.outputs.url }}" run: | - echo ${{ needs.preview.outputs.url }} + echo ${{ needs.preview.outputs.url }} \ No newline at end of file diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml index 4c2b1e3004..706a768abf 100644 --- a/.github/workflows/promote.yaml +++ b/.github/workflows/promote.yaml @@ -4,12 +4,12 @@ on: workflow_dispatch: inputs: version: - description: 'Version to promote (e.g.: 3.0.6-rc.6)' + description: 'Version to promote (e.g.: 3.1.2-rc.2)' required: true referenceBranch: description: 'Branch to be updated after the promotion' required: true - default: 'maintenance-3.0.x' + default: 'maintenance-3.1.x' dryRun: description: 'Run the workflow without pushing code or publishing artifacts' type: boolean @@ -21,15 +21,16 @@ jobs: steps: - uses: actions/setup-node@v3 with: - node-version: 14 + node-version: 18 registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' - uses: actions/checkout@v2 with: ref: v${{ github.event.inputs.version }} + token: ${{ secrets.GITHUB_TOKEN }} - - run: git config user.name "nuxeo-web-ui-jx-bot" && git config user.email "ui+jx-bot@nuxeo.com" + - run: git config user.name "nuxeo-webui-jx-bot" && git config user.email "webui@hyland.com" - run: echo "VERSION=$(echo '${{ github.event.inputs.version }}' | sed -e 's/-rc.[0-9]*//')" >> $GITHUB_ENV @@ -161,4 +162,4 @@ jobs: git commit -a -m "Update $OLD_SNAPSHOT to $NEW_SNAPSHOT" - if: ${{ github.event.inputs.dryRun == 'false' }} - run: git push origin ${{ github.event.inputs.referenceBranch }} + run: git push origin ${{ github.event.inputs.referenceBranch }} \ No newline at end of file diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5f3cfedd17..b9518f20cd 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -3,12 +3,12 @@ name: Test on: pull_request: branches: - - maintenance-3.0.x + - maintenance-3.1.x workflow_call: inputs: branch: description: 'The current branch' - default: maintenance-3.0.x + default: maintenance-3.1.x type: string required: false secrets: @@ -20,7 +20,7 @@ on: required: true env: - BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.0.x' }} + BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }} jobs: unit-test: @@ -34,7 +34,7 @@ jobs: with: registry-url: 'https://packages.nuxeo.com/repository/npm-public/' scope: '@nuxeo' - node-version: 14 + node-version: 18 - name: Install env: @@ -45,4 +45,4 @@ jobs: env: SAUCE_USERNAME: nuxeo-web-ui SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }} - run: npm run test + run: npm run test \ No newline at end of file diff --git a/.github/workflows/veracode.yml b/.github/workflows/veracode.yml new file mode 100644 index 0000000000..149fbf4f9f --- /dev/null +++ b/.github/workflows/veracode.yml @@ -0,0 +1,193 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. + +# This workflow will initiate a Veracode Static Analysis Pipeline scan, return a results.json and convert to SARIF for upload as a code scanning alert + +name: Veracode + +on: + pull_request: + # The branches below must be a subset of the branches above + branches: [ "maintenance-3.1.x" ] + schedule: + # At 01:00 on Sunday + - cron: '0 1 * * SUN' + workflow_call: + inputs: + branch: + description: 'The branch to Analyze' + type: string + required: true + secrets: + NPM_PACKAGES_TOKEN: + description: 'NPM_PACKAGES_TOKEN' + required: true + PACKAGES_AUTH_USER: + description: 'PACKAGES_AUTH_USER' + required: true + PACKAGES_AUTH_TOKEN: + description: 'PACKAGES_AUTH_TOKEN' + required: true + VERACODE_API_ID: + description: 'VERACODE_API_ID' + required: true + VERACODE_API_KEY: + description: 'VERACODE_API_KEY' + required: true + +env: + REFERENCE_BRANCH: maintenance-3.1.x + NPM_REPOSITORY: https://packages.nuxeo.com/repository/npm-public/ + BRANCH_NAME: ${{ github.head_ref || inputs.branch || 'maintenance-3.1.x' }} + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +permissions: + contents: read + +jobs: + # This workflow contains a job to build and submit pipeline scan, you will need to customize the build process accordingly and make sure the artifact you build is used as the file input to the pipeline scan file parameter + sast-scan: + # The type of runner that the job will run on + permissions: + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/upload-sarif to upload SARIF results + actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status + runs-on: ubuntu-latest + steps: + + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it and copies all sources into ZIP file for submitting for analysis. Replace this section with your applications build steps + - uses: actions/checkout@v2 + with: + ref: ${{ env.BRANCH_NAME }} + + - uses: actions/setup-node@v1 + with: + registry-url: ${{ env.NPM_REPOSITORY }} + node-version: 14 + scope: '@nuxeo' + + - uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '17' + + - name: Determine nuxeo-elements branch to link + id: pick_nuxeo_elements_branch + run: | + if git ls-remote --exit-code --heads https://github.com/nuxeo/nuxeo-elements ${{ env.BRANCH_NAME }}; then + echo ::set-output name=branch::${{ env.BRANCH_NAME }} + else + echo ::set-output name=branch::${{ env.REFERENCE_BRANCH }} + fi + - name: Install Web UI + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }} + run: | + npm install + pushd packages/nuxeo-web-ui-ftest + npm install + popd + - name: Checkout the nuxeo-elements repo + uses: actions/checkout@v2 + with: + repository: nuxeo/nuxeo-elements + path: nuxeo-elements + fetch-depth: 1 + ref: ${{ steps.pick_nuxeo_elements_branch.outputs.branch }} + + - name: Pack Elements modules + run: | + pushd nuxeo-elements + pushd core + echo "ELEMENTS_CORE=$(npm pack 2>&1 | tail -1)" >> $GITHUB_ENV + popd + pushd ui + echo "ELEMENTS_UI=$(npm pack 2>&1 | tail -1)" >> $GITHUB_ENV + popd + pushd dataviz + echo "ELEMENTS_DATAVIZ=$(npm pack 2>&1 | tail -1)" >> $GITHUB_ENV + popd + pushd testing-helpers + echo "ELEMENTS_HELPERS=$(npm pack 2>&1 | tail -1)" >> $GITHUB_ENV + popd + popd + - name: Link elements to Web UI + run: | + npm install --no-package-lock --@nuxeo:registry="${{ env.NPM_REPOSITORY }}" nuxeo-elements/core/${ELEMENTS_CORE} + npm install --no-package-lock --@nuxeo:registry="${{ env.NPM_REPOSITORY }}" nuxeo-elements/ui/${ELEMENTS_UI} + npm install --no-package-lock --@nuxeo:registry="${{ env.NPM_REPOSITORY }}" nuxeo-elements/dataviz/${ELEMENTS_DATAVIZ} + npm install --no-package-lock --@nuxeo:registry="${{ env.NPM_REPOSITORY }}" nuxeo-elements/testing-helpers/${ELEMENTS_HELPERS} + - name: 'Update settings.xml with server configuration' + run: | + echo ' + + + maven-internal + ${{ secrets.PACKAGES_AUTH_USER }} + ${{ secrets.PACKAGES_AUTH_TOKEN }} + + + ' > ~/.m2/settings.xml + - name: Nuxeo package build + run: mvn install -DskipInstall + - name: Archive packages + uses: actions/upload-artifact@v2 + with: + name: packages + path: | + plugin/web-ui/marketplace/target/nuxeo-web-ui-marketplace-*.zip + + # download the Veracode Static Analysis Pipeline scan jar + - run: curl --silent --show-error --fail -O https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip + - run: unzip -o pipeline-scan-LATEST.zip + - name: Code Scanning + id: code_scanning + run: java -jar pipeline-scan.jar --veracode_api_id "${{secrets.VERACODE_API_ID}}" --veracode_api_key "${{secrets.VERACODE_API_KEY}}" --fail_on_severity="Very High, High" --summary_output=true --file plugin/web-ui/marketplace/target/nuxeo-web-ui-marketplace-*.zip + continue-on-error: true + - name: Convert pipeline scan output to SARIF format + id: convert + uses: Veracode/veracode-pipeline-scan-results-to-sarif@v1.0.5 + with: + pipeline-results-json: results.json + output-results-sarif: veracode-results.sarif + finding-rule-level: "4:3:0" + - name: Upload SARIF file to repository + uses: github/codeql-action/upload-sarif@v2 + with: + # Path to SARIF file relative to the root of the repository + sarif_file: veracode-results.sarif + - name: Slack notification + if: (github.event_name == 'pull_request' || github.event_name == 'schedule') + uses: slackapi/slack-github-action@v1.23.0 + env: + REPO_URL: ${{ github.server_url }}/${{ github.repository }} + SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} + SLACK_CHANNEL_ID: ${{ secrets.SLACK_CHANNEL_ID }} + with: + channel-id: ${{ env.SLACK_CHANNEL_ID }} + payload: | + { + "text": "<${{ env.REPO_URL }}/actions/runs/${{ github.run_id }}|Code scanning> ${{ steps.code_scanning.outcome }} in nuxeo/nuxeo-web-ui <${{ env.REPO_URL }}/commit/${{ github.sha }}|${{ github.ref_name }}>", + "blocks": [ + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": "<${{ env.REPO_URL }}/actions/runs/${{ github.run_id }}|Code scanning> ${{ job.status }} in nuxeo/nuxeo-WEB-UI <${{ env.REPO_URL }}/commit/${{ github.sha }}|${{ github.ref_name }}>" + } + } + ] + } + - name: Send scan result summary to slack + uses: crederauk/slack-workflow-summary@v1.2.2 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }} + - name: Send scan result file to slack + uses: adrey/slack-file-upload-action@master + with: + token: ${{ secrets.SLACK_BOT_TOKEN }} + path: results.txt + channel: ${{ secrets.SLACK_CHANNEL_ID }} \ No newline at end of file diff --git a/Jenkinsfiles/web-ui-pipeline.groovy b/Jenkinsfiles/web-ui-pipeline.groovy index a5687a5c1a..94524c6471 100644 --- a/Jenkinsfiles/web-ui-pipeline.groovy +++ b/Jenkinsfiles/web-ui-pipeline.groovy @@ -2,7 +2,7 @@ properties([ [$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false], parameters([ string(name: 'BRANCH', defaultValue: '', description: 'Branch to test, fall-backs on $BASE_BRANCH if not found.', trim: false), - choice(name: 'BASE_BRANCH', choices: ['maintenance-3.0.x'], description: 'The branch to fallback on when $BRANCH is not found.'), + choice(name: 'BASE_BRANCH', choices: ['maintenance-3.1.x'], description: 'The branch to fallback on when $BRANCH is not found.'), string(name: 'SLAVE', defaultValue: 'SLAVE', description: 'Slave label to be used.', trim: false), booleanParam(name: 'CLEAN', defaultValue: false, description: 'Run npm cache clean?'), booleanParam(name: 'SAUCE_LAB', defaultValue: true, description: 'Should unit tests be run on Sauce Lab (or just Chrome on the slave)?'), diff --git a/README.md b/README.md index 2be21f6320..c91f16ff16 100644 --- a/README.md +++ b/README.md @@ -99,15 +99,16 @@ This also builds the marketplace running the functionnal tests. At the moment, CI for Nuxeo Web UI is built on top of [Github Actions](https://github.com/features/actions). We currently provide worflow definitions for building and testing Nuxeo Web UI, to setup preview environments for pull requests, and to promote new releases. -Although there are no cross-repo support for building and testing Nuxeo Web UI with [nuxeo-elements](https://github.com/nuxeo/nuxeo-elements/tree/maintenance-3.0.x), preview environments are setup with cross-repo support. To this extent, in pull requests annotated with the tag `preview`, the workflow will lookup for a corresponding branch with the same name in `nuxeo-elements` repo, and use it in the preview instance. +Although there are no cross-repo support for building and testing Nuxeo Web UI with [nuxeo-elements](https://github.com/nuxeo/nuxeo-elements/tree/maintenance-3.1.x), preview environments are setup with cross-repo support. To this extent, in pull requests annotated with the tag `preview`, the workflow will lookup for a corresponding branch with the same name in `nuxeo-elements` repo, and use it in the preview instance. ## License [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) -(C) Copyright Nuxeo Corp. (http://nuxeo.com/) +©2023 Hyland Software, Inc. and its affiliates. All rights reserved. +All Hyland product names are registered or unregistered trademarks of Hyland Software, Inc. or its affiliates. -All images, icons, fonts, and videos contained in this folder are copyrighted by Nuxeo, all rights reserved. +All images, icons, fonts, and videos contained in this folder are copyrighted by Hyland Software, all rights reserved. ## About Nuxeo diff --git a/addons/amazon-s3-online-storage/index.js b/addons/amazon-s3-online-storage/index.js index 1b4cd0bd23..44c9a32de6 100644 --- a/addons/amazon-s3-online-storage/index.js +++ b/addons/amazon-s3-online-storage/index.js @@ -1,6 +1,7 @@ /** @license -(C) Copyright Nuxeo Corp. (http://nuxeo.com/) +©2023 Hyland Software, Inc. and its affiliates. All rights reserved. +All Hyland product names are registered or unregistered trademarks of Hyland Software, Inc. or its affiliates. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/addons/easyshare/document/easysharefolder/nuxeo-easysharefolder-create-layout.html b/addons/easyshare/document/easysharefolder/nuxeo-easysharefolder-create-layout.html index 16d566a4ab..10bd3d628b 100644 --- a/addons/easyshare/document/easysharefolder/nuxeo-easysharefolder-create-layout.html +++ b/addons/easyshare/document/easysharefolder/nuxeo-easysharefolder-create-layout.html @@ -1,6 +1,7 @@ - diff --git a/plugin/web-ui/addon/pom.xml b/plugin/web-ui/addon/pom.xml index 8309e13ce6..986a1c4130 100644 --- a/plugin/web-ui/addon/pom.xml +++ b/plugin/web-ui/addon/pom.xml @@ -3,7 +3,7 @@ org.nuxeo.web.ui nuxeo-web-ui-parent - 3.0.22-SNAPSHOT + 3.1.5-SNAPSHOT ../../../pom.xml diff --git a/plugin/web-ui/addon/src/main/java/org/nuxeo/web/ui/url/codec/WebNotificationDocumentIdCodec.java b/plugin/web-ui/addon/src/main/java/org/nuxeo/web/ui/url/codec/WebNotificationDocumentIdCodec.java index 063ac22723..87936d75d0 100644 --- a/plugin/web-ui/addon/src/main/java/org/nuxeo/web/ui/url/codec/WebNotificationDocumentIdCodec.java +++ b/plugin/web-ui/addon/src/main/java/org/nuxeo/web/ui/url/codec/WebNotificationDocumentIdCodec.java @@ -1,5 +1,6 @@ /* - * (C) Copyright Nuxeo Corp. (http://nuxeo.com/) + * ©2023 Hyland Software, Inc. and its affiliates. All rights reserved. +All Hyland product names are registered or unregistered trademarks of Hyland Software, Inc. or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml b/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml index 714f248ed8..2bfce8be48 100644 --- a/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml +++ b/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml @@ -35,6 +35,9 @@ ${nuxeo.s3storage.useDirectUpload:=false} + + + ${org.nuxeo.download.url.follow.redirect:=false} ${org.nuxeo.elasticsearch.provider.maxResultWindow:=10000} diff --git a/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp b/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp index 14729eb2ce..c23574fec6 100644 --- a/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp +++ b/plugin/web-ui/addon/src/main/resources/web/nuxeo.war/ui/index.jsp @@ -1,6 +1,7 @@