- 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..2379a96c 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,28 @@
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;
+}
+
+#refreshResultsBtn:focus-visible {
+ background-color: #E0E1E0;
+}
+
@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..72314b96 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",
@@ -17,14 +18,23 @@ export class BulkActionMonitoringSummaryComponent implements OnChanges {
statusText = "";
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) {
this.replacePlaceholderValues();
}
+
+ const refreshBtn = document.querySelector(
+ "#refreshResultsBtn"
+ ) as HTMLElement;
+ if (refreshBtn) {
+ refreshBtn.focus();
+ }
}
replacePlaceholderValues(): void {
this.statusText = BULK_ACTION_LABELS.BULK_ACTION_SUMMARY_TEXT.replace(
@@ -92,9 +102,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/fulltext-reindex/fulltext-reindex.constants.ts b/nuxeo-admin-console-web/angular-app/src/app/features/fulltext-reindex/fulltext-reindex.constants.ts
new file mode 100644
index 00000000..d7098a4d
--- /dev/null
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/fulltext-reindex/fulltext-reindex.constants.ts
@@ -0,0 +1,19 @@
+export const FULLTEXT_REINDEX_LABELS = {
+ FOLDER_REINDEX_TITLE: "Reindex the fulltext of a document and all of its children",
+ DOCUMENT_REINDEX_TITLE: "Reindex the fulltext of a single document",
+ NXQL_QUERY_REINDEX_TITLE: "Reindex the fulltext of the documents returned by a NXQL query",
+ REINDEX_BUTTON_LABEL: "Reindex",
+ DOCUMENT_QUERY:
+ "ecm:path='{query}' AND ecm:mixinType = 'Downloadable' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
+ FOLDER_QUERY:
+ "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:mixinType = 'Downloadable' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
+ NXQL_QUERY:
+ "(ecm:uuid='{query}' OR ecm:ancestorId='{query}') AND ecm:mixinType = 'Downloadable' AND ecm:isProxy = 0 AND ecm:mixinType != 'HiddenInNavigation' AND ecm:isVersion = 0 AND ecm:isTrashed = 0",
+ NXQL_QUERY_DEFAULT_VALUE:
+ "SELECT * FROM Document WHERE ecm:mixinType != 'HiddenInNavigation' AND ecm:isProxy = 0 AND ecm:isVersion = 0 AND ecm:isTrashed = 0 AND ecm:mixinType = 'Downloadable' AND dc:title = 'A document to reindex'",
+ FORCE: "force",
+ FORCE_TITLE: "Empty fulltext index of binaries for excluded documents",
+ TRUE: "True",
+ FALSE: "False",
+ FORCE_HELPER_TEXT: "Use this option if you changed your fulltext configuration to exclude additional documents. This will remove the content of the files they hold from the fulltext index."
+}
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..7b04a547 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,31 +1,50 @@
\ No newline at end of file
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.scss b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.scss
index 5c7b2343..8521aa43 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.scss
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.scss
@@ -1,15 +1,27 @@
.document-tab-container {
padding: 10px 0px 0px 10px;
+ .required-indicator {
+ color: rgb(218, 21, 0);
+ font-family: "Open Sans", sans-serif;
+ padding-left: 2px;
+ }
&.vertical-flex {
display: flex;
flex-direction: column;
align-items: stretch;
}
#requiredField {
- font-size: 12px;
- color: #da1500;
- font-weight: 400;
+ font-size: 14px;
+ color: rgb(218, 21, 0);
font-family: "Open Sans";
+ line-height: 1;
+ }
+ .label {
+ line-height: 1;
+ margin: 5px;
+ font-size: 14px;
+ font-weight: 400;
+ font-family: "Open Sans", sans-serif;
}
&__button {
border-radius: 4px !important;
@@ -18,22 +30,40 @@
position: relative;
left: 20px;
font-size: 16px;
- bottom: 3px;
+ bottom: 4px;
+ font-family: "Open Sans", sans-serif;
+ font-weight: 550;
+ letter-spacing: normal;
+ background-color: #0a60ce !important;
+ color: #fff;
&.video-renditions {
left: 0;
bottom: 0;
}
- }
- mat-form-field.hy-form-field {
- margin-top: 10px;
- max-width: 350px;
- width: 80%;
- &.video-renditions {
- margin-top: 30px;
+ &.fulltext-reindex {
+ left: 0;
+ bottom: 0;
}
}
.conversion-helper-text {
font-size: 14px;
margin-top: -15px;
+ color: #666666;
+ }
+ .force-checkbox-container {
+ display: flex;
+ align-items: center;
+ margin: 0 0 10px;
+ }
+
+ .force-conversion-helper-text {
+ max-width: 600px;
+ white-space: normal;
+ word-wrap: break-word;
+ font-size: 13px;
+ margin-top: -15px;
+ color: #666666;
}
+
+
}
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.spec.ts
index db5fea0d..775b718e 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.spec.ts
@@ -4,11 +4,6 @@ import { MatTabsModule } from "@angular/material/tabs";
import { MatButtonModule } from "@angular/material/button";
import { MatInputModule } from "@angular/material/input";
import { MatFormFieldModule } from "@angular/material/form-field";
-import {
- HyFormContainerModule,
- HyMaterialModule,
- HyMaterialTabsModule,
-} from "@hyland/ui";
import {
MatDialog,
MatDialogRef,
@@ -35,6 +30,7 @@ import { ErrorModalComponent } from "../error-modal/error-modal.component";
import { featureMap, FEATURES } from "../../generic-multi-feature-layout.mapping";
import { PICTURE_RENDITIONS_LABELS } from "../../../../pictures/pictures-renditions.constants";
import { THUMBNAIL_GENERATION_LABELS } from "../../../../thumbnail-generation/thumbnail-generation.constants";
+import { FULLTEXT_REINDEX_LABELS } from "../../../../fulltext-reindex/fulltext-reindex.constants";
describe("DocumentTabComponent", () => {
let component: DocumentTabComponent;
@@ -83,8 +79,9 @@ describe("DocumentTabComponent", () => {
},
error: null,
};
- mockDialogRef = jasmine.createSpyObj("MatDialogRef", ["afterClosed"]);
+ mockDialogRef = jasmine.createSpyObj("MatDialogRef", ["afterClosed", "afterOpened"]);
mockDialogRef.afterClosed.and.returnValue(of({}));
+ mockDialogRef.afterOpened.and.returnValue(of());
dialogService = jasmine.createSpyObj("MatDialog", ["open"]);
dialogService.open.and.returnValue(mockDialogRef);
@@ -94,13 +91,10 @@ describe("DocumentTabComponent", () => {
BrowserAnimationsModule,
CommonModule,
MatTabsModule,
- HyMaterialModule,
- HyFormContainerModule,
ReactiveFormsModule,
MatFormFieldModule,
MatInputModule,
MatButtonModule,
- HyMaterialTabsModule,
MatDialogModule,
StoreModule.forRoot(provideMockStore),
],
@@ -156,6 +150,7 @@ describe("DocumentTabComponent", () => {
expect(showActionLaunchedModalSpy).toHaveBeenCalledWith(commandId);
expect(dialogService.open).toHaveBeenCalledWith(GenericModalComponent, {
disableClose: true,
+ hasBackdrop: true,
height: MODAL_DIMENSIONS.HEIGHT,
width: MODAL_DIMENSIONS.WIDTH,
data: {
@@ -284,6 +279,7 @@ describe("DocumentTabComponent", () => {
expect(dialogService.open).toHaveBeenCalledWith(ErrorModalComponent, {
disableClose: true,
+ hasBackdrop: true,
height: MODAL_DIMENSIONS.HEIGHT,
width: MODAL_DIMENSIONS.WIDTH,
data: {
@@ -308,8 +304,14 @@ describe("DocumentTabComponent", () => {
const result = featureMap()[FEATURES.THUMBNAIL_GENERATION](GENERIC_LABELS.DOCUMENT);
expect(result.labels.pageTitle).toBe(THUMBNAIL_GENERATION_LABELS.DOCUMENT_THUMBNAIL_GENERATION_TITLE);
expect(result.labels.submitBtnLabel).toBe(THUMBNAIL_GENERATION_LABELS.THUMBNAIL_GENERATION_BUTTON_LABEL);
- expect(result.data.bodyParam.query).toBe(THUMBNAIL_GENERATION_LABELS.DOCUMENT_QUERY);
});
});
+ describe('FEATURES.FULLTEXT_REINDEX', () => {
+ it('should return correct labels and data for DOCUMENT tabType', () => {
+ const result = featureMap()[FEATURES.FULLTEXT_REINDEX](GENERIC_LABELS.DOCUMENT);
+ expect(result.labels.pageTitle).toBe(FULLTEXT_REINDEX_LABELS.DOCUMENT_REINDEX_TITLE);
+ expect(result.labels.submitBtnLabel).toBe(FULLTEXT_REINDEX_LABELS.REINDEX_BUTTON_LABEL);
+ });
+ });
});
\ No newline at end of file
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.ts b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.ts
index 0748686b..a1c693d4 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/document-tab/document-tab.component.ts
@@ -1,4 +1,5 @@
import { VIDEO_RENDITIONS_LABELS } from "./../../../../video-renditions-generation/video-renditions-generation.constants";
+import { FULLTEXT_REINDEX_LABELS } from "src/app/features/fulltext-reindex/fulltext-reindex.constants";
import { REST_END_POINTS } from "./../../../../../shared/constants/rest-end-ponts.constants";
import { GenericMultiFeatureUtilitiesService } from "./../../services/generic-multi-feature-utilities.service";
import { NuxeoJSClientService } from "./../../../../../shared/services/nuxeo-js-client.service";
@@ -54,9 +55,10 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
documentActionLaunchedSubscription = new Subscription();
documentActionErrorSubscription = new Subscription();
actionDialogClosedSubscription = new Subscription();
- confirmDialogClosedSubscription = new Subscription();
launchedDialogClosedSubscription = new Subscription();
errorDialogClosedSubscription = new Subscription();
+ launchedDialogOpenedSubscription = new Subscription();
+ errorDialogOpenedSubscription = new Subscription();
launchedDialogRef: MatDialogRef<
GenericModalComponent,
GenericModalClosedInfo
@@ -72,6 +74,7 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
activeFeature: FeaturesKey = {} as FeaturesKey;
requestQuery = "";
VIDEO_RENDITIONS_LABELS = VIDEO_RENDITIONS_LABELS;
+ FULLTEXT_REINDEX_LABELS = FULLTEXT_REINDEX_LABELS;
FEATURES = FEATURES;
constructor(
public dialogService: MatDialog,
@@ -82,6 +85,7 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
) {
this.inputForm = this.fb.group({
inputIdentifier: ["", Validators.required],
+ force: [false],
});
this.nuxeo = this.nuxeoJSClientService.getNuxeoInstance();
this.documentActionLaunched$ = this.store.pipe(
@@ -113,7 +117,13 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
);
this.inputForm.addControl(
VIDEO_RENDITIONS_LABELS.RECOMPUTE_ALL_VIDEO_INFO_KEY,
- new FormControl("true")
+ new FormControl("false")
+ );
+ }
+ if (this.isFeatureFullTextReindex()) {
+ this.inputForm.addControl(
+ FULLTEXT_REINDEX_LABELS.FORCE,
+ new FormControl("false")
);
}
}
@@ -140,6 +150,7 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
showActionErrorModal(error: ErrorDetails): void {
this.errorDialogRef = this.dialogService.open(ErrorModalComponent, {
disableClose: true,
+ hasBackdrop: true,
height: MODAL_DIMENSIONS.HEIGHT,
width: MODAL_DIMENSIONS.WIDTH,
data: {
@@ -151,6 +162,17 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
?.subscribe(() => {
this.onActionErrorModalClose();
});
+
+ this.errorDialogOpenedSubscription = this.errorDialogRef
+ .afterOpened()
+ .subscribe(() => {
+ const dialogElement = document.querySelector(
+ ".cdk-dialog-container"
+ ) as HTMLElement;
+ if (dialogElement) {
+ dialogElement.focus();
+ }
+ });
}
onActionErrorModalClose(): void {
@@ -161,6 +183,7 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
showActionLaunchedModal(commandId: string | null): void {
this.launchedDialogRef = this.dialogService.open(GenericModalComponent, {
disableClose: true,
+ hasBackdrop: true,
height: MODAL_DIMENSIONS.HEIGHT,
width: MODAL_DIMENSIONS.WIDTH,
data: {
@@ -176,14 +199,29 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
.subscribe(() => {
this.onActionLaunchedModalClose();
});
+
+ this.launchedDialogOpenedSubscription = this.launchedDialogRef
+ .afterOpened()
+ .subscribe(() => {
+ const dialogElement = document.querySelector(
+ ".cdk-dialog-container"
+ ) as HTMLElement;
+ if (dialogElement) {
+ dialogElement.focus();
+ }
+ });
}
onActionLaunchedModalClose(): void {
this.isSubmitBtnDisabled = false;
- this.inputForm?.get('inputIdentifier')?.reset();
+ this.inputForm?.get("inputIdentifier")?.reset();
if (this.isFeatureVideoRenditions()) {
- this.inputForm?.get('conversionNames')?.reset();
+ this.inputForm?.get("conversionNames")?.reset();
+ }
+ if (this.isFeatureFullTextReindex()) {
+ this.inputForm?.get("force")?.reset();
}
+
document.getElementById("inputIdentifier")?.focus();
}
@@ -294,6 +332,13 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
);
}
+ isFeatureFullTextReindex(): boolean {
+ return (
+ this.activeFeature ===
+ (FEATURES.FULLTEXT_REINDEX as FeaturesKey)
+ );
+ }
+
ngOnDestroy(): void {
this.store.dispatch(FeatureActions.resetDocumentActionState());
this.documentActionLaunchedSubscription?.unsubscribe();
@@ -301,5 +346,7 @@ export class DocumentTabComponent implements OnInit, OnDestroy {
this.actionDialogClosedSubscription?.unsubscribe();
this.launchedDialogClosedSubscription?.unsubscribe();
this.errorDialogClosedSubscription?.unsubscribe();
+ this.launchedDialogOpenedSubscription?.unsubscribe();
+ this.errorDialogOpenedSubscription?.unsubscribe();
}
-}
+}
\ No newline at end of file
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.html b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.html
index 4dd9f182..0bbed1aa 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.html
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.html
@@ -1,26 +1,18 @@
-
-
-
-
-
-
{{ERROR_MODAL_LABELS.ERROR_SUBHEADING}}
-
{{ERROR_MODAL_LABELS.ERROR_STATUS}} {{data.error.details.status}}
-
{{ERROR_MODAL_LABELS.ERROR_DETAILS}} {{data.error.details.message}}
-
- {{getCustomErrorMessage()}}
-
-
-
-
-
\ No newline at end of file
+ {{ ERROR_MODAL_LABELS.ERROR_MODAL_TITLE }}
+
+
+
{{ERROR_MODAL_LABELS.ERROR_SUBHEADING}}
+
{{ERROR_MODAL_LABELS.ERROR_STATUS}} {{data.error.details.status}}
+
{{ERROR_MODAL_LABELS.ERROR_DETAILS}} {{data.error.details.message}}
+
+ {{getCustomErrorMessage()}}
+
+
+
+
+ {{ GENERIC_LABELS.CLOSE_LABEL }}
+
+
\ No newline at end of file
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.scss b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.scss
index 2f83a285..9b6fbd6f 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.scss
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.scss
@@ -1,3 +1,3 @@
-:host ::ng-deep hy-dialog-box-title .mat-title {
- font-weight: 300;
-}
+.separator {
+ margin-top: 1.5rem;
+}
\ No newline at end of file
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.spec.ts b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.spec.ts
index 9da110ce..c8c465cd 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.spec.ts
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/error-modal/error-modal.component.spec.ts
@@ -1,6 +1,5 @@
import { ErrorModalComponent } from '../error-modal/error-modal.component';
-import { HyDialogBoxModule } from "@hyland/ui";
-import { MatDialogRef } from "@angular/material/dialog";
+import { MatDialogModule, MatDialogRef } from "@angular/material/dialog";
import { ComponentFixture, TestBed } from "@angular/core/testing";
import { MAT_DIALOG_DATA } from "@angular/material/dialog";
import { CommonModule } from "@angular/common";
@@ -44,7 +43,7 @@ describe("ErrorModalComponent", () => {
const dialogRefSpy = jasmine.createSpyObj("MatDialogRef", ["close"]);
TestBed.configureTestingModule({
declarations: [ErrorModalComponent],
- imports: [CommonModule, HyDialogBoxModule],
+ imports: [CommonModule, MatDialogModule],
providers: [
{ provide: MatDialogRef, useValue: dialogRefSpy },
{ provide: MAT_DIALOG_DATA, useValue: {} },
diff --git a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/folder-tab/folder-tab.component.html b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/folder-tab/folder-tab.component.html
index 660373d7..6d595962 100644
--- a/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/folder-tab/folder-tab.component.html
+++ b/nuxeo-admin-console-web/angular-app/src/app/features/sub-features/generic-multi-feature-layout/components/folder-tab/folder-tab.component.html
@@ -1,9 +1,9 @@