revert modify after rebase

This commit is contained in:
Eugenio Romano 2017-08-01 11:10:23 +01:00 committed by Eugenio Romano
parent e1d1e647c6
commit cfa8a222f0
29 changed files with 11359 additions and 198 deletions

View File

@ -34,11 +34,8 @@ export class AboutComponent implements OnInit {
ecmHost: string = '';
bpmHost: string = '';
githubUrlCommitAlpha: string = 'https://github.com/Alfresco/alfresco-ng2-components/commits/';
configFile: string = '';
ecmHost: string = '';
bpmHost: string = '';
ecmVersion: EcmProductVersionModel = null;
bpmVersion: BpmProductVersionModel = null;
constructor(private http: Http,
private appConfig: AppConfigService,
@ -107,19 +104,4 @@ export class AboutComponent implements OnInit {
}
}
}
private gitHubLinkCreation(alfrescoPackagesTableRepresentation): void {
let corePackage = alfrescoPackagesTableRepresentation.find((packageUp) => {
return packageUp.name === 'ng2-alfresco-core';
});
if (corePackage) {
let commitIsh = corePackage.version.split('-');
if (commitIsh.length > 1) {
this.githubUrlCommitAlpha = this.githubUrlCommitAlpha + commitIsh[1];
} else {
this.githubUrlCommitAlpha = this.githubUrlCommitAlpha + corePackage.version;
}
}
}
}

View File

@ -23,8 +23,6 @@ import { DocumentListComponent, DropdownSitesComponent, PermissionStyleModel } f
import { CreateFolderDialogComponent } from '../../dialogs/create-folder.dialog';
import { CreateFolderDialog } from '../../dialogs/create-folder.dialog';
@Component({
selector: 'files-component',
templateUrl: './files.component.html',
@ -163,15 +161,7 @@ export class FilesComponent implements OnInit {
});
}
onCreateFolderClicked(event: Event) {
let dialogRef = this.dialog.open(CreateFolderDialog);
dialogRef.afterClosed().subscribe(folderName => {
if (folderName) {
this.contentService.createFolder('', folderName, this.documentList.currentFolderId).subscribe(
node => console.log(node),
err => console.log(err)
);
}
});
getSiteContent(site: SiteModel) {
this.currentFolderId = site && site.guid ? site.guid : '-my-';
}
}

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -110,8 +110,6 @@ export class FormFieldModel extends FormWidgetModel {
set readOnly(readOnly: boolean) {
this._readOnly = readOnly;
this.updateForm();
this._readOnly = readOnly;
this.updateForm();
}
get isValid(): boolean {

View File

@ -30,61 +30,6 @@ import { DateEditorComponent } from './editors/date/date.editor';
import { DropdownEditorComponent } from './editors/dropdown/dropdown.editor';
import { RowEditorComponent } from './editors/row.editor';
import { TextEditorComponent } from './editors/text/text.editor';
import { CoreModule, LogService } from 'ng2-alfresco-core';
import { FormService } from './../../../services/form.service';
import { EcmModelService } from './../../../services/ecm-model.service';
import { WidgetVisibilityService } from '../../../services/widget-visibility.service';
import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { RowEditorComponent } from './editors/row.editor';
import { DropdownEditorComponent } from './editors/dropdown/dropdown.editor';
import { DateEditorComponent } from './editors/date/date.editor';
import { BooleanEditorComponent } from './editors/boolean/boolean.editor';
import { TextEditorComponent } from './editors/text/text.editor';
import { CoreModule, LogService } from 'ng2-alfresco-core';
import { FormService } from './../../../services/form.service';
import { EcmModelService } from './../../../services/ecm-model.service';
import { WidgetVisibilityService } from '../../../services/widget-visibility.service';
let fakeFormField = {
id: 'fake-dynamic-table',
name: 'fake-label',
value: [{1: 1, 2: 2, 3: 4}],
required: false,
readOnly: false,
overrideId: false,
colspan: 1,
placeholder: null,
minLength: 0,
maxLength: 0,
params: {
existingColspan: 1,
maxColspan: 1
},
sizeX: 2,
sizeY: 2,
row: -1,
col: -1,
columnDefinitions: [
{
id: 1,
name: 1,
type: 'String',
visible: true
},
{
id: 2,
name: 2,
type: 'String',
visible: true
},
{
id: 3,
name: 3,
type: 'String',
visible: true
}
]
};
let fakeFormField = {
id: 'fake-dynamic-table',

View File

@ -101,17 +101,6 @@ describe('TextWidgetComponent', () => {
expect(inputElement.disabled).toBeTruthy();
});
}));
it('should be disabled on readonly forms', async(() => {
widget.field.form.readOnly = true;
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(inputElement).toBeDefined();
expect(inputElement).not.toBeNull();
expect(inputElement.disabled).toBeTruthy();
});
}));
});
describe('and mask is configured on text element', () => {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -128,27 +128,58 @@ export * from './src/models/permissions.enum';
export * from './src/models/site.model';
export * from './src/models/product-version.model';
export * from './src/models/index';
// Old deprecated import
import { AuthenticationService as AlfrescoAuthenticationService } from './src/services/authentication.service';
import { TranslationService as AlfrescoTranslationService } from './src/services/translation.service';
export { AuthenticationService as AlfrescoAuthenticationService } from './src/services/authentication.service';
export { TranslationService as AlfrescoTranslationService } from './src/services/translation.service';
export * from './src/services/search.service';
export const ALFRESCO_CORE_PROVIDERS: any[] = [
NotificationService,
LogService,
LogServiceMock,
AlfrescoAuthenticationService,
AlfrescoContentService,
AlfrescoSettingsService,
StorageService,
CookieService,
AlfrescoApiService,
AlfrescoTranslateLoader,
AlfrescoTranslationService,
RenditionsService,
ContentService,
AuthGuard,
AuthGuardEcm,
AuthGuardBpm,
...CONTEXT_MENU_PROVIDERS
];
export function providers() {
return [
UserPreferencesService,
NotificationService,
LogService,
LogServiceMock,
AuthenticationService,
AlfrescoContentService,
AlfrescoSettingsService,
StorageService,
CookieService,
AlfrescoApiService,
AlfrescoTranslateLoader,
TranslationService,
RenditionsService,
ContentService,
AuthGuard,
AuthGuardEcm,
AuthGuardBpm,
ThumbnailService,
UploadService,
SearchService,
DeletedNodesApiService,
FavoritesApiService,
NodesApiService,
PeopleApiService,
SearchApiService,
SharedLinksApiService,
SitesApiService,
DiscoveryApiService,
// Old deprecated import
AlfrescoTranslationService,
AlfrescoAuthenticationService
];
}
export function obsoleteMdlDirectives() {
return [
MDLDirective,
AlfrescoMdlMenuDirective,
AlfrescoMdlTextFieldDirective
];
}
export function createTranslateLoader(http: Http, logService: LogService) {
return new AlfrescoTranslateLoader(http, logService);

View File

@ -102,20 +102,39 @@ export class AlfrescoContentService {
}
/**
* Create a folder
* @param name - the folder name
* Check if the user has permissions on that node
* @param MinimalNode - node to check allowableOperations
* @param PermissionsEnum - create, delete, update, updatePermissions, !create, !delete, !update, !updatePermissions
*
* @returns {boolean} has permission
*/
createFolder(relativePath: string, name: string, parentId?: string): Observable<FolderCreatedEvent> {
return Observable.fromPromise(this.apiService.getInstance().nodes.createFolder(name, relativePath, parentId))
.do(data => {
this.folderCreated.next(<FolderCreatedEvent>{
relativePath: relativePath,
name: name,
parentId: parentId,
node: data
});
})
.catch(err => this.handleError(err));
hasPermission(node: any, permission: PermissionsEnum|string): boolean {
let hasPermission = false;
if (this.hasAllowableOperations(node)) {
if (permission && permission.startsWith('!')) {
hasPermission = node.allowableOperations.find(currentPermission => currentPermission === permission.replace('!', '')) ? false : true;
} else {
hasPermission = node.allowableOperations.find(currentPermission => currentPermission === permission) ? true : false;
}
} else {
if (permission && permission.startsWith('!')) {
hasPermission = true;
}
}
return hasPermission;
}
/**
* Check if the node has the properties allowableOperations
* @param MinimalNode - node to check allowableOperations
*
* @returns {boolean} has AllowableOperations
*/
hasAllowableOperations(node: any): boolean {
return node && node.allowableOperations ? true : false;
}
private handleError(error: any) {

View File

@ -227,7 +227,6 @@ You can add a template that will be shown when there are no results in your data
[data]="data"
[actions]="contentActions"
[multiselect]="multiselect"
[loading]=isLoading()"
(showRowContextMenu)="onShowRowContextMenu($event)"
(showRowActionsMenu)="onShowRowActionsMenu($event)"
(executeRowAction)="onExecuteRowAction($event)"

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -226,6 +226,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck
if (this.data) {
this.data.setRows(this.convertToRowsData(rows));
}
}
private setTableSchema() {
if (this.columnList && this.columnList.columns) {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -23,10 +23,6 @@ import { DataColumn, DataRow, DataSorting, DataTableAdapter } from 'ng2-alfresco
import { PermissionStyleModel } from './../models/permissions-style.model';
import { DocumentListService } from './../services/document-list.service';
declare var require: any;
declare var require: any;
export class ShareDataTableAdapter implements DataTableAdapter {
ERR_ROW_NOT_FOUND: string = 'Row not found';

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -221,25 +221,6 @@ export class UploadButtonComponent implements OnInit, OnChanges {
error => this.onError.emit(error)
);
}
return 'Error';
}
// TODO: move to AlfrescoContentService
getFolderNode(nodeId: string): Observable<MinimalNodeEntryEntity> {
let opts: any = {
includeSource: true,
include: ['allowableOperations']
};
return Observable.fromPromise(this.apiService.getInstance().nodes.getNodeInfo(nodeId, opts))
.catch(err => this.handleError(err));
}
private handleError(error: Response) {
// in a real world app, we may send the error to some remote logging infrastructure
// instead of just logging it to the console
this.logService.error(error);
return Observable.throw(error || 'Server error');
}
// TODO: move to AlfrescoContentService

View File

@ -28,15 +28,6 @@ export class UploadDragAreaComponent {
@Input()
enabled: boolean = true;
/**
* @deprecated Deprecated in 1.6.0, you can use UploadService events and NotificationService api instead.
*
* @type {boolean}
* @memberof UploadButtonComponent
*/
@Input()
enabled: boolean = true;
/**
* @deprecated Deprecated in 1.6.0, you can use UploadService events and NotificationService api instead.
*

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

View File

@ -8,8 +8,6 @@ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
module.exports = {
resolveLoader: {

11271
ng2-components/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff