Merge pull request #1850 from Alfresco/development

1.4.0
Alfresco · Apr 27, 2017 · bca027d · bca027d
2 parents a68b803 + ac16f1c
commit bca027d
Show file tree

Hide file tree

Showing 192 changed files with 6,952 additions and 2,201 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,7 @@ env:
     - MODULE=ng2-activiti-diagrams
     - MODULE=ng2-activiti-analytics
     - MODULE=ng2-alfresco-userinfo
+    - MODULE=ng2-alfresco-social
 
 before_script:
   - if ([ "$MODULE" != "ng2-alfresco-core" ]); then

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/appveyor.yml b/appveyor.yml
@@ -24,6 +24,7 @@ environment:
   - COMPONENT_NAME: ng2-activiti-diagrams
   - COMPONENT_NAME: ng2-activiti-analytics
   - COMPONENT_NAME: ng2-alfresco-userinfo
+  - COMPONENT_NAME: ng2-alfresco-social
 
 # Install scripts. (runs after repo cloning)
 install:

diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html
@@ -58,6 +58,7 @@
             <a class="mdl-navigation__link" href="" routerLink="/activiti" (click)="hideDrawer()">Process Services</a>
             <a class="mdl-navigation__link" href="" routerLink="/webscript" (click)="hideDrawer()">Webscript</a>
             <a class="mdl-navigation__link" href="" routerLink="/tag" (click)="hideDrawer()">Tag</a>
+            <a class="mdl-navigation__link" href="" routerLink="/social" (click)="hideDrawer()">Social</a>
             <a class="mdl-navigation__link" href="" routerLink="/about" (click)="hideDrawer()">About</a>
             <a class="mdl-navigation__link" href="" routerLink="/settings" (click)="hideDrawer()">Settings</a>
         </nav>

diff --git a/demo-shell-ng2/app/app.module.ts b/demo-shell-ng2/app/app.module.ts
@@ -25,6 +25,7 @@ import { DataTableModule } from 'ng2-alfresco-datatable';
 import { DocumentListModule } from 'ng2-alfresco-documentlist';
 import { UploadModule } from 'ng2-alfresco-upload';
 import { TagModule } from 'ng2-alfresco-tag';
+import { SocialModule } from 'ng2-alfresco-social';
 import { WebScriptModule } from 'ng2-alfresco-webscript';
 import { ViewerModule } from 'ng2-alfresco-viewer';
 import { ActivitiFormModule } from 'ng2-activiti-form';
@@ -50,6 +51,7 @@ import {
     FormViewer,
     WebscriptComponent,
     TagComponent,
+    SocialComponent,
     AboutComponent,
     FilesComponent,
     FormNodeViewer,
@@ -68,6 +70,7 @@ import {
         DocumentListModule.forRoot(),
         UploadModule.forRoot(),
         TagModule.forRoot(),
+        SocialModule.forRoot(),
         WebScriptModule.forRoot(),
         ViewerModule.forRoot(),
         ActivitiFormModule.forRoot(),
@@ -91,6 +94,7 @@ import {
         FormViewer,
         WebscriptComponent,
         TagComponent,
+        SocialComponent,
         AboutComponent,
         FilesComponent,
         FormNodeViewer,

diff --git a/demo-shell-ng2/app/app.routes.ts b/demo-shell-ng2/app/app.routes.ts
@@ -29,6 +29,7 @@ import {
     ActivitiAppsView,
     WebscriptComponent,
     TagComponent,
+    SocialComponent,
     AboutComponent,
     FormViewer,
     FormNodeViewer,
@@ -117,6 +118,11 @@ export const appRoutes: Routes = [
         component: TagComponent,
         canActivate: [AuthGuardEcm]
     },
+    {
+        path: 'social',
+        component: SocialComponent,
+        canActivate: [AuthGuardEcm]
+    },
     { path: 'about', component: AboutComponent },
     { path: 'settings', component: SettingComponent }
 ];

diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.css b/demo-shell-ng2/app/components/activiti/activiti-demo.component.css
@@ -21,6 +21,6 @@
 }
 
 .list-buttons {
-    text-align: right;
+    text-align: left;
     margin-bottom: 5px;
-}
+}
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -19,20 +19,25 @@
             <div class="page-content">
                 <div class="mdl-grid">
                     <div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp">
-                        <activiti-filters
-                            [appId]="appId"
-                            (filterClick)="onTaskFilterClick($event)"
-                            (onSuccess)="onSuccessTaskFilterList($event)"
-                            #activitifilter>
-                        </activiti-filters>
-                    </div>
-                    <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp list-column">
                         <div class="list-buttons">
                             <activiti-start-task
                                 [appId]="appId"
                                 (onSuccess)="onStartTaskSuccess($event)">
                             </activiti-start-task>
                         </div>
+                        <adf-accordion>
+                            <adf-accordion-group [heading]="'Tasks'" [isSelected]="true" [isOpen]="true" [headingIcon]="'assignment'">
+                                <activiti-filters
+                                    [appId]="appId"
+                                    [hasIcon]="false"
+                                    (filterClick)="onTaskFilterClick($event)"
+                                    (onSuccess)="onSuccessTaskFilterList($event)"
+                                    #activitifilter>
+                                </activiti-filters>
+                            </adf-accordion-group>
+                        </adf-accordion>
+                    </div>
+                    <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp list-column">
                         <activiti-tasklist
                             [appId]="taskFilter?.appId"
                             [processDefinitionKey]="taskFilter?.filter?.processDefinitionKey"
@@ -58,10 +63,12 @@
                     </div>
                     <div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp">
                         <activiti-task-details #activitidetails
+                            [debugMode]="true"
                             [taskId]="currentTaskId"
                             (formCompleted)="onFormCompleted($event)"
                             (formContentClicked)="onFormContentClick($event)"
-                            (taskCreated)="onTaskCreated($event)">
+                            (taskCreated)="onTaskCreated($event)"
+                            (taskDeleted)="onTaskDeleted($event)">
                         </activiti-task-details>
                     </div>
                 </div>
@@ -76,13 +83,6 @@
                 <div class="page-content">
                     <div class="mdl-grid">
                         <div class="mdl-cell mdl-cell--2-col task-column  mdl-shadow--2dp">
-                            <activiti-process-instance-filters
-                                [appId]="appId"
-                                (filterClick)="onProcessFilterClick($event)"
-                                (onSuccess)="onSuccessProcessFilterList($event)">
-                            </activiti-process-instance-filters>
-                        </div>
-                        <div class="mdl-cell mdl-cell--3-col task-column list-column mdl-shadow--2dp" *ngIf="processFilter && !isStartProcessMode()">
                             <div class="list-buttons">
                                 <button
                                     md-raised-button
@@ -92,6 +92,17 @@
                                     <span>START PROCESS</span>
                                 </button>
                             </div>
+                            <adf-accordion>
+                                <adf-accordion-group [heading]="'Processes'" [isSelected]="true" [isOpen]="true" [headingIcon]="'assessment'">
+                                    <activiti-process-instance-filters
+                                        [appId]="appId"
+                                        (filterClick)="onProcessFilterClick($event)"
+                                        (onSuccess)="onSuccessProcessFilterList($event)">
+                                    </activiti-process-instance-filters>
+                                </adf-accordion-group>
+                            </adf-accordion>
+                        </div>
+                        <div class="mdl-cell mdl-cell--3-col task-column list-column mdl-shadow--2dp" *ngIf="processFilter && !isStartProcessMode()">
                             <activiti-process-instance-list
                                 *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId"
                                 [processDefinitionKey]="processFilter.filter.processDefinitionKey"

diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -264,6 +264,10 @@ export class ActivitiDemoComponent implements AfterViewInit {
         this.taskList.reload();
     }
 
+    onTaskDeleted(data: any) {
+        this.taskList.reload();
+    }
+
     ngAfterViewInit() {
         // workaround for MDL issues with dynamic components
         if (componentHandler) {

diff --git a/demo-shell-ng2/app/components/files/files.component.css b/demo-shell-ng2/app/components/files/files.component.css
@@ -15,8 +15,3 @@
 .error-message--text {
     color: #d50000;
 }
-
-.options-container {
-    width: 250px;
-    margin: 20px;
-}