inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1240 Folder search, after clicking on folder in list of suggestions, suggestions do not disappear

Browse Source
This commit is contained in:
Eugenio Romano 2016-12-15 16:59:42 +00:00
parent d94a31e51e
commit cb714bf260
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
View File

@ -68,6 +68,8 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
@ViewChild('resultsTableBody', {}) resultsTableBody: ElementRef; @ViewChild('resultsTableBody', {}) resultsTableBody: ElementRef;
baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
constructor(private alfrescoSearchService: AlfrescoSearchService, constructor(private alfrescoSearchService: AlfrescoSearchService,
private translate: AlfrescoTranslationService, private translate: AlfrescoTranslationService,
private alfrescoThumbnailService: AlfrescoThumbnailService) { private alfrescoThumbnailService: AlfrescoThumbnailService) {
@ -127,13 +129,12 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
let icon = this.alfrescoThumbnailService.getMimeTypeIcon(node.entry.content.mimeType); let icon = this.alfrescoThumbnailService.getMimeTypeIcon(node.entry.content.mimeType);
return this.resolveIconPath(icon); return this.resolveIconPath(icon);
} else if (node.entry.isFolder) { } else if (node.entry.isFolder) {
return 'ft_ic_folder.svg'; return `${this.baseComponentPath}/../assets/images/ft_ic_folder.svg`;
} }
} }
resolveIconPath(icon: string): string { resolveIconPath(icon: string): string {
let baseComponentPath = module.id.replace('/components/alfresco-search.component.js', ''); return `${this.baseComponentPath}/../assets/images/${icon}`;
return `${baseComponentPath}/../assets/images/${icon}`;
} }
/** /**

18
ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts
View File

@ -348,6 +348,22 @@ describe('AlfrescoSearchControlComponent', () => {
}); });
}); });
}); it('should set un-active the search after file/folder is clicked', () => {
component.searchActive = true;
component.onFileClicked({
value: 'node12345'
});
expect(component.searchActive).toBe(false);
});
it('should reset the search term after file/folder is clicked', () => {
component.liveSearchTerm = 'test';
component.onFileClicked({
value: 'node12345'
});
expect(component.liveSearchTerm).toBe('');
});
});
}); });

2
ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
View File

@ -171,6 +171,8 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy {
} }
onFileClicked(event): void { onFileClicked(event): void {
this.liveSearchTerm = '';
this.searchActive = false;
this.fileSelect.emit(event); this.fileSelect.emit(event);
} }

7
ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
View File

@ -63,6 +63,8 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
queryParamName = 'q'; queryParamName = 'q';
baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
constructor(private alfrescoSearchService: AlfrescoSearchService, constructor(private alfrescoSearchService: AlfrescoSearchService,
private translate: AlfrescoTranslationService, private translate: AlfrescoTranslationService,
private _alfrescoThumbnailService: AlfrescoThumbnailService, private _alfrescoThumbnailService: AlfrescoThumbnailService,
@ -100,13 +102,12 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
let icon = this._alfrescoThumbnailService.getMimeTypeIcon(node.entry.content.mimeType); let icon = this._alfrescoThumbnailService.getMimeTypeIcon(node.entry.content.mimeType);
return this.resolveIconPath(icon); return this.resolveIconPath(icon);
} else if (node.entry.isFolder) { } else if (node.entry.isFolder) {
return 'ft_ic_folder.svg'; return `${this.baseComponentPath}/../assets/images/ft_ic_folder.svg`;
} }
} }
private resolveIconPath(icon: string): string { private resolveIconPath(icon: string): string {
let baseComponentPath = module.id.replace('/components/alfresco-search.component.js', ''); return `${this.baseComponentPath}/../assets/images/${icon}`;
return `${baseComponentPath}/../assets/images/${icon}`;
} }
/** /**