inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-24 17:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-2162] allow custom icons with navbar (#917)

Browse Source 
* allow custom icons with navbar

* fix breaking change

* update protractor settings
This commit is contained in:
Denys Vuika
2019-02-04 21:11:10 +00:00
committed by GitHub
parent 80dabdd26a
commit ff19e57185
5 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@@ -5,25 +5,25 @@
"requires": true,
"dependencies": {
"@alfresco/adf-content-services": {
"version": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.0.0-0282bfa4686accfd24cbac61795891378c25fb64.tgz",
"integrity": "sha512-Nr401vcfIWxUBjOzJWCfSELbPBhTmljhMXHyDJrsI4rBFepftSwARzkRJeMvFw21Z4lzBICmx9ZUDIDV43A7Lw==",
"version": "3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5.tgz",
"integrity": "sha512-TVR6PQznEWtrSWqZHaceogd/E32Q1RsQUxcdjysLJvKWwJZ0of3Nkl7PuJkw4l9SLEah85l0O1lZn0la5HgqtQ==",
"requires": {
"tslib": "^1.9.0"
}
},
"@alfresco/adf-core": {
"version": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.0.0-0282bfa4686accfd24cbac61795891378c25fb64.tgz",
"integrity": "sha512-I/XI+n/+hOpYvWsP7B2oGXmvRLQMDNU6j+PclfPoMb4vMeT7HBtuGukz+K0hvERcHzEfj3N84rrlSTZZ9jDRuQ==",
"version": "3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5.tgz",
"integrity": "sha512-XlubGS/9XDsvc0LLmih6t6X/bKq3UI2OfX8O6mZzfTGzztfkqvgvD1T4E8zgVuZg6J0bE8dTyO7RsNZpyQJBdQ==",
"requires": {
"tslib": "^1.9.0"
}
},
"@alfresco/adf-extensions": {
"version": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.0.0-0282bfa4686accfd24cbac61795891378c25fb64.tgz",
"integrity": "sha512-Ke/8qTyCWceQPNo5qQ8YCHsQ9Ocg6n4+aiOJumqYhFqdbsapbp6dXcDHULh6ZfawVHInKBGvEIv12j7gjZDL2Q==",
"version": "3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5.tgz",
"integrity": "sha512-Zq+rBpDqc7BJ+rMKxniXMWYWUex6tUOhW1wdSvh9oP5dgyLlHRgsvoyIDeDei76u0cuVjbZziQzzJGlWKShmrA==",
"requires": {
"tslib": "^1.9.0"
}

6
package.json
View File

@@ -33,9 +33,9 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"@alfresco/adf-core": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"@alfresco/adf-extensions": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"@alfresco/adf-content-services": "3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5",
"@alfresco/adf-core": "3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5",
"@alfresco/adf-extensions": "3.0.0-3a5fe3fb92cdc7397cbfd3d0869833ea1f1fe8d5",
"@alfresco/js-api": "3.0.0-d7850f421268e21861e2cd219441b7343efd27ba",
"@angular/animations": "7.2.3",
"@angular/cdk": "^7.3.0",

23
protractor.conf.js
View File

@@ -2,9 +2,7 @@
// https://github.com/angular/protractor/blob/master/lib/config.ts
const path = require('path');
const {
SpecReporter
} = require('jasmine-spec-reporter');
const { SpecReporter } = require('jasmine-spec-reporter');
const jasmineReporters = require('jasmine-reporters');
const CDP = require('chrome-remote-interface');
@@ -63,7 +61,13 @@ exports.config = {
default_directory: downloadFolder
}
},
args: ['--incognito', '--headless', '--remote-debugging-port=9222', '--disable-gpu', '--no-sandbox']
args: [
'--incognito',
'--headless',
'--remote-debugging-port=9222',
'--disable-gpu',
'--no-sandbox'
]
}
},
@@ -76,10 +80,11 @@ exports.config = {
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 60000,
print: function () {}
print: function() {}
},
plugins: [{
plugins: [
{
package: 'protractor-screenshoter-plugin',
screenshotPath: `${projectRoot}/e2e-output/report`,
screenshotOnExpect: 'failure',
@@ -90,7 +95,8 @@ exports.config = {
htmlOnExpect: 'none',
htmlOnSpec: 'none',
clearFoldersBeforeTest: true
}],
}
],
onPrepare() {
require('ts-node').register({
@@ -105,7 +111,8 @@ exports.config = {
jasmine.getEnv().addReporter(
new SpecReporter({
spec: {
displayStacktrace: true
displayStacktrace: true,
displayDuration: true
}
})
);

26
src/app/components/sidenav/sidenav.component.html
View File

@@ -25,7 +25,10 @@
[matRippleCentered]="true"
[matRippleRadius]="20"
>
<mat-icon>{{ item.icon }}</mat-icon>
<adf-icon
[color]="routerLink.isActive ? 'accent' : 'primary'"
[value]="item.icon"
></adf-icon>
</button>
<span
@@ -55,15 +58,14 @@
collapsedHeight="48px"
>
<mat-panel-title [attr.title]="item.description | translate">
<mat-icon
<adf-icon
[color]="
routerLink.isActive && !expansionPanel.expanded
? 'accent'
: 'primary'
"
>
{{ item.icon }}
</mat-icon>
[value]="item.icon"
></adf-icon>
<span
class="item--label item--parent"
[id]="item.id"
@@ -97,7 +99,7 @@
[matRippleCentered]="true"
[matRippleRadius]="20"
>
<mat-icon>{{ child.icon }}</mat-icon>
<adf-icon [value]="item.icon"></adf-icon>
</button>
<span
@@ -146,7 +148,10 @@
[attr.aria-label]="item.title | translate"
[attr.title]="item.description | translate"
>
<mat-icon>{{ item.icon }}</mat-icon>
<adf-icon
[color]="routerLink.isActive ? 'accent' : 'primary'"
[value]="item.icon"
></adf-icon>
</button>
</div>
</ng-container>
@@ -160,15 +165,14 @@
#childMenu="matMenuTrigger"
[matMenuTriggerFor]="menu"
>
<mat-icon
<adf-icon
[color]="
routerLink.isActive || childMenu.menuOpen
? 'accent'
: 'primary'
"
>
{{ item.icon }}
</mat-icon>
[value]="item.icon"
></adf-icon>
</button>
</div>

3
src/app/services/node-actions.service.ts
View File

@@ -250,7 +250,8 @@ export class NodeActionsService {
imageResolver: this.imageResolver.bind(this),
isSelectionValid: this.canCopyMoveInsideIt.bind(this),
breadcrumbTransform: this.customizeBreadcrumb.bind(this),
select: new Subject<MinimalNodeEntryEntity[]>()
select: new Subject<MinimalNodeEntryEntity[]>(),
excludeSiteContent: []
};
this.dialog.open(ContentNodeSelectorComponent, <any>{