mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2026-09-09 18:02:54 +00:00
[ACS-10475] [Search] UX improvements for search (#5042)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
aca-toolbar {
|
||||
.aca-toolbar {
|
||||
min-height: 48px;
|
||||
height: 56px;
|
||||
color: var(--adf-theme-foreground-text-color-064);
|
||||
background-color: inherit;
|
||||
border: none;
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
import { inject, Injectable } from '@angular/core';
|
||||
import {
|
||||
AuthenticationService,
|
||||
AppConfigService,
|
||||
PageTitleService,
|
||||
UserPreferencesService,
|
||||
AuthenticationService,
|
||||
NotificationService,
|
||||
StorageService
|
||||
PageTitleService,
|
||||
StorageService,
|
||||
UserPreferencesService
|
||||
} from '@alfresco/adf-core';
|
||||
import { Observable, BehaviorSubject, Subject } from 'rxjs';
|
||||
import { BehaviorSubject, Observable, Subject } from 'rxjs';
|
||||
import {
|
||||
AlfrescoApiService,
|
||||
FileUploadErrorEvent,
|
||||
@@ -72,7 +72,7 @@ export class AppService implements ShellAppService {
|
||||
toggleAppNavBar$ = new Subject<void>();
|
||||
|
||||
hideSidenavConditions = ['/preview/'];
|
||||
minimizeSidenavConditions = ['/search'];
|
||||
minimizeSidenavConditions = [];
|
||||
|
||||
/**
|
||||
* Whether `withCredentials` mode is enabled.
|
||||
|
||||
-70
@@ -1,70 +0,0 @@
|
||||
/*!
|
||||
* Copyright © 2005-2025 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';
|
||||
import { noLeadingTrailingOperatorsValidator } from './no-leading-trailing-operators.validator';
|
||||
|
||||
describe('noLeadingTrailingOperatorsValidator', () => {
|
||||
const validatorFn = noLeadingTrailingOperatorsValidator();
|
||||
|
||||
it('should return null for valid input without operators', () => {
|
||||
const control = new FormControl('valid input');
|
||||
expect(validatorFn(control)).toBeNull();
|
||||
});
|
||||
|
||||
it('should return null for empty input', () => {
|
||||
const control = new FormControl('');
|
||||
expect(validatorFn(control)).toBeNull();
|
||||
});
|
||||
|
||||
it('should return null for valid input with operators', () => {
|
||||
const control = new FormControl('valid AND input OR phrase');
|
||||
expect(validatorFn(control)).toBeNull();
|
||||
});
|
||||
|
||||
it('should return error for input with leading AND operator', () => {
|
||||
const control = new FormControl('AND input');
|
||||
expect(validatorFn(control)).toEqual({ operators: true });
|
||||
});
|
||||
|
||||
it('should return error for input with leading OR operator', () => {
|
||||
const control = new FormControl('OR input');
|
||||
expect(validatorFn(control)).toEqual({ operators: true });
|
||||
});
|
||||
|
||||
it('should return error for input with trailing AND operator', () => {
|
||||
const control = new FormControl('input AND');
|
||||
expect(validatorFn(control)).toEqual({ operators: true });
|
||||
});
|
||||
|
||||
it('should return error for input with trailing OR operator', () => {
|
||||
const control = new FormControl('input OR');
|
||||
expect(validatorFn(control)).toEqual({ operators: true });
|
||||
});
|
||||
|
||||
it('should return error for input with only operator', () => {
|
||||
const control = new FormControl('AND OR');
|
||||
expect(validatorFn(control)).toEqual({ operators: true });
|
||||
});
|
||||
});
|
||||
@@ -1,43 +0,0 @@
|
||||
/*!
|
||||
* Copyright © 2005-2025 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 { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
|
||||
|
||||
const isOperator = (word: string): boolean => {
|
||||
const operators = ['AND', 'OR'];
|
||||
return operators.includes(word.trim());
|
||||
};
|
||||
|
||||
export const noLeadingTrailingOperatorsValidator = (): ValidatorFn => {
|
||||
return (control: AbstractControl<string>): ValidationErrors | null => {
|
||||
const rawValue = control.value;
|
||||
if (!rawValue) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const words = rawValue.trim().split(/\s+/);
|
||||
|
||||
return isOperator(words[0]) || isOperator(words[words.length - 1]) ? { operators: true } : null;
|
||||
};
|
||||
};
|
||||
@@ -1,50 +0,0 @@
|
||||
/*!
|
||||
* Copyright © 2005-2025 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';
|
||||
import { noWhitespaceValidator } from './no-whitespace.validator';
|
||||
|
||||
describe('noWhitespaceValidator', () => {
|
||||
const validatorFn = noWhitespaceValidator();
|
||||
|
||||
it('should return null for valid non-whitespace input', () => {
|
||||
const control = new FormControl('valid input');
|
||||
expect(validatorFn(control)).toBeNull();
|
||||
});
|
||||
|
||||
it('should return error for input with only spaces', () => {
|
||||
const control = new FormControl(' ');
|
||||
expect(validatorFn(control)).toEqual({ whitespace: true });
|
||||
});
|
||||
|
||||
it('should return error for empty string', () => {
|
||||
const control = new FormControl('');
|
||||
expect(validatorFn(control)).toBeNull();
|
||||
});
|
||||
|
||||
it('should return null for input with leading and trailing spaces but valid content inside', () => {
|
||||
const control = new FormControl(' valid ');
|
||||
expect(validatorFn(control)).toBeNull();
|
||||
});
|
||||
});
|
||||
@@ -1,37 +0,0 @@
|
||||
/*!
|
||||
* Copyright © 2005-2025 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 { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
|
||||
|
||||
export const noWhitespaceValidator = (): ValidatorFn => {
|
||||
return (control: AbstractControl): ValidationErrors | null => {
|
||||
const rawValue = control.value;
|
||||
if (!rawValue) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const trimmedValue = rawValue.toString().trim();
|
||||
return trimmedValue.length === 0 ? { whitespace: true } : null;
|
||||
};
|
||||
};
|
||||
@@ -64,6 +64,3 @@ export * from './lib/services/navigation-history.service';
|
||||
export * from './lib/testing/lib-testing-module';
|
||||
|
||||
export * from './lib/utils/node.utils';
|
||||
|
||||
export * from './lib/validators/no-whitespace.validator';
|
||||
export * from './lib/validators/no-leading-trailing-operators.validator';
|
||||
|
||||
Reference in New Issue
Block a user