diff --git a/.env.sample b/.env.sample index fd4f795504..3d2f6441a8 100644 --- a/.env.sample +++ b/.env.sample @@ -1,4 +1,4 @@ -NUXEO_WEB_UI_VERSION=3.1.11-SNAPSHOT +NUXEO_WEB_UI_VERSION=3.1.14-SNAPSHOT NUXEO_VERSION=master NUXEO_PACKAGES=nuxeo-drive nuxeo-liveconnect nuxeo-template-rendering NUXEO_DEV_MODE=true diff --git a/.github/workflows/cross-repo.yaml b/.github/workflows/cross-repo.yaml index 71206da39e..8b10f91448 100644 --- a/.github/workflows/cross-repo.yaml +++ b/.github/workflows/cross-repo.yaml @@ -212,7 +212,7 @@ jobs: - name: Archive cucumber reports if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: cucumber-reports path: | @@ -220,14 +220,14 @@ jobs: - name: Archive screenshots if: ${{ failure() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: screenshots path: ftest/target/screenshots/ - name: Archive logs if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: logs path: | @@ -236,7 +236,7 @@ jobs: - name: Archive packages if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: packages path: | diff --git a/.github/workflows/ftest.yaml b/.github/workflows/ftest.yaml index 45af9ec7fd..c282a54150 100644 --- a/.github/workflows/ftest.yaml +++ b/.github/workflows/ftest.yaml @@ -138,21 +138,21 @@ jobs: - name: Archive cucumber reports if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: cucumber-reports path: ftest/target/cucumber-reports/ - name: Archive screenshots if: ${{ failure() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: screenshots path: ftest/target/screenshots/ - name: Archive logs if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: logs path: | @@ -161,7 +161,7 @@ jobs: - name: Archive packages if: ${{ always() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: packages path: | diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ae278ea10a..7f33cf3e95 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -115,7 +115,7 @@ jobs: mvn -B -nsu -ntp -f plugin/itests/marketplace install - name: Archive packages - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: packages path: | diff --git a/.github/workflows/veracode-3.0.x.yaml b/.github/workflows/veracode-3.0.x.yaml new file mode 100644 index 0000000000..cb81b1f89b --- /dev/null +++ b/.github/workflows/veracode-3.0.x.yaml @@ -0,0 +1,184 @@ +# 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 Maintenance 3.0.x + +on: + schedule: + - cron: '30 14 * * *' # 14:30 UTC = 8:00 PM IST + +env: + REFERENCE_BRANCH: maintenance-3.0.x + NPM_REPOSITORY: https://packages.nuxeo.com/repository/npm-public/ + BRANCH_NAME: ${{ 'maintenance-3.0.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-build: + # 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: [self-hosted, master] + 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: 18 + scope: '@nuxeo' + + - uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: '11' + + - 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: add .npmrc + run: | + pushd /tmp/_temp/ + 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} + 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: Delete Node Modules + run: | + rm -rf node_modules + rm -rf packages/nuxeo-designer-catalog/node_modules + rm -rf packages/nuxeo-web-ui-ftest/node_modules + rm -rf plugin/a11y/node_modules + + - name: Delete Test Folders + run: | + rm -rf nuxeo-elements/testing-helpers/ + rm -rf nuxeo-elements/ui/test/ + rm -rf nuxeo-elements/storybook/ + rm -rf ftest/ + rm -rf plugin/ + rm -rf scripts/ + rm -rf test/ + rm -rf packages/nuxeo-web-ui-ftest/ + + - name: Install zip + run: apt-get install zip + + - name: Zip nuxeo-web-ui + run: | + echo nuxeo-web-ui-${{ steps.get-tag.outputs.TAG }}.zip + zip -r nuxeo-web-ui.zip * + + - name: Upload ZIP as artifact + uses: actions/upload-artifact@v3 + with: + name: nuxeo-web-ui + path: nuxeo-web-ui.zip + + sast-scan: + needs: sast-scan-build + permissions: + contents: read + security-events: write + actions: read + runs-on: ubuntu-latest + steps: + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: nuxeo-web-ui + path: . + + - name: List downloaded artifact + run: | + ls -l + pwd + + - name: Veracode Upload And Scan + uses: veracode/veracode-uploadandscan-action@0.2.6 + with: + appname: 'Nuxeo Web UI' + createprofile: false + filepath: 'nuxeo-web-ui.zip' + vid: '${{ secrets.VERACODE_SECRET_API_ID }}' + vkey: '${{ secrets.VERACODE_SECRET_KEY }}' + sandboxname: 'master' + scantimeout: 600 + include: '*.war, *.zip, *.js, *.html, *.css, *.json' + criticality: 'High' + includenewmodules: 'true' \ No newline at end of file diff --git a/.github/workflows/veracode.yml b/.github/workflows/veracode-3.1.x.yaml similarity index 52% rename from .github/workflows/veracode.yml rename to .github/workflows/veracode-3.1.x.yaml index 149fbf4f9f..7c611fa487 100644 --- a/.github/workflows/veracode.yml +++ b/.github/workflows/veracode-3.1.x.yaml @@ -4,43 +4,17 @@ # 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 + +name: Veracode Maintenance 3.1.x 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 + - cron: '30 17 * * *' # 17:30 UTC = 11:00 PM IST 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' }} + BRANCH_NAME: ${{'maintenance-3.1.x' }} # A workflow run is made up of one or more jobs that can run sequentially or in parallel permissions: @@ -48,13 +22,13 @@ permissions: 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: + sast-scan-build: # 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 + runs-on: [self-hosted, master] 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 @@ -65,13 +39,13 @@ jobs: - uses: actions/setup-node@v1 with: registry-url: ${{ env.NPM_REPOSITORY }} - node-version: 14 + node-version: 18 scope: '@nuxeo' - uses: actions/setup-java@v2 with: distribution: 'zulu' - java-version: '17' + java-version: '11' - name: Determine nuxeo-elements branch to link id: pick_nuxeo_elements_branch @@ -113,6 +87,19 @@ jobs: echo "ELEMENTS_HELPERS=$(npm pack 2>&1 | tail -1)" >> $GITHUB_ENV popd popd + + - name: add .npmrc + run: | + pushd /tmp/_temp/ + 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} @@ -130,64 +117,68 @@ jobs: ' > ~/.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 + + - name: Delete Node Modules + run: | + rm -rf node_modules + rm -rf packages/nuxeo-designer-catalog/node_modules + rm -rf packages/nuxeo-web-ui-ftest/node_modules + rm -rf plugin/a11y/node_modules + + - name: Delete Test Folders + run: | + rm -rf nuxeo-elements/testing-helpers/ + rm -rf nuxeo-elements/ui/test/ + rm -rf nuxeo-elements/storybook/ + rm -rf ftest/ + rm -rf plugin/ + rm -rf scripts/ + rm -rf test/ + rm -rf packages/nuxeo-web-ui-ftest/ + + - name: Install zip + run: apt-get install zip + + - name: Zip nuxeo-web-ui + run: | + echo nuxeo-web-ui-${{ steps.get-tag.outputs.TAG }}.zip + zip -r nuxeo-web-ui.zip * + + - name: Upload ZIP as artifact + uses: actions/upload-artifact@v3 with: - token: ${{ secrets.SLACK_BOT_TOKEN }} - path: results.txt - channel: ${{ secrets.SLACK_CHANNEL_ID }} \ No newline at end of file + name: nuxeo-web-ui + path: nuxeo-web-ui.zip + + sast-scan: + needs: sast-scan-build + permissions: + contents: read + security-events: write + actions: read + runs-on: ubuntu-latest + steps: + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: nuxeo-web-ui + path: . + + - name: List downloaded artifact + run: | + ls -l + pwd + + - name: Veracode Upload And Scan + uses: veracode/veracode-uploadandscan-action@0.2.6 + with: + appname: 'Nuxeo Web UI' + createprofile: false + filepath: 'nuxeo-web-ui.zip' + vid: '${{ secrets.VERACODE_SECRET_API_ID }}' + vkey: '${{ secrets.VERACODE_SECRET_KEY }}' + sandboxname: 'master' + scantimeout: 600 + include: '*.war, *.zip, *.js, *.html, *.css, *.json' + criticality: 'High' + includenewmodules: 'true' \ No newline at end of file diff --git a/charts/preview/Chart.yaml b/charts/preview/Chart.yaml index 1780632f37..7d7254a8b8 100644 --- a/charts/preview/Chart.yaml +++ b/charts/preview/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: A Helm chart for Web UI preview icon: https://media.licdn.com/dms/image/C4D0BAQFPXiXFrp4LBA/company-logo_200_200/0?e=2159024400&v=beta&t=RW9EU0QUciUVuPSpLySd9FtJ2yG-O37_hAAvc32f6ro name: preview -version: 3.1.11-SNAPSHOT +version: 3.1.14-SNAPSHOT diff --git a/elements/nuxeo-app.js b/elements/nuxeo-app.js index 7837754727..8153a3cff8 100644 --- a/elements/nuxeo-app.js +++ b/elements/nuxeo-app.js @@ -459,11 +459,7 @@ Polymer({ - + { + const updatedUrl = createUrlFromString(url); + const { hostname: currentUrlHostName } = new URL(updatedUrl); + return currentUrlHostName?.toLowerCase() === userHostName?.toLowerCase(); + }); + return isValidUrl; +} + +function encodeQueryParams(path) { + const pathUrl = new URL(path); + const queryParams = pathUrl.search.split('?')[1]; + const encodepath = queryParams ? `${pathUrl.origin}?${encodeURIComponent(queryParams)}` : path; + return encodepath; +} + function _routeAdmin(selectedAdminTab, errorPath, routeData) { const hasPermission = app.currentUser.isAdministrator || app.currentUser.extendedGroups.find((grp) => grp.name === 'powerusers'); @@ -196,7 +226,13 @@ app.router = { } const isFullpath = /^http(s)?:\/\//.test(path); if (isFullpath) { - window.location = path; + const isValidUrl = isTrustedDomain(path); + if (isValidUrl) { + const encodepath = encodeQueryParams(path); + const link = document.createElement('a'); + link.setAttribute('href', encodepath); + link.click(); + } } else { page(path); } diff --git a/ftest/pom.xml b/ftest/pom.xml index 674a0dfb56..87f9fb2f59 100644 --- a/ftest/pom.xml +++ b/ftest/pom.xml @@ -4,7 +4,7 @@ org.nuxeo.web.ui nuxeo-web-ui-parent - 3.1.11-SNAPSHOT + 3.1.14-SNAPSHOT ../pom.xml diff --git a/package.json b/package.json index 8ff69e2449..84e91f4965 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "repository": "nuxeo/nuxeo-web-ui.git", "homepage": "http://www.nuxeo.com", "name": "@nuxeo/nuxeo-web-ui", - "version": "3.1.11-SNAPSHOT", + "version": "3.1.14-SNAPSHOT", "license": "Apache-2.0", "vendor": "Nuxeo", "engines": { @@ -14,7 +14,7 @@ }, "devDependencies": { "@nuxeo/nuxeo-web-ui-ftest": "file:./packages/nuxeo-web-ui-ftest", - "@nuxeo/testing-helpers": "~3.1.11-rc", + "@nuxeo/testing-helpers": "~3.1.14-rc", "@open-wc/eslint-config": "^0.3.0", "@open-wc/karma-esm": "^2.13.21", "@open-wc/prettier-config": "^0.1.0", @@ -62,8 +62,8 @@ "wdio-json-reporter": "^3.0.0", "webpack": "^5.3.0", "webpack-bundle-analyzer": "^3.9.0", - "webpack-cli": "^4.1.0", - "webpack-dev-server": "^3.11.0", + "webpack-cli": "^5.1.4", + "webpack-dev-server": "^5.0.4", "webpack-log": "^3.0.1", "webpack-merge": "^5.2.0", "workbox-cli": "3.6.3" @@ -109,9 +109,9 @@ "@material/mwc-snackbar": "^0.26.1", "@nuxeo/chart-elements": "^4.0.0-nx.1", "@nuxeo/moment": "^2.24.0-nx.0", - "@nuxeo/nuxeo-dataviz-elements": "~3.1.11-rc", - "@nuxeo/nuxeo-elements": "~3.1.11-rc", - "@nuxeo/nuxeo-ui-elements": "~3.1.11-rc", + "@nuxeo/nuxeo-dataviz-elements": "~3.1.14-rc", + "@nuxeo/nuxeo-elements": "~3.1.14-rc", + "@nuxeo/nuxeo-ui-elements": "~3.1.14-rc", "@nuxeo/page": "^1.11.4-nx.0", "@polymer/app-layout": "^3.1.0", "@polymer/iron-a11y-announcer": "^3.2.0", diff --git a/packages/nuxeo-web-ui-ftest/package.json b/packages/nuxeo-web-ui-ftest/package.json index 72b9ad506c..9b49e4a98d 100644 --- a/packages/nuxeo-web-ui-ftest/package.json +++ b/packages/nuxeo-web-ui-ftest/package.json @@ -1,6 +1,6 @@ { "name": "@nuxeo/nuxeo-web-ui-ftest", - "version": "3.1.11-SNAPSHOT", + "version": "3.1.14-SNAPSHOT", "bin": { "nuxeo-web-ui-ftest": "./bin/nuxeo-web-ui-ftest.js" }, diff --git a/packages/nuxeo-web-ui-ftest/pages/login.js b/packages/nuxeo-web-ui-ftest/pages/login.js index 3a5d8f570e..ee1c6dd48b 100644 --- a/packages/nuxeo-web-ui-ftest/pages/login.js +++ b/packages/nuxeo-web-ui-ftest/pages/login.js @@ -19,6 +19,7 @@ export default class Login { const baseUrl = process.env.NUXEO_URL || ''; await driver.pause(1000); await browser.url(baseUrl ? `${baseUrl}/logout` : 'logout'); + await driver.pause(4000); return new this(); })(); } diff --git a/plugin/a11y/pom.xml b/plugin/a11y/pom.xml index ddad35d2a9..60d8b86a96 100644 --- a/plugin/a11y/pom.xml +++ b/plugin/a11y/pom.xml @@ -4,7 +4,7 @@ org.nuxeo.web.ui nuxeo-web-ui-parent - 3.1.11-SNAPSHOT + 3.1.14-SNAPSHOT ../../pom.xml diff --git a/plugin/itests/addon/pom.xml b/plugin/itests/addon/pom.xml index 10b4eb6ae4..60dbc9eac9 100644 --- a/plugin/itests/addon/pom.xml +++ b/plugin/itests/addon/pom.xml @@ -4,7 +4,7 @@ org.nuxeo.web.ui nuxeo-web-ui-parent - 3.1.11-SNAPSHOT + 3.1.14-SNAPSHOT ../../../pom.xml diff --git a/plugin/itests/marketplace/pom.xml b/plugin/itests/marketplace/pom.xml index 900b2c0d20..886e06635f 100644 --- a/plugin/itests/marketplace/pom.xml +++ b/plugin/itests/marketplace/pom.xml @@ -3,7 +3,7 @@ org.nuxeo.web.ui nuxeo-web-ui-parent - 3.1.11-SNAPSHOT + 3.1.14-SNAPSHOT ../../../pom.xml diff --git a/plugin/metrics/pom.xml b/plugin/metrics/pom.xml index a664ab68a6..6564d544ba 100644 --- a/plugin/metrics/pom.xml +++ b/plugin/metrics/pom.xml @@ -4,7 +4,7 @@ org.nuxeo.web.ui nuxeo-web-ui-parent - 3.1.11-SNAPSHOT + 3.1.14-SNAPSHOT ../../pom.xml diff --git a/plugin/web-ui/addon/pom.xml b/plugin/web-ui/addon/pom.xml index 06d8558dea..79512fd8e4 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.1.11-SNAPSHOT + 3.1.14-SNAPSHOT ../../../pom.xml 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 cf0b597912..792dc7fc3f 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 @@ -51,5 +51,10 @@ + + ${org.nuxeo.pagination.nuxeoSelectOptions.maxAllowedItems:=1000} + + ${org.nuxeo.web.ui.trustedDomains:=} + \ No newline at end of file diff --git a/plugin/web-ui/marketplace/pom.xml b/plugin/web-ui/marketplace/pom.xml index cdaa108ece..30b4bacd13 100644 --- a/plugin/web-ui/marketplace/pom.xml +++ b/plugin/web-ui/marketplace/pom.xml @@ -3,7 +3,7 @@ org.nuxeo.web.ui nuxeo-web-ui-parent - 3.1.11-SNAPSHOT + 3.1.14-SNAPSHOT ../../../pom.xml diff --git a/pom.xml b/pom.xml index cb63faad96..0721eaa0f3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom Nuxeo Web UI - Parent Nuxeo Web UI - Parent - 3.1.11-SNAPSHOT + 3.1.14-SNAPSHOT 2023.* diff --git a/webpack.config.js b/webpack.config.js index 372f7ca404..61c8680b75 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -186,15 +186,22 @@ const development = merge([ devtool: 'cheap-module-source-map', plugins: [new CopyWebpackPlugin({ patterns: [...tmp, ...polyfills, ...addons, ...thirdparty] })], devServer: { - contentBase: TARGET, + static: { + directory: TARGET, + }, compress: true, - overlay: true, + client: { + overlay: true, + }, port: 5000, host: '0.0.0.0', historyApiFallback: true, - proxy: { - '/nuxeo': `http://${process.env.NUXEO_HOST || 'localhost:8080'}/`, - }, + proxy: [ + { + context: ['/nuxeo'], + target: `http://${process.env.NUXEO_HOST || 'localhost:8080'}/`, + }, + ], }, }, ]); @@ -226,6 +233,11 @@ const production = merge([ }), ...analyzer, ], + devServer: { + client: { + overlay: false, + }, + }, }, ]);