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

upgrade libraries (#910)

Browse Source 
* upgrade libraries

* fix breaking changes

* fix divider

* remove header workarounds
This commit is contained in:
Denys Vuika
2019-02-01 19:19:44 +00:00
committed by GitHub
parent e004d365a9
commit ecc94a6dd2
15 changed files with 519 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

871
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

42
package.json
View File

@@ -32,45 +32,45 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "3.0.0-7c66589b26e57061a07a8d38bfebc2ee05fb1b83", "@alfresco/adf-content-services": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"@alfresco/adf-core": "3.0.0-7c66589b26e57061a07a8d38bfebc2ee05fb1b83", "@alfresco/adf-core": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"@alfresco/adf-extensions": "3.0.0-7c66589b26e57061a07a8d38bfebc2ee05fb1b83", "@alfresco/adf-extensions": "3.0.0-0282bfa4686accfd24cbac61795891378c25fb64",
"@alfresco/js-api": "3.0.0-e9c8ed80decc71d2fc6833cef22851b64ce4b604", "@alfresco/js-api": "3.0.0-d7850f421268e21861e2cd219441b7343efd27ba",
"@angular/animations": "7.2.2", "@angular/animations": "7.2.3",
"@angular/cdk": "^7.3.0", "@angular/cdk": "^7.3.0",
"@angular/common": "7.2.2", "@angular/common": "7.2.3",
"@angular/compiler": "7.2.2", "@angular/compiler": "7.2.3",
"@angular/core": "7.2.2", "@angular/core": "7.2.3",
"@angular/flex-layout": "^7.0.0-beta.19", "@angular/flex-layout": "^7.0.0-beta.23",
"@angular/forms": "7.2.2", "@angular/forms": "7.2.3",
"@angular/http": "7.2.2", "@angular/http": "7.2.3",
"@angular/material": "^7.3.0", "@angular/material": "^7.3.0",
"@angular/material-moment-adapter": "^7.3.0", "@angular/material-moment-adapter": "^7.3.0",
"@angular/platform-browser": "7.2.2", "@angular/platform-browser": "7.2.3",
"@angular/platform-browser-dynamic": "7.2.2", "@angular/platform-browser-dynamic": "7.2.3",
"@angular/router": "7.2.2", "@angular/router": "7.2.3",
"@mat-datetimepicker/core": "^3.0.0-beta.0", "@mat-datetimepicker/core": "^3.0.0-beta.0",
"@mat-datetimepicker/moment": "^3.0.0-beta.0", "@mat-datetimepicker/moment": "^3.0.0-beta.0",
"@ngrx/effects": "^7.2.0", "@ngrx/effects": "^7.2.0",
"@ngrx/router-store": "^7.2.0", "@ngrx/router-store": "^7.2.0",
"@ngrx/store": "^7.2.0", "@ngrx/store": "^7.2.0",
"@ngrx/store-devtools": "^7.2.0", "@ngrx/store-devtools": "^7.2.0",
"@ngx-translate/core": "^10.0.2", "@ngx-translate/core": "^11.0.1",
"core-js": "^2.5.7", "core-js": "^2.5.7",
"hammerjs": "2.0.8", "hammerjs": "2.0.8",
"minimatch-browser": "^1.0.0", "minimatch-browser": "^1.0.0",
"moment": "^2.24.0", "moment": "^2.24.0",
"moment-es6": "1.0.0", "moment-es6": "1.0.0",
"pdfjs-dist": "^2.0.489", "pdfjs-dist": "^2.0.489",
"rxjs": "^6.3.3", "rxjs": "^6.4.0",
"zone.js": "0.8.29" "zone.js": "0.8.29"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.12.0", "@angular-devkit/build-angular": "~0.13.0",
"@angular-devkit/build-ng-packagr": "~0.12.0", "@angular-devkit/build-ng-packagr": "~0.13.0",
"@angular/cli": "^7.2.3", "@angular/cli": "^7.3.0",
"@angular/compiler-cli": "7.2.2", "@angular/compiler-cli": "7.2.3",
"@angular/language-service": "7.2.2", "@angular/language-service": "7.2.3",
"@types/jasmine": "^2.5.53", "@types/jasmine": "^2.5.53",
"@types/jasminewd2": "^2.0.2", "@types/jasminewd2": "^2.0.2",
"@types/node": "9.3.0", "@types/node": "9.3.0",

22
src/app/components/favorite-libraries/favorite-libraries.component.html
View File

@@ -31,18 +31,16 @@
[imageResolver]="imageResolver" [imageResolver]="imageResolver"
(name-click)="navigateTo($event.detail?.node)" (name-click)="navigateTo($event.detail?.node)"
> >
<empty-folder-content> <adf-custom-empty-content-template>
<ng-template> <adf-empty-content
<adf-empty-content icon="library_books"
icon="library_books" [title]="
[title]=" 'APP.BROWSE.LIBRARIES.EMPTY_STATE.FAVORITE_LIBRARIES.TITLE'
'APP.BROWSE.LIBRARIES.EMPTY_STATE.FAVORITE_LIBRARIES.TITLE' "
" subtitle="APP.BROWSE.LIBRARIES.EMPTY_STATE.FAVORITE_LIBRARIES.TEXT"
subtitle="APP.BROWSE.LIBRARIES.EMPTY_STATE.FAVORITE_LIBRARIES.TEXT" >
> </adf-empty-content>
</adf-empty-content> </adf-custom-empty-content-template>
</ng-template>
</empty-folder-content>
<data-columns> <data-columns>
<ng-container *ngFor="let column of columns; trackBy: trackById"> <ng-container *ngFor="let column of columns; trackBy: trackById">

18
src/app/components/favorites/favorites.component.html
View File

@@ -23,16 +23,14 @@
(node-dblclick)="onNodeDoubleClick($event.detail?.node)" (node-dblclick)="onNodeDoubleClick($event.detail?.node)"
(name-click)="onNodeDoubleClick($event.detail?.node)" (name-click)="onNodeDoubleClick($event.detail?.node)"
> >
<empty-folder-content> <adf-custom-empty-content-template>
<ng-template> <adf-empty-content
<adf-empty-content icon="star_rate"
icon="star_rate" [title]="'APP.BROWSE.FAVORITES.EMPTY_STATE.TITLE'"
[title]="'APP.BROWSE.FAVORITES.EMPTY_STATE.TITLE'" subtitle="APP.BROWSE.FAVORITES.EMPTY_STATE.TEXT"
subtitle="APP.BROWSE.FAVORITES.EMPTY_STATE.TEXT" >
> </adf-empty-content>
</adf-empty-content> </adf-custom-empty-content-template>
</ng-template>
</empty-folder-content>
<data-columns> <data-columns>
<ng-container *ngFor="let column of columns; trackBy: trackById"> <ng-container *ngFor="let column of columns; trackBy: trackById">

2
src/app/components/header/header.component.html
View File

@@ -10,7 +10,7 @@
<aca-search-input></aca-search-input> <aca-search-input></aca-search-input>
<div class="adf-toolbar-divider"></div> <adf-toolbar-divider></adf-toolbar-divider>
<aca-current-user></aca-current-user> <aca-current-user></aca-current-user>

18
src/app/components/libraries/libraries.component.html
View File

@@ -25,16 +25,14 @@
(node-dblclick)="navigateTo($event.detail?.node)" (node-dblclick)="navigateTo($event.detail?.node)"
(name-click)="navigateTo($event.detail?.node)" (name-click)="navigateTo($event.detail?.node)"
> >
<empty-folder-content> <adf-custom-empty-content-template>
<ng-template> <adf-empty-content
<adf-empty-content icon="library_books"
icon="library_books" [title]="'APP.BROWSE.LIBRARIES.EMPTY_STATE.FILE_LIBRARIES.TITLE'"
[title]="'APP.BROWSE.LIBRARIES.EMPTY_STATE.FILE_LIBRARIES.TITLE'" subtitle="APP.BROWSE.LIBRARIES.EMPTY_STATE.FILE_LIBRARIES.TEXT"
subtitle="APP.BROWSE.LIBRARIES.EMPTY_STATE.FILE_LIBRARIES.TEXT" >
> </adf-empty-content>
</adf-empty-content> </adf-custom-empty-content-template>
</ng-template>
</empty-folder-content>
<data-columns> <data-columns>
<ng-container *ngFor="let column of columns; trackBy: trackById"> <ng-container *ngFor="let column of columns; trackBy: trackById">

18
src/app/components/recent-files/recent-files.component.html
View File

@@ -24,16 +24,14 @@
(node-dblclick)="onNodeDoubleClick($event.detail?.node)" (node-dblclick)="onNodeDoubleClick($event.detail?.node)"
(name-click)="onNodeDoubleClick($event.detail?.node)" (name-click)="onNodeDoubleClick($event.detail?.node)"
> >
<empty-folder-content> <adf-custom-empty-content-template>
<ng-template> <adf-empty-content
<adf-empty-content icon="access_time"
icon="access_time" [title]="'APP.BROWSE.RECENT.EMPTY_STATE.TITLE'"
[title]="'APP.BROWSE.RECENT.EMPTY_STATE.TITLE'" subtitle="APP.BROWSE.RECENT.EMPTY_STATE.TEXT"
subtitle="APP.BROWSE.RECENT.EMPTY_STATE.TEXT" >
> </adf-empty-content>
</adf-empty-content> </adf-custom-empty-content-template>
</ng-template>
</empty-folder-content>
<data-columns> <data-columns>
<ng-container *ngFor="let column of columns; trackBy: trackById"> <ng-container *ngFor="let column of columns; trackBy: trackById">

20
src/app/components/search/search-libraries-results/search-libraries-results.component.html
View File

@@ -99,17 +99,15 @@
</ng-container> </ng-container>
</data-columns> </data-columns>
<empty-folder-content> <adf-custom-empty-content-template>
<ng-template> <ng-container *ngIf="data">
<ng-container *ngIf="data"> <div class="empty-search__block">
<div class="empty-search__block"> <p class="empty-search__text">
<p class="empty-search__text"> {{ 'APP.BROWSE.SEARCH.NO_RESULTS' | translate }}
{{ 'APP.BROWSE.SEARCH.NO_RESULTS' | translate }} </p>
</p> </div>
</div> </ng-container>
</ng-container> </adf-custom-empty-content-template>
</ng-template>
</empty-folder-content>
</adf-document-list> </adf-document-list>
<adf-pagination <adf-pagination

20
src/app/components/search/search-results/search-results.component.html
View File

@@ -87,17 +87,15 @@
</data-column> </data-column>
</data-columns> </data-columns>
<empty-folder-content> <adf-custom-empty-content-template>
<ng-template> <ng-container *ngIf="data">
<ng-container *ngIf="data"> <div class="empty-search__block">
<div class="empty-search__block"> <p class="empty-search__text">
<p class="empty-search__text"> {{ 'APP.BROWSE.SEARCH.NO_RESULTS' | translate }}
{{ 'APP.BROWSE.SEARCH.NO_RESULTS' | translate }} </p>
</p> </div>
</div> </ng-container>
</ng-container> </adf-custom-empty-content-template>
</ng-template>
</empty-folder-content>
</adf-document-list> </adf-document-list>
<adf-pagination <adf-pagination

18
src/app/components/shared-files/shared-files.component.html
View File

@@ -22,16 +22,14 @@
(node-dblclick)="showPreview($event.detail?.node)" (node-dblclick)="showPreview($event.detail?.node)"
(name-click)="showPreview($event.detail?.node)" (name-click)="showPreview($event.detail?.node)"
> >
<empty-folder-content> <adf-custom-empty-content-template>
<ng-template> <adf-empty-content
<adf-empty-content icon="people"
icon="people" [title]="'APP.BROWSE.SHARED.EMPTY_STATE.TITLE'"
[title]="'APP.BROWSE.SHARED.EMPTY_STATE.TITLE'" subtitle="APP.BROWSE.SHARED.EMPTY_STATE.TEXT"
subtitle="APP.BROWSE.SHARED.EMPTY_STATE.TEXT" >
> </adf-empty-content>
</adf-empty-content> </adf-custom-empty-content-template>
</ng-template>
</empty-folder-content>
<data-columns> <data-columns>
<ng-container *ngFor="let column of columns; trackBy: trackById"> <ng-container *ngFor="let column of columns; trackBy: trackById">

28
src/app/components/trashcan/trashcan.component.html
View File

@@ -22,21 +22,19 @@
[imageResolver]="imageResolver" [imageResolver]="imageResolver"
[sorting]="['archivedAt', 'desc']" [sorting]="['archivedAt', 'desc']"
> >
<empty-folder-content> <adf-custom-empty-content-template>
<ng-template> <adf-empty-content
<adf-empty-content icon="delete"
icon="delete" [title]="'APP.BROWSE.TRASHCAN.EMPTY_STATE.TITLE'"
[title]="'APP.BROWSE.TRASHCAN.EMPTY_STATE.TITLE'" >
> <p class="adf-empty-content__text">
<p class="adf-empty-content__text"> {{ 'APP.BROWSE.TRASHCAN.EMPTY_STATE.FIRST_TEXT' | translate }}
{{ 'APP.BROWSE.TRASHCAN.EMPTY_STATE.FIRST_TEXT' | translate }} </p>
</p> <p class="adf-empty-content__text">
<p class="adf-empty-content__text"> {{ 'APP.BROWSE.TRASHCAN.EMPTY_STATE.SECOND_TEXT' | translate }}
{{ 'APP.BROWSE.TRASHCAN.EMPTY_STATE.SECOND_TEXT' | translate }} </p>
</p> </adf-empty-content>
</adf-empty-content> </adf-custom-empty-content-template>
</ng-template>
</empty-folder-content>
<data-columns> <data-columns>
<ng-container *ngFor="let column of columns; trackBy: trackById"> <ng-container *ngFor="let column of columns; trackBy: trackById">

2
src/app/services/content-api.service.ts
View File

@@ -87,7 +87,7 @@ export class ContentApiService {
}; };
const queryOptions = Object.assign(defaults, options || {}); const queryOptions = Object.assign(defaults, options || {});
return from((<any>this.api.nodesApi).getNodeInfo(nodeId, queryOptions)); return from(this.api.nodesApi.getNodeInfo(nodeId, queryOptions));
} }
/** /**

2
src/app/ui/custom-theme.scss
View File

@@ -25,7 +25,6 @@
@import './overrides/adf-upload-drag-area.theme'; @import './overrides/adf-upload-drag-area.theme';
@import './overrides/adf-search-sorting-picker.theme'; @import './overrides/adf-search-sorting-picker.theme';
@import './overrides/adf-content-node-selector.theme'; @import './overrides/adf-content-node-selector.theme';
@import './overrides/adf-layout-header.theme';
@import './overrides/adf-version-manager.theme'; @import './overrides/adf-version-manager.theme';
@import 'snackbar'; @import 'snackbar';
@@ -81,7 +80,6 @@ $custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent);
@include adf-upload-drag-area-theme($theme); @include adf-upload-drag-area-theme($theme);
@include adf-search-sorting-picker-theme($theme); @include adf-search-sorting-picker-theme($theme);
@include adf-content-node-selector-theme($theme); @include adf-content-node-selector-theme($theme);
@include adf-layout-header-theme($theme);
@include adf-version-manager-theme($theme); @include adf-version-manager-theme($theme);
@include layout-theme($theme); @include layout-theme($theme);

36
src/app/ui/overrides/adf-layout-header.theme.scss
View File

@@ -1,36 +0,0 @@
@mixin adf-layout-header-theme($theme) {
$background: map-get($theme, background);
.adf-layout-header {
.mat-toolbar-single-row {
color: #ffffff !important;
.adf-app-logo {
margin-left: 6px;
vertical-align: middle;
margin-top: -3px;
}
.adf-app-title {
letter-spacing: -0.3px;
font-weight: 100;
cursor: pointer;
}
.mat-icon-button {
margin-right: 0;
.mat-icon {
font-size: 29px;
padding: 0 5px 0 0;
}
}
}
.adf-toolbar-divider {
margin: 0 5px;
& > div {
background-color: mat-color($background, card, 1);
}
}
}
}

10
src/app/ui/overrides/adf-upload-drag-area.theme.scss
View File

@@ -16,7 +16,7 @@ $alfresco-app-color--default: #00bcd4;
adf-upload-drag-area { adf-upload-drag-area {
@include flex-column; @include flex-column;
.upload-border { .adf-upload-border {
@include flex-column; @include flex-column;
vertical-align: unset; vertical-align: unset;
@@ -27,18 +27,18 @@ $alfresco-app-color--default: #00bcd4;
adf-upload-drag-area:first-child { adf-upload-drag-area:first-child {
& > div { & > div {
adf-upload-drag-area { adf-upload-drag-area {
.file-draggable__input-focus { .adf-file-draggable__input-focus {
@include file-draggable__input-focus($theme); @include file-draggable__input-focus($theme);
} }
} }
} }
.upload-border { .adf-upload-border {
vertical-align: inherit !important; vertical-align: inherit !important;
text-align: inherit !important; text-align: inherit !important;
} }
.file-draggable__input-focus { .adf-file-draggable__input-focus {
color: none !important; color: none !important;
border: none !important; border: none !important;
margin-left: 0 !important; margin-left: 0 !important;
@@ -52,7 +52,7 @@ $alfresco-app-color--default: #00bcd4;
} }
adf-upload-drag-area { adf-upload-drag-area {
.file-draggable__input-focus { .adf-file-draggable__input-focus {
adf-document-list { adf-document-list {
background: #e0f7fa; background: #e0f7fa;