Merge pull request #1672 from Alfresco/development

1.2.0
Alfresco · Feb 27, 2017 · c13c3aa · c13c3aa
2 parents 427dc0b + cb19ff9
commit c13c3aa
Show file tree

Hide file tree

Showing 184 changed files with 2,494 additions and 1,265 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -12,11 +12,11 @@ Please ask before on our gitter channel https://gitter.im/Alfresco/alfresco-ng2-
 - [ ] Support request
 - [ ] Documentation
 ```
-**Current behavior:**
-<!-- Describe the current behavior. -->
+**Current behaviour:**
+<!-- Describe the current behaviour. -->
 
 **Expected behavior:**
-<!-- Describe the expected behavior. -->
+<!-- Describe the expected behaviour. -->
 
 **Steps to reproduce the issue:**
 <!-- Describe the steps to reproduce the issue. -->

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,11 +20,11 @@
 [ ] Other... Please describe:
 ```
 
-**What is the current behavior?** (You can also link to an open issue here)
+**What is the current behaviour?** (You can also link to an open issue here)
 
 
 
-**What is the new behavior?**
+**What is the new behaviour?**
 
 
 

diff --git a/demo-shell-ng2/README.md b/demo-shell-ng2/README.md
@@ -12,7 +12,7 @@
 
 ## Installing
 
-To correctly use this demo check that on your machine is running [Node](https://nodejs.org/en/) version 6.9.2 LTS or higher.
+To correctly use this demo check that on your machine is running [Node](https://nodejs.org/en/) version 5.x.x or higher.
 
 ```sh
 git clone https://github.com/Alfresco/alfresco-ng2-components.git
@@ -26,7 +26,7 @@ npm install
 npm start
 ```
 
-This command compiles and starts the project in watch mode. 
+This command compiles and starts the project in watch mode.
 Browser will automatically reload upon changes.
 Upon start you can navigate to `http://localhost:3000` with your preferred browser.
 
@@ -41,7 +41,7 @@ npm run build
 npm run start:dist
 ```
 
-This command builds broject in `production` mode. 
+This command builds project in `production` mode.
 All output is placed to `dist` folder and can be served your preferred web server.
 You should need no additional files outside the `dist` folder.
 
@@ -81,4 +81,20 @@ Directory structure:
 │   └── fr.json
 ```
 
+## Custom-files
 
+If you need to add custom files on your project you can add this files in the folders public
+
+```
+.
+├── public/
+│   ├── images/
+│   ├── css/
+│   └── js/
+```
+
+the public folder above wil be copied in the root of your project and you can refer to them for example as
+
+ * './images/custom_image.png'
+ * './js/custom_script.js'
+ * './css/custom_style.css'
diff --git a/demo-shell-ng2/WINDOWS.md b/demo-shell-ng2/WINDOWS.md
diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html
@@ -19,7 +19,7 @@
             <nav class="mdl-navigation mdl-layout--large-screen-only">
                 <a class="mdl-navigation__link" data-automation-id="home" href="" routerLink="/">Home</a>
                 <a class="mdl-navigation__link" data-automation-id="files" href="" routerLink="/files">DocumentList</a>
-                <a class="mdl-navigation__link" data-automation-id="activiti" href="" routerLink="/activiti">Activiti</a>
+                <a class="mdl-navigation__link" data-automation-id="activiti" href="" routerLink="/activiti">Process Services</a>
                 <a class="mdl-navigation__link" data-automation-id="login" href="" routerLink="/login">Login</a>
                 <a class="mdl-navigation__link" data-automation-id="settings" href="" routerLink="/settings">Settings</a>
             </nav>
@@ -39,14 +39,14 @@
                 <span class="flag-icon flag-icon-gb"></span>
                 <label tabindex="0"> English</label>
             </a>
-            <a class="mdl-navigation__link" (click)="changeLanguage('gr')">
-                <span class="flag-icon flag-icon-gr"></span>
-                <label tabindex="0"> Greek</label>
-            </a>
             <a class="mdl-navigation__link" (click)="changeLanguage('it')">
                 <span class="flag-icon flag-icon-it"></span>
                 <label tabindex="0"> Italian</label>
             </a>
+            <a class="mdl-navigation__link" (click)="changeLanguage('ru')">
+                <span class="flag-icon flag-icon-ru"></span>
+                <label tabindex="0"> Russian</label>
+            </a>
         </nav>
         <span class="mdl-layout-title">Components</span>
         <nav class="mdl-navigation">

diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts
@@ -43,13 +43,7 @@ export class AppComponent {
         this.setProvider();
 
         if (translateService) {
-            if (process.env.ENV === 'production') {
-                translateService.addTranslationFolder('custom', 'i18n/custom-translation');
-                translateService.addTranslationFolder('ng2-alfresco-login', 'i18n/custom-translation/alfresco-login');
-            } else {
-                translateService.addTranslationFolder('custom', 'custom-translation');
-                translateService.addTranslationFolder('ng2-alfresco-login', 'custom-translation/alfresco-login');
-            }
+            translateService.addTranslationFolder('app', 'resources');
         }
     }
 
@@ -75,7 +69,7 @@ export class AppComponent {
             );
     }
 
-    navigateToLogin(){
+    navigateToLogin() {
         this.router.navigate(['/login']);
         this.hideDrawer();
     }

diff --git a/demo-shell-ng2/app/app.module.ts b/demo-shell-ng2/app/app.module.ts
@@ -35,6 +35,7 @@ import { AnalyticsModule } from 'ng2-activiti-analytics';
 import { AppComponent } from './app.component';
 import { routing } from './app.routes';
 import { CustomEditorsModule } from './components/activiti/custom-editor/custom-editor.component';
+import { Editor3DModule } from 'ng2-3d-editor';
 
 import {
     HomeComponent,
@@ -71,7 +72,8 @@ import {
         ActivitiProcessListModule.forRoot(),
         UserInfoComponentModule.forRoot(),
         AnalyticsModule.forRoot(),
-        CustomEditorsModule
+        CustomEditorsModule,
+        Editor3DModule.forRoot()
     ],
     declarations: [
         AppComponent,
@@ -94,4 +96,3 @@ import {
     bootstrap: [ AppComponent ]
 })
 export class AppModule { }
-
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -119,7 +119,10 @@
                         <activiti-analytics *ngIf="report"
                                             [appId]="appId"
                                             [reportId]="report.id"
-                                            (editReport)="onEditReport($event)">
+                                            [hideParameters]="false"
+                                            (editReport)="onEditReport($event)"
+                                            (reportSaved)="onReportSaved()"
+                                            (reportDeleted)="onReportDeleted()">
                         </activiti-analytics>
                     </div>
                 </div>

diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -154,7 +154,7 @@ export class ActivitiDemoComponent implements AfterViewInit {
     }
 
     onTaskFilterClick(event: FilterRepresentationModel) {
-        if(event){
+        if (event) {
             this.taskFilter = event;
         }
     }
@@ -202,6 +202,21 @@ export class ActivitiDemoComponent implements AfterViewInit {
         this.analyticsreportlist.reload();
     }
 
+    onReportSaved() {
+        this.analyticsreportlist.reload();
+    }
+
+    onReportDeleted() {
+        this.analyticsreportlist.reload();
+        this.selectFirstElementInReportList();
+    }
+
+    selectFirstElementInReportList() {
+        if (!this.analyticsreportlist.isReportsEmpty()) {
+            this.analyticsreportlist.selectReport(this.analyticsreportlist.reports[0]);
+        }
+    }
+
     navigateStartProcess() {
         this.resetProcessFilters();
         this.reloadProcessFilters();

diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html
@@ -35,6 +35,15 @@
                     </template>
                     -->
                 </content-column>
+                <content-column
+                    title="{{'DOCUMENT_LIST.COLUMNS.TAG' | translate}}"
+                    key="id"
+                    sortable="true"
+                    class="full-width ellipsis-cell">
+                    <template let-entry="$implicit">
+                        <alfresco-tag-node-list  [nodeId]="entry.data.getValue(entry.row, entry.col)"></alfresco-tag-node-list>
+                    </template>
+                </content-column>
                 <content-column
                         title="{{'DOCUMENT_LIST.COLUMNS.CREATED_BY' | translate}}"
                         key="createdByUser.displayName"
@@ -165,7 +174,13 @@ <h5>Upload</h5>
     <alfresco-viewer [(showViewer)]="fileShowed"
                      [fileNodeId]="fileNodeId"
                      [overlayMode]="true">
-        <div class="mdl-spinner mdl-js-spinner is-active"></div>
+
+        <extension-viewer [supportedExtensions]="['obj','3DS']" #extension>
+            <template let-urlFileContent="urlFileContent" let-extension="extension" >
+                <threed-viewer [urlFile]="urlFileContent" [extension]="extension" ></threed-viewer>
+            </template>
+        </extension-viewer>
+
     </alfresco-viewer>
 </div>
 
diff --git a/demo-shell-ng2/app/components/home/home.component.css b/demo-shell-ng2/app/components/home/home.component.css
@@ -29,6 +29,13 @@
     margin-right: 4px;
 }
 
+
+.home--card__text {
+    font-size: 16px;
+    line-height: 18px;
+}
+
+
 .home--feature-list {
     list-style: none;
     padding-left: 0;

diff --git a/demo-shell-ng2/app/components/home/home.component.html b/demo-shell-ng2/app/components/home/home.component.html
@@ -3,11 +3,11 @@
         <div class="mdl-card__title mdl-card--expand" routerLink="/files">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">dvr</i>
-                <span>DocumentList - ECM</span>
+                <span class="home--card__text">DocumentList - Content Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Demonstrates multiple Alfresco ECM components used together to display the files of your ECM instance:
+        Demonstrates multiple Alfresco Content Services components used together to display the files of your Content Services instance:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -39,11 +39,11 @@ <h2 class="mdl-card__title-text">
         <div class="mdl-card__title mdl-card--expand" routerLink="/activiti">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">apps</i>
-                <span>Activiti - BPM</span>
+                <span class="home--card__text">Process Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Demonstrates multiple Alfresco BPM components used together to show your BPM process and tasks:
+        Demonstrates multiple Alfresco Process Services components used together to show your Process Services process and tasks:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -91,7 +91,7 @@ <h2 class="mdl-card__title-text">
         <div class="mdl-card__title mdl-card--expand" routerLink="/datatable">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">view_module</i>
-                <span>DataTable-ECM&BPM</span>
+                <span class="home--card__text">DataTable - Content Services & Process Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
@@ -111,11 +111,11 @@ <h2 class="mdl-card__title-text">
         <div class="mdl-card__title mdl-card--expand" routerLink="/uploader">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">file_upload</i>
-                <span>Uploader - ECM</span>
+                <span class="home--card__text">Uploader - Content Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Basic table uploader component for the ECM and BPM:
+        Basic table uploader component for the Content Services & Process Services:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -131,11 +131,11 @@ <h2 class="mdl-card__title-text">
         <div class="mdl-card__title mdl-card--expand" routerLink="/login">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">account_circle</i>
-                <span>Login - ECM & BPM</span>
+                <span class="home--card__text">Login - Content Services & Process Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Login component for the ECM and BPM:
+        Login component for the Content Services and Process Services:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -151,11 +151,11 @@ <h2 class="mdl-card__title-text">
     <div class="mdl-card__title mdl-card--expand" routerLink="/webscript">
         <h2 class="mdl-card__title-text">
             <i class="material-icons home--card__icon">extension</i>
-            <span>Webscript - ECM</span>
+            <span class="home--card__text">Webscript - Content Services</span>
         </h2>
     </div>
     <div class="mdl-card__supporting-text">
-        Displays and creates webscripts in your ECM instance:
+        Displays and creates webscripts in your Content Services instance:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>
@@ -171,11 +171,11 @@ <h2 class="mdl-card__title-text">
         <div class="mdl-card__title mdl-card--expand" routerLink="/tag">
             <h2 class="mdl-card__title-text">
                 <i class="material-icons home--card__icon">local_offer</i>
-                <span>Tag - ECM</span>
+                <span class="home--card__text">Tag - Content Services</span>
             </h2>
         </div>
     <div class="mdl-card__supporting-text">
-        Displays and adds tags to the node of your ECM instance:
+        Displays and adds tags to the node of your Content Services instance:
         <ul class="home--feature-list">
             <li>
                 <i class="material-icons home--feature-list__icon">brightness_1</i>

diff --git a/demo-shell-ng2/app/components/login/login-demo.component.css b/demo-shell-ng2/app/components/login/login-demo.component.css
@@ -23,6 +23,7 @@
 .toggle {
     width: 120px;
     margin: 20px;
+    padding: 5px;
 }
 
 @media (min-width: 721px) {

diff --git a/demo-shell-ng2/app/components/login/login-demo.component.html b/demo-shell-ng2/app/components/login/login-demo.component.html
@@ -5,14 +5,14 @@
         <label for="switch1" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
             <input type="checkbox" id="switch1" [checked]="isECM" class="mdl-switch__input"
                    (click)="toggleECM()">
-            <span class="mdl-switch__label">ECM</span>
+            <span class="mdl-switch__label">Content Services</span>
         </label>
     </p>
     <p class="toggle">
         <label for="switch2" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
             <input type="checkbox" id="switch2" [checked]="isBPM" class="mdl-switch__input"
                    (click)="toggleBPM()">
-            <span class="mdl-switch__label">BPM</span>
+            <span class="mdl-switch__label">Process Services</span>
         </label>
     </p>
     <p class="toggle">
@@ -49,14 +49,14 @@
             <label for="switch1-mobile" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
                 <input type="checkbox" id="switch1-mobile" [checked]="isECM" class="mdl-switch__input"
                        (click)="toggleECM()">
-                <span class="mdl-switch__label">ECM</span>
+                <span class="mdl-switch__label">Content Services</span>
             </label>
         </p>
         <p>
             <label for="switch2-mobile" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
                 <input type="checkbox" id="switch2-mobile" [checked]="isBPM" class="mdl-switch__input"
                        (click)="toggleBPM()">
-                <span class="mdl-switch__label">BPM</span>
+                <span class="mdl-switch__label">Process Services</span>
             </label>
         </p>
         <p>

diff --git a/demo-shell-ng2/app/components/search/search.component.ts b/demo-shell-ng2/app/components/search/search.component.ts
@@ -17,7 +17,6 @@
 
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { MinimalNodeEntity } from 'alfresco-js-api';
 
 @Component({
     selector: 'search-component',