From c5d2e1d4e694c7ae366ffb4d5a0b8d310ec2f5cf Mon Sep 17 00:00:00 2001
From: nuxeo-webui-jx-bot
Date: Mon, 28 Oct 2024 06:52:22 +0000
Subject: [PATCH 1/7] Update 23.0.5-SNAPSHOT to 23.0.6-SNAPSHOT
---
nuxeo-admin-console-package/pom.xml | 2 +-
nuxeo-admin-console-package/src/main/resources/package.xml | 2 +-
nuxeo-admin-console-web/angular-app/package.json | 2 +-
nuxeo-admin-console-web/pom.xml | 4 ++--
pom.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/nuxeo-admin-console-package/pom.xml b/nuxeo-admin-console-package/pom.xml
index 5c5640d2..0bb17fd1 100644
--- a/nuxeo-admin-console-package/pom.xml
+++ b/nuxeo-admin-console-package/pom.xml
@@ -3,7 +3,7 @@
org.nuxeo.admin.console
nuxeoadmin
- 23.0.5-SNAPSHOT
+ 23.0.6-SNAPSHOT
../pom.xml
diff --git a/nuxeo-admin-console-package/src/main/resources/package.xml b/nuxeo-admin-console-package/src/main/resources/package.xml
index 94e044c6..416a9936 100644
--- a/nuxeo-admin-console-package/src/main/resources/package.xml
+++ b/nuxeo-admin-console-package/src/main/resources/package.xml
@@ -1,5 +1,5 @@
-
+
Nuxeo Admin Console
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.
diff --git a/nuxeo-admin-console-web/angular-app/package.json b/nuxeo-admin-console-web/angular-app/package.json
index a8a7f8bb..53c661a2 100644
--- 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",
diff --git a/nuxeo-admin-console-web/pom.xml b/nuxeo-admin-console-web/pom.xml
index 47d81ac6..b6a174d8 100644
--- a/nuxeo-admin-console-web/pom.xml
+++ b/nuxeo-admin-console-web/pom.xml
@@ -3,13 +3,13 @@
org.nuxeo.admin.console
nuxeoadmin
- 23.0.5-SNAPSHOT
+ 23.0.6-SNAPSHOT
../pom.xml
nuxeo-admin-console-web
Admin console
- 23.0.5-SNAPSHOT
+ 23.0.6-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index bb03e97a..bf31b8cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
org.nuxeo.admin.console
nuxeoadmin
- 23.0.5-SNAPSHOT
+ 23.0.6-SNAPSHOT
Admin Console UI
Nuxeo Admin console UI is a standard base web application for Nuxeo admin users.
pom
From e6432c5a6ca3671236aa9dce264b64caa216e6a7 Mon Sep 17 00:00:00 2001
From: swarnadipa choudhury <67375320+swarnadipa-dev@users.noreply.github.com>
Date: Tue, 12 Nov 2024 11:53:24 +0530
Subject: [PATCH 2/7] NAC-317 use angular material instead of hyland UI
elements (#212)
* NAC-317: initial commit - removed hyland UI packages, replaced toastservice, mattooltip, maticon, modified pipeline jobs & updated package.json
* form field
* dialog, snackbar, table, form fields
* dialog, snackbar, table, form fields
* ui css changes
* rectified css on homepage
* rectified css on header
* changes
* css changes, removed hylandssomanager component
* added favicon. refactored styles
* lint & unit test fixes
* CSS Changes for Refresh button
* removed package-lock.json, installed material design icons
* removed redundant css
* Switched to material symbols instead of material design icons
* keyboard navigar=tion on table rows, deleted empty directive, font family change
* deleted .npmrc
* fixed button & modal styles
---------
Co-authored-by: Nishant0928
Co-authored-by: Madhur Kulshrestha
---
.github/workflows/dev.yaml | 10 -
.github/workflows/lint.yaml | 6 -
.github/workflows/main.yaml | 12 +-
.github/workflows/utest.yaml | 5 -
README.md | 8 -
nuxeo-admin-console-web/angular-app/.npmrc | 3 -
.../angular-app/angular.json | 67 ++---
.../angular-app/package.json | 9 +-
.../angular-app/src/app/app-routing.module.ts | 4 -
.../angular-app/src/app/app.component.html | 2 +-
.../angular-app/src/app/app.component.scss | 1 -
.../angular-app/src/app/app.component.spec.ts | 98 +++++---
.../angular-app/src/app/app.component.ts | 1 +
.../angular-app/src/app/app.module.ts | 29 +--
.../src/app/auth/auth-routing.module.ts | 17 --
.../angular-app/src/app/auth/auth.module.ts | 8 -
.../SSO/hylandSSOManager.component.html | 13 -
.../SSO/hylandSSOManager.component.ts | 34 ---
.../bulk-action-monitoring.module.ts | 16 +-
...bulk-action-monitoring-form.component.html | 4 +-
...bulk-action-monitoring-form.component.scss | 27 +-
...k-action-monitoring-form.component.spec.ts | 1 +
.../bulk-action-monitoring-form.component.ts | 61 +++--
...k-action-monitoring-details.component.html | 98 ++++----
...k-action-monitoring-details.component.scss | 18 +-
...ction-monitoring-details.component.spec.ts | 4 +-
...ulk-action-monitoring-details.component.ts | 13 +-
...action-monitoring-result.component.spec.ts | 17 +-
...k-action-monitoring-summary.component.html | 6 +-
...k-action-monitoring-summary.component.scss | 18 +-
...ction-monitoring-summary.component.spec.ts | 39 +--
...ulk-action-monitoring-summary.component.ts | 17 +-
.../store/effects.spec.ts | 3 +-
.../bulk-action-monitoring/store/effects.ts | 74 +-----
.../probes-summary.component.spec.ts | 14 +-
.../registration-version.component.scss | 7 +
.../src/app/features/home/home.module.ts | 4 -
.../features/probes/probes.component.spec.ts | 14 +-
.../src/app/features/probes/probes.module.ts | 4 -
.../document-tab/document-tab.component.html | 22 +-
.../document-tab/document-tab.component.scss | 33 ++-
.../document-tab.component.spec.ts | 10 +-
.../document-tab/document-tab.component.ts | 2 +
.../error-modal/error-modal.component.html | 44 ++--
.../error-modal/error-modal.component.scss | 6 +-
.../error-modal/error-modal.component.spec.ts | 5 +-
.../folder-tab/folder-tab.component.html | 24 +-
.../folder-tab/folder-tab.component.scss | 35 +--
.../folder-tab/folder-tab.component.spec.ts | 11 +-
.../folder-tab/folder-tab.component.ts | 3 +
.../generic-modal.component.html | 93 ++++---
.../generic-modal.component.scss | 15 +-
.../generic-modal.component.spec.ts | 5 +-
.../nxql-tab/nxql-tab.component.html | 25 +-
.../nxql-tab/nxql-tab.component.scss | 42 +++-
.../nxql-tab/nxql-tab.component.spec.ts | 11 +-
.../components/nxql-tab/nxql-tab.component.ts | 3 +
.../generic-multi-feature-layout.mapping.ts | 3 +-
.../generic-multi-feature-layout.module.ts | 12 +-
.../components/probes-data.component.html | 236 +++++++++---------
.../components/probes-data.component.scss | 130 ++++++----
.../components/probes-data.component.spec.ts | 5 +-
.../components/probes-data.component.ts | 63 +++--
.../probes-data/probes-data.module.ts | 5 +-
.../features/warning/warning.component.html | 28 +--
.../features/warning/warning.component.scss | 53 ++--
.../warning/warning.component.spec.ts | 2 -
.../app/features/warning/warning.component.ts | 2 +-
...ning,constants.ts => warning.constants.ts} | 0
.../components/base-layout.component.spec.ts | 28 ++-
.../header-bar/header-bar.component.html | 8 +-
.../header-bar/header-bar.component.scss | 29 ++-
.../header-bar/header-bar.component.spec.ts | 4 +-
.../layouts/menu-bar/menu-bar.component.scss | 12 +-
.../custom-snack-bar.component.html | 10 +
.../custom-snack-bar.component.scss | 18 ++
.../custom-snack-bar.component.spec.ts | 50 ++++
.../custom-snack-bar.component.ts | 24 ++
.../src/app/shared/types/common.interface.ts | 43 ++--
.../angular-app/src/assets/bulk-state1.json | 19 --
.../angular-app/src/assets/bulk-state2.json | 19 --
.../angular-app/src/assets/bulk-state3.json | 19 --
.../angular-app/src/assets/bulk-state4.json | 19 --
.../angular-app/src/assets/bulk-state5.json | 19 --
.../angular-app/src/assets/bulk-state6.json | 19 --
.../angular-app/src/assets/bulk-state7.json | 19 --
.../src/assets/fonts/Open_Sans/OFL.txt | 93 -------
...OpenSans-Italic-VariableFont_wdth,wght.ttf | Bin 580280 -> 0 bytes
.../OpenSans-VariableFont_wdth,wght.ttf | Bin 529700 -> 0 bytes
.../src/assets/fonts/Open_Sans/README.txt | 100 --------
.../fonts/Open_Sans/static/OpenSans-Bold.ttf | Bin 130860 -> 0 bytes
.../Open_Sans/static/OpenSans-BoldItalic.ttf | Bin 136360 -> 0 bytes
.../Open_Sans/static/OpenSans-ExtraBold.ttf | Bin 131244 -> 0 bytes
.../static/OpenSans-ExtraBoldItalic.ttf | Bin 136928 -> 0 bytes
.../Open_Sans/static/OpenSans-Italic.ttf | Bin 136604 -> 0 bytes
.../fonts/Open_Sans/static/OpenSans-Light.ttf | Bin 130804 -> 0 bytes
.../Open_Sans/static/OpenSans-LightItalic.ttf | Bin 136896 -> 0 bytes
.../Open_Sans/static/OpenSans-Medium.ttf | Bin 130976 -> 0 bytes
.../static/OpenSans-MediumItalic.ttf | Bin 136796 -> 0 bytes
.../Open_Sans/static/OpenSans-Regular.ttf | Bin 130832 -> 0 bytes
.../Open_Sans/static/OpenSans-SemiBold.ttf | Bin 130760 -> 0 bytes
.../static/OpenSans-SemiBoldItalic.ttf | Bin 136724 -> 0 bytes
.../static/OpenSans_Condensed-Bold.ttf | Bin 130372 -> 0 bytes
.../static/OpenSans_Condensed-BoldItalic.ttf | Bin 136240 -> 0 bytes
.../static/OpenSans_Condensed-ExtraBold.ttf | Bin 130812 -> 0 bytes
.../OpenSans_Condensed-ExtraBoldItalic.ttf | Bin 136652 -> 0 bytes
.../static/OpenSans_Condensed-Italic.ttf | Bin 136588 -> 0 bytes
.../static/OpenSans_Condensed-Light.ttf | Bin 130472 -> 0 bytes
.../static/OpenSans_Condensed-LightItalic.ttf | Bin 136760 -> 0 bytes
.../static/OpenSans_Condensed-Medium.ttf | Bin 130520 -> 0 bytes
.../OpenSans_Condensed-MediumItalic.ttf | Bin 136700 -> 0 bytes
.../static/OpenSans_Condensed-Regular.ttf | Bin 130492 -> 0 bytes
.../static/OpenSans_Condensed-SemiBold.ttf | Bin 130524 -> 0 bytes
.../OpenSans_Condensed-SemiBoldItalic.ttf | Bin 136792 -> 0 bytes
.../static/OpenSans_SemiCondensed-Bold.ttf | Bin 131168 -> 0 bytes
.../OpenSans_SemiCondensed-BoldItalic.ttf | Bin 137104 -> 0 bytes
.../OpenSans_SemiCondensed-ExtraBold.ttf | Bin 131744 -> 0 bytes
...OpenSans_SemiCondensed-ExtraBoldItalic.ttf | Bin 137584 -> 0 bytes
.../static/OpenSans_SemiCondensed-Italic.ttf | Bin 137000 -> 0 bytes
.../static/OpenSans_SemiCondensed-Light.ttf | Bin 131128 -> 0 bytes
.../OpenSans_SemiCondensed-LightItalic.ttf | Bin 137220 -> 0 bytes
.../static/OpenSans_SemiCondensed-Medium.ttf | Bin 130976 -> 0 bytes
.../OpenSans_SemiCondensed-MediumItalic.ttf | Bin 137068 -> 0 bytes
.../static/OpenSans_SemiCondensed-Regular.ttf | Bin 130848 -> 0 bytes
.../OpenSans_SemiCondensed-SemiBold.ttf | Bin 130856 -> 0 bytes
.../OpenSans_SemiCondensed-SemiBoldItalic.ttf | Bin 137132 -> 0 bytes
.../angular-app/src/favicon.svg | 30 +++
.../angular-app/src/polyfills.ts | 1 -
.../angular-app/src/styles.scss | 231 +++++++++++++++--
.../angular-app/tsconfig.app.json | 3 +-
.../angular-app/tsconfig.json | 3 -
131 files changed, 1203 insertions(+), 1331 deletions(-)
delete mode 100644 nuxeo-admin-console-web/angular-app/.npmrc
delete mode 100644 nuxeo-admin-console-web/angular-app/src/app/auth/auth-routing.module.ts
delete mode 100644 nuxeo-admin-console-web/angular-app/src/app/auth/auth.module.ts
delete mode 100644 nuxeo-admin-console-web/angular-app/src/app/auth/components/SSO/hylandSSOManager.component.html
delete mode 100644 nuxeo-admin-console-web/angular-app/src/app/auth/components/SSO/hylandSSOManager.component.ts
rename nuxeo-admin-console-web/angular-app/src/app/features/warning/{warning,constants.ts => warning.constants.ts} (100%)
create mode 100644 nuxeo-admin-console-web/angular-app/src/app/shared/components/custom-snack-bar/custom-snack-bar.component.html
create mode 100644 nuxeo-admin-console-web/angular-app/src/app/shared/components/custom-snack-bar/custom-snack-bar.component.scss
create mode 100644 nuxeo-admin-console-web/angular-app/src/app/shared/components/custom-snack-bar/custom-snack-bar.component.spec.ts
create mode 100644 nuxeo-admin-console-web/angular-app/src/app/shared/components/custom-snack-bar/custom-snack-bar.component.ts
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/bulk-state1.json
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/bulk-state2.json
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/bulk-state3.json
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/bulk-state4.json
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/bulk-state5.json
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/bulk-state6.json
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/bulk-state7.json
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/OFL.txt
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/OpenSans-Italic-VariableFont_wdth,wght.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/OpenSans-VariableFont_wdth,wght.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/README.txt
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-Bold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-BoldItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-ExtraBold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-ExtraBoldItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-Italic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-Light.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-LightItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-Medium.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-MediumItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-Regular.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-SemiBold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans-SemiBoldItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Bold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-BoldItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-ExtraBold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-ExtraBoldItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Italic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Light.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-LightItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Medium.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-MediumItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-Regular.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-SemiBold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_Condensed-SemiBoldItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Bold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-BoldItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-ExtraBold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-ExtraBoldItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Italic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Light.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-LightItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Medium.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-MediumItalic.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-Regular.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-SemiBold.ttf
delete mode 100644 nuxeo-admin-console-web/angular-app/src/assets/fonts/Open_Sans/static/OpenSans_SemiCondensed-SemiBoldItalic.ttf
create mode 100644 nuxeo-admin-console-web/angular-app/src/favicon.svg
delete mode 100644 nuxeo-admin-console-web/angular-app/src/polyfills.ts
diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
index a814edc0..2ae00b55 100644
--- 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
index bc1b32d9..f88e7f33 100644
--- 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
index 4d22116a..7b5a9adc 100644
--- 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
index 359a0909..03336df0 100644
--- 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
index 1b0a03ff..cb2cd749 100644
--- a/README.md
+++ b/README.md
@@ -22,14 +22,6 @@ Once you have it, just add the following lines to your Maven settings.xml :
```
-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-web/angular-app/.npmrc b/nuxeo-admin-console-web/angular-app/.npmrc
deleted file mode 100644
index 58575ad0..00000000
--- a/nuxeo-admin-console-web/angular-app/.npmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-@hylandsoftware:registry=https://npm.pkg.github.com
-@nuxeo:registry=https://packages.nuxeo.com/repository/npm-public
-registry=https://registry.npmjs.org/
diff --git a/nuxeo-admin-console-web/angular-app/angular.json b/nuxeo-admin-console-web/angular-app/angular.json
index 533efe27..09a4b4b1 100644
--- 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"
}
-}
\ No newline at end of file
+}
diff --git a/nuxeo-admin-console-web/angular-app/package.json b/nuxeo-admin-console-web/angular-app/package.json
index 53c661a2..e0c618eb 100644
--- a/nuxeo-admin-console-web/angular-app/package.json
+++ b/nuxeo-admin-console-web/angular-app/package.json
@@ -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
index 64906972..ddd91ae5 100644
--- 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
@@ -54,10 +54,6 @@ export const appRoutes: Route[] = [
"./features/sub-features/generic-multi-feature-layout/generic-multi-feature-layout.module"
).then((m) => m.GenericMultiFeatureLayoutModule),
},
- {
- path: "auth",
- loadChildren: () => import("./auth/auth.module").then((m) => m.AuthModule),
- },
{ 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
index dc60aca9..91de2c14 100644
--- 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 @@
{{ UNAUTHORIZED_MESSAGE }}
- logout {{ LOGIN_WITH_DIFFERENT_ACCOUNT }}
+ logout {{ LOGIN_WITH_DIFFERENT_ACCOUNT }}
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
index 67d45d45..aa9fc475 100644
--- 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;
diff --git a/nuxeo-admin-console-web/angular-app/src/app/app.component.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/app.component.spec.ts
index 190a7820..4731b58b 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/app.component.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/app.component.spec.ts
@@ -6,21 +6,21 @@ import { PersistenceService } from "./shared/services/persistence.service";
import { WarningComponent } from "./features/warning/warning.component";
import { CommonService } from "./shared/services/common.service";
import { EventEmitter } from "@angular/core";
-import { provideMockStore, MockStore } from '@ngrx/store/testing';
-import { AuthStateInterface } from './auth/types/authState.interface';
-import { UserInterface } from './shared/types/user.interface';
-import { APP_CONSTANTS } from './app.constants';
-import { By } from '@angular/platform-browser';
-import { authActions } from './auth/store/actions';
-import { ActivatedRoute, RouterModule } from '@angular/router';
+import { provideMockStore, MockStore } from "@ngrx/store/testing";
+import { AuthStateInterface } from "./auth/types/authState.interface";
+import { UserInterface } from "./shared/types/user.interface";
+import { APP_CONSTANTS } from "./app.constants";
+import { By } from "@angular/platform-browser";
+import { authActions } from "./auth/store/actions";
+import { ActivatedRoute, RouterModule } from "@angular/router";
import { BaseLayoutModule } from "./layouts/base-layout/base-layout.module";
-import { BaseLayoutComponent } from "./layouts/base-layout/components/base-layout.component"
-import { HyMaterialIconModule } from "@hyland/ui";
+import { BaseLayoutComponent } from "./layouts/base-layout/components/base-layout.component";
import { HeaderBarComponent } from "./layouts/header-bar/header-bar.component";
import { MenuBarComponent } from "./layouts/menu-bar/menu-bar.component";
-import { MatListModule } from '@angular/material/list';
-import { MatSidenavModule } from '@angular/material/sidenav';
-import { MatToolbarModule } from '@angular/material/toolbar';
+import { MatListModule } from "@angular/material/list";
+import { MatSidenavModule } from "@angular/material/sidenav";
+import { MatToolbarModule } from "@angular/material/toolbar";
+import { MatIconModule } from "@angular/material/icon";
describe("AppComponent", () => {
let component: AppComponent;
@@ -28,26 +28,26 @@ describe("AppComponent", () => {
const mockActivatedRoute = {
snapshot: {
paramMap: {
- get: () => 'Administrator'
- }
- }
+ get: () => "Administrator",
+ },
+ },
};
let store: MockStore<{ auth: AuthStateInterface }>;
const initialAuthState: AuthStateInterface = {
isSubmitting: false,
currentUser: {
- id: 'Administrator',
+ id: "Administrator",
isAdministrator: true,
properties: {
firstName: "nco",
lastName: "admin",
email: "nco-admin@nuxeo.com",
- username: "Administrator"
- }
+ username: "Administrator",
+ },
} as UserInterface,
isLoading: false,
- validationErrors: null
+ validationErrors: null,
};
class persistenceServiceStub {
@@ -64,11 +64,24 @@ describe("AppComponent", () => {
loadApp = new EventEmitter();
}
-
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [AppComponent, BaseLayoutComponent, HeaderBarComponent, MenuBarComponent],
- imports: [CommonModule, MatDialogModule, BaseLayoutModule, HyMaterialIconModule, RouterModule, MatToolbarModule, MatListModule, MatSidenavModule],
+ declarations: [
+ AppComponent,
+ BaseLayoutComponent,
+ HeaderBarComponent,
+ MenuBarComponent,
+ ],
+ imports: [
+ CommonModule,
+ MatDialogModule,
+ BaseLayoutModule,
+ RouterModule,
+ MatToolbarModule,
+ MatListModule,
+ MatSidenavModule,
+ MatIconModule,
+ ],
providers: [
{ provide: PersistenceService, useClass: persistenceServiceStub },
{ provide: CommonService, useClass: commonServiceStub },
@@ -88,10 +101,12 @@ describe("AppComponent", () => {
describe("ngOnInit", () => {
it("should initiate JS client and subscribe to currentUser$", () => {
- spyOn(component['nuxeoJsClientService'], 'initiateJSClient');
- spyOn(component.currentUser$, 'subscribe').and.callThrough();
+ spyOn(component["nuxeoJsClientService"], "initiateJSClient");
+ spyOn(component.currentUser$, "subscribe").and.callThrough();
component.ngOnInit();
- expect(component['nuxeoJsClientService'].initiateJSClient).toHaveBeenCalledWith(component.baseUrl);
+ expect(
+ component["nuxeoJsClientService"].initiateJSClient
+ ).toHaveBeenCalledWith(component.baseUrl);
expect(component.currentUser$.subscribe).toHaveBeenCalled();
});
@@ -100,7 +115,10 @@ describe("AppComponent", () => {
spyOn(component.persistenceService, "get").and.returnValue(null);
component.ngOnInit();
expect(component.persistenceService.get).toHaveBeenCalled();
- expect(component.dialogService.open).toHaveBeenCalledWith(WarningComponent, { disableClose: true });
+ expect(component.dialogService.open).toHaveBeenCalledWith(
+ WarningComponent,
+ { disableClose: true, hasBackdrop: true }
+ );
});
it("should not open the warning dialog if warning preference is set", () => {
@@ -140,33 +158,39 @@ describe("AppComponent", () => {
expect(store.dispatch).toHaveBeenCalledWith(authActions.signOut());
});
});
-
describe("DOM", () => {
it("should display unauthorized message if currentUser is not administrator", () => {
store.setState({
auth: {
- ...initialAuthState, currentUser: {
- id: 'Administrator', isAdministrator: false, properties: {
+ ...initialAuthState,
+ currentUser: {
+ id: "Administrator",
+ isAdministrator: false,
+ properties: {
firstName: "nco",
lastName: "admin",
email: "nco-admin@nuxeo.com",
- username: "Administrator"
- }
- }
- }
+ username: "Administrator",
+ },
+ },
+ },
});
fixture.detectChanges();
- const unauthorizedMessage = fixture.debugElement.query(By.css('.unauthorized'));
+ const unauthorizedMessage = fixture.debugElement.query(
+ By.css(".unauthorized")
+ );
expect(unauthorizedMessage).toBeTruthy();
- expect(unauthorizedMessage.nativeElement.textContent).toContain(APP_CONSTANTS.UNAUTHORIZED_MESSAGE);
+ expect(unauthorizedMessage.nativeElement.textContent).toContain(
+ APP_CONSTANTS.UNAUTHORIZED_MESSAGE
+ );
});
it("should display base-layout if loadApp is true and currentUser is administrator", () => {
component.loadApp = true;
fixture.detectChanges();
- const baseLayout = fixture.debugElement.query(By.css('base-layout'));
+ const baseLayout = fixture.debugElement.query(By.css("base-layout"));
expect(baseLayout).toBeTruthy();
});
});
-});
\ No newline at end of file
+});
diff --git a/nuxeo-admin-console-web/angular-app/src/app/app.component.ts b/nuxeo-admin-console-web/angular-app/src/app/app.component.ts
index 67a158b2..811c6131 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/app.component.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/app.component.ts
@@ -48,6 +48,7 @@ export class AppComponent implements OnInit, OnDestroy {
if (!doNotWarn) {
this.dialogService.open(WarningComponent, {
disableClose: true,
+ hasBackdrop: true
});
this.loadAppSubscription = this.commonService.loadApp.subscribe(load => {
this.loadApp = load;
diff --git a/nuxeo-admin-console-web/angular-app/src/app/app.module.ts b/nuxeo-admin-console-web/angular-app/src/app/app.module.ts
index d1f8ae65..d92257fb 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/app.module.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/app.module.ts
@@ -1,3 +1,4 @@
+import { MatTooltipModule } from "@angular/material/tooltip";
import { GenericMultiFeatureLayoutModule } from "./features/sub-features/generic-multi-feature-layout/generic-multi-feature-layout.module";
import { GenericModalComponent } from "./features/sub-features/generic-multi-feature-layout/components/generic-modal/generic-modal.component";
import { bulkActionMonitoringReducer } from "./features/bulk-action-monitoring/store/reducers";
@@ -14,13 +15,10 @@ import { CommonModule } from "@angular/common";
import { MatIconModule } from "@angular/material/icon";
import { MatToolbarModule } from "@angular/material/toolbar";
import { AppRoutingModule } from "./app-routing.module";
-import { AuthRoutingModule } from "./auth/auth-routing.module";
import { HomeModule } from "./features/home/home.module";
import { WarningComponent } from "./features/warning/warning.component";
-import { HylandSSOManagerComponent } from "./auth/components/SSO/hylandSSOManager.component";
import { BackendErrorMessagesComponent } from "./shared/components/backendErrorMessages/backendErrorMessages.component";
import { AppComponent } from "./app.component";
-import { AuthInterceptorService } from "./auth/services/auth-interceptor.service";
import { authReducer } from "./auth/store/reducers";
import * as authEffects from "./auth/store/effects";
import { ngrxDevtools } from "../devtools/ngrx-devtools";
@@ -30,11 +28,6 @@ import { MatButtonModule } from "@angular/material/button";
import { MatSidenavModule } from "@angular/material/sidenav";
import { HeaderBarComponent } from "./layouts/header-bar/header-bar.component";
import { MenuBarComponent } from "./layouts/menu-bar/menu-bar.component";
-import {
- HyDialogBoxModule,
- HyDialogModule,
- HyMaterialIconModule,
-} from "@hyland/ui";
import { MatCheckboxModule } from "@angular/material/checkbox";
import { MatListModule } from "@angular/material/list";
import { homeReducer } from "./features/home/store/reducers";
@@ -48,10 +41,15 @@ import {
documentActionReducer,
nxqlActionReducer,
} from "./features/sub-features/generic-multi-feature-layout/store/reducers";
-import { HyKeyboardFocusService } from "@hyland/ui/keyboard-focus";
import { BulkActionMonitoringModule } from "./features/bulk-action-monitoring/bulk-action-monitoring.module";
import { ErrorModalComponent } from "./features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component";
import { ProbesDataModule } from "./features/sub-features/probes-data/probes-data.module";
+import {
+ MAT_DIALOG_DEFAULT_OPTIONS,
+ MatDialogModule,
+} from "@angular/material/dialog";
+import { CustomSnackBarComponent } from "./shared/components/custom-snack-bar/custom-snack-bar.component";
+import { AuthInterceptorService } from "./auth/services/auth-interceptor.service";
@NgModule({
declarations: [
@@ -60,10 +58,10 @@ import { ProbesDataModule } from "./features/sub-features/probes-data/probes-dat
MenuBarComponent,
WarningComponent,
BackendErrorMessagesComponent,
- HylandSSOManagerComponent,
BaseLayoutComponent,
GenericModalComponent,
ErrorModalComponent,
+ CustomSnackBarComponent,
],
imports: [
BrowserModule,
@@ -72,7 +70,6 @@ import { ProbesDataModule } from "./features/sub-features/probes-data/probes-dat
RouterModule,
CommonModule,
AppRoutingModule,
- AuthRoutingModule,
StoreModule.forRoot({
router: routerReducer,
auth: authReducer,
@@ -92,22 +89,21 @@ import { ProbesDataModule } from "./features/sub-features/probes-data/probes-dat
ProbesEffects
),
MatIconModule,
+ MatTooltipModule,
MatToolbarModule,
MatButtonModule,
MatSidenavModule,
HomeModule,
MatListModule,
BaseLayoutModule,
- HyDialogModule,
MatSidenavModule,
MatButtonModule,
- HyDialogBoxModule,
FormsModule,
MatCheckboxModule,
- HyMaterialIconModule,
BulkActionMonitoringModule,
ProbesDataModule,
GenericMultiFeatureLayoutModule,
+ MatDialogModule,
],
providers: [
{
@@ -115,10 +111,9 @@ import { ProbesDataModule } from "./features/sub-features/probes-data/probes-dat
useClass: AuthInterceptorService,
multi: true,
},
+ { provide: MAT_DIALOG_DEFAULT_OPTIONS, useValue: { hasBackdrop: false } },
ngrxDevtools,
],
bootstrap: [AppComponent],
})
-export class AppModule {
- constructor(private _hyKeyboardFocusService: HyKeyboardFocusService) {}
-}
+export class AppModule {}
diff --git a/nuxeo-admin-console-web/angular-app/src/app/auth/auth-routing.module.ts b/nuxeo-admin-console-web/angular-app/src/app/auth/auth-routing.module.ts
deleted file mode 100644
index 42e98416..00000000
--- a/nuxeo-admin-console-web/angular-app/src/app/auth/auth-routing.module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { NgModule } from "@angular/core";
-import { RouterModule } from "@angular/router";
-import { Route } from "@angular/router";
-import { HylandSSOManagerComponent } from "./components/SSO/hylandSSOManager.component";
-
-export const authRoutes: Route[] = [
- {
- path: '',
- component: HylandSSOManagerComponent,
- },
-];
-
-@NgModule({
- imports: [RouterModule.forChild(authRoutes)],
- exports: [RouterModule],
-})
-export class AuthRoutingModule {}
diff --git a/nuxeo-admin-console-web/angular-app/src/app/auth/auth.module.ts b/nuxeo-admin-console-web/angular-app/src/app/auth/auth.module.ts
deleted file mode 100644
index e607d82a..00000000
--- a/nuxeo-admin-console-web/angular-app/src/app/auth/auth.module.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { NgModule } from "@angular/core";
-import { AuthRoutingModule } from "./auth-routing.module";
-
-@NgModule({
- declarations: [],
- imports: [AuthRoutingModule],
-})
-export class AuthModule {}
diff --git a/nuxeo-admin-console-web/angular-app/src/app/auth/components/SSO/hylandSSOManager.component.html b/nuxeo-admin-console-web/angular-app/src/app/auth/components/SSO/hylandSSOManager.component.html
deleted file mode 100644
index 8c057e48..00000000
--- a/nuxeo-admin-console-web/angular-app/src/app/auth/components/SSO/hylandSSOManager.component.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
- Initiating Hyland SSO...
-
-
-
-
-
-
\ No newline at end of file
diff --git a/nuxeo-admin-console-web/angular-app/src/app/auth/components/SSO/hylandSSOManager.component.ts b/nuxeo-admin-console-web/angular-app/src/app/auth/components/SSO/hylandSSOManager.component.ts
deleted file mode 100644
index fb379429..00000000
--- a/nuxeo-admin-console-web/angular-app/src/app/auth/components/SSO/hylandSSOManager.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Component, OnInit } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
-import { Store } from "@ngrx/store";
-import { combineLatest } from "rxjs";
-import { authActions } from "../../store/actions";
-import {
- selectIsSubmitting,
- selectValidationErrors,
-} from "../../store/reducers";
-import { HylandSSORequestInterface } from "../../types/hylandSSORequest.interface";
-
-@Component({
- selector: "ssomanager",
- templateUrl: "./hylandSSOManager.component.html",
-})
-export class HylandSSOManagerComponent implements OnInit {
- data$ = combineLatest({
- isSubmitting: this.store.select(selectIsSubmitting),
- backendErrors: this.store.select(selectValidationErrors),
- });
-
- constructor(private fb: FormBuilder, private store: Store) {}
-
- initSSO() {
- const request: HylandSSORequestInterface = {
- app: { appID: "AdminPanel" },
- };
- this.store.dispatch(authActions.sso({ request }));
- }
-
- ngOnInit() {
- this.initSSO();
- }
-}
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/bulk-action-monitoring.module.ts b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/bulk-action-monitoring.module.ts
index 280c2acf..49b66a6f 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/bulk-action-monitoring.module.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/bulk-action-monitoring.module.ts
@@ -2,23 +2,19 @@ import { BulkActionMonitoringDetailsComponent } from "./components/bulk-action-m
import { BulkActionMonitoringSummaryComponent } from "./components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component";
import { BulkActionMonitoringResultComponent } from "./components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-result.component";
import { BulkActionMonitoringFormComponent } from "./components/bulk-action-monitoring/bulk-action-monitoring-form/bulk-action-monitoring-form.component";
-import { MatTooltipModule } from "@angular/material/tooltip";
import { MatCardModule } from "@angular/material/card";
import { MatIconModule } from "@angular/material/icon";
import { BulkActionMonitoringRoutingModule } from "./bulk-action-monitoring-routing.module";
import { MatButtonModule } from "@angular/material/button";
import { NgModule } from "@angular/core";
import { CommonModule } from "@angular/common";
-import {
- HyFormContainerModule,
- HyMaterialModule,
- HyToastModule,
-} from "@hyland/ui";
import { ReactiveFormsModule } from "@angular/forms";
import { MatFormFieldModule } from "@angular/material/form-field";
import { MatInputModule } from "@angular/material/input";
-import { HyContentListModule } from "@hyland/ui/content-list";
import { BulkActionMonitoringComponent } from "./components/bulk-action-monitoring/bulk-action-monitoring.component";
+import { MatTooltipModule } from "@angular/material/tooltip";
+import { MatSnackBarModule } from "@angular/material/snack-bar";
+import { MatTableModule } from "@angular/material/table";
@NgModule({
declarations: [
@@ -30,8 +26,6 @@ import { BulkActionMonitoringComponent } from "./components/bulk-action-monitori
],
imports: [
CommonModule,
- HyMaterialModule,
- HyFormContainerModule,
ReactiveFormsModule,
MatFormFieldModule,
MatInputModule,
@@ -39,9 +33,9 @@ import { BulkActionMonitoringComponent } from "./components/bulk-action-monitori
BulkActionMonitoringRoutingModule,
MatIconModule,
MatCardModule,
- HyContentListModule,
- HyToastModule,
MatTooltipModule,
+ MatSnackBarModule,
+ MatTableModule,
],
})
export class BulkActionMonitoringModule {}
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-form/bulk-action-monitoring-form.component.html b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-form/bulk-action-monitoring-form.component.html
index 912299e9..9a95f92c 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-form/bulk-action-monitoring-form.component.html
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-form/bulk-action-monitoring-form.component.html
@@ -1,8 +1,8 @@
\ No newline at end of file
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.scss b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.scss
index 6826a830..e864533e 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.scss
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.scss
@@ -29,26 +29,12 @@
&__additional-info {
margin-left: 10px;
- width: 74%;
+ width: 75%;
height: 220px;
}
-
- .mat-mdc-card-content {
- width: 100%;
- height: 100%;
- padding: 0;
- }
-}
-
-::ng-deep .hy-content-list__custom-cell {
- max-height: none !important;
- height: auto;
-}
-::ng-deep .hy-content-list__virtual-scroll-viewport {
- height: 90% !important;
}
-@media (max-width: 962px) {
+@media (max-width: 1024px) {
.bulk-action-details {
flex-direction: column;
align-items: center;
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.spec.ts
index ea1f7780..78f5591a 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.spec.ts
@@ -3,7 +3,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { MatCardModule } from "@angular/material/card";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { BulkActionMonitoringDetailsComponent } from "./bulk-action-monitoring-details.component";
-import { HyContentListModule } from "@hyland/ui";
+import { MatTableModule } from '@angular/material/table';
describe("BulkActionMonitoringDetailsComponent", () => {
let component: BulkActionMonitoringDetailsComponent;
@@ -12,7 +12,7 @@ describe("BulkActionMonitoringDetailsComponent", () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [BulkActionMonitoringDetailsComponent],
- imports: [MatCardModule, HyContentListModule, NoopAnimationsModule],
+ imports: [MatCardModule, NoopAnimationsModule, MatTableModule],
}).compileComponents();
fixture = TestBed.createComponent(BulkActionMonitoringDetailsComponent);
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.ts b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.ts
index 1aba9dc5..9fb55252 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-details/bulk-action-monitoring-details.component.ts
@@ -1,5 +1,5 @@
-import { BULK_ACTION_LABELS } from './../../../../bulk-action-monitoring.constants';
-import { BulkActionInfoDetails } from './../../../../bulk-action-monitoring.interface';
+import { BULK_ACTION_LABELS } from "./../../../../bulk-action-monitoring.constants";
+import { BulkActionInfoDetails } from "./../../../../bulk-action-monitoring.interface";
import { Component, Input, OnChanges } from "@angular/core";
@Component({
@@ -15,9 +15,18 @@ export class BulkActionMonitoringDetailsComponent implements OnChanges {
docsProcessedText = "";
errorsFoundText = "";
docsSkippedText = "";
+ columnsToDisplay: string[] = [];
ngOnChanges(): void {
this.additionalInfoDataSrc = [this.bulkActionDetails];
+ this.columnsToDisplay = [
+ "scrollStart",
+ "scrollEnd",
+ "processingStart",
+ "processingEnd",
+ "completed",
+ "processingMillis",
+ ];
if (this.bulkActionDetails) {
this.replacePlaceholderValues();
}
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-result.component.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-result.component.spec.ts
index 271e31c4..87030ee6 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-result.component.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-result.component.spec.ts
@@ -1,17 +1,15 @@
import { BulkActionMonitoringInfo, BulkActionInfoSummary, BulkActionInfoDetails } from './../../../bulk-action-monitoring.interface';
import { NoopAnimationsModule } from "@angular/platform-browser/animations";
-import { MatTooltipModule } from "@angular/material/tooltip";
import { MatCardModule } from "@angular/material/card";
import { BulkActionMonitoringSummaryComponent } from "./bulk-action-monitoring-summary/bulk-action-monitoring-summary.component";
import { BulkActionMonitoringDetailsComponent } from "./bulk-action-monitoring-details/bulk-action-monitoring-details.component";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { BulkActionMonitoringResultComponent } from "./bulk-action-monitoring-result.component";
-import {
- HyContentListModule,
- HyMaterialModule,
- HyToastService,
-} from "@hyland/ui";
import { provideMockStore } from "@ngrx/store/testing";
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { MatTableModule } from '@angular/material/table';
describe("BulkActionMonitoringResultComponent", () => {
let component: BulkActionMonitoringResultComponent;
@@ -40,7 +38,6 @@ describe("BulkActionMonitoringResultComponent", () => {
};
beforeEach(async () => {
- const toastServiceSpy = jasmine.createSpyObj("HyToastService", ["success"]);
await TestBed.configureTestingModule({
declarations: [
BulkActionMonitoringResultComponent,
@@ -48,14 +45,14 @@ describe("BulkActionMonitoringResultComponent", () => {
BulkActionMonitoringSummaryComponent,
],
imports: [
- HyMaterialModule,
MatCardModule,
- HyContentListModule,
+ MatSnackBarModule,
+ MatIconModule,
MatTooltipModule,
+ MatTableModule,
NoopAnimationsModule,
],
providers: [
- { provide: HyToastService, useValue: toastServiceSpy },
provideMockStore({ initialState }),
],
}).compileComponents();
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.html b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.html
index 4abb42b2..81fcb17a 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.html
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.html
@@ -10,12 +10,12 @@
{{getRunningStatusText()}}
- info
+ info
- refresh {{BULK_ACTION_LABELS.REFRESH}}
+ refresh {{BULK_ACTION_LABELS.REFRESH}}
{{statusText}}
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.scss b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.scss
index 563bcdfd..34acd884 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.scss
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.scss
@@ -1,20 +1,17 @@
.bulk-action-summary {
margin-top: 30px;
-
&__header {
display: flex;
flex-direction: row;
.action-details {
.info-icon {
position: relative;
- top: 3px;
+ top: 10px;
cursor: pointer;
- margin-left: 4px;
+ margin-left: 5px;
width: auto;
}
}
-
-
.action-name {
font-weight: 550;
font-size: 20px;
@@ -32,17 +29,24 @@
button {
margin-left: 30px;
- margin-top: 2px;
+ margin-top: 4px;
+ border-radius: 8px;
+ padding: 0 16px;
+ border-color: #6b7280;
+ font-family: "Open Sans", sans-serif;
}
}
}
+mat-icon {
+ font-size: 16px;
+}
+
@media (max-width: 962px) {
.bulk-action-summary__header {
flex-direction: column;
align-items: flex-start;
padding-top: 10px;
-
button {
margin-left: 0;
margin-top: 6px;
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.spec.ts
index 6f210565..0b032b8b 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.spec.ts
@@ -1,19 +1,25 @@
-import { BULK_ACTION_LABELS } from './../../../../bulk-action-monitoring.constants';
-import { BulkActionInfoSummary } from './../../../../bulk-action-monitoring.interface';
+import { CustomSnackBarComponent } from "./../../../../../../shared/components/custom-snack-bar/custom-snack-bar.component";
+import { NoopAnimationsModule } from "@angular/platform-browser/animations";
import { MatTooltipModule } from "@angular/material/tooltip";
+import { MatIconModule } from "@angular/material/icon";
+import { BULK_ACTION_LABELS } from "./../../../../bulk-action-monitoring.constants";
+import { BulkActionInfoSummary } from "./../../../../bulk-action-monitoring.interface";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { BulkActionMonitoringSummaryComponent } from "./bulk-action-monitoring-summary.component";
import { StoreModule } from "@ngrx/store";
-import { HyMaterialModule, HyToastService } from "@hyland/ui";
import * as BulkActionMonitoringActions from "../../../../store/actions";
import * as fromReducer from "../../../../store/reducers";
import { MockStore, provideMockStore } from "@ngrx/store/testing";
+import { MatSnackBar, MatSnackBarModule } from "@angular/material/snack-bar";
describe("BulkActionMonitoringSummaryComponent", () => {
let component: BulkActionMonitoringSummaryComponent;
let fixture: ComponentFixture;
- let toastService: jasmine.SpyObj;
let store: MockStore;
+ let snackBar: jasmine.SpyObj;
+ const snackBarSpy = jasmine.createSpyObj("MatSnackBar", [
+ "openFromComponent",
+ ]);
const initialState = {
bulkActionMonitoringInfo: {
"entity-type": null,
@@ -38,27 +44,25 @@ describe("BulkActionMonitoringSummaryComponent", () => {
};
beforeEach(async () => {
- const toastServiceSpy = jasmine.createSpyObj("HyToastService", ["success"]);
await TestBed.configureTestingModule({
declarations: [BulkActionMonitoringSummaryComponent],
providers: [
- { provide: HyToastService, useValue: toastServiceSpy },
provideMockStore({ initialState }),
+ { provide: MatSnackBar, useValue: snackBarSpy },
],
imports: [
- HyMaterialModule,
- StoreModule.forRoot(provideMockStore),
+ MatSnackBarModule,
+ MatIconModule,
MatTooltipModule,
+ NoopAnimationsModule,
+ StoreModule.forRoot(provideMockStore),
],
}).compileComponents();
fixture = TestBed.createComponent(BulkActionMonitoringSummaryComponent);
component = fixture.componentInstance;
- toastService = TestBed.inject(
- HyToastService
- ) as jasmine.SpyObj;
store = TestBed.inject(MockStore);
-
+ snackBar = TestBed.inject(MatSnackBar) as jasmine.SpyObj;
fixture.detectChanges();
});
@@ -133,10 +137,15 @@ describe("BulkActionMonitoringSummaryComponent", () => {
} as BulkActionInfoSummary;
spyOn(store, "dispatch");
component.onRefresh();
- expect(toastService.success).toHaveBeenCalledWith(
- BULK_ACTION_LABELS.INFORMATION_UPDATED,
+ expect(snackBar.openFromComponent).toHaveBeenCalledWith(
+ CustomSnackBarComponent,
{
- canBeDismissed: true,
+ data: {
+ message: BULK_ACTION_LABELS.INFORMATION_UPDATED,
+ panelClass: "success-snack",
+ },
+ duration: 5000,
+ panelClass: ["success-snack"],
}
);
expect(store.dispatch).toHaveBeenCalledWith(
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.ts b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.ts
index 5d972381..dc4ec046 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/components/bulk-action-monitoring/bulk-action-monitoring-result/bulk-action-monitoring-summary/bulk-action-monitoring-summary.component.ts
@@ -1,10 +1,11 @@
+import { CustomSnackBarComponent } from "./../../../../../../shared/components/custom-snack-bar/custom-snack-bar.component";
import { BULK_ACTION_LABELS } from "./../../../../bulk-action-monitoring.constants";
import { BulkActionInfoSummary } from "./../../../../bulk-action-monitoring.interface";
import { Component, Input, OnChanges } from "@angular/core";
-import { HyToastService } from "@hyland/ui";
import * as BulkActionMonitoringActions from "../../../../store/actions";
import { Store } from "@ngrx/store";
import { BulkActionMonitoringState } from "../../../../store/reducers";
+import { MatSnackBar } from "@angular/material/snack-bar";
@Component({
selector: "bulk-action-monitoring-summary",
@@ -18,8 +19,8 @@ export class BulkActionMonitoringSummaryComponent implements OnChanges {
nonRunningText = "";
BULK_ACTION_LABELS = BULK_ACTION_LABELS;
constructor(
- private toastService: HyToastService,
- private store: Store<{ bulkActionMonitoring: BulkActionMonitoringState }>
+ private store: Store<{ bulkActionMonitoring: BulkActionMonitoringState }>,
+ private _snackBar: MatSnackBar
) {}
ngOnChanges(): void {
if (this.bulkActionSummary) {
@@ -92,9 +93,15 @@ export class BulkActionMonitoringSummaryComponent implements OnChanges {
}
onRefresh(): void {
- this.toastService.success(BULK_ACTION_LABELS.INFORMATION_UPDATED, {
- canBeDismissed: true,
+ this._snackBar.openFromComponent(CustomSnackBarComponent, {
+ data: {
+ message: BULK_ACTION_LABELS.INFORMATION_UPDATED,
+ panelClass: "success-snack",
+ },
+ duration: 5000,
+ panelClass: ["success-snack"],
});
+
this.store.dispatch(
BulkActionMonitoringActions.performBulkActionMonitor({
id: this.bulkActionSummary?.commandId,
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/store/effects.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/store/effects.spec.ts
index 9af1613a..351c554b 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/store/effects.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/store/effects.spec.ts
@@ -7,8 +7,7 @@ import * as BulkActionMonitoringActions from "./actions";
import { HttpErrorResponse } from "@angular/common/http";
import { BulkActionMonitoringService } from "../services/bulk-action-monitoring.service";
-// TODO: Remove this once testing is complete for different bulk action states for different action IDs
-xdescribe("ElasticSearch Reindex Effects", () => {
+describe("ElasticSearch Reindex Effects", () => {
const bulkActionMonitoringServiceSpy = jasmine.createSpyObj(
"BulkActionMonitoringService",
["performBulkActionMonitoring"]
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/store/effects.ts b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/store/effects.ts
index c49af3c3..300b6a97 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/store/effects.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/bulk-action-monitoring/store/effects.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpErrorResponse } from "@angular/common/http";
+import { HttpErrorResponse } from "@angular/common/http";
import { of } from "rxjs";
import { catchError, map, switchMap } from "rxjs/operators";
import { createEffect } from "@ngrx/effects";
@@ -6,65 +6,23 @@ import { Actions, ofType } from "@ngrx/effects";
import { BulkActionMonitoringService } from "../services/bulk-action-monitoring.service";
import * as BulkActionMonitoringActions from "../store/actions";
import { inject } from "@angular/core";
-import { BulkActionMonitoringInfo } from "../bulk-action-monitoring.interface";
-import { NuxeoJSClientService } from "../../../shared/services/nuxeo-js-client.service";
-
-// TODO: Remove this once testing is complete for different bulk action states for different action IDs
-const jsonMap = [
- {
- id: "a703f6r8-7H19-062c-120d-8ea50f1aa6c8",
- filename: "/assets/bulk-state1.json",
- },
- {
- id: "b703q4b8-OH1f-w62c-950d-8ea30f1aa6c8",
- filename: "/assets/bulk-state2.json",
- },
- {
- id: "c703fmb8-7I1f-062c-92ld-8ea20f1aa6c8",
- filename: "/assets/bulk-state3.json",
- },
- {
- id: "d703f2b8-7H1f-962c-250d-8wa50f1ma6c8",
- filename: "/assets/bulk-state4.json",
- },
- {
- id: "e723f4b8-7P1f-062J-950d-82a30f1aa6c8",
- filename: "/assets/bulk-state5.json",
- },
- {
- id: "f723f4b8-7H1f-062c-050d-8ea50effaa6c8",
- filename: "/assets/bulk-state6.json",
- },
- {
- id: "g703f4b8-7H1f-062c-950d-8ea50f1aa6c8",
- filename: "/assets/bulk-state7.json",
- },
-];
-
export const loadPerformBulkActionMonitoringEffect = createEffect(
(
actions$ = inject(Actions),
- bulkActionMonitoringService = inject(BulkActionMonitoringService),
- httpClient = inject(HttpClient),
- nuxeoJsClientService = inject(NuxeoJSClientService)
+ bulkActionMonitoringService = inject(BulkActionMonitoringService)
) => {
return actions$.pipe(
ofType(BulkActionMonitoringActions.performBulkActionMonitor),
switchMap((action) => {
- // TODO: Remove this once testing is complete for different bulk action states for different action IDs
- const isTestId = jsonMap.some((map) => action.id === map.id);
- if (isTestId) {
- let fileName = jsonMap.find(
- (item) => item.id === action.id
- )?.filename;
- fileName= `${nuxeoJsClientService.getBaseUrl()}/nuxeoadmin${fileName}`;
- return httpClient.get(fileName as string).pipe(
+ return bulkActionMonitoringService
+ .performBulkActionMonitoring(action?.id)
+ .pipe(
map((data) => {
return BulkActionMonitoringActions.onBulkActionMonitorLaunch({
- bulkActionMonitoringInfo: data as BulkActionMonitoringInfo,
+ bulkActionMonitoringInfo: data,
});
}),
- catchError((error) => {
+ catchError((error: HttpErrorResponse) => {
return of(
BulkActionMonitoringActions.onBulkActionMonitorFailure({
error,
@@ -72,24 +30,6 @@ export const loadPerformBulkActionMonitoringEffect = createEffect(
);
})
);
- } else {
- return bulkActionMonitoringService
- .performBulkActionMonitoring(action?.id)
- .pipe(
- map((data) => {
- return BulkActionMonitoringActions.onBulkActionMonitorLaunch({
- bulkActionMonitoringInfo: data,
- });
- }),
- catchError((error: HttpErrorResponse) => {
- return of(
- BulkActionMonitoringActions.onBulkActionMonitorFailure({
- error,
- })
- );
- })
- );
- }
})
);
},
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/home/components/probes-summary/probes-summary.component.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/features/home/components/probes-summary/probes-summary.component.spec.ts
index 682f9af4..db45a5fb 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/home/components/probes-summary/probes-summary.component.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/home/components/probes-summary/probes-summary.component.spec.ts
@@ -4,23 +4,18 @@ import { StoreModule } from '@ngrx/store';
import { ProbeDataReducer } from '../../../sub-features/probes-data/store/reducers';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { HyContentListModule } from '@hyland/ui/content-list';
-import { MatTooltipModule } from '@angular/material/tooltip';
import { MatCardModule } from '@angular/material/card';
import { CommonModule } from '@angular/common';
import { By } from '@angular/platform-browser';
import { ProbesDataComponent } from '../../../sub-features/probes-data/components/probes-data.component';
-import { HyToastService } from '@hyland/ui';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatTableModule } from '@angular/material/table';
describe('ProbesSummaryComponent', () => {
let component: ProbesSummaryComponent;
let fixture: ComponentFixture;
beforeEach(async () => {
- const toastServiceSpy = jasmine.createSpyObj("HyToastService", [
- "success",
- "error",
- ]);
await TestBed.configureTestingModule({
declarations: [ProbesSummaryComponent, ProbesDataComponent],
imports: [
@@ -28,11 +23,10 @@ describe('ProbesSummaryComponent', () => {
HttpClientTestingModule,
CommonModule,
MatCardModule,
- HyContentListModule,
- MatTooltipModule,
+ MatSnackBarModule,
+ MatTableModule,
BrowserAnimationsModule,
],
- providers: [{ provide: HyToastService, useValue: toastServiceSpy }],
}).compileComponents();
fixture = TestBed.createComponent(ProbesSummaryComponent);
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/home/components/registration-version/registration-version.component.scss b/nuxeo-admin-console-web/angular-app/src/app/features/home/components/registration-version/registration-version.component.scss
index 88f3c1de..7097864a 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/home/components/registration-version/registration-version.component.scss
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/home/components/registration-version/registration-version.component.scss
@@ -1,5 +1,12 @@
.registration-version {
height: 100%;
+ &.mdc-card {
+ border-radius: 12px;
+ padding: 24px;
+ background: white;
+ border: 1px solid #d1d5db;
+ box-shadow: none;
+ }
}
.registration-version__button {
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/home/home.module.ts b/nuxeo-admin-console-web/angular-app/src/app/features/home/home.module.ts
index 9dcb721a..a6aa9422 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/home/home.module.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/home/home.module.ts
@@ -7,8 +7,6 @@ import { HomeComponent } from "./components/home.component";
import { ProbesSummaryComponent } from "./components/probes-summary/probes-summary.component";
import { RegistrationVersionComponent } from "./components/registration-version/registration-version.component";
import { HomeRoutingModule } from "./home-routing.module";
-import { HyContentListModule } from "@hyland/ui/content-list";
-import { MatTooltipModule } from "@angular/material/tooltip";
import { ProbesDataModule } from "../sub-features/probes-data/probes-data.module";
@NgModule({
@@ -22,9 +20,7 @@ import { ProbesDataModule } from "../sub-features/probes-data/probes-data.module
MatCardModule,
MatButtonModule,
HomeRoutingModule,
- HyContentListModule,
MatProgressSpinnerModule,
- MatTooltipModule,
ProbesDataModule,
],
})
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/probes/probes.component.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/features/probes/probes.component.spec.ts
index aeb4f686..4961426b 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/probes/probes.component.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/probes/probes.component.spec.ts
@@ -4,23 +4,18 @@ import { StoreModule } from "@ngrx/store";
import { ProbeDataReducer } from "../sub-features/probes-data/store/reducers";
import { HttpClientTestingModule } from "@angular/common/http/testing";
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
-import { HyContentListModule } from "@hyland/ui/content-list";
-import { MatTooltipModule } from "@angular/material/tooltip";
import { MatCardModule } from "@angular/material/card";
import { CommonModule } from "@angular/common";
import { By } from "@angular/platform-browser";
import { ProbesDataComponent } from "../sub-features/probes-data/components/probes-data.component";
-import { HyToastService } from "@hyland/ui";
+import { MatSnackBarModule } from "@angular/material/snack-bar";
+import { MatTableModule } from "@angular/material/table";
describe("ProbesComponent", () => {
let component: ProbesComponent;
let fixture: ComponentFixture;
beforeEach(async () => {
- const toastServiceSpy = jasmine.createSpyObj("HyToastService", [
- "success",
- "error",
- ]);
await TestBed.configureTestingModule({
declarations: [ProbesComponent, ProbesDataComponent],
imports: [
@@ -28,11 +23,10 @@ describe("ProbesComponent", () => {
HttpClientTestingModule,
CommonModule,
MatCardModule,
- HyContentListModule,
- MatTooltipModule,
+ MatSnackBarModule,
+ MatTableModule,
BrowserAnimationsModule,
],
- providers: [{ provide: HyToastService, useValue: toastServiceSpy }],
}).compileComponents();
fixture = TestBed.createComponent(ProbesComponent);
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/probes/probes.module.ts b/nuxeo-admin-console-web/angular-app/src/app/features/probes/probes.module.ts
index 174ebdc7..9958ffae 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/probes/probes.module.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/probes/probes.module.ts
@@ -4,8 +4,6 @@ import { MatCardModule } from "@angular/material/card";
import { MatButtonModule } from "@angular/material/button";
import { ProbesComponent } from "./probes.component";
import { ProbesRoutingModule } from "./probes-routing-module";
-import { HyContentListModule } from "@hyland/ui/content-list";
-import { MatTooltipModule } from "@angular/material/tooltip";
import { ProbesDataModule } from "../sub-features/probes-data/probes-data.module";
@NgModule({
@@ -15,8 +13,6 @@ import { ProbesDataModule } from "../sub-features/probes-data/probes-data.module
MatCardModule,
MatButtonModule,
ProbesRoutingModule,
- HyContentListModule,
- MatTooltipModule,
ProbesDataModule
],
exports: [
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.html b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.html
index 0432cfd9..4b9f1e60 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.html
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.html
@@ -1,8 +1,8 @@