Merge pull request #218 from nuxeo/dev

Code Freeze: Merge dev into main with Release Candidate v23.0.6-rc.6
nuxeo · Dec 23, 2024 · 15d5563 · 15d5563
2 parents bb3ae5f + 0d180c8
commit 15d5563
Show file tree

Hide file tree

Showing 139 changed files with 1,682 additions and 1,371 deletions.
diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
@@ -133,16 +133,6 @@ jobs:
           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

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -40,12 +40,6 @@ jobs:
           node-version: 20
           scope: '@nuxeo'
 
-      - name: Configure Additional Registries
-        run: |
-            npm config set @hylandsoftware:registry https://npm.pkg.github.com --global
-            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

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -132,17 +132,7 @@ jobs:
           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

diff --git a/.github/workflows/utest.yaml b/.github/workflows/utest.yaml
@@ -40,11 +40,6 @@ jobs:
           node-version: 20
           scope: '@nuxeo'
 
-      - name: Configure Additional Registries
-        run: |
-            npm config set @hylandsoftware:registry https://npm.pkg.github.com --global
-            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

diff --git a/README.md b/README.md
@@ -22,14 +22,6 @@ Once you have it, just add the following lines to your Maven settings.xml :
    </servers>
 </settings>
 ```
-And those lines to your NPM .npmrc :
-```bash
-@hylandsoftware:registry=https://npm.pkg.github.com
-@nuxeo:registry=https://packages.nuxeo.com/repository/npm-public
-registry=https://registry.npmjs.org/
-//npm.pkg.github.com/:_authToken=GITHUB_TOKEN
-```
-
 
 ## Naviagte to Working Directory
 ```bash

diff --git a/nuxeo-admin-console-package/pom.xml b/nuxeo-admin-console-package/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.nuxeo.admin.console</groupId>
     <artifactId>nuxeoadmin</artifactId>
-    <version>23.0.5-SNAPSHOT</version>
+    <version>23.0.6-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/nuxeo-admin-console-package/src/main/resources/package.xml b/nuxeo-admin-console-package/src/main/resources/package.xml
@@ -1,5 +1,5 @@
 <!-- See documentation at http://doc.nuxeo.com/x/HgIz -->
-<package type="addon" name="nuxeo-admin-console" version="23.0.5-SNAPSHOT">
+<package type="addon" name="nuxeo-admin-console" version="23.0.6-SNAPSHOT">
   <title>Nuxeo Admin Console</title>
   <description>
     <p>The Nuxeo admin console provides a dedicated UI for system administrators to get an overview of the system and perform common tasks like reindexing documents.</p>

diff --git a/nuxeo-admin-console-web/angular-app/.npmrc b/nuxeo-admin-console-web/angular-app/.npmrc
diff --git a/nuxeo-admin-console-web/angular-app/angular.json b/nuxeo-admin-console-web/angular-app/angular.json
@@ -11,37 +11,19 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@hylandsoftware/hy-ui-devkit:browser",
+          "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist/admin_console_ui",
             "index": "src/index.jsp",
             "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": ["zone.js"],
             "tsConfig": "tsconfig.app.json",
             "assets": [
-              "src/assets",
-              {
-                "glob": "**/*",
-                "input": "./node_modules/@hyland/ui/assets/public",
-                "output": "./"
-              }
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": [],
-            "i18nPaths": [
-              "src/app"
-            ],
-            "i18nModules": [
-              "@hyland/ui",
-              "@hyland/ui-shell"
+              "src/favicon.svg",
+              "src/assets"
             ],
-            "stylePreprocessorOptions": {
-              "includePaths": [
-                "node_modules"
-              ]
-            }
+            "styles": ["node_modules/@angular/material/prebuilt-themes/indigo-pink.css","src/styles.scss"],
+            "scripts": []
           },
           "configurations": {
             "production": {
@@ -63,8 +45,7 @@
                   "maximumError": "5mb"
                 }
               ],
-              "outputHashing": "all",
-              "silentRefresh": true
+              "outputHashing": "all"
             },
             "development": {
               "buildOptimizer": false,
@@ -83,14 +64,13 @@
                   "replace": "src/devtools/ngrx-devtools.ts",
                   "with": "src/devtools/ngrx-devtools.development.ts"
                 }
-              ],
-              "silentRefresh": true
+              ]
             }
           },
           "defaultConfiguration": "production"
         },
         "serve": {
-          "builder": "@hylandsoftware/hy-ui-devkit:dev-server",
+          "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
               "browserTarget": "admin_console_ui:build:production"
@@ -110,34 +90,17 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "polyfills": [
-              "src/polyfills.ts",
-              "zone.js",
-              "zone.js/testing"
-            ],
+            "polyfills": ["zone.js", "zone.js/testing"],
             "tsConfig": "tsconfig.spec.json",
-            "assets": [
-              "src/favicon.ico",
-              "src/assets"
-            ],
-            "styles": [
-              "src/styles.scss"
-            ],
-            "scripts": [],
-            "stylePreprocessorOptions": {
-              "includePaths": [
-                "node_modules"
-              ]
-            }
+            "assets": ["src/favicon.svg", "src/assets"],
+            "styles": ["src/styles.scss"],
+            "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-eslint/builder:lint",
           "options": {
-            "lintFilePatterns": [
-              "src/**/*.ts",
-              "src/**/*.html"
-            ]
+            "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
           }
         }
       }
@@ -149,4 +112,4 @@
   "cli": {
     "analytics": "bac8daa6-35ed-405f-89f7-031d9cd916f4"
   }
-}
+}
diff --git a/nuxeo-admin-console-web/angular-app/package.json b/nuxeo-admin-console-web/angular-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxeo-admin-console-ui",
-  "version": "23.0.5-SNAPSHOT",
+  "version": "23.0.6-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -13,23 +13,22 @@
   },
   "dependencies": {
     "@angular/animations": "^16.2.0",
+    "@angular/cdk": "^16.2.14",
     "@angular/common": "^16.2.0",
     "@angular/compiler": "^16.2.0",
     "@angular/core": "^16.2.0",
     "@angular/forms": "^16.2.0",
+    "@angular/material": "^16.2.14",
     "@angular/platform-browser": "^16.2.0",
     "@angular/platform-browser-dynamic": "^16.2.0",
     "@angular/router": "^16.2.0",
-    "@hyland/ui": "npm:@hylandsoftware/hy-ui@^8.0.0",
-    "@hyland/ui-shell": "npm:@hylandsoftware/hy-ui-shell@^8.0.0",
-    "@hylandsoftware/hy-ui-icons": "^4.0.2",
     "@ngneat/transloco": "^6.0.0",
     "@ngrx/effects": "^16.0.0",
     "@ngrx/router-store": "^16.0.0",
     "@ngrx/store": "^16.0.0",
     "@ngrx/store-devtools": "^16.0.0",
     "angular-oauth2-oidc": "^15.0.1",
-    "hammerjs": "^2.0.8",
+    "material-symbols": "^0.26.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.13.0"
@@ -51,8 +50,6 @@
     "@angular-eslint/template-parser": "16.3.1",
     "@angular/cli": "^16.2.14",
     "@angular/compiler-cli": "^16.2.0",
-    "@hylandsoftware/hy-ui-devkit": "^6.0.1",
-    "@hylandsoftware/hy-ui-standards": "^6.0.1",
     "@types/jasmine": "~4.3.0",
     "@types/node": "^20.14.8",
     "@typescript-eslint/eslint-plugin": "5.62.0",

diff --git a/nuxeo-admin-console-web/angular-app/src/app/app-routing.module.ts b/nuxeo-admin-console-web/angular-app/src/app/app-routing.module.ts
@@ -55,8 +55,11 @@ export const appRoutes: Route[] = [
       ).then((m) => m.GenericMultiFeatureLayoutModule),
   },
   {
-    path: "auth",
-    loadChildren: () => import("./auth/auth.module").then((m) => m.AuthModule),
+  path: "fulltext-reindex",
+    loadChildren: () =>
+      import(
+        "./features/sub-features/generic-multi-feature-layout/generic-multi-feature-layout.module"
+      ).then((m) => m.GenericMultiFeatureLayoutModule),
   },
   { path: "**", redirectTo: "" },
 ];

diff --git a/nuxeo-admin-console-web/angular-app/src/app/app.component.html b/nuxeo-admin-console-web/angular-app/src/app/app.component.html
@@ -1,7 +1,7 @@
 <div class="unauthorized" *ngIf="currentUser?.isAdministrator === false">
     <h1>{{ UNAUTHORIZED_MESSAGE }}</h1>
     <button mat-stroked-button (click)="onSignOut()" aria-label="Logout">
-        <mat-icon hyIcon>logout</mat-icon> {{ LOGIN_WITH_DIFFERENT_ACCOUNT }}
+        <mat-icon fontSet="material-symbols-outlined">logout</mat-icon> {{ LOGIN_WITH_DIFFERENT_ACCOUNT }}
     </button>
 </div>
 

diff --git a/nuxeo-admin-console-web/angular-app/src/app/app.component.scss b/nuxeo-admin-console-web/angular-app/src/app/app.component.scss
@@ -1,4 +1,3 @@
-@import '~@hylandsoftware/hy-ui-icons/index.css';
 .unauthorized{
     display: flex;
     flex-direction: column;