From 90cb0d4db0e42a573ad0c31000f073c8183ddc31 Mon Sep 17 00:00:00 2001
From: MichalKinas <113341662+MichalKinas@users.noreply.github.com>
Date: Mon, 18 Nov 2024 15:11:00 +0100
Subject: [PATCH] [ACS-9008] Proper form initialization for Saved Searches
(#4243)
* [ACS-9008] Proper form initialization
* [ACS-9008] Add saved search form interface, fix other dialog
---
.../saved-search-edit-dialog.component.ts | 20 +++++++------
.../dialog/save-search-dialog.component.ts | 22 +++++++-------
.../dialog/saved-search-form.interface.ts | 30 +++++++++++++++++++
3 files changed, 53 insertions(+), 19 deletions(-)
create mode 100644 projects/aca-content/src/lib/components/search/search-save/dialog/saved-search-form.interface.ts
diff --git a/projects/aca-content/src/lib/components/search/search-save/dialog/edit/saved-search-edit-dialog.component.ts b/projects/aca-content/src/lib/components/search/search-save/dialog/edit/saved-search-edit-dialog.component.ts
index 2d2090f6f..deb9a46d7 100644
--- a/projects/aca-content/src/lib/components/search/search-save/dialog/edit/saved-search-edit-dialog.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-save/dialog/edit/saved-search-edit-dialog.component.ts
@@ -31,6 +31,7 @@ import { Store } from '@ngrx/store';
import { CoreModule } from '@alfresco/adf-core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { UniqueSearchNameValidator } from '../unique-search-name-validator';
+import { SavedSearchForm } from '../saved-search-form.interface';
@Component({
standalone: true,
@@ -42,15 +43,7 @@ import { UniqueSearchNameValidator } from '../unique-search-name-validator';
host: { class: 'aca-saved-search-edit-dialog' }
})
export class SavedSearchEditDialogComponent {
- form = new FormGroup({
- name: new FormControl('', {
- validators: [Validators.required, forbidOnlySpaces],
- asyncValidators: [this.uniqueSearchNameValidator.validate.bind(this.uniqueSearchNameValidator)],
- updateOn: 'blur'
- }),
- description: new FormControl('')
- });
-
+ form: FormGroup<SavedSearchForm>;
isLoading = false;
constructor(
@@ -60,6 +53,15 @@ export class SavedSearchEditDialogComponent {
private readonly uniqueSearchNameValidator: UniqueSearchNameValidator,
@Inject(MAT_DIALOG_DATA) private readonly data: SavedSearch
) {
+ this.form = new FormGroup({
+ name: new FormControl('', {
+ validators: [Validators.required, forbidOnlySpaces],
+ asyncValidators: [this.uniqueSearchNameValidator.validate.bind(this.uniqueSearchNameValidator)],
+ updateOn: 'change'
+ }),
+ description: new FormControl('')
+ });
+
this.form.patchValue({
name: this.data.name,
description: this.data.description
diff --git a/projects/aca-content/src/lib/components/search/search-save/dialog/save-search-dialog.component.ts b/projects/aca-content/src/lib/components/search/search-save/dialog/save-search-dialog.component.ts
index 41c75d1f7..62e200e90 100644
--- a/projects/aca-content/src/lib/components/search/search-save/dialog/save-search-dialog.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-save/dialog/save-search-dialog.component.ts
@@ -41,6 +41,7 @@ import { take } from 'rxjs/operators';
import { Store } from '@ngrx/store';
import { AppStore, SnackbarErrorAction, SnackbarInfoAction } from '@alfresco/aca-shared/store';
import { UniqueSearchNameValidator } from './unique-search-name-validator';
+import { SavedSearchForm } from './saved-search-form.interface';
@Component({
standalone: true,
@@ -66,15 +67,7 @@ import { UniqueSearchNameValidator } from './unique-search-name-validator';
host: { class: 'aca-save-search-dialog' }
})
export class SaveSearchDialogComponent {
- form = new FormGroup({
- name: new FormControl('', {
- validators: [Validators.required, forbidOnlySpaces],
- asyncValidators: [this.uniqueSearchNameValidator.validate.bind(this.uniqueSearchNameValidator)],
- updateOn: 'blur'
- }),
- description: new FormControl('')
- });
-
+ form: FormGroup<SavedSearchForm>;
disableSubmitButton = false;
constructor(
@@ -83,7 +76,16 @@ export class SaveSearchDialogComponent {
private readonly savedSearchesService: SavedSearchesService,
private readonly uniqueSearchNameValidator: UniqueSearchNameValidator,
@Inject(MAT_DIALOG_DATA) private readonly data: { searchUrl: string }
- ) {}
+ ) {
+ this.form = new FormGroup({
+ name: new FormControl('', {
+ validators: [Validators.required, forbidOnlySpaces],
+ asyncValidators: [this.uniqueSearchNameValidator.validate.bind(this.uniqueSearchNameValidator)],
+ updateOn: 'change'
+ }),
+ description: new FormControl('')
+ });
+ }
submit() {
if (this.form.invalid || this.disableSubmitButton) {
diff --git a/projects/aca-content/src/lib/components/search/search-save/dialog/saved-search-form.interface.ts b/projects/aca-content/src/lib/components/search/search-save/dialog/saved-search-form.interface.ts
new file mode 100644
index 000000000..009c512bf
--- /dev/null
+++ b/projects/aca-content/src/lib/components/search/search-save/dialog/saved-search-form.interface.ts
@@ -0,0 +1,30 @@
+/*!
+ * Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Alfresco Example Content Application
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import { FormControl } from '@angular/forms';
+
+export interface SavedSearchForm {
+ name: FormControl<string>;
+ description: FormControl<string>;
+}