+
{{ item.getTitle() }}
diff --git a/client/src/app/site/services/color.service.spec.ts b/client/src/app/site/services/color.service.spec.ts
index 67ec6ca83b..3d455d9e20 100644
--- a/client/src/app/site/services/color.service.spec.ts
+++ b/client/src/app/site/services/color.service.spec.ts
@@ -1,16 +1,53 @@
import { TestBed } from '@angular/core/testing';
-import { ColorService } from './color.service';
+import { HtmlColor } from '../../domain/definitions/key-types';
+import { Color, ColorService } from './color.service';
-xdescribe(`ColorService`, () => {
+describe(`ColorService`, () => {
let service: ColorService;
beforeEach(() => {
- TestBed.configureTestingModule({});
+ TestBed.configureTestingModule({
+ providers: [ColorService]
+ });
service = TestBed.inject(ColorService);
});
it(`should be created`, () => {
expect(service).toBeTruthy();
});
+
+ it(`parse html color to color`, () => {
+ const value: HtmlColor = `#aa11ff`;
+ expect(service.parseHtmlColorToColor(value)).toEqual(new Color(value));
+ });
+
+ it(`parse html color and check color parts`, () => {
+ const value: HtmlColor = `#aa11ff`;
+ expect(service.parseHtmlColorToColor(value).blue).toEqual(parseInt(`ff`, 16).toString());
+ expect(service.parseHtmlColorToColor(value).green).toEqual(parseInt(`11`, 16).toString());
+ expect(service.parseHtmlColorToColor(value).red).toEqual(parseInt(`aa`, 16).toString());
+ expect(service.parseHtmlColorToColor(value).value).toEqual(value);
+ });
+
+ it(`get random color`, () => {
+ expect(service.getRandomHtmlColor()).toMatch(/#[0-9abcdef]{6}/);
+ });
+
+ it(`generate color palette`, () => {
+ expect(service.generateColorPaletteByHex(`aa11ff`).length).toBe(14);
+ });
+
+ it(`create color object`, () => {
+ expect(service.createColorObject(`aa11ff`, `test-color`)).toEqual({
+ name: `test-color`,
+ hex: `#aa11ff`,
+ darkContrast: false
+ });
+ });
+
+ it(`is light from hex`, () => {
+ expect(service.isLightFromHex(`#110011`)).toBe(false);
+ expect(service.isLightFromHex(`#ffeeff`)).toBe(true);
+ });
});
diff --git a/client/src/app/site/services/global-search/global-search.service.ts b/client/src/app/site/services/global-search/global-search.service.ts
index 3f52d4cc44..670e2f776e 100644
--- a/client/src/app/site/services/global-search/global-search.service.ts
+++ b/client/src/app/site/services/global-search/global-search.service.ts
@@ -56,7 +56,7 @@ export class GlobalSearchService {
const result = results[fqid];
if (result.matched_by) {
for (const field of Object.keys(result.matched_by)) {
- if (result.content[field]) {
+ if (result.content[field] && !this.isTitleField(collectionFromFqid(fqid), field)) {
for (const word of result.matched_by[field]) {
result.content[field] = `${result.content[field]}`.replace(
new RegExp(word, `gi`),
@@ -69,6 +69,14 @@ export class GlobalSearchService {
}
}
+ private isTitleField(collection: string, field: string): boolean {
+ if (collection === `user`) {
+ return [`first_name`, `last_name`, `username`, `title`].includes(field);
+ } else {
+ return [`name`, `title`].includes(field);
+ }
+ }
+
private updateScores(results: GlobalSearchResponse): void {
for (const fqid of Object.keys(results)) {
this.updateScore(fqid, results[fqid].score || 0, results);