Code Freeze: Merge dev into main with Release Candidate v23.0.3-rc.12 (…

…#161) * NXP-32807: common networks layer (#127) (#138) * NXP-32807: common networks layer * NXP-32807: common networks layer * NXP-32807: common networks layer * NXP-32807: common networks layer * NXP-32807: common networks layer * NXP-32807: common networks layer * NXP-32807: common networks layer * NXP-32807: common networks layer * NXP-32807: common networks layer * NXP-32807: common networks layer Co-authored-by: Nishant0928 <[email protected]> * Introduced Maven Cache (#139) * NAC-246: remove extra css layers and address consequences (#136) NXP-32813: remove extra css layers and address consequences Co-authored-by: Madhur Kulshrestha <[email protected]> * Added Node Modules caching in all pipelines (#141) * Added node module caching in all pipelines * NAC-252: remove google font link (#143) * Revert "NXP-32807: common networks layer (#127) (#138)" (#144) This reverts commit 1ddf940. * Update 23.0.1-SNAPSHOT to 23.0.2-SNAPSHOT * Removed usage of googleapis (#146) Removed usage of googleapis * Update 23.0.2-SNAPSHOT to 23.0.3-SNAPSHOT * NXP-32807: common networks layer Re-adding the changes * NAC-135: bulk action monitoring action form (#147) * NAC-135: bulk action monitoring action form * NAC-135: bulk action monitoring action form * NAC-135: bulk action monitoring action form * NAC-135: bulk action monitoring action form * NAC-135: admin bulk action monitoring form * NAC-135: admin bulk action monitoring form * NAC-255: logout is not working for Admin Console (#152) * NAC-255: logout is not working for Admin Console * NAC-138: Admin console - Bulk action monitoring details (#149) * NAC-138: bulk action monitoring details * UI changes * changed pluralize logic * bulk action summary UI changes * unit tests * accessibility and resizing issues * status text edit, sample json for action ids with logic & a11y for info icon * json & css change * refactored * PR feedback changes * tooltio changes * css changes * modified folder structure * css icon changes * css changes --------- Co-authored-by: Nishant0928 <[email protected]> * handled error condition (#154) * NAC-138: error text modification (#155) * NAC-138: error text modification * cursor pointer removed * NAC-253: deep linking to the bulk action monitoring (#153) * NAC-253: deep linking to the bulk action monitoring * unit tests * unit test fixes * lint changes * lint changes * lint changes --------- Co-authored-by: swarnadipa-dev <[email protected]> * NAC-247: codefreeze.yaml (#156) (#157) * NAC-247: release process workflow dev.yaml (#151) * NAC-247: release process workflow dev.yaml * NAC-247: release process workflow main.yaml * NAC-247: release process workflow code-freeze.yaml * NAC-247: release process workflow promote.yaml * NAC-247: release process workflow delete-preprod-version.yaml * NAC-247: release process workflow format main.yaml * NAC-247: release process workflow format main.yaml * NAC-247: pre release bata tag yaml * NAC-247: promote yaml * NAC-247: hotfix checker.yaml * NAC-247: main.yaml * NAC-261: Focus moves to Bulk Action ID field when user clicks Refresh button (#158) * NAC-261: Focus moves to Bulk Action ID field when user clicks Refresh button * removed extra space * NAC-261: removed extra code * NAC-261: removed extra code * NAC-138 : Rectified base url for json files (#159) * NAC-138: bulk action monitoring details * UI changes * changed pluralize logic * bulk action summary UI changes * unit tests * accessibility and resizing issues * status text edit, sample json for action ids with logic & a11y for info icon * json & css change * refactored * PR feedback changes * tooltio changes * css changes * modified folder structure * css icon changes * css changes * Rectified base url for json files --------- Co-authored-by: swarnadipa-dev <[email protected]> Co-authored-by: Nishant0928 <[email protected]> * NAC-257: accessibility issues after removing extra css layers (#160) --------- Co-authored-by: Nishant0928 <[email protected]> Co-authored-by: nuxeo-webui-jx-bot <[email protected]> Co-authored-by: Rakesh Kumar Singh <[email protected]> Co-authored-by: swarnadipa choudhury <[email protected]> Co-authored-by: Nishant0928 <[email protected]> Co-authored-by: swarnadipa-dev <[email protected]>
nuxeo · Sep 2, 2024 · 7c6da8c · 7c6da8c
1 parent 104bcb9
commit 7c6da8c
Show file tree

Hide file tree

Showing 92 changed files with 3,789 additions and 697 deletions.
diff --git a/.github/workflows/delete-preprod-version.yaml b/.github/workflows/delete-preprod-version.yaml
@@ -0,0 +1,21 @@
+name: Delete Marketplace Version (Pre-Prod)
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version to delete Pre-Prod eg.(23.0.1-rc.002)'
+        required: true
+
+jobs:
+  delete-marketplace-version:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Delete Marketplace Version (Pre-Prod)
+      run: |
+        echo "Deleting version ${{ github.event.inputs.version }} from the pre-production marketplace..."
+        version=${{ github.event.inputs.version }}
+        curl -i -u ${{ secrets.CONNECT_PREPROD_AUTH }} -X DELETE "https://nos-preprod-connect.nuxeocloud.com/nuxeo/site/marketplace/delete/nuxeo-admin-console-${version}"
+      env:
+        CONNECT_PREPROD_AUTH: ${{ secrets.CONNECT_PREPROD_AUTH }}
diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
@@ -0,0 +1,166 @@
+name: Dev
+
+on:
+  push:
+    branches:
+      - dev
+
+  # Manually trigger the workflow
+  workflow_dispatch:
+
+jobs:
+  lint:
+    uses: nuxeo/nuxeo-admin-console-ui/.github/workflows/lint.yaml@dev
+    secrets:
+      NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
+      GIT_TOKEN: ${{ secrets.GIT_TOKEN }} 
+
+  test:
+    uses: nuxeo/nuxeo-admin-console-ui/.github/workflows/utest.yaml@dev
+    secrets:
+      NPM_PACKAGES_TOKEN: ${{ secrets.NPM_PACKAGES_TOKEN }}
+      GIT_TOKEN: ${{ secrets.GIT_TOKEN }} 
+
+  build:
+    needs: [lint, test]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - run: git config user.name "nuxeo-webui-jx-bot" && git config user.email "[email protected]"
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          registry-url: ${{ env.NEXUS_URL }}
+          scope: '@nuxeo'
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: 'Update settings.xml with server configuration'
+        run: |
+          echo '<settings>
+              <servers>
+                <server>
+                  <id>maven-internal</id>
+                  <username>${{ secrets.PACKAGES_AUTH_USER }}</username>
+                  <password>${{ secrets.PACKAGES_AUTH_TOKEN }}</password>
+                </server>
+              </servers>
+              </settings>' > ~/.m2/settings.xml
+
+      - name: Configure .npmrc
+        working-directory: nuxeo-admin-console-web/angular-app
+        run: |
+          echo "//npm.pkg.github.com/:_authToken=${{ secrets.GIT_TOKEN }}" >> .npmrc
+
+      - name: Prepare Environment
+        run: |
+          echo "BRANCH_NAME=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV
+          pushd nuxeo-admin-console-web/angular-app
+          echo $(npx -c 'echo "$npm_package_version"')
+          echo "PACKAGE_VERSION=$(npx -c 'echo "$npm_package_version"')" >> $GITHUB_ENV 
+          popd
+
+      - name: Get Prerelease Version
+        run: |
+          git fetch origin --tags
+          RC_VERSION=$(git tag --sort=taggerdate --list "v${PACKAGE_VERSION/-SNAPSHOT}*.*" "v${PACKAGE_VERSION/-SNAPSHOT}" | grep -v 'beta' | tail -1 | tr -d '\n')
+          echo "v${PACKAGE_VERSION/-SNAPSHOT}*" "->" "${RC_VERSION}" "->" "${RC_VERSION:-$PACKAGE_VERSION}"
+          echo "VERSION=$(npx semver -i prerelease --preid rc ${RC_VERSION:-$PACKAGE_VERSION} | tr -d '\n')" >> $GITHUB_ENV
+      
+      - name: Update Version ${{env.VERSION}}
+        run: |
+          # find . -type f -not -path "./node_modules/*" -regex ".*\.\(yaml\|sample\|json\)" -exec sed -i 's/'"${{env.PACKAGE_VERSION}}"'/'"${{env.VERSION}}"'/g' {} \;
+          # set padded version to build package for connect preprod
+          PADDED=$(printf '%03d' $(echo ${{env.VERSION}} | sed -r s/[0-9]+\.[0-9]+\.[0-9]+-rc\.\([0-9]+\)/\\1/g))
+          PADDED_VERSION=$(echo ${{env.VERSION}} | sed -E "s/([0-9]+\.[0-9]+\.[0-9]+-rc\.)[0-9]+/\\1$PADDED/g")
+          echo "PADDED_VERSION=$PADDED_VERSION" >> $GITHUB_ENV
+          find . -type f -not -path "./node_modules/*" -regex ".*\.\(xml\)" -exec sed -i 's/'"${{env.PACKAGE_VERSION}}"'/'"$PADDED_VERSION"'/g' {} \;
+          sed -i -e 's/\${project.version}/'"$PADDED_VERSION"'/g' nuxeo-admin-console-package/pom.xml
+          pushd nuxeo-admin-console-web/angular-app
+          npm version ${{env.VERSION}} --no-git-tag-version
+          popd
+         
+      - name: Cache node modules
+        id: cache-npm
+        uses: actions/cache@v4
+        env:
+            cache-name: cache-node-modules
+        with:
+        # npm cache files are stored in `~/.npm` on Linux/macOS
+            path: ~/.npm
+            key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+            restore-keys: |
+                ${{ runner.os }}-build-${{ env.cache-name }}-
+                ${{ runner.os }}-build-
+                ${{ runner.os }}-
+
+      - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
+        name: List the state of node modules
+        continue-on-error: true
+        run: npm list
+
+      - name: Install Angular CLI
+        run: npm install -g @angular/cli
+
+      - name: Install Dependencies
+        working-directory: nuxeo-admin-console-web/angular-app
+        run: npm install
+
+      - name: Restore Maven cache
+        uses: skjolber/maven-cache-github-action@v1
+        with:
+          step: restore
+
+      - name: Build Angular Project
+        run: mvn package
+
+      - name: Save Maven cache
+        uses: skjolber/maven-cache-github-action@v1
+        with:
+          step: save
+
+      - name: Archive Package
+        uses: actions/upload-artifact@v4
+        with:
+          name: packages
+          path: |
+            nuxeo-admin-console-package/target/nuxeo-admin-console-*.zip
+
+      - name: Delete & Update .npmrc 
+        working-directory: nuxeo-admin-console-web/angular-app
+        run: |
+          rm .npmrc
+          echo "
+          @hylandsoftware:registry=https://npm.pkg.github.com
+          @nuxeo:registry=https://packages.nuxeo.com/repository/npm-public
+          registry=https://registry.npmjs.org/
+          " >> .npmrc
+
+      - name: Tag
+        run: |
+          git add nuxeo-admin-console-web/angular-app/package-lock.json
+          git commit -a -m "Release ${{env.VERSION}}"
+          git tag -a v${{env.VERSION}} -m "Release ${{env.VERSION}}"
+          git push origin v${{env.VERSION}}
+        
+      - name: Publish on Pre-Prod Marketplace
+        working-directory: nuxeo-admin-console-package/target
+        env:
+          CONNECT_PREPROD_URL: https://nos-preprod-connect.nuxeocloud.com/nuxeo
+        run: |
+          PACKAGE="nuxeo-admin-console-${{env.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
diff --git a/.github/workflows/hotfix-checker.yaml b/.github/workflows/hotfix-checker.yaml
@@ -0,0 +1,85 @@
+name: Hotfix
+
+on:
+  push:
+    branches:
+      - main  
+
+  # Manually trigger the workflow 
+  workflow_dispatch:
+
+jobs:
+    get-branch-name:
+        runs-on: ubuntu-latest
+        outputs:
+          last_pr_branch: ${{ steps.get-branch.outputs.last_pr_branch }}
+        steps:
+          - name: Checkout Code
+            uses: actions/checkout@v4
+
+          - name: Authenticate GitHub CLI
+            run: |
+              echo "${{ secrets.GIT_TOKEN }}" | gh auth login --with-token 
+    
+
+          - name: Get the branch name of the last merged PR
+            id: get-branch
+            run: |
+              last_pr_merge_commit=$(git log --merges --pretty=format:"%H" -n 1)
+              merge_message=$(git log -1 --pretty=%B $last_pr_merge_commit)
+              full_branch_name=$(echo "$merge_message" | grep -oP 'from \K[^/]+/[^\s]+$')
+              branch_name=$(echo "$full_branch_name" | awk -F'/' '{print $2}')
+              echo "The branch name is $branch_name & full name is $full_branch_name"
+              echo "::set-output name=last_pr_branch::$(echo $branch_name | xargs)"
+
+    hotfix-merge:
+        needs: get-branch-name
+        runs-on: ubuntu-latest
+        steps:
+        - name: Checkout Code
+          if: needs.get-branch-name.outputs.last_pr_branch != 'dev'
+          uses: actions/checkout@v4
+
+        - name: Setup Git config
+          if: needs.get-branch-name.outputs.last_pr_branch != 'dev'
+          run: git config user.name "nuxeo-webui-jx-bot" && git config user.email "[email protected]"
+
+        - name: Authenticate GitHub CLI
+          if: needs.get-branch-name.outputs.last_pr_branch != 'dev'
+          run: |
+                echo "${{ secrets.GIT_TOKEN }}" | gh auth login --with-token 
+        
+        - name: Debug Output
+          if: needs.get-branch-name.outputs.last_pr_branch != 'dev'
+          run: |
+                echo "Branch name: ${{ needs.get-branch-name.outputs.last_pr_branch }}"
+
+        - name: Get latest beta tag
+          if: needs.get-branch-name.outputs.last_pr_branch != 'dev'
+          run: |
+            git fetch  origin --tags
+            latest_beta_tag=$(git for-each-ref --sort=-taggerdate --format '%(refname:short)' refs/tags | grep -E '^v23\.[0-9]+\.[0-9]+-beta\.[0-9]+$' | head -n 1 | sed 's/^v//')
+            echo "Latest beta tag: $latest_beta_tag"
+            echo "LATEST_BETA_TAG=$latest_beta_tag" >> $GITHUB_ENV
+
+        - name: Update beta version
+          if: needs.get-branch-name.outputs.last_pr_branch != 'dev'
+          run: |
+                # Increment beta.x to x+1 while preserving the correct format
+                BASE_VERSION=$(echo $LATEST_BETA_TAG | sed 's/-beta.*//')
+                BETA_NUMBER=$(echo $LATEST_BETA_TAG | sed 's/.*-beta.//')
+                NEW_BETA_NUMBER=$((BETA_NUMBER + 1))
+                NEW_BETA_TAG="${BASE_VERSION}-beta.${NEW_BETA_NUMBER}"
+                echo "New beta tag: $NEW_BETA_TAG"
+                echo "NEW_BETA_TAG=$NEW_BETA_TAG" >> $GITHUB_ENV
+
+        - name: Store Beta Release Version as a Secret
+          if: needs.get-branch-name.outputs.last_pr_branch != 'dev'
+          id: get-hotfix-beta-version
+          run: |
+            gh secret set BETA_RELEASE_VERSION --body ${{ env.NEW_BETA_TAG }}
+
+        - name: Create Pull Request
+          if: needs.get-branch-name.outputs.last_pr_branch != 'dev'
+          run: |
+            gh pr create --base dev --head main --title "HF: Merge main into dev" --body "### This pull request merges the latest changes from the **main** branch into the **dev** branch."
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -46,6 +46,25 @@ jobs:
             npm config set //npm.pkg.github.com/:_authToken=${{ secrets.GIT_TOKEN }} --global
             npm config set registry https://registry.npmjs.org/ --global
 
+      - name: Cache node modules
+        id: cache-npm
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
+        name: List the state of node modules
+        continue-on-error: true
+        run: npm list
+
       - name: Install @angular/cli
         run: npm install -g @angular/cli