-
+
+
-
-
-
+
-
-
+
-
+
{{'PS-TAB.AUDIT-LOG' | translate}}
@@ -92,7 +90,7 @@
-
+
-
-
-
+
+
+
-
-
-
+
-
-
+
-
+
-
- {{'PS-TAB.START-PROCESS' | translate}}
+ {{'PS-TAB.AUDIT-LOG' | translate}}
-
-
+
-
-
+
+
-
-
-
+
+
-
@@ -14,40 +14,42 @@
{{errorMessage}}
- Report List
-
+
-
+
@@ -20,10 +23,10 @@
@@ -20,10 +23,10 @@
+
+
+
+ {{link.icon}}
+ {{link.title}}
+
+
+ exit_to_app
+ Logout
+
+
+
+
+
+
+
+
+ ADF Demo Application
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/demo-shell-ng2/app/components/app-layout/app-layout.component.scss b/demo-shell-ng2/app/components/app-layout/app-layout.component.scss
new file mode 100644
index 00000000000..f9aebf51388
--- /dev/null
+++ b/demo-shell-ng2/app/components/app-layout/app-layout.component.scss
@@ -0,0 +1,52 @@
+@mixin adf-app-layout-theme($theme) {
+ $primary: map-get($theme, primary);
+ $minimumAppWidth: 320px;
+ $toolbarHeight: 64px;
+
+ .adf-app-layout {
+ display: block;
+ min-width: $minimumAppWidth;
+ height: 100%;
+
+ .adf-nav-container {
+ display: block;
+ min-width: $minimumAppWidth;
+ height: 100%;
+ }
+
+ .adf-sidenav-link {
+ &.active {
+ color: mat-color($primary);
+ }
+ }
+
+ &-user-profile {
+ margin-right: 10px;
+ }
+
+ &-menu-spacer {
+ flex: 1 1 auto;
+ }
+
+ &-toolbar {
+ height: $toolbarHeight;
+ line-height: $toolbarHeight;
+ overflow: hidden;
+
+ md-toolbar-row {
+ height: $toolbarHeight;
+ align-items: stretch;
+ justify-content: space-between;
+ }
+
+ .adf-toolbar-link {
+ min-width: 0;
+ line-height: $toolbarHeight;
+
+ &.active {
+ background-color: rgba(0,0,0,.12);
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/demo-shell-ng2/app/components/app-layout/app-layout.component.ts b/demo-shell-ng2/app/components/app-layout/app-layout.component.ts
new file mode 100644
index 00000000000..494a107fa27
--- /dev/null
+++ b/demo-shell-ng2/app/components/app-layout/app-layout.component.ts
@@ -0,0 +1,53 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, ViewEncapsulation } from '@angular/core';
+import { AlfrescoTranslationService } from 'ng2-alfresco-core';
+
+@Component({
+ templateUrl: 'app-layout.component.html',
+ styleUrls: ['app-layout.component.scss'],
+ host: {
+ 'class': 'adf-app-layout'
+ },
+ encapsulation: ViewEncapsulation.None
+})
+export class AppLayoutComponent {
+
+ links: Array = [
+ { href: '/home', icon: 'home', title: 'Home' },
+ { href: '/files', icon: 'folder_open', title: 'Content Services' },
+ { href: '/activiti', icon: 'device_hub', title: 'Process Services' },
+ { href: '/login', icon: 'vpn_key', title: 'Login' },
+ { href: '/dl-custom-sources', icon: 'extension', title: 'DL: Custom Sources' },
+ { href: '/datatable', icon: 'view_module', title: 'DataTable' },
+ { href: '/form', icon: 'poll', title: 'Form' },
+ { href: '/form-list', icon: 'library_books', title: 'Form List' },
+ { href: '/uploader', icon: 'file_upload', title: 'Uploader' },
+ { href: '/webscript', icon: 'extension', title: 'Webscript' },
+ { href: '/tag', icon: 'local_offer', title: 'Tag' },
+ { href: '/social', icon: 'thumb_up', title: 'Social' },
+ { href: '/settings', icon: 'settings', title: 'Settings' },
+ { href: '/about', icon: 'info_outline', title: 'About' }
+ ];
+
+ constructor(private translateService: AlfrescoTranslationService) {}
+
+ changeLanguage(lang: string) {
+ this.translateService.use(lang);
+ }
+}
diff --git a/demo-shell-ng2/app/components/datatable/datatable-demo.component.css b/demo-shell-ng2/app/components/datatable/datatable-demo.component.css
index cf1e8fe8da1..207585ba571 100644
--- a/demo-shell-ng2/app/components/datatable/datatable-demo.component.css
+++ b/demo-shell-ng2/app/components/datatable/datatable-demo.component.css
@@ -1,10 +1,10 @@
-alfresco-datatable >>> .custom-row-style.alfresco-datatable__row:focus {
+adf-datatable ::ng-deep .custom-row-style.alfresco-datatable__row:focus {
outline-offset: -1px;
outline-width: 1px;
outline-color: green;
outline-style: solid;
}
-alfresco-datatable >>> .custom-row-style.alfresco-datatable__row--selected {
+adf-datatable ::ng-deep .custom-row-style.alfresco-datatable__row--selected {
color: green;
}
diff --git a/demo-shell-ng2/app/components/file-view/file-view.component.html b/demo-shell-ng2/app/components/file-view/file-view.component.html
new file mode 100644
index 00000000000..050da36d0d4
--- /dev/null
+++ b/demo-shell-ng2/app/components/file-view/file-view.component.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
diff --git a/demo-shell-ng2/app/components/file-view/file-view.component.ts b/demo-shell-ng2/app/components/file-view/file-view.component.ts
new file mode 100644
index 00000000000..6137f1b5751
--- /dev/null
+++ b/demo-shell-ng2/app/components/file-view/file-view.component.ts
@@ -0,0 +1,53 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AlfrescoApiService } from 'ng2-alfresco-core';
+
+@Component({
+ selector: 'adf-file-view',
+ templateUrl: 'file-view.component.html'
+})
+export class FileViewComponent implements OnInit {
+
+ nodeId: string = null;
+
+ constructor(
+ private router: Router,
+ private route: ActivatedRoute,
+ private apiService: AlfrescoApiService) {}
+
+ ngOnInit() {
+ this.route.params.subscribe(params => {
+ const id = params.nodeId;
+ if (id) {
+ this.apiService.getInstance().nodes.getNodeInfo(id).then(
+ (node) => {
+ if (node && node.isFile) {
+ this.nodeId = id;
+ return;
+ }
+ this.router.navigate(['/files', id]);
+ },
+ () => this.router.navigate(['/files', id])
+ );
+ }
+ });
+ }
+
+}
diff --git a/demo-shell-ng2/app/components/files/files.component.css b/demo-shell-ng2/app/components/files/files.component.css
deleted file mode 100644
index 62054c10771..00000000000
--- a/demo-shell-ng2/app/components/files/files.component.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.container {
- margin: 10px;
-}
-
-@media only screen and (max-width: 640px) {
- .container {
- margin: 0;
- }
-}
-
-.error-message {
- text-align: left;
-}
-
-.error-message--text {
- color: #d50000;
-}
-
-.adf-not-overlay-viewer {
- height:900px;
-}
-
-adf-document-list >>> adf-datatable tr.is-selected .image-table-cell {
- position: relative;
-}
-
-adf-document-list >>> adf-datatable tr.document-list__create {
- background: green !important;
-}
-
-adf-document-list >>> adf-datatable tr.document-list__disable {
- background: red !important;
-}
-
-adf-document-list >>> adf-datatable tr.is-selected .image-table-cell::before {
- content: "\E876"; /* "done" */
- font-family: "Material Icons";
- font-size: 24px;
- line-height: 32px;
- text-align: center;
- color: white;
- position: absolute;
- width: 32px;
- height: 32px;
- top: 50%;
- left: 50%;
- margin-top: -16px;
- margin-left: -12px;
- border-radius: 100%;
- background: #00bcd4;
-}
-
-.adf-demo-site-container-style {
- margin-top: 10px;
- margin-bottom: 10px;
- width: 100%;
- min-width: 200px;
-}
-
-
diff --git a/demo-shell-ng2/app/components/files/files.component.html b/demo-shell-ng2/app/components/files/files.component.html
index 3f4ba40def1..1f218c0a180 100644
--- a/demo-shell-ng2/app/components/files/files.component.html
+++ b/demo-shell-ng2/app/components/files/files.component.html
@@ -3,8 +3,8 @@
-
{{'ANALYTICS_REPORT.NO_REPORT_MESSAGE' | translate}}
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.scss b/demo-shell-ng2/app/components/activiti/activiti-demo.component.scss
new file mode 100644
index 00000000000..3b297a204a6
--- /dev/null
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.scss
@@ -0,0 +1,106 @@
+
+.adf-no-form-container {
+ text-align: center;
+ font-weight: 600;
+ font-size: 18px;
+}
+
+.activiti-demo-grid {
+
+ .activiti-demo-grid-item {
+ margin: 4px;
+ box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
+ padding: 10px;
+ }
+
+ .activiti-demo-list-buttons {
+ margin-bottom: 24px;
+ }
+
+ .activiti-demo-list-buttons-start {
+ width: 100%;
+ }
+
+ .activiti-demo-tasks-list.small-pagination,
+ .activiti-demo-processes-list.small-pagination {
+ .adf-pagination {
+
+ flex-wrap: wrap;
+ padding-bottom: 24px;
+ padding-top: 8px;
+
+ &__block {
+ border-right: none;
+ }
+
+ &__range-block.adf-pagination__block:first-child {
+ order: 1;
+ width: 60%;
+ flex: 0 0 auto;
+ box-sizing: border-box;
+ padding-left: 2px;
+ justify-content: flex-start;
+ }
+
+ &__perpage-block {
+ order: 3;
+ width: 60%;
+ box-sizing: border-box;
+ padding-left: 2px;
+ justify-content: flex-start;
+ }
+
+ &__actualinfo-block {
+ order: 2;
+ width: 40%;
+ box-sizing: border-box;
+ padding-right: 2px;
+ justify-content: flex-end;
+ }
+
+ &__controls-block {
+ order: 4;
+ width: 40%;
+ box-sizing: border-box;
+ padding-right: 2px;
+ justify-content: flex-end;
+ }
+ }
+ }
+
+ .activiti-demo-list {
+ .adf-data-table {
+ border: none;
+ }
+
+ .adf-data-table tr,
+ .adf-data-table td {
+ height: 36px;
+ font-size: 14px;
+ }
+
+ .adf-data-table td {
+ padding-top: 0;
+ padding-bottom: 0;
+ border-bottom: none;
+ }
+
+ .adf-data-table th {
+ padding-top: 0;
+ padding-bottom: 0;
+ height: 40px;
+ vertical-align: middle;
+ font-size: 14px;
+ }
+ }
+
+ @media screen and (max-width: 1279px) {
+ container-widget .grid-list {
+ flex-direction: column;
+
+ .grid-list-item {
+ width: 100% !important;
+ }
+ }
+ }
+}
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
index 8ad9141f2d4..bcde6be5abf 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -16,11 +16,14 @@
*/
// tslint:disable-next-line:adf-file-name
-import { AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Pagination } from 'alfresco-js-api';
import { AnalyticsReportListComponent } from 'ng2-activiti-analytics';
-import { FORM_FIELD_VALIDATORS, FormEvent, FormFieldEvent, FormRenderingService, FormService } from 'ng2-activiti-form';
+import {
+ DynamicTableRow, FORM_FIELD_VALIDATORS, FormEvent, FormFieldEvent, FormRenderingService,
+ FormService, ValidateDynamicTableRowEvent
+} from 'ng2-activiti-form';
import {
FilterProcessRepresentationModel,
ProcessFiltersComponent,
@@ -48,15 +51,14 @@ import { Subscription } from 'rxjs/Rx';
import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component';
import { DemoFieldValidator } from './demo-field-validator';
-declare var componentHandler;
-
const currentProcessIdNew = '__NEW__';
const currentTaskIdNew = '__NEW__';
@Component({
- selector: 'activiti-demo',
+ selector: 'adf-activiti-demo',
templateUrl: './activiti-demo.component.html',
- styleUrls: ['./activiti-demo.component.css']
+ styleUrls: ['./activiti-demo.component.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
@@ -90,7 +92,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
fileShowed: boolean = false;
selectFirstReport: boolean = false;
- private tabs = { tasks : 0 , processes : 1, reports: 2};
+ private tabs = { tasks: 0, processes: 1, reports: 2 };
content: Blob;
contentName: string;
@@ -99,14 +101,14 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
currentTaskId: string;
currentProcessInstanceId: string;
- taskSchemaColumns: any [] = [];
+ taskSchemaColumns: any[] = [];
taskPagination: Pagination = {
skipCount: 0,
maxItems: 10,
totalItems: 0
};
taskPage: number = 0;
- processSchemaColumns: any [] = [];
+ processSchemaColumns: any[] = [];
activeTab: number = this.tabs.tasks; // tasks|processes|reports
@@ -159,6 +161,17 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
console.log(`Field value changed. Form: ${e.form.id}, Field: ${e.field.id}, Value: ${e.field.value}`);
});
+ formService.validateDynamicTableRow.subscribe(
+ (e: ValidateDynamicTableRowEvent) => {
+ const row: DynamicTableRow = e.row;
+ if (row && row.value && row.value.name === 'admin') {
+ e.summary.isValid = false;
+ e.summary.text = 'Sorry, wrong value. You cannot use "admin".';
+ e.preventDefault();
+ }
+ }
+ );
+
// Uncomment this block to see form event handling in action
/*
formService.formEvents.subscribe((event: Event) => {
@@ -199,13 +212,13 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
ngOnInit() {
this.taskListService.tasksList$.subscribe(
(tasks) => {
- this.taskPagination = {count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total};
- console.log({count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total});
+ this.taskPagination = { count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total };
+ console.log({ count: tasks.data.length, maxItems: this.taskPagination.maxItems, skipCount: this.taskPagination.skipCount, totalItems: tasks.total });
}, (err) => {
- console.log('err');
- });
+ console.log('err' + err);
+ });
- if (this.router.url.includes('processes') ) {
+ if (this.router.url.includes('processes')) {
this.activeTab = this.tabs.processes;
}
this.sub = this.route.params.subscribe(params => {
@@ -225,6 +238,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
ngOnDestroy() {
this.sub.unsubscribe();
+ this.taskListService.tasksList$.subscribe();
}
onTaskFilterClick(filter: FilterRepresentationModel): void {
@@ -277,6 +291,16 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
this.currentTaskId = taskId;
}
+ onTaskRowDblClick(event: CustomEvent) {
+ const taskId = event.detail.value.obj.id;
+ this.currentTaskId = taskId;
+ }
+
+ onProcessRowDblClick(event: CustomEvent) {
+ const processInstanceId = event.detail.value.obj.id;
+ this.currentProcessInstanceId = processInstanceId;
+ }
+
onProcessRowClick(processInstanceId): void {
this.currentProcessInstanceId = processInstanceId;
}
@@ -309,7 +333,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
onStartProcessInstance(instance: ProcessInstance): void {
this.currentProcessInstanceId = instance.id;
this.activitiStartProcess.reset();
- this.resetProcessFilters();
+ this.activitiprocessfilter.selectRunningFilter();
}
onCancelProcessInstance() {
@@ -369,11 +393,6 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
}
ngAfterViewInit() {
- // workaround for MDL issues with dynamic components
- if (componentHandler) {
- componentHandler.upgradeAllRegistered();
- }
-
this.loadStencilScriptsInPageFromActiviti();
}
@@ -403,8 +422,10 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
created: event.value.created
});
this.activitifilter.selectFilter(null);
- this.taskList.setCustomDataSource([processTaskDataRow]);
- this.taskList.selectTask(taskId);
+ if (this.taskList) {
+ this.taskList.setCustomDataSource([processTaskDataRow]);
+ this.taskList.selectTask(taskId);
+ }
this.currentTaskId = taskId;
}
diff --git a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.css b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.css
index 5aadf220a03..5989db0e26c 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.css
+++ b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.css
@@ -1,3 +1,3 @@
-adf-create-process-attachment >>> button {
+adf-create-process-attachment ::ng-deep button {
float: right;
}
diff --git a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html
index 2fe07f5a1c6..40c432c332c 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.html
@@ -3,15 +3,18 @@ Attachments
Attachments
-
-
+
diff --git a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
index 0c317b6b9ad..487faefa465 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-process-attachments.component.ts
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
import { ProcessAttachmentListComponent, ProcessUploadService } from 'ng2-activiti-processlist';
+import { ProcessInstance, ProcessService } from 'ng2-activiti-processlist';
import { UploadService } from 'ng2-alfresco-core';
@Component({
@@ -24,11 +25,11 @@ import { UploadService } from 'ng2-alfresco-core';
templateUrl: './activiti-process-attachments.component.html',
styleUrls: ['./activiti-process-attachments.component.css'],
providers: [
- { provide: UploadService, useClass: ProcessUploadService }
+ {provide: UploadService, useClass: ProcessUploadService}
]
})
-export class ActivitiProcessAttachmentsComponent implements OnInit {
+export class ActivitiProcessAttachmentsComponent implements OnInit, OnChanges {
@Input()
processId: string;
@@ -39,15 +40,23 @@ export class ActivitiProcessAttachmentsComponent implements OnInit {
fileShowed: boolean = false;
content: Blob;
contentName: string;
+ processInstance: ProcessInstance;
- constructor(private uploadService: UploadService) {
-
+ constructor(private uploadService: UploadService, private processService: ProcessService) {
}
ngOnInit() {
this.uploadService.fileUploadComplete.subscribe(value => this.onFileUploadComplete(value.data));
}
+ ngOnChanges() {
+ if (this.processId) {
+ this.processService.getProcess(this.processId).subscribe((processInstance: ProcessInstance) => {
+ this.processInstance = processInstance;
+ });
+ }
+ }
+
onFileUploadComplete(content: any) {
this.processAttachList.add(content);
}
@@ -58,4 +67,8 @@ export class ActivitiProcessAttachmentsComponent implements OnInit {
this.contentName = content.name;
}
+ isCompletedProcess(): boolean {
+ return this.processInstance && this.processInstance.ended !== undefined && this.processInstance.ended !== null;
+ }
+
}
diff --git a/demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.html b/demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.html
index fb812041e8c..6bac0d752a1 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.html
@@ -1,4 +1,4 @@
-
diff --git a/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.css b/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.css
index b2f81426048..b267b82e421 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.css
+++ b/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.css
@@ -1,3 +1,3 @@
-adf-create-task-attachment >>> button {
+adf-create-task-attachment ::ng-deep button {
float: right;
}
diff --git a/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.html b/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.html
index 72871b82b6c..614eb855bf9 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.html
@@ -3,15 +3,18 @@ Attachments
Attachments
-
-
+
diff --git a/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.ts b/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.ts
index 4d5cda21326..e10f87513cc 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-task-attachments.component.ts
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
import { ProcessUploadService, TaskAttachmentListComponent } from 'ng2-activiti-tasklist';
+import { ActivitiTaskListService } from 'ng2-activiti-tasklist';
import { UploadService } from 'ng2-alfresco-core';
@Component({
@@ -28,7 +29,7 @@ import { UploadService } from 'ng2-alfresco-core';
]
})
-export class ActivitiTaskAttachmentsComponent implements OnInit {
+export class ActivitiTaskAttachmentsComponent implements OnInit, OnChanges {
@Input()
taskId: string;
@@ -40,7 +41,10 @@ export class ActivitiTaskAttachmentsComponent implements OnInit {
content: Blob;
contentName: string;
- constructor(private uploadService: UploadService) {
+ taskDetails: any;
+
+ constructor(private uploadService: UploadService,
+ private activitiTaskList: ActivitiTaskListService) {
}
@@ -48,6 +52,15 @@ export class ActivitiTaskAttachmentsComponent implements OnInit {
this.uploadService.fileUploadComplete.subscribe(value => this.onFileUploadComplete(value.data));
}
+ ngOnChanges() {
+ if (this.taskId) {
+ this.activitiTaskList.getTaskDetails(this.taskId).map((res) => res).subscribe(
+ (res: any) => {
+ this.taskDetails = res;
+ });
+ }
+ }
+
onFileUploadComplete(content: any) {
this.taskAttachList.add(content);
}
@@ -58,4 +71,7 @@ export class ActivitiTaskAttachmentsComponent implements OnInit {
this.contentName = content.name;
}
+ isCompletedTask(): boolean {
+ return this.taskDetails && this.taskDetails.endDate !== undefined && this.taskDetails.endDate !== null;
+ }
}
diff --git a/demo-shell-ng2/app/components/activiti/form-node-viewer.component.html b/demo-shell-ng2/app/components/activiti/form-node-viewer.component.html
index e2f166282b9..c66bacf0545 100644
--- a/demo-shell-ng2/app/components/activiti/form-node-viewer.component.html
+++ b/demo-shell-ng2/app/components/activiti/form-node-viewer.component.html
@@ -1,6 +1,6 @@
-
-
+
diff --git a/demo-shell-ng2/app/components/activiti/form-viewer.component.html b/demo-shell-ng2/app/components/activiti/form-viewer.component.html
index 2a5c98ccdb4..acda361721e 100644
--- a/demo-shell-ng2/app/components/activiti/form-viewer.component.html
+++ b/demo-shell-ng2/app/components/activiti/form-viewer.component.html
@@ -1,11 +1,11 @@
-
diff --git a/demo-shell-ng2/app/components/app-layout/app-layout.component.html b/demo-shell-ng2/app/components/app-layout/app-layout.component.html
new file mode 100644
index 00000000000..5f0f5131ea5
--- /dev/null
+++ b/demo-shell-ng2/app/components/app-layout/app-layout.component.html
@@ -0,0 +1,49 @@
+
+
+
+
+
- Current folder ID: {{ documentList.currentFolderId }}
- -
- Selected Nodes:
-
-
--
-
- - {{ node.entry.name }} - -
-
- Use inline viewer (no overlay)
-
-
-
- Use File Viewer dialog
-
-
-
- Multiselect (with checkboxes)
-
-
-
- Dropdown breadcrumb
-
-
-
- Multiple File Upload
-
+
-
- Folder upload
-
-
-
- Custom extensions filter
-
-
-
- Enable versioning
-
-
-
- Disable upload button when user has no permissions
-
-
-
-
-
-
-
-
Upload
-
-
-
+ ): boolean {
diff --git a/demo-shell-ng2/app/components/form/demo-form.ts b/demo-shell-ng2/app/components/form/demo-form.ts
index a496247facb..daae995c37b 100644
--- a/demo-shell-ng2/app/components/form/demo-form.ts
+++ b/demo-shell-ng2/app/components/form/demo-form.ts
@@ -2,14 +2,14 @@
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
diff --git a/demo-shell-ng2/app/components/form/form-list-demo.component.ts b/demo-shell-ng2/app/components/form/form-list-demo.component.ts
index 162b04084b9..90b9eb930ff 100644
--- a/demo-shell-ng2/app/components/form/form-list-demo.component.ts
+++ b/demo-shell-ng2/app/components/form/form-list-demo.component.ts
@@ -66,8 +66,8 @@ export class FormListDemoComponent {
onRowDblClick(event: CustomEvent) {
let rowForm = event.detail.value.obj;
- this.formService.getFormDefinitionById(rowForm.id).subscribe((definition) => {
- let form = this.formService.parseForm(definition);
+ this.formService.getFormDefinitionById(rowForm.id).subscribe((formModel) => {
+ let form = this.formService.parseForm(formModel.formDefinition);
this.form = form;
});
diff --git a/demo-shell-ng2/app/components/home/home.component.css b/demo-shell-ng2/app/components/home/home.component.scss
similarity index 70%
rename from demo-shell-ng2/app/components/home/home.component.css
rename to demo-shell-ng2/app/components/home/home.component.scss
index c2f3fabcdf6..ef2f88a86ce 100644
--- a/demo-shell-ng2/app/components/home/home.component.css
+++ b/demo-shell-ng2/app/components/home/home.component.scss
@@ -5,6 +5,18 @@
display: block;
overflow-y: auto;
height: 400px;
+
+ h2 {
+ line-height: 30px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ .material-icons {
+ position: relative;
+ top: 6px;
+ }
}
.adf-home-card-title {
diff --git a/demo-shell-ng2/app/components/home/home.component.ts b/demo-shell-ng2/app/components/home/home.component.ts
index 06cb1aaccb3..e9ac7cca29d 100644
--- a/demo-shell-ng2/app/components/home/home.component.ts
+++ b/demo-shell-ng2/app/components/home/home.component.ts
@@ -20,6 +20,6 @@ import { Component } from '@angular/core';
@Component({
selector: 'home-view',
templateUrl: './home.component.html',
- styleUrls: ['./home.component.css']
+ styleUrls: ['./home.component.scss']
})
export class HomeComponent {}
diff --git a/demo-shell-ng2/app/components/login/login-demo.component.css b/demo-shell-ng2/app/components/login/login-demo.component.css
index 32185b2b029..db7a0976961 100644
--- a/demo-shell-ng2/app/components/login/login-demo.component.css
+++ b/demo-shell-ng2/app/components/login/login-demo.component.css
@@ -35,6 +35,6 @@
}
}
-.settings >>> .mat-slide-toggle-thumb-container {
+.settings ::ng-deep .mat-slide-toggle-thumb-container {
cursor: pointer;
}
diff --git a/demo-shell-ng2/app/components/login/login-demo.component.html b/demo-shell-ng2/app/components/login/login-demo.component.html
index 3d2cbab27e8..d1c4bc48b37 100644
--- a/demo-shell-ng2/app/components/login/login-demo.component.html
+++ b/demo-shell-ng2/app/components/login/login-demo.component.html
@@ -45,21 +45,22 @@
settings
-
+
+ (nodeDbClick)="nodeDbClick($event)">
{{'SETTINGS.CS-HOST' | translate }}
- link
+ link
{{'SETTINGS.TITLE' | translate}}
{{'SETTINGS.BP-HOST' | translate }}
- link
+ link
{{'SETTINGS.TITLE' | translate}}
-
+
-
Current folder ID: {{ documentList.currentFolderId }}
+ +
+ Selected Nodes:
+
- -
+
- + {{ node.entry.name }} + +
-
-
+
+
- Enable upload (demoing enabled/disabled state only if the permission are not checked dynamically)
-
-
-
-
+
+ Multiselect (with checkboxes)
+
+
+
+ Multiple File Upload
+
+
+
+ Folder upload
+
+
+
+ Custom extensions filter
+
+
+
+ Enable versioning
+
+
+
+
+
+
+
+
+ Enable upload (demoing enabled/disabled state only if the permission are not checked dynamically)
+
- Upload
+
+
+
+
+
+
+
+
+
-
-
- {{mode.viewValue}}
-
-
+
+
For 'Multiple' selection mode use Cmd (macOS) or Ctrl (Win) to toggle selection of multiple items.
-
+
+
+ {{mode.viewValue}}
+
+
+
For 'Multiple' selection mode use Cmd (macOS) or Ctrl (Win) to toggle selection of multiple items.
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/demo-shell-ng2/app/components/files/files.component.scss b/demo-shell-ng2/app/components/files/files.component.scss
new file mode 100644
index 00000000000..9cbbedf0069
--- /dev/null
+++ b/demo-shell-ng2/app/components/files/files.component.scss
@@ -0,0 +1,93 @@
+$minimumDocumentListWidth: 425px;
+
+.container {
+ margin: 10px;
+}
+
+@media only screen and (max-width: 640px) {
+ .container {
+ margin: 0;
+ }
+}
+
+.error-message {
+ text-align: left;
+}
+
+.error-message--text {
+ color: #d50000;
+}
+
+.adf-not-overlay-viewer {
+ height:900px;
+}
+
+adf-document-list ::ng-deep adf-datatable tr.is-selected .image-table-cell {
+ position: relative;
+}
+
+adf-document-list ::ng-deep adf-datatable tr.document-list__create {
+ background: green !important;
+}
+
+adf-document-list ::ng-deep adf-datatable tr.document-list__disable {
+ background: red !important;
+}
+
+adf-document-list ::ng-deep adf-datatable tr.is-selected .image-table-cell::before {
+ content: "\E876"; /* "done" */
+ font-family: "Material Icons";
+ font-size: 24px;
+ line-height: 32px;
+ text-align: center;
+ color: white;
+ position: absolute;
+ width: 32px;
+ height: 32px;
+ top: 50%;
+ left: 50%;
+ margin-top: -16px;
+ margin-left: -12px;
+ border-radius: 100%;
+ background: #00bcd4;
+}
+
+.adf-demo-site-container-style {
+ margin-top: 10px;
+ margin-bottom: 10px;
+ width: 100%;
+ min-width: 200px;
+}
+
+.adf-content-service-settings {
+ padding: 16px;
+}
+
+.adf-files-toolbar {
+ & /deep/ md-toolbar-row {
+ white-space: initial;
+
+ & /deep/ a.adf-breadcrumb-item-anchor {
+ white-space: initial;
+ }
+ }
+}
+
+@media (max-width: $minimumDocumentListWidth) {
+ adf-document-list /deep/ adf-datatable {
+ & /deep/ .adf-data-table-cell--fileSize {
+ display: none;
+ }
+ }
+
+ .adf-demo-site-container-style {
+ width: 100%;
+ display: block;
+
+ & /deep/ .adf-site-dropdown-list-element {
+ width: 100%;
+ }
+ }
+}
+
+
diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts
index 49fa245059c..9c33269d766 100644
--- a/demo-shell-ng2/app/components/files/files.component.ts
+++ b/demo-shell-ng2/app/components/files/files.component.ts
@@ -27,25 +27,22 @@ import {
import { DataColumn, DataRow } from 'ng2-alfresco-datatable';
import { DocumentListComponent, PermissionStyleModel } from 'ng2-alfresco-documentlist';
-import { ViewerService } from 'ng2-alfresco-viewer';
+const DEFAULT_FOLDER_TO_SHOW = '-my-';
@Component({
selector: 'adf-files-component',
templateUrl: './files.component.html',
- styleUrls: ['./files.component.css']
+ styleUrls: ['./files.component.scss']
})
export class FilesComponent implements OnInit {
// The identifier of a node. You can also use one of these well-known aliases: -my- | -shared- | -root-
- currentFolderId: string = '-my-';
+ currentFolderId: string = DEFAULT_FOLDER_TO_SHOW;
errorMessage: string = null;
fileNodeId: any;
showViewer: boolean = false;
toolbarColor = 'default';
- useDropdownBreadcrumb = false;
- useViewerDialog = true;
- useInlineViewer = false;
selectionModes = [
{ value: 'none', viewValue: 'None' },
@@ -62,9 +59,6 @@ export class FilesComponent implements OnInit {
@Input()
multipleFileUpload: boolean = false;
- @Input()
- disableWithNoPermission: boolean = false;
-
@Input()
folderUpload: boolean = false;
@@ -92,31 +86,19 @@ export class FilesComponent implements OnInit {
private contentService: AlfrescoContentService,
private dialog: MdDialog,
private translateService: AlfrescoTranslationService,
- private viewerService: ViewerService,
private router: Router,
@Optional() private route: ActivatedRoute) {
}
showFile(event) {
- if (this.useViewerDialog) {
- if (event.value.entry.isFile) {
- this.viewerService
- .showViewerForNode(event.value.entry)
- .then(result => {
- console.log(result);
- });
- }
- } else {
- if (event.value.entry.isFile) {
- this.fileNodeId = event.value.entry.id;
- this.showViewer = true;
- } else {
- this.showViewer = false;
- }
+ const entry = event.value.entry;
+ if (entry && entry.isFile) {
+ this.router.navigate(['/files', entry.id, 'view']);
}
}
onFolderChange($event) {
+ this.currentFolderId = $event.value.id;
this.router.navigate(['/files', $event.value.id]);
}
@@ -136,7 +118,7 @@ export class FilesComponent implements OnInit {
});
}
- this.uploadService.fileUploadComplete.debounceTime(300).subscribe(value => this.onFileUploadEvent(value));
+ this.uploadService.fileUploadComplete.asObservable().debounceTime(300).subscribe(value => this.onFileUploadEvent(value));
this.uploadService.fileUploadDeleted.subscribe((value) => this.onFileUploadEvent(value));
this.contentService.folderCreated.subscribe(value => this.onFolderCreated(value));
@@ -223,7 +205,11 @@ export class FilesComponent implements OnInit {
}
getSiteContent(site: SiteModel) {
- this.currentFolderId = site && site.guid ? site.guid : '-my-';
+ this.currentFolderId = site && site.guid ? site.guid : DEFAULT_FOLDER_TO_SHOW;
+ }
+
+ getDocumentListCurrentFolderId() {
+ return this.documentList.currentFolderId || DEFAULT_FOLDER_TO_SHOW;
}
hasSelection(selection: Array
-
-
-
-
- Search results
+ Search results
-
-
+
diff --git a/demo-shell-ng2/app/components/search/search.component.scss b/demo-shell-ng2/app/components/search/search.component.scss
new file mode 100644
index 00000000000..a8a1a2930ab
--- /dev/null
+++ b/demo-shell-ng2/app/components/search/search.component.scss
@@ -0,0 +1,20 @@
+div.search-results-container {
+ padding: 0 20px 20px 20px;
+}
+
+.adf-search-title {
+ font-size: 22px;
+ padding: 15px 0 15px 0;
+}
+
+@media screen and (max-width: 600px) {
+ :host .col-display-name {
+ min-width: 100px;
+ }
+ :host .col-modified-at, :host .col-modified-by {
+ display: none;
+ }
+ :host div.search-results-container table {
+ width: 100%;
+ }
+}
diff --git a/demo-shell-ng2/app/components/search/search.component.ts b/demo-shell-ng2/app/components/search/search.component.ts
index 7adfa19d012..35a1d22f5e1 100644
--- a/demo-shell-ng2/app/components/search/search.component.ts
+++ b/demo-shell-ng2/app/components/search/search.component.ts
@@ -21,28 +21,7 @@ import { Router } from '@angular/router';
@Component({
selector: 'search-component',
templateUrl: './search.component.html',
- styles: [`
- :host div.search-results-container {
- padding: 0 20px 20px 20px;
- }
- :host h1 {
- font-size: 22px;
- }
- :host tbody tr {
- cursor: pointer;
- }
- @media screen and (max-width: 600px) {
- :host .col-display-name {
- min-width: 100px;
- }
- :host .col-modified-at, :host .col-modified-by {
- display: none;
- }
- :host div.search-results-container table {
- width: 100%;
- }
- }
- `]
+ styleUrls: ['./search.component.scss']
})
export class SearchComponent {
diff --git a/demo-shell-ng2/app/components/settings/settings.component.css b/demo-shell-ng2/app/components/settings/settings.component.css
deleted file mode 100644
index df2ab9e2083..00000000000
--- a/demo-shell-ng2/app/components/settings/settings.component.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.adf-setting-container {
- display: table;
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-.adf-setting-card {
- width: 400px;
-}
-
-.full-width {
- width: 100%;
-}
-
-.adf-setting-card-padding {
- width: 50%;
- display: table-cell;
- vertical-align: middle;
- margin: 0;
-}
diff --git a/demo-shell-ng2/app/components/settings/settings.component.html b/demo-shell-ng2/app/components/settings/settings.component.html
index 9e66b624ac1..ced5a98a591 100644
--- a/demo-shell-ng2/app/components/settings/settings.component.html
+++ b/demo-shell-ng2/app/components/settings/settings.component.html
@@ -10,7 +10,7 @@