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

latest adf alpha (#353)

Browse Source 
* latest adf alpha

* fix test

* try using instant translation for page titles

* upgrade to latest alpha

* update app config

* upgrade to adf app config pipe

* update libs

* update libs

* update config file

* fix code after upgrade

* upgrade e2e

* upgrade libs

* update libs

* fix e2e
This commit is contained in:
Denys Vuika
2018-05-10 22:07:02 +01:00
committed by GitHub
parent 028722b1a9
commit 8a222bcb89
29 changed files with 2205 additions and 2353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.angular-cli.json
View File

@@ -46,7 +46,8 @@
"scripts": [
"../node_modules/pdfjs-dist/build/pdf.js",
"../node_modules/pdfjs-dist/lib/shared/compatibility.js",
"../node_modules/pdfjs-dist/web/pdf_viewer.js"
"../node_modules/pdfjs-dist/web/pdf_viewer.js",
"../node_modules/moment/min/moment.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {

6
e2e/components/data-table/data-table.ts
View File

@@ -50,9 +50,9 @@ export class DataTable extends Component {
emptyListContainer: 'div.adf-no-content-container',
emptyFolderDragAndDrop: '.adf-empty-list_template .adf-empty-folder',
emptyListTitle: '.app-empty-folder__title',
emptyListSubtitle: '.app-empty-folder__subtitle',
emptyListText: '.app-empty-folder__text'
emptyListTitle: '.adf-empty-content__title',
emptyListSubtitle: '.adf-empty-content__subtitle',
emptyListText: '.adf-empty-content__text'
};
head: ElementFinder = this.component.element(by.css(DataTable.selectors.head));

4322
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@@ -23,8 +23,8 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "2.4.0-5096baa758e7c50a6b1e02a83e079691ee6615d1",
"@alfresco/adf-core": "2.4.0-5096baa758e7c50a6b1e02a83e079691ee6615d1",
"@alfresco/adf-content-services": "2.4.0-589af266d4d41dac4659880c1a12a96f1f0338b5",
"@alfresco/adf-core": "2.4.0-589af266d4d41dac4659880c1a12a96f1f0338b5",
"@angular/animations": "5.1.1",
"@angular/cdk": "5.0.1",
"@angular/common": "5.1.1",

9
src/app.config.json
View File

@@ -168,6 +168,7 @@
],
"facetQueries": {
"label": "My facet queries",
"pageSize": 5,
"queries": [
{ "query": "created:2018", "label": "Created This Year" },
{ "query": "content.mimetype", "label": "Type" },
@@ -219,6 +220,7 @@
"component": {
"selector": "check-list",
"settings": {
"pageSize": 5,
"operator": "OR",
"options": [
{ "name": "Folder", "value": "TYPE:'cm:folder'" },
@@ -249,7 +251,8 @@
"component": {
"selector": "number-range",
"settings": {
"field": "cm:content.size"
"field": "cm:content.size",
"format": "[{FROM} TO {TO}]"
}
}
},
@@ -260,7 +263,8 @@
"component": {
"selector": "date-range",
"settings": {
"field": "cm:created"
"field": "cm:created",
"dateFormat": "DD-MMM-YY"
}
}
},
@@ -272,6 +276,7 @@
"selector": "radio",
"settings": {
"field": null,
"pageSize": 5,
"options": [
{ "name": "None", "value": "", "default": true },
{

7
src/app/app.component.ts
View File

@@ -62,10 +62,9 @@ export class AppComponent implements OnInit {
const data: any = snapshot.data || {};
if (data.i18nTitle) {
this.translateService.translate
.stream(data.i18nTitle)
.subscribe((title) => pageTitle.setTitle(title));
pageTitle.setTitle(
this.translateService.instant(data.i18nTitle)
);
} else {
pageTitle.setTitle(data.title || '');
}

4
src/app/app.module.ts
View File

@@ -50,7 +50,6 @@ import { SearchInputComponent } from './components/search-input/search-input.com
import { SidenavComponent } from './components/sidenav/sidenav.component';
import { AboutComponent } from './components/about/about.component';
import { LocationLinkComponent } from './components/location-link/location-link.component';
import { EmptyFolderComponent } from './components/empty-folder/empty-folder.component';
import { NodeCopyDirective } from './common/directives/node-copy.directive';
import { NodeDeleteDirective } from './common/directives/node-delete.directive';
import { NodeMoveDirective } from './common/directives/node-move.directive';
@@ -59,7 +58,6 @@ import { NodePermanentDeleteDirective } from './common/directives/node-permanent
import { NodeUnshareDirective } from './common/directives/node-unshare.directive';
import { NodeInfoDirective } from './common/directives/node-info.directive';
import { NodeVersionsDirective } from './common/directives/node-versions.directive';
import { AppConfigPipe } from './common/pipes/app-config.pipe';
import { VersionManagerDialogAdapterComponent } from './components/versions-dialog/version-manager-dialog-adapter.component';
import { BrowsingFilesService } from './common/services/browsing-files.service';
import { ContentManagementService } from './common/services/content-management.service';
@@ -104,7 +102,6 @@ import { SearchComponent } from './components/search/search.component';
PreviewComponent,
AboutComponent,
LocationLinkComponent,
EmptyFolderComponent,
NodeCopyDirective,
NodeDeleteDirective,
NodeMoveDirective,
@@ -113,7 +110,6 @@ import { SearchComponent } from './components/search/search.component';
NodeUnshareDirective,
NodeInfoDirective,
NodeVersionsDirective,
AppConfigPipe,
VersionManagerDialogAdapterComponent,
SearchComponent
],

39
src/app/common/pipes/app-config.pipe.ts
View File

@@ -1,39 +0,0 @@
/*!
* @license
* Alfresco Example Content Application
*
* Copyright (C) 2005 - 2018 Alfresco Software Limited
*
* This file is part of the Alfresco Example Content Application.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { Pipe, PipeTransform } from '@angular/core';
import { AppConfigService } from '@alfresco/adf-core';
@Pipe({
name: 'appConfig',
pure: true
})
export class AppConfigPipe implements PipeTransform {
constructor(private config: AppConfigService) {}
transform(value: string, fallback: any): any {
return this.config.get(value, fallback);
}
}

6
src/app/components/empty-folder/empty-folder.component.html
View File

@@ -1,6 +0,0 @@
<div class="app-empty-folder">
<mat-icon class="app-empty-folder__icon">{{ icon }}</mat-icon>
<p class="app-empty-folder__title">{{ title | translate }}</p>
<p class="app-empty-folder__subtitle">{{ subtitle | translate }}</p>
<ng-content></ng-content>
</div>

29
src/app/components/empty-folder/empty-folder.component.scss
View File

@@ -1,29 +0,0 @@
@import 'variables';
.app-empty-folder {
color: $alfresco-secondary-text-color;
display: flex;
flex-direction: column;
align-items: center;
&__icon {
font-size: 52px;
height: 52px;
width: 52px;
}
p {
line-height: 0;
}
&__title {
font-size: 18px;
font-weight: 600;
}
&__subtitle,
&__text {
font-size: 14px;
font-weight: 300;
}
}

33
src/app/components/empty-folder/empty-folder.component.spec.ts
View File

@@ -1,33 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MatIconModule } from '@angular/material';
import { TranslateModule } from '@ngx-translate/core';
import { EmptyFolderComponent } from './empty-folder.component';
describe('EmptyFolderComponent', () => {
let component: EmptyFolderComponent;
let fixture: ComponentFixture<EmptyFolderComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
MatIconModule,
TranslateModule.forRoot()
],
declarations: [
EmptyFolderComponent
]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(EmptyFolderComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

22
src/app/components/empty-folder/empty-folder.component.ts
View File

@@ -1,22 +0,0 @@
import { Component, Input, ChangeDetectionStrategy, ViewEncapsulation } from '@angular/core';
@Component({
selector: 'app-empty-folder',
templateUrl: './empty-folder.component.html',
styleUrls: ['./empty-folder.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
// tslint:disable-next-line:use-host-property-decorator
host: { class: 'app-empty-folder' }
})
export class EmptyFolderComponent {
@Input()
icon = 'cake';
@Input()
title = '';
@Input()
subtitle = '';
}

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

@@ -112,11 +112,11 @@
<empty-folder-content>
<ng-template>
<app-empty-folder
<adf-empty-content
icon="star_rate"
[title]="'APP.BROWSE.FAVORITES.EMPTY_STATE.TITLE'"
subtitle="APP.BROWSE.FAVORITES.EMPTY_STATE.TEXT">
</app-empty-folder>
</adf-empty-content>
</ng-template>
</empty-folder-content>
@@ -170,7 +170,7 @@
</adf-document-list>
<adf-pagination
[supportedPageSizes]="'pagination.supportedPageSizes' | appConfig"
[supportedPageSizes]="'pagination.supportedPageSizes' | adfAppConfig"
[target]="documentList"
(changePageSize)="onChangePageSize($event)">
</adf-pagination>

3
src/app/components/favorites/favorites.component.spec.ts
View File

@@ -35,7 +35,7 @@ import {
UserPreferencesService, LogService, AppConfigService,
StorageService, CookieService, ThumbnailService,
AuthenticationService, TimeAgoPipe, NodeNameTooltipPipe,
NodeFavoriteDirective, DataTableComponent
NodeFavoriteDirective, DataTableComponent, AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent, CustomResourcesService } from '@alfresco/adf-content-services';
@@ -46,7 +46,6 @@ import { DocumentListService } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../common/services/content-management.service';
import { NodeInfoDirective } from '../../common/directives/node-info.directive';
import { NodePermissionService } from '../../common/services/node-permission.service';
import { AppConfigPipe } from '../../common/pipes/app-config.pipe';
import { FavoritesComponent } from './favorites.component';

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

@@ -171,7 +171,7 @@
</adf-document-list>
<adf-pagination
[supportedPageSizes]="'pagination.supportedPageSizes' | appConfig"
[supportedPageSizes]="'pagination.supportedPageSizes' | adfAppConfig"
[target]="documentList"
(changePageSize)="onChangePageSize($event)">
</adf-pagination>

3
src/app/components/files/files.component.spec.ts
View File

@@ -37,7 +37,7 @@ import {
UserPreferencesService, LogService, AppConfigService,
StorageService, CookieService, ThumbnailService, AuthenticationService,
TimeAgoPipe, NodeNameTooltipPipe, FileSizePipe, NodeFavoriteDirective,
DataTableComponent, UploadService
DataTableComponent, UploadService, AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent, CustomResourcesService } from '@alfresco/adf-content-services';
import { MatMenuModule, MatSnackBarModule, MatIconModule, MatDialogModule } from '@angular/material';
@@ -47,7 +47,6 @@ import { BrowsingFilesService } from '../../common/services/browsing-files.servi
import { NodeActionsService } from '../../common/services/node-actions.service';
import { NodePermissionService } from '../../common/services/node-permission.service';
import { NodeInfoDirective } from '../../common/directives/node-info.directive';
import { AppConfigPipe } from '../../common/pipes/app-config.pipe';
import { FilesComponent } from './files.component';

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

@@ -21,11 +21,11 @@
<empty-folder-content>
<ng-template>
<app-empty-folder
<adf-empty-content
icon="group_work"
[title]="'APP.BROWSE.LIBRARIES.EMPTY_STATE.TITLE'"
subtitle="APP.BROWSE.LIBRARIES.EMPTY_STATE.TEXT">
</app-empty-folder>
</adf-empty-content>
</ng-template>
</empty-folder-content>
@@ -67,7 +67,7 @@
</adf-document-list>
<adf-pagination
[supportedPageSizes]="'pagination.supportedPageSizes' | appConfig"
[supportedPageSizes]="'pagination.supportedPageSizes' | adfAppConfig"
[target]="documentList"
(changePageSize)="onChangePageSize($event)">
</adf-pagination>

3
src/app/components/libraries/libraries.component.spec.ts
View File

@@ -34,7 +34,7 @@ import {
NodesApiService, AlfrescoApiService, ContentService,
UserPreferencesService, LogService, AppConfigService,
StorageService, CookieService, ThumbnailService, AuthenticationService,
TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent
TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent, AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent, CustomResourcesService } from '@alfresco/adf-content-services';
import { TranslateModule } from '@ngx-translate/core';
@@ -42,7 +42,6 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { MatMenuModule, MatSnackBarModule, MatIconModule } from '@angular/material';
import { DocumentListService } from '@alfresco/adf-content-services';
import { ShareDataTableAdapter } from '@alfresco/adf-content-services';
import { AppConfigPipe } from '../../common/pipes/app-config.pipe';
import { LibrariesComponent } from './libraries.component';

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

@@ -1,5 +1,5 @@
<adf-login
[copyrightText]="'application.copyright' | appConfig"
[copyrightText]="'application.copyright' | adfAppConfig"
providers="ECM"
successRoute="/personal-files"
[showRememberMe]="false"

5
src/app/components/login/login.component.spec.ts
View File

@@ -33,11 +33,10 @@ import { TestBed, async, ComponentFixture } from '@angular/core/testing';
import {
AuthenticationService, UserPreferencesService, TranslationService,
TranslationMock, AppConfigService, StorageService, AlfrescoApiService,
CookieService, LogService
CookieService, LogService, AppConfigPipe
} from '@alfresco/adf-core';
import { LoginComponent } from './login.component';
import { AppConfigPipe } from '../../common/pipes/app-config.pipe';
describe('LoginComponent', () => {
let fixture: ComponentFixture<LoginComponent>;
@@ -82,7 +81,7 @@ describe('LoginComponent', () => {
beforeEach(() => {
spyOn(userPreference, 'setStoragePrefix');
spyOn(router, 'navigateByUrl');
spyOn(auth, 'getRedirectUrl').and.returnValue('/some-url');
spyOn(auth, 'getRedirect').and.returnValue('/some-url');
spyOn(location, 'forward');
});

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

@@ -107,11 +107,11 @@
<empty-folder-content>
<ng-template>
<app-empty-folder
<adf-empty-content
icon="access_time"
[title]="'APP.BROWSE.RECENT.EMPTY_STATE.TITLE'"
subtitle="APP.BROWSE.RECENT.EMPTY_STATE.TEXT">
</app-empty-folder>
</adf-empty-content>
</ng-template>
</empty-folder-content>
@@ -158,7 +158,7 @@
</adf-document-list>
<adf-pagination
[supportedPageSizes]="'pagination.supportedPageSizes' | appConfig"
[supportedPageSizes]="'pagination.supportedPageSizes' | adfAppConfig"
[target]="documentList"
(changePageSize)="onChangePageSize($event)">
</adf-pagination>

3
src/app/components/recent-files/recent-files.component.spec.ts
View File

@@ -33,7 +33,7 @@ import {
NodesApiService, AlfrescoApiService, ContentService,
UserPreferencesService, LogService, AppConfigService,
StorageService, CookieService, ThumbnailService, AuthenticationService,
TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent
TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent, AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent, CustomResourcesService } from '@alfresco/adf-content-services';
import { TranslateModule } from '@ngx-translate/core';
@@ -42,7 +42,6 @@ import { MatMenuModule, MatSnackBarModule, MatIconModule } from '@angular/materi
import { DocumentListService } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../common/services/content-management.service';
import { NodeInfoDirective } from '../../common/directives/node-info.directive';
import { AppConfigPipe } from '../../common/pipes/app-config.pipe';
import { NodePermissionService } from '../../common/services/node-permission.service';
import { RecentFilesComponent } from './recent-files.component';

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

@@ -112,11 +112,11 @@
<empty-folder-content>
<ng-template>
<app-empty-folder
<adf-empty-content
icon="people"
[title]="'APP.BROWSE.SHARED.EMPTY_STATE.TITLE'"
subtitle="APP.BROWSE.SHARED.EMPTY_STATE.TEXT">
</app-empty-folder>
</adf-empty-content>
</ng-template>
</empty-folder-content>
@@ -175,7 +175,7 @@
</adf-document-list>
<adf-pagination
[supportedPageSizes]="'pagination.supportedPageSizes' | appConfig"
[supportedPageSizes]="'pagination.supportedPageSizes' | adfAppConfig"
[target]="documentList"
(changePageSize)="onChangePageSize($event)">
</adf-pagination>

3
src/app/components/shared-files/shared-files.component.spec.ts
View File

@@ -33,7 +33,7 @@ import {
NodesApiService, AlfrescoApiService, ContentService,
UserPreferencesService, LogService, AppConfigService,
StorageService, CookieService, ThumbnailService, AuthenticationService,
TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent
TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent, AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent, CustomResourcesService } from '@alfresco/adf-content-services';
import { TranslateModule } from '@ngx-translate/core';
@@ -43,7 +43,6 @@ import { DocumentListService } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../common/services/content-management.service';
import { NodeInfoDirective } from '../../common/directives/node-info.directive';
import { NodePermissionService } from '../../common/services/node-permission.service';
import { AppConfigPipe } from '../../common/pipes/app-config.pipe';
import { SharedFilesComponent } from './shared-files.component';

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

@@ -40,12 +40,12 @@
<empty-folder-content>
<ng-template>
<app-empty-folder
<adf-empty-content
icon="delete"
[title]="'APP.BROWSE.TRASHCAN.EMPTY_STATE.TITLE'">
<p class="app-empty-folder__text">{{ 'APP.BROWSE.TRASHCAN.EMPTY_STATE.FIRST_TEXT' | translate }}</p>
<p class="app-empty-folder__text">{{ 'APP.BROWSE.TRASHCAN.EMPTY_STATE.SECOND_TEXT' | translate }}</p>
</app-empty-folder>
<p class="adf-empty-content__text">{{ 'APP.BROWSE.TRASHCAN.EMPTY_STATE.FIRST_TEXT' | translate }}</p>
<p class="adf-empty-content__text">{{ 'APP.BROWSE.TRASHCAN.EMPTY_STATE.SECOND_TEXT' | translate }}</p>
</adf-empty-content>
</ng-template>
</empty-folder-content>
@@ -99,7 +99,7 @@
</adf-document-list>
<adf-pagination
[supportedPageSizes]="'pagination.supportedPageSizes' | appConfig"
[supportedPageSizes]="'pagination.supportedPageSizes' | adfAppConfig"
[target]="documentList"
(changePageSize)="onChangePageSize($event)">
</adf-pagination>

3
src/app/components/trashcan/trashcan.component.spec.ts
View File

@@ -33,7 +33,7 @@ import {
UserPreferencesService, LogService, AppConfigService,
StorageService, CookieService, ThumbnailService,
AuthenticationService, TimeAgoPipe, NodeNameTooltipPipe,
NodeFavoriteDirective, DataTableComponent
NodeFavoriteDirective, DataTableComponent, AppConfigPipe
} from '@alfresco/adf-core';
import { DocumentListComponent, CustomResourcesService } from '@alfresco/adf-content-services';
import { TranslateModule } from '@ngx-translate/core';
@@ -42,7 +42,6 @@ import { MatMenuModule, MatSnackBarModule, MatIconModule } from '@angular/materi
import { DocumentListService } from '@alfresco/adf-content-services';
import { ContentManagementService } from '../../common/services/content-management.service';
import { NodeInfoDirective } from '../../common/directives/node-info.directive';
import { AppConfigPipe } from '../../common/pipes/app-config.pipe';
import { TrashcanComponent } from './trashcan.component';

1
src/app/ui/application.scss
View File

@@ -21,7 +21,6 @@ ng-component {
@import 'layout';
@import './overrides/adf-login';
@import './overrides/adf-sidenav-layout';
@import './overrides/alfresco-document-list';
@import './overrides/alfresco-upload-drag-area';

5
src/app/ui/overrides/_adf-login.scss
View File

@@ -1,5 +0,0 @@
@import 'mixins';
adf-login {
@include flex-column;
}

7
src/app/ui/overrides/_alfresco-document-list.scss
View File

@@ -75,16 +75,9 @@ adf-datatable {
}
.adf-document-list--empty {
.adf-data-table {
@include flex-column;
justify-content: center;
align-items: center;
}
.adf-data-table .adf-datatable-row:hover,
.adf-data-table .adf-datatable-row:focus {
background-color: unset;
cursor: default;
}
}