revert modify after rebase

demo-shell-ng2/app/components/about/about.component.ts

@@ -34,11 +34,8 @@ export class AboutComponent implements OnInit {
     ecmHost: string = '';
     bpmHost: string = '';
 
-    githubUrlCommitAlpha: string = 'https://github.com/Alfresco/alfresco-ng2-components/commits/';
+    ecmVersion: EcmProductVersionModel = null;
-
+    bpmVersion: BpmProductVersionModel = null;
-    configFile: string = '';
-    ecmHost: string = '';
-    bpmHost: string = '';
 
     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;
-            }
-        }
-    }
 }

demo-shell-ng2/app/components/files/files.component.ts

@@ -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) {
+    getSiteContent(site: SiteModel) {
-        let dialogRef = this.dialog.open(CreateFolderDialog);
+        this.currentFolderId = site && site.guid ? site.guid : '-my-';
-        dialogRef.afterClosed().subscribe(folderName => {
-            if (folderName) {
-                this.contentService.createFolder('', folderName, this.documentList.currentFolderId).subscribe(
-                    node => console.log(node),
-                    err => console.log(err)
-                );
-            }
-        });
     }
 }

ng2-components/ng2-activiti-analytics/config/webpack.common.js

@@ -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: {

ng2-components/ng2-activiti-diagrams/config/webpack.common.js

@@ -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: {

ng2-components/ng2-activiti-form/config/webpack.common.js

@@ -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: {

ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts

@@ -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 {

ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.spec.ts

@@ -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',

ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.spec.ts

@@ -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', () => {

ng2-components/ng2-activiti-processlist/config/webpack.common.js

@@ -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: {

ng2-components/ng2-activiti-tasklist/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-core/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-core/index.ts

@@ -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[] = [
+export function providers() {
-    NotificationService,
+    return [
-    LogService,
+        UserPreferencesService,
-    LogServiceMock,
+        NotificationService,
-    AlfrescoAuthenticationService,
+        LogService,
-    AlfrescoContentService,
+        LogServiceMock,
-    AlfrescoSettingsService,
+        AuthenticationService,
-    StorageService,
+        AlfrescoContentService,
-    CookieService,
+        AlfrescoSettingsService,
-    AlfrescoApiService,
+        StorageService,
-    AlfrescoTranslateLoader,
+        CookieService,
-    AlfrescoTranslationService,
+        AlfrescoApiService,
-    RenditionsService,
+        AlfrescoTranslateLoader,
-    ContentService,
+        TranslationService,
-    AuthGuard,
+        RenditionsService,
-    AuthGuardEcm,
+        ContentService,
-    AuthGuardBpm,
+        AuthGuard,
-    ...CONTEXT_MENU_PROVIDERS
+        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);

ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.ts

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

ng2-components/ng2-alfresco-datatable/README.md

@@ -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)"

ng2-components/ng2-alfresco-datatable/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts

@@ -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) {

ng2-components/ng2-alfresco-documentlist/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts

@@ -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';

ng2-components/ng2-alfresco-login/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-search/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-social/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-tag/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-upload/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts

@@ -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

ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts

@@ -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.
      *

ng2-components/ng2-alfresco-userinfo/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-viewer/config/webpack.common.js

@@ -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: {

ng2-components/ng2-alfresco-webscript/config/webpack.common.js

@@ -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: {