From cfb9c4bca95d7cd1f302c8c8c569a5d5a1291007 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 17 Apr 2020 12:25:25 +0100 Subject: [PATCH] use Logger instead of console (#1417) --- e2e/components/data-table/data-table.ts | 9 ++++--- .../info-drawer-metadata-library.ts | 3 ++- e2e/components/info-drawer/info-drawer.ts | 3 ++- e2e/components/menu/menu.ts | 13 +++++----- e2e/components/pagination/pagination.ts | 9 ++++--- e2e/components/sidenav/sidenav.ts | 5 ++-- e2e/components/viewer/viewer.ts | 3 ++- e2e/pages/page.ts | 4 +-- e2e/suites/application/general.test.ts | 3 ++- .../apis/favorites/favorites-api.ts | 5 ++-- .../repo-client/apis/queries/queries-api.ts | 9 ++++--- e2e/utilities/repo-client/apis/repo-api.ts | 25 +++++++++---------- .../repo-client/apis/search/search-api.ts | 9 ++++--- .../apis/shared-links/shared-links-api.ts | 5 ++-- .../repo-client/apis/sites/sites-api.ts | 5 ++-- .../repo-client/apis/trashcan/trashcan-api.ts | 7 +++--- e2e/utilities/utils.ts | 6 ++--- package-lock.json | 8 ++++++ package.json | 1 + src/app/extensions/extension.service.ts | 13 +++++++--- src/main.ts | 4 +-- tslint.json | 9 ++++--- 22 files changed, 92 insertions(+), 66 deletions(-) diff --git a/e2e/components/data-table/data-table.ts b/e2e/components/data-table/data-table.ts index 054bb1c73..ca5e24a45 100755 --- a/e2e/components/data-table/data-table.ts +++ b/e2e/components/data-table/data-table.ts @@ -24,6 +24,7 @@ */ import { ElementFinder, ElementArrayFinder, by, browser, ExpectedConditions as EC, protractor } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { BROWSER_WAIT_TIMEOUT } from '../../configs'; import { Component } from '../component'; import { Menu } from '../menu/menu'; @@ -247,7 +248,7 @@ export class DataTable extends Component { await browser.actions().mouseMove(item).perform(); await browser.actions().doubleClick().perform(); } catch (error) { - console.log('--- catch: doubleClickOnRowByName', error); + Logger.error('--- catch: doubleClickOnRowByName', error); } } @@ -259,7 +260,7 @@ export class DataTable extends Component { await item.click(); } catch (e) { - console.log('--- select item catch : ', e); + Logger.error('--- select item catch : ', e); } } } @@ -272,7 +273,7 @@ export class DataTable extends Component { await item.click(); } catch (e) { - console.log('--- unselect item catch : ', e); + Logger.error('--- unselect item catch : ', e); } } } @@ -303,7 +304,7 @@ export class DataTable extends Component { await this.wait(); } } catch (error) { - console.log('------ clearSelection catch : ', error); + Logger.error('------ clearSelection catch : ', error); } } diff --git a/e2e/components/info-drawer/info-drawer-metadata-library.ts b/e2e/components/info-drawer/info-drawer-metadata-library.ts index 047d2b13c..2b752003e 100755 --- a/e2e/components/info-drawer/info-drawer-metadata-library.ts +++ b/e2e/components/info-drawer/info-drawer-metadata-library.ts @@ -24,6 +24,7 @@ */ import { ElementFinder, by, browser, ExpectedConditions as EC } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { Component } from '../component'; import { BROWSER_WAIT_TIMEOUT } from '../../configs'; @@ -192,7 +193,7 @@ export class LibraryMetadata extends Component { } else if (val === 'moderated') { await this.visibilityModerated.click(); } else { - console.log('----- invalid visibility', val); + Logger.error('----- invalid visibility', val); } await this.waitForVisibilityDropDownToClose(); diff --git a/e2e/components/info-drawer/info-drawer.ts b/e2e/components/info-drawer/info-drawer.ts index 3caf2854b..7a0880b82 100755 --- a/e2e/components/info-drawer/info-drawer.ts +++ b/e2e/components/info-drawer/info-drawer.ts @@ -24,6 +24,7 @@ */ import { ElementFinder, ElementArrayFinder, by, browser, ExpectedConditions as EC } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { Component } from '../component'; import { BROWSER_WAIT_TIMEOUT } from '../../configs'; import { CommentsTab } from './info-drawer-comments-tab'; @@ -145,7 +146,7 @@ export class InfoDrawer extends Component { browser.wait(EC.invisibilityOf(this.propertiesTab.component), BROWSER_WAIT_TIMEOUT) ]); } catch (error) { - console.error('--- info-drawer clickCommentsTab catch error: ', error); + Logger.error('--- info-drawer clickCommentsTab catch error: ', error); } } diff --git a/e2e/components/menu/menu.ts b/e2e/components/menu/menu.ts index e6b44d3a6..cbcbbc9c5 100755 --- a/e2e/components/menu/menu.ts +++ b/e2e/components/menu/menu.ts @@ -24,6 +24,7 @@ */ import { ElementFinder, ElementArrayFinder, by, browser, ExpectedConditions as EC } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { BROWSER_WAIT_TIMEOUT } from '../../configs'; import { Component } from '../component'; import { Utils } from '../../utilities/utils' @@ -175,7 +176,7 @@ export class Menu extends Component { await browser.actions().click().perform(); await this.waitForMenuToClose(); } catch (e) { - console.log('____ click nth menu item catch ___', e); + Logger.error('____ click nth menu item catch ___', e); } } @@ -185,7 +186,7 @@ export class Menu extends Component { await browser.wait(EC.elementToBeClickable(elem), BROWSER_WAIT_TIMEOUT, 'timeout waiting for menu item to be clickable'); await elem.click(); } catch (e) { - console.log('___click menu item catch___', e); + Logger.error('___click menu item catch___', e); } } @@ -196,7 +197,7 @@ export class Menu extends Component { await browser.actions().mouseMove(elem).perform(); await browser.sleep(500); } catch (error) { - console.log('----- mouse over error: ', error); + Logger.error('----- mouse over error: ', error); } } @@ -207,7 +208,7 @@ export class Menu extends Component { const elemClass = await elem.getAttribute('class'); return elemClass.includes('mat-menu-item-submenu-trigger'); } catch (error) { - console.log('---- has submenu error: ', error); + Logger.error('---- has submenu error: ', error); return false; } } @@ -218,7 +219,7 @@ export class Menu extends Component { await browser.wait(EC.elementToBeClickable(elem), BROWSER_WAIT_TIMEOUT); await elem.click(); } catch (e) { - console.log('___click submenu item catch___', e); + Logger.error('___click submenu item catch___', e); } } @@ -240,7 +241,7 @@ export class Menu extends Component { const disabled = await item.getAttribute('disabled'); return disabled; } catch (error) { - console.log('----- isMenuItemDisabled catch: ', error); + Logger.error('----- isMenuItemDisabled catch: ', error); return null; } } diff --git a/e2e/components/pagination/pagination.ts b/e2e/components/pagination/pagination.ts index 1d118016b..cadf9df4e 100755 --- a/e2e/components/pagination/pagination.ts +++ b/e2e/components/pagination/pagination.ts @@ -24,6 +24,7 @@ */ import { ElementFinder, by, browser, ExpectedConditions as EC } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { BROWSER_WAIT_TIMEOUT } from '../../configs'; import { Menu } from '../menu/menu'; import { Component } from '../component'; @@ -65,7 +66,7 @@ export class Pagination extends Component { await maxItemsButton.click(); await menu.waitForMenuToOpen(); } catch (error) { - console.log('____ open max items catch ___', error); + Logger.error('____ open max items catch ___', error); } } @@ -77,7 +78,7 @@ export class Pagination extends Component { await pagesButton.click(); await menu.waitForMenuToOpen(); } catch (error) { - console.log('____ open current page menu ___', error); + Logger.error('____ open current page menu ___', error); } } @@ -87,7 +88,7 @@ export class Pagination extends Component { await this.menu.clickNthItem(1); await this.menu.waitForMenuToClose(); } catch (error) { - console.log('___ reset to default page size catch ___', error); + Logger.error('___ reset to default page size catch ___', error); } } @@ -97,7 +98,7 @@ export class Pagination extends Component { await this.menu.clickNthItem(1); await this.menu.waitForMenuToClose(); } catch (error) { - console.log('____ reset to default page number catch ___', error); + Logger.error('____ reset to default page number catch ___', error); } } diff --git a/e2e/components/sidenav/sidenav.ts b/e2e/components/sidenav/sidenav.ts index 24b231f2f..0d29c4a40 100755 --- a/e2e/components/sidenav/sidenav.ts +++ b/e2e/components/sidenav/sidenav.ts @@ -24,6 +24,7 @@ */ import { ElementFinder, ElementArrayFinder, by, element, browser } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { SIDEBAR_LABELS, BROWSER_WAIT_TIMEOUT } from '../../configs'; import { Menu } from '../menu/menu'; import { Component } from '../component'; @@ -86,7 +87,7 @@ export class Sidenav extends Component { } } catch (e) { - console.log('---- sidebar navigation catch expandMenu: ', e); + Logger.error('---- sidebar navigation catch expandMenu: ', e); } } @@ -162,7 +163,7 @@ export class Sidenav extends Component { await Utils.waitUntilElementClickable(link); await link.click(); } catch (error) { - console.log('---- sidebar navigation clickLink catch error: ', error); + Logger.error('---- sidebar navigation clickLink catch error: ', error); } } diff --git a/e2e/components/viewer/viewer.ts b/e2e/components/viewer/viewer.ts index 4ecff869e..860d6a3a7 100755 --- a/e2e/components/viewer/viewer.ts +++ b/e2e/components/viewer/viewer.ts @@ -24,6 +24,7 @@ */ import { ElementFinder, by, browser, ExpectedConditions as EC, ElementArrayFinder } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { Component } from '../component'; import { BROWSER_WAIT_TIMEOUT } from '../../configs'; import { Toolbar } from '../toolbar/toolbar'; @@ -61,7 +62,7 @@ export class Viewer extends Component { await browser.wait(EC.presenceOf(this.viewerContainer), BROWSER_WAIT_TIMEOUT); await browser.wait(EC.presenceOf(this.viewerLayout), BROWSER_WAIT_TIMEOUT); } catch (error) { - console.log('\n-----> catch waitForViewerToOpen <-----\n', error) + Logger.error('\n-----> catch waitForViewerToOpen <-----\n', error) } } diff --git a/e2e/pages/page.ts b/e2e/pages/page.ts index eb05cc09b..549837f79 100755 --- a/e2e/pages/page.ts +++ b/e2e/pages/page.ts @@ -24,6 +24,7 @@ */ import { browser, by, ElementFinder, ExpectedConditions as EC, until } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { BROWSER_WAIT_TIMEOUT, USE_HASH_STRATEGY } from './../configs'; import { Utils } from '../utilities/utils'; @@ -108,7 +109,7 @@ export abstract class Page { const action = await browser.wait(until.elementLocated(by.css('.mat-simple-snackbar-action button')), BROWSER_WAIT_TIMEOUT, '------- timeout waiting for snack action to appear'); await action.click(); } catch (e) { - console.log(e, '.......failed on click snack bar action.........'); + Logger.error(e, '.......failed on click snack bar action.........'); } } @@ -120,7 +121,6 @@ export abstract class Page { return this.genericErrorTitle.getText(); } - async isUndoActionPresent() { const message = await this.snackBar.getAttribute('innerText'); return message.includes('Undo'); diff --git a/e2e/suites/application/general.test.ts b/e2e/suites/application/general.test.ts index 891f5d4b3..4170710a0 100644 --- a/e2e/suites/application/general.test.ts +++ b/e2e/suites/application/general.test.ts @@ -24,6 +24,7 @@ */ import { browser } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { BrowsingPage, LoginPage } from '../../pages/pages'; import { CreateOrEditFolderDialog } from '../../components/dialog/create-edit-folder-dialog'; import { RepoClient } from '../../utilities/repo-client/repo-client'; @@ -67,7 +68,7 @@ describe('General', () => { try { await createDialog.waitForDialogToClose(); } catch (error) { - console.log('err: ', error); + Logger.error('err: ', error); } expect(await createDialog.isDialogOpen()).not.toBe(true, 'dialog is present'); }); diff --git a/e2e/utilities/repo-client/apis/favorites/favorites-api.ts b/e2e/utilities/repo-client/apis/favorites/favorites-api.ts index 3c66f6abd..34784f61b 100755 --- a/e2e/utilities/repo-client/apis/favorites/favorites-api.ts +++ b/e2e/utilities/repo-client/apis/favorites/favorites-api.ts @@ -24,6 +24,7 @@ */ import { RepoApi } from '../repo-api'; +import { Logger } from '@alfresco/adf-testing'; import { RepoClient } from './../../repo-client'; import { Utils } from '../../../../utilities/utils'; import { FavoritesApi as AdfFavoritesApi, SitesApi as AdfSiteApi, FavoriteEntry } from '@alfresco/js-api'; @@ -166,8 +167,8 @@ export class FavoritesApi extends RepoApi { }; return await Utils.retryCall(favoriteFiles); } catch (error) { - console.log(`${this.constructor.name} ${this.waitForApi.name} catch: `); - console.log(`\tExpected: ${data.expect} items, but found ${error}`); + Logger.error(`${this.constructor.name} ${this.waitForApi.name} catch: `); + Logger.error(`\tExpected: ${data.expect} items, but found ${error}`); } } } diff --git a/e2e/utilities/repo-client/apis/queries/queries-api.ts b/e2e/utilities/repo-client/apis/queries/queries-api.ts index 12d487c0e..b21a8bc15 100755 --- a/e2e/utilities/repo-client/apis/queries/queries-api.ts +++ b/e2e/utilities/repo-client/apis/queries/queries-api.ts @@ -24,6 +24,7 @@ */ import { RepoApi } from '../repo-api'; +import { Logger } from '@alfresco/adf-testing'; import { Utils } from '../../../../utilities/utils'; import { QueriesApi as AdfQueriesApi } from '@alfresco/js-api'; @@ -77,8 +78,8 @@ export class QueriesApi extends RepoApi { return await Utils.retryCall(sites); } catch (error) { - console.log(`${this.constructor.name} ${this.waitForSites.name} catch: `); - console.log(`\tExpected: ${data.expect} items, but found ${error}`); + Logger.error(`${this.constructor.name} ${this.waitForSites.name} catch: `); + Logger.error(`\tExpected: ${data.expect} items, but found ${error}`); } } @@ -95,8 +96,8 @@ export class QueriesApi extends RepoApi { return await Utils.retryCall(nodes); } catch (error) { - console.log(`${this.constructor.name} ${this.waitForFilesAndFolders.name} catch: `); - console.log(`\tExpected: ${data.expect} items, but found ${error}`); + Logger.error(`${this.constructor.name} ${this.waitForFilesAndFolders.name} catch: `); + Logger.error(`\tExpected: ${data.expect} items, but found ${error}`); } } } diff --git a/e2e/utilities/repo-client/apis/repo-api.ts b/e2e/utilities/repo-client/apis/repo-api.ts index fe1abb687..972c3f320 100644 --- a/e2e/utilities/repo-client/apis/repo-api.ts +++ b/e2e/utilities/repo-client/apis/repo-api.ts @@ -25,6 +25,7 @@ import { browser } from 'protractor'; import { AlfrescoApi } from '@alfresco/js-api'; +import { Logger } from '@alfresco/adf-testing'; export abstract class RepoApi { alfrescoJsApi = new AlfrescoApi(); @@ -36,30 +37,28 @@ export abstract class RepoApi { this.alfrescoJsApi.setConfig(browser.params.config); } - apiAuth() { + apiAuth(): Promise { return this.alfrescoJsApi.login(this.username, this.password); } - getUsername() { + getUsername(): string { return this.username; } protected handleError(message: string, response: any) { - console.log(`\n--- ${message} error :`); - console.log('\t>>> username: ', this.username); - console.log('\t>>> JSON: ', JSON.stringify(browser.params.config)); + Logger.error(`\n--- ${message} error :`); + Logger.error('\t>>> username: ', this.username); + Logger.error('\t>>> JSON: ', JSON.stringify(browser.params.config)); if ( response.status && response.response ) { try { - console.log('\t>>> Status: ', response.status); - console.log('\t>>> Text: ', response.response.text); - console.log('\t>>> Method: ', response.response.error.method); - console.log('\t>>> Path: ', response.response.error.path); + Logger.error('\t>>> Status: ', response.status); + Logger.error('\t>>> Text: ', response.response.text); + Logger.error('\t>>> Method: ', response.response.error.method); + Logger.error('\t>>> Path: ', response.response.error.path); } catch { - console.log('\t>>> ', response); + Logger.error('\t>>> ', response); } } - else console.log('\t>>> ', response); - + else Logger.error('\t>>> ', response); } - } diff --git a/e2e/utilities/repo-client/apis/search/search-api.ts b/e2e/utilities/repo-client/apis/search/search-api.ts index 4b18a406c..e41e02b95 100755 --- a/e2e/utilities/repo-client/apis/search/search-api.ts +++ b/e2e/utilities/repo-client/apis/search/search-api.ts @@ -24,6 +24,7 @@ */ import { RepoApi } from '../repo-api'; +import { Logger } from '@alfresco/adf-testing'; import { Utils } from '../../../../utilities/utils'; import { SearchApi as AdfSearchApi } from '@alfresco/js-api'; @@ -109,8 +110,8 @@ export class SearchApi extends RepoApi { return await Utils.retryCall(recentFiles); } catch (error) { - console.log(`${this.constructor.name} ${this.waitForApi.name} catch: `); - console.log(`\tExpected: ${data.expect} items, but found ${error}`); + Logger.error(`${this.constructor.name} ${this.waitForApi.name} catch: `); + Logger.error(`\tExpected: ${data.expect} items, but found ${error}`); } } @@ -127,8 +128,8 @@ export class SearchApi extends RepoApi { return await Utils.retryCall(nodes); } catch (error) { - console.log(`${this.constructor.name} ${this.waitForNodes.name} catch: `); - console.log(`\tExpected: ${data.expect} items, but found ${error}`); + Logger.error(`${this.constructor.name} ${this.waitForNodes.name} catch: `); + Logger.error(`\tExpected: ${data.expect} items, but found ${error}`); } } } diff --git a/e2e/utilities/repo-client/apis/shared-links/shared-links-api.ts b/e2e/utilities/repo-client/apis/shared-links/shared-links-api.ts index 3c29020ad..2775276ef 100755 --- a/e2e/utilities/repo-client/apis/shared-links/shared-links-api.ts +++ b/e2e/utilities/repo-client/apis/shared-links/shared-links-api.ts @@ -24,6 +24,7 @@ */ import { RepoApi } from '../repo-api'; +import { Logger } from '@alfresco/adf-testing'; import { Utils } from '../../../../utilities/utils'; import { SharedlinksApi as AdfSharedlinksApi, SharedLinkEntry } from '@alfresco/js-api'; @@ -102,8 +103,8 @@ export class SharedLinksApi extends RepoApi { return await Utils.retryCall(sharedFiles); } catch (error) { - console.log(`${this.constructor.name} ${this.waitForApi.name} catch: `); - console.log(`\tExpected: ${data.expect} items, but found ${error}`); + Logger.error(`${this.constructor.name} ${this.waitForApi.name} catch: `); + Logger.error(`\tExpected: ${data.expect} items, but found ${error}`); } } } diff --git a/e2e/utilities/repo-client/apis/sites/sites-api.ts b/e2e/utilities/repo-client/apis/sites/sites-api.ts index 0fba767aa..c07762c8a 100755 --- a/e2e/utilities/repo-client/apis/sites/sites-api.ts +++ b/e2e/utilities/repo-client/apis/sites/sites-api.ts @@ -24,6 +24,7 @@ */ import { RepoApi } from '../repo-api'; +import { Logger } from '@alfresco/adf-testing'; import { SiteBody, SiteMemberRoleBody, SiteMemberBody, SiteEntry, SiteMembershipRequestEntry, SitesApi as AdfSiteApi, SiteMemberEntry } from '@alfresco/js-api'; import { SITE_VISIBILITY, SITE_ROLES } from '../../../../configs'; import { Utils } from '../../../../utilities/utils'; @@ -260,8 +261,8 @@ export class SitesApi extends RepoApi { return await Utils.retryCall(sites); } catch (error) { - console.log(`${this.constructor.name} ${this.waitForApi.name} catch: `); - console.log(`\tExpected: ${data.expect} items, but found ${error}`); + Logger.error(`${this.constructor.name} ${this.waitForApi.name} catch: `); + Logger.error(`\tExpected: ${data.expect} items, but found ${error}`); } } } diff --git a/e2e/utilities/repo-client/apis/trashcan/trashcan-api.ts b/e2e/utilities/repo-client/apis/trashcan/trashcan-api.ts index 72316fbcc..8ec875a3f 100644 --- a/e2e/utilities/repo-client/apis/trashcan/trashcan-api.ts +++ b/e2e/utilities/repo-client/apis/trashcan/trashcan-api.ts @@ -24,13 +24,14 @@ */ import { RepoApi } from '../repo-api'; +import { Logger } from '@alfresco/adf-testing'; import { Utils } from '../../../../utilities/utils'; import { TrashcanApi as AdfTrashcanApi} from '@alfresco/js-api'; export class TrashcanApi extends RepoApi { trashcanApi = new AdfTrashcanApi(this.alfrescoJsApi); - constructor(username?, password?) { + constructor(username?: string, password?: string) { super(username, password); } @@ -92,8 +93,8 @@ export class TrashcanApi extends RepoApi { return await Utils.retryCall(deletedFiles); } catch (error) { - console.log(`${this.constructor.name} ${this.waitForApi.name} catch: `); - console.log(`\tExpected: ${data.expect} items, but found ${error}`); + Logger.error(`${this.constructor.name} ${this.waitForApi.name} catch: `); + Logger.error(`\tExpected: ${data.expect} items, but found ${error}`); } } } diff --git a/e2e/utilities/utils.ts b/e2e/utilities/utils.ts index 2eaa2aa42..77bbad5f9 100755 --- a/e2e/utilities/utils.ts +++ b/e2e/utilities/utils.ts @@ -24,13 +24,13 @@ */ import { browser, protractor, ElementFinder, ExpectedConditions as EC, by, logging } from 'protractor'; +import { Logger } from '@alfresco/adf-testing'; import { BROWSER_WAIT_TIMEOUT, E2E_ROOT_PATH, EXTENSIBILITY_CONFIGS } from '../configs'; const path = require('path'); const fs = require('fs'); const StreamZip = require('node-stream-zip'); - export class Utils { static string257 = 'assembly doctor offender limit clearance inspiration baker fraud active apples trait brainstorm concept breaks down presidential \ reluctance summary communication patience books opponent banana economist head develop project swear unanimous read conservation'; @@ -136,7 +136,7 @@ export class Utils { if (fileExists) { fs.rename(oldFilePath, newFilePath, function (err) { if (err) { - console.log('==== rename err: ', err); + Logger.error('==== rename err: ', err); } }); } @@ -152,7 +152,7 @@ export class Utils { storeEntries: true }); - await zip.on('error', err => { console.log('=== unzip err: ', err) }); + await zip.on('error', err => { Logger.error('=== unzip err: ', err) }); await zip.on('ready', async () => { if (unzippedName) { diff --git a/package-lock.json b/package-lock.json index 6a1682ea4..df285da53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,14 @@ "tslib": "^1.9.0" } }, + "@alfresco/adf-testing": { + "version": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-3.8.0-83e362d31a737200bc9251e9505137f198509d2f.tgz", + "integrity": "sha512-sHVC+O/9t9dXxAzQBAzC/RlXM5StvgF8bmKtHRUQIzmQx3wCb7zBLZyE8S5xRkhxvF5ODbr6+GXBqM4KGVB0bA==", + "requires": { + "tslib": "^1.9.0" + } + }, "@alfresco/js-api": { "version": "3.8.0-17d85a03af98b8dd906f51d10c6887393910e64b", "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.8.0-17d85a03af98b8dd906f51d10c6887393910e64b.tgz", diff --git a/package.json b/package.json index ff0666c98..d61441235 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "@alfresco/adf-content-services": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", "@alfresco/adf-core": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", "@alfresco/adf-extensions": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", + "@alfresco/adf-testing": "3.8.0-83e362d31a737200bc9251e9505137f198509d2f", "@alfresco/js-api": "3.8.0-17d85a03af98b8dd906f51d10c6887393910e64b", "@angular-custom-builders/lite-serve": "0.0.2", "@angular/animations": "7.2.15", diff --git a/src/app/extensions/extension.service.ts b/src/app/extensions/extension.service.ts index ab588c568..cf6e07751 100644 --- a/src/app/extensions/extension.service.ts +++ b/src/app/extensions/extension.service.ts @@ -55,7 +55,11 @@ import { DocumentListPresetRef, IconRef } from '@alfresco/adf-extensions'; -import { AppConfigService, AuthenticationService } from '@alfresco/adf-core'; +import { + AppConfigService, + AuthenticationService, + LogService +} from '@alfresco/adf-core'; import { BehaviorSubject, Observable } from 'rxjs'; import { RepositoryInfo, NodeEntry } from '@alfresco/js-api'; import { ViewerRules } from './viewer.rules'; @@ -123,7 +127,8 @@ export class AppExtensionService implements RuleContext { public permissions: NodePermissionService, protected appConfig: AppConfigService, protected matIconRegistry: MatIconRegistry, - protected sanitizer: DomSanitizer + protected sanitizer: DomSanitizer, + protected logger: LogService ) { this.references$ = this._references.asObservable(); @@ -146,7 +151,7 @@ export class AppExtensionService implements RuleContext { setup(config: ExtensionConfig) { if (!config) { - console.error('Extension configuration not found'); + this.logger.error('Extension configuration not found'); return; } @@ -347,7 +352,7 @@ export class AppExtensionService implements RuleContext { try { this.appConfig.config['content-metadata'] = { presets }; } catch (error) { - console.error( + this.logger.error( error, '- could not change content-metadata from app.config -' ); diff --git a/src/main.ts b/src/main.ts index dc1b0fb09..52b14ff03 100644 --- a/src/main.ts +++ b/src/main.ts @@ -35,6 +35,4 @@ if (environment.production) { enableProdMode(); } -platformBrowserDynamic() - .bootstrapModule(AppModule) - .catch(err => console.log(err)); +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/tslint.json b/tslint.json index 4032dbddf..42530ca16 100644 --- a/tslint.json +++ b/tslint.json @@ -33,7 +33,7 @@ ], "no-arg": true, "no-bitwise": true, - "no-console": [true, "debug", "info", "time", "timeEnd", "trace"], + "no-console": [true, "log", "error", "debug", "info", "time", "timeEnd", "trace"], "no-construct": true, "no-debugger": true, "no-duplicate-imports": true, @@ -51,6 +51,7 @@ "no-unnecessary-initializer": true, "no-unused-expression": true, "no-var-keyword": true, + "no-trailing-whitespace": true, "object-literal-sort-keys": false, "prefer-const": true, "radix": true, @@ -72,9 +73,9 @@ ["app", "aca", "adf"], "kebab-case" ], - "use-input-property-decorator": true, - "use-output-property-decorator": true, - "use-host-property-decorator": false, + "no-inputs-metadata-property": true, + "no-outputs-metadata-property": true, + "no-host-metadata-property": false, "no-input-rename": true, "no-output-rename": true, "use-life-cycle-interface": true,