From 5b5916bfb142a9c1411f08dcfdd7f15624ce9675 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Mon, 13 Mar 2017 10:42:18 +0000
Subject: [PATCH] fix image paths for components (#1696)

* fix Login image paths

* fix TaskList image paths

* fix DocumentList image paths

* fix Search image paths
---
 .../activiti-people-search.component.html      |  5 ++---
 .../activiti-people-search.component.ts        |  4 ++--
 .../components/activiti-people.component.html  |  2 +-
 .../components/activiti-people.component.ts    |  4 ++--
 .../activiti-task-details.component.ts         |  4 +++-
 .../components/document-list.component.html    |  2 +-
 .../src/components/document-list.component.ts  |  7 +++++--
 .../src/data/share-datatable-adapter.spec.ts   | 18 +++++++++---------
 .../src/data/share-datatable-adapter.ts        |  2 +-
 .../components/alfresco-login.component.html   |  8 ++------
 .../src/components/alfresco-login.component.ts | 10 +++-------
 .../alfresco-search-autocomplete.component.ts  |  6 +++---
 .../components/alfresco-search.component.html  |  2 +-
 .../components/alfresco-search.component.ts    | 12 +++++-------
 14 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html
index 279df098d6..106ad72f01 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.html
@@ -1,12 +1,11 @@
 <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-    <input class="mdl-textfield__input" type="text" id="userSearchText" [value]=""
-           [formControl]="searchUser"/>
+    <input class="mdl-textfield__input" type="text" id="userSearchText" [value]="" [formControl]="searchUser"/>
     <label class="mdl-textfield__label" for="userSearchText">Search user</label>
 </div>
 <ul class='mdl-list'>
     <li class="mdl-list__item fix-element-user-list" *ngFor="let user of userList">
         <button (click)="onRowClick(user)" id="user-{{user.id}}" class="mdl-chip mdl-chip--contact mdl-chip-search-people">
-            <img class="mdl-chip__contact" [src]="iconImageUrl || baseComponentPath + '/../assets/images/user.jpg'" />
+            <img class="mdl-chip__contact" [src]="iconImageUrl" />
             <span class="mdl-chip__text mdl-chip-search-people__text">{{getDisplayUser(user)}}</span>
         </button>
     </li>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts
index faa5dd69a4..2defe31809 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people-search.component.ts
@@ -32,10 +32,10 @@ declare let componentHandler: any;
 
 export class ActivitiPeopleSearch implements OnInit, AfterViewInit {
 
-    baseComponentPath = module.id.replace('/activiti-people-search.component.js', '');
+    private baseComponentPath: string = module.id.replace('components/activiti-people-search.component.js', '');
 
     @Input()
-    iconImageUrl: string;
+    iconImageUrl: string = this.baseComponentPath + 'assets/images/user.jpg';
 
     @Input()
     results: Observable<User[]>;
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html
index f8352a46b1..2d7e3f0a50 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.html
@@ -8,7 +8,7 @@
     <ul class='mdl-list'>
         <li class="mdl-list__item" *ngFor="let user of people">
             <span class="mdl-chip mdl-chip--contact mdl-chip--deletable">
-                <img class="mdl-chip__contact" [src]="iconImageUrl || baseComponentPath + '/../assets/images/user.jpg'" />
+                <img class="mdl-chip__contact" [src]="iconImageUrl" />
                 <span id="user-{{user.id}}" class="mdl-chip__text">{{getDisplayUser(user)}}</span>
                 <a *ngIf="!readOnly" class="mdl-chip__action"><i id="remove-{{user.id}}" (click)="removeInvolvedUser(user)" class="material-icons people__icon">cancel</i></a>
             </span>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts
index 99bd8cd213..3009213b80 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-people.component.ts
@@ -31,10 +31,10 @@ declare let dialogPolyfill: any;
 })
 export class ActivitiPeople {
 
-    baseComponentPath = module.id.replace('/activiti-people.component.js', '');
+    private baseComponentPath: string = module.id.replace('components/activiti-people.component.js', '');
 
     @Input()
-    iconImageUrl: string;
+    iconImageUrl: string = this.baseComponentPath + 'assets/images/user.jpg';
 
     @Input()
     people: User [] = [];
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
index 4976be0e8f..fe0919a4c9 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
@@ -31,6 +31,8 @@ import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
 })
 export class ActivitiTaskDetails implements OnInit, OnChanges {
 
+    private baseComponentPath: string = module.id.replace('components/activiti-task-details.component', '');
+
     @ViewChild('activiticomments')
     activiticomments: any;
 
@@ -77,7 +79,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
     showFormRefreshButton: boolean = true;
 
     @Input()
-    peopleIconImageUrl: string;
+    peopleIconImageUrl: string = this.baseComponentPath + 'assets/images/user.jpg';
 
     @Output()
     formSaved: EventEmitter<FormModel> = new EventEmitter<FormModel>();
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html
index e3056806e1..5b6d96bb64 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.html
@@ -23,7 +23,7 @@
                     <div class="document-list__this-space-is-empty">This folder is empty</div>
                     <div class="document-list__drag-drop">Drag and Drop</div>
                     <div class="document-list__any-files-here-to-add">any files here to add</div>
-                    <img [src]="baseComponentPath + '/assets/images/empty_doc_lib.svg'" class="document-list__empty_doc_lib">
+                    <img [src]="emptyFolderImageUrl" class="document-list__empty_doc_lib">
                 </div>
             </template>
         </no-content-template>
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
index a044503309..2d9225523f 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
@@ -52,10 +52,10 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni
     static DOUBLE_CLICK_NAVIGATION: string = 'dblclick';
     static DEFAULT_PAGE_SIZE: number = 20;
 
-    baseComponentPath = module.id.replace('/components/document-list.component.js', '');
+    baseComponentPath = module.id.replace('components/document-list.component.js', '');
 
     @Input()
-    fallbackThumbnail: string = this.baseComponentPath + '/assets/images/ft_ic_miscellaneous.svg';
+    fallbackThumbnail: string = this.baseComponentPath + 'assets/images/ft_ic_miscellaneous.svg';
 
     @Input()
     navigate: boolean = true;
@@ -87,6 +87,9 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni
     @Input()
     pageSize: number = DocumentListComponent.DEFAULT_PAGE_SIZE;
 
+    @Input()
+    emptyFolderImageUrl: string = this.baseComponentPath + 'assets/images/empty_doc_lib.svg';
+
     skipCount: number = 0;
 
     pagination: Pagination;
diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts
index 707305bf92..8916edaa63 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.spec.ts
@@ -26,7 +26,7 @@ describe('ShareDataTableAdapter', () => {
     let documentListService: DocumentListServiceMock;
 
     beforeEach(() => {
-        basePath = '/root';
+        basePath = '/root/';
         documentListService = new DocumentListServiceMock();
     });
 
@@ -219,7 +219,7 @@ describe('ShareDataTableAdapter', () => {
         let col = <DataColumn> { type: 'image', key: '$thumbnail' };
 
         let value = adapter.getValue(row, col);
-        expect(value).toBe(`${basePath}/assets/images/ft_ic_miscellaneous.svg`);
+        expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`);
     });
 
     it('should generate fallback icon for a file thumbnail with missing mime type', () => {
@@ -232,7 +232,7 @@ describe('ShareDataTableAdapter', () => {
         let col = <DataColumn> { type: 'image', key: '$thumbnail' };
 
         let value = adapter.getValue(row, col);
-        expect(value).toBe(`${basePath}/assets/images/ft_ic_miscellaneous.svg`);
+        expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`);
     });
 
     it('should generate fallback icon for a file with no content entry', () => {
@@ -245,7 +245,7 @@ describe('ShareDataTableAdapter', () => {
         let col = <DataColumn> { type: 'image', key: '$thumbnail' };
 
         let value = adapter.getValue(row, col);
-        expect(value).toBe(`${basePath}/assets/images/ft_ic_miscellaneous.svg`);
+        expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`);
     });
 
     it('should generate fallback icon when document service fails to find one', () => {
@@ -257,7 +257,7 @@ describe('ShareDataTableAdapter', () => {
         let col = <DataColumn> { type: 'image', key: '$thumbnail' };
 
         let value = adapter.getValue(row, col);
-        expect(value).toBe(`${basePath}/assets/images/ft_ic_miscellaneous.svg`);
+        expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`);
     });
 
     it('should return image value unmodified', () => {
@@ -281,7 +281,7 @@ describe('ShareDataTableAdapter', () => {
         let col = <DataColumn> { type: 'image', key: '$thumbnail' };
 
         let value = adapter.getValue(row, col);
-        expect(value).toBe(`${basePath}/assets/images/ft_ic_folder.svg`);
+        expect(value).toBe(`${basePath}assets/images/ft_ic_folder.svg`);
     });
 
     it('should resolve file thumbnail', () => {
@@ -311,7 +311,7 @@ describe('ShareDataTableAdapter', () => {
         let col = <DataColumn> { type: 'image', key: '$thumbnail' };
 
         let value = adapter.getValue(row, col);
-        expect(value).toBe(`${basePath}/assets/images/ft_ic_miscellaneous.svg`);
+        expect(value).toBe(`${basePath}assets/images/ft_ic_miscellaneous.svg`);
     });
 
     it('should require document service to resolve thumbnail', () => {
@@ -351,10 +351,10 @@ describe('ShareDataTableAdapter', () => {
         let row = new ShareDataRow(file);
         let col = <DataColumn> {type: 'image', key: '$thumbnail'};
 
-        let adapter = new ShareDataTableAdapter(documentListService, '/root', null);
+        let adapter = new ShareDataTableAdapter(documentListService, basePath, null);
         let value = adapter.getValue(row, col);
 
-        expect(value).toBe(`/root/assets/images/${fileName}`);
+        expect(value).toBe(`${basePath}assets/images/${fileName}`);
         expect(documentListService.getMimeTypeIcon).toHaveBeenCalled();
     });
 
diff --git a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
index 23fd57f915..1974613789 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
@@ -223,7 +223,7 @@ export class ShareDataTableAdapter implements DataTableAdapter {
     }
 
     getImagePath(id: string): any {
-        return `${this.basePath}/assets/images/${id}`;
+        return `${this.basePath}assets/images/${id}`;
     }
 }
 
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html
index a6b6011ac9..1407b617e7 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html
@@ -1,18 +1,14 @@
 <div class="content-grid mdl-grid content-layout login-content"
-     [style.background-image]="'url(' + (backgroundImageUrl || baseComponentPath + '/../assets/images/background.svg') + ')'">
+     [style.background-image]="'url(' + backgroundImageUrl + ')'">
     <div class="login-card-wide mdl-card mdl-shadow--4dp">
         <form [formGroup]="form" (submit)="onSubmit(form.value, $event)">
             <div class="mdl-card__title alfresco-logo">
-
                 <!--HEADER TEMPLATE-->
                 <template *ngIf="headerTemplate"
                           ngFor [ngForOf]="[data]"
                           [ngForTemplate]="headerTemplate">
                 </template>
-
-                <img  *ngIf="!headerTemplate" class="center"
-                      [src]="logoImageUrl || baseComponentPath + '/../assets/images/alfresco-logo.svg'"
-                     alt="{{'LOGIN.LOGO' | translate }}">
+                <img *ngIf="!headerTemplate" class="center" [src]="logoImageUrl" alt="{{'LOGIN.LOGO' | translate }}">
             </div>
             <div class="mdl-card__supporting-text">
 
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
index f2aa8d6531..d034bf7b33 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts
@@ -31,7 +31,7 @@ declare let componentHandler: any;
 })
 export class AlfrescoLoginComponent implements OnInit {
 
-    baseComponentPath = module.id.replace('/alfresco-login.component.js', '');
+    private baseComponentPath: string = module.id.replace('components/alfresco-login.component.js', '');
 
     isPasswordShow: boolean = false;
 
@@ -42,10 +42,10 @@ export class AlfrescoLoginComponent implements OnInit {
     registerLink: string = '';
 
     @Input()
-    logoImageUrl: string;
+    logoImageUrl: string = this.baseComponentPath + 'assets/images/alfresco-logo.svg';
 
     @Input()
-    backgroundImageUrl: string;
+    backgroundImageUrl: string = this.baseComponentPath + 'assets/images/background.svg';
 
     @Input()
     providers: string;
@@ -69,13 +69,9 @@ export class AlfrescoLoginComponent implements OnInit {
     error: boolean = false;
     errorMsg: string;
     success: boolean = false;
-
     formError: { [id: string]: string };
-
     minLength: number = 2;
-
     footerTemplate: TemplateRef<any>;
-
     headerTemplate: TemplateRef<any>;
 
     private _message: { [id: string]: { [id: string]: string } };
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
index f3a066f4ba..a7c0f8f6b2 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
@@ -68,7 +68,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
 
     @ViewChild('resultsTableBody', {}) resultsTableBody: ElementRef;
 
-    baseComponentPath: string = module.id.replace('/components/alfresco-search-autocomplete.component.js', '');
+    baseComponentPath: string = module.id.replace('components/alfresco-search-autocomplete.component.js', '');
 
     constructor(private searchService: AlfrescoSearchService,
                 private translateService: AlfrescoTranslationService,
@@ -130,12 +130,12 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
             return this.resolveIconPath(icon);
         }
         if (node.entry.isFolder) {
-            return `${this.baseComponentPath}/assets/images/ft_ic_folder.svg`;
+            return `${this.baseComponentPath}assets/images/ft_ic_folder.svg`;
         }
     }
 
     resolveIconPath(icon: string): string {
-        return `${this.baseComponentPath}/assets/images/${icon}`;
+        return `${this.baseComponentPath}assets/images/${icon}`;
     }
 
     /**
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
index a38feaaf40..d6df24dd37 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.html
@@ -16,7 +16,7 @@
                 <template>
                     <div class="empty_template">
                         <div class="no-result-message">{{ 'SEARCH.RESULTS.NONE' | translate:{searchTerm: searchTerm} }}</div>
-                        <img [src]="baseComponentPath + '/assets/images/empty_doc_lib.svg'" class="no-result__empty_doc_lib">
+                        <img [src]="emptyFolderImageUrl" class="no-result__empty_doc_lib">
                     </div>
                 </template>
                 <template>
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
index 0a6cbc00b9..7b64a613d2 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
@@ -32,6 +32,8 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
     static SINGLE_CLICK_NAVIGATION: string = 'click';
     static DOUBLE_CLICK_NAVIGATION: string = 'dblclick';
 
+    private baseComponentPath: string = module.id.replace('components/alfresco-search.component.js', '');
+
     @Input()
     searchTerm: string = '';
 
@@ -50,6 +52,9 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
     @Input()
     navigationMode: string = AlfrescoSearchComponent.DOUBLE_CLICK_NAVIGATION; // click|dblclick
 
+    @Input()
+    emptyFolderImageUrl: string = this.baseComponentPath + 'assets/images/empty_doc_lib.svg';
+
     @Output()
     resultsLoad = new EventEmitter();
 
@@ -57,19 +62,12 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
     preview: EventEmitter<any> = new EventEmitter<any>();
 
     results: any = null;
-
     pagination: Pagination;
-
     errorMessage;
-
     queryParamName = 'q';
-
     skipCount: number = 0;
-
     nodeResults: NodePaging;
 
-    baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
-
     constructor(private searchService: AlfrescoSearchService,
                 private translateService: AlfrescoTranslationService,
                 @Optional() private route: ActivatedRoute) {