-
-
-
+
+
+
diff --git a/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.scss b/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.scss
new file mode 100644
index 0000000000..76cb774450
--- /dev/null
+++ b/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.scss
@@ -0,0 +1,25 @@
+app-service-task-list-cloud-demo {
+ min-height: 100%;
+ min-width: 100%;
+ display: flex;
+
+ .app-task-list-with-filter, .app-task-list-container {
+ flex-direction: column;
+ display: flex;
+ flex: 1;
+ }
+
+ &, .app-task-list-container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .app-task-list-container {
+ place-content: stretch space-between;
+ align-items: stretch;
+
+ .app-cloud-layout-overflow {
+ flex: 1;
+ }
+ }
+}
diff --git a/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.ts
index 594b474982..ce88cd9dc6 100644
--- a/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.ts
+++ b/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.ts
@@ -15,9 +15,13 @@
* limitations under the License.
*/
-import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core';
-import { TaskListCloudSortingModel, ServiceTaskListCloudComponent, ServiceTaskFilterCloudModel } from '@alfresco/adf-process-services-cloud';
-import { UserPreferencesService, AppConfigService, PaginationModel } from '@alfresco/adf-core';
+import { Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import {
+ ServiceTaskFilterCloudModel,
+ ServiceTaskListCloudComponent,
+ TaskListCloudSortingModel
+} from '@alfresco/adf-process-services-cloud';
+import { AppConfigService, PaginationModel, UserPreferencesService } from '@alfresco/adf-core';
import { CloudLayoutService, CloudServiceSettings } from './services/cloud-layout.service';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
@@ -25,7 +29,10 @@ import { takeUntil } from 'rxjs/operators';
const TASK_FILTER_PROPERTY_KEYS = 'adf-edit-service-task-filter';
@Component({
- templateUrl: './service-task-list-cloud-demo.component.html'
+ selector: 'app-service-task-list-cloud-demo',
+ templateUrl: './service-task-list-cloud-demo.component.html',
+ styleUrls: ['./service-task-list-cloud-demo.component.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class ServiceTaskListCloudDemoComponent implements OnInit, OnDestroy {
@ViewChild('taskCloud')
diff --git a/demo-shell/src/app/components/cloud/shared/cloud-settings.component.html b/demo-shell/src/app/components/cloud/shared/cloud-settings.component.html
index 4a4d2076df..c28264756a 100644
--- a/demo-shell/src/app/components/cloud/shared/cloud-settings.component.html
+++ b/demo-shell/src/app/components/cloud/shared/cloud-settings.component.html
@@ -1,71 +1,67 @@
-
-
- {{ 'SETTINGS_CLOUD.MULTISELECTION' | translate }}
-
-
- {{ 'SETTINGS_CLOUD.ACTION.ACTION_MENU' | translate }}
-
-
- {{ 'SETTINGS_CLOUD.ACTION.CONTEX_MENU' | translate }}
-
-
- {{ 'SETTINGS_CLOUD.TESTING_MODE' | translate }}
-
-
- {{ 'SETTINGS_CLOUD.TASK_DETAILS_REDIRECTION' | translate }}
-
-
- {{ 'SETTINGS_CLOUD.PROCESS_DETAILS_REDIRECTION' | translate }}
-
-
-
- {{ 'SETTINGS_CLOUD.SELECTION_MODE' | translate }}
-
-
-
- {{ option.title }}
-
-
-
-
-
- {{ 'SETTINGS_CLOUD.ACTION.ACTION_TITLE' | translate }}
-
-
-
-
-
-
- {{action.title}}
-
- cancel
-
-
-
-
-
-
-
+
+ {{ 'SETTINGS_CLOUD.MULTISELECTION' | translate }}
+
+
+ {{ 'SETTINGS_CLOUD.ACTION.ACTION_MENU' | translate }}
+
+
+ {{ 'SETTINGS_CLOUD.ACTION.CONTEX_MENU' | translate }}
+
+
+ {{ 'SETTINGS_CLOUD.TESTING_MODE' | translate }}
+
+
+ {{ 'SETTINGS_CLOUD.TASK_DETAILS_REDIRECTION' | translate }}
+
+
+ {{ 'SETTINGS_CLOUD.PROCESS_DETAILS_REDIRECTION' | translate }}
+
+
+
+ {{ 'SETTINGS_CLOUD.SELECTION_MODE' | translate }}
+
+
+
+ {{ option.title }}
+
+
+
+
+
+ {{ 'SETTINGS_CLOUD.ACTION.ACTION_TITLE' | translate }}
+
+
+
+
+
+
+ {{action.title}}
+
+ cancel
+
+
+
+
+
+
diff --git a/demo-shell/src/app/components/cloud/shared/cloud-settings.component.scss b/demo-shell/src/app/components/cloud/shared/cloud-settings.component.scss
index 887fdd7773..06a13066f6 100644
--- a/demo-shell/src/app/components/cloud/shared/cloud-settings.component.scss
+++ b/demo-shell/src/app/components/cloud/shared/cloud-settings.component.scss
@@ -1,7 +1,25 @@
-.app-settings-container {
+app-cloud-settings {
padding: 20px 30px;
-}
+ flex-direction: column;
+ display: flex;
+ flex: 1;
-.app-settings-container mat-form-field {
- max-width: 200px;
+ mat-form-field {
+ max-width: 200px;
+ }
+
+ .app-cloud-settings-form {
+ display: flex;
+ place-content: center space-around;
+ align-items: center;
+
+ mat-form-field {
+ flex: 1 1 100%;
+ max-width: 23%;
+ }
+
+ mat-form-field, mat-checkbox {
+ margin-right: 20px;
+ }
+ }
}
diff --git a/demo-shell/src/app/components/cloud/shared/cloud-settings.component.ts b/demo-shell/src/app/components/cloud/shared/cloud-settings.component.ts
index cd51e926c2..3bb5fdc271 100644
--- a/demo-shell/src/app/components/cloud/shared/cloud-settings.component.ts
+++ b/demo-shell/src/app/components/cloud/shared/cloud-settings.component.ts
@@ -15,16 +15,17 @@
* limitations under the License.
*/
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { CloudLayoutService, ActionMenuModel } from '../services/cloud-layout.service';
+import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { ActionMenuModel, CloudLayoutService } from '../services/cloud-layout.service';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
-import { UntypedFormGroup, UntypedFormControl } from '@angular/forms';
+import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
@Component({
selector: 'app-cloud-settings',
templateUrl: './cloud-settings.component.html',
- styleUrls: ['./cloud-settings.component.scss']
+ styleUrls: ['./cloud-settings.component.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class CloudSettingsComponent implements OnInit, OnDestroy {
private onDestroy$ = new Subject
();
diff --git a/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts b/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts
index d0020a2106..1f9fcc64e1 100644
--- a/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts
+++ b/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts
@@ -23,7 +23,6 @@ import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select';
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { CoreModule } from '@alfresco/adf-core';
-import { FlexLayoutModule } from '@angular/flex-layout';
@NgModule({
imports: [
@@ -32,8 +31,7 @@ import { FlexLayoutModule } from '@angular/flex-layout';
MatDialogModule,
MatInputModule,
MatSelectModule,
- MatSlideToggleModule,
- FlexLayoutModule
+ MatSlideToggleModule
],
declarations: [ CloudSettingsComponent ],
exports: [ CommonModule, CloudSettingsComponent]
diff --git a/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.html b/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.html
index fa6dbde956..c0fcec543c 100644
--- a/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.html
+++ b/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.html
@@ -1,19 +1,18 @@
Simple page to show the taskId: {{ taskId }} of the app: {{ appName }}
-
-
-
-
+
+
+
+
diff --git a/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.scss b/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.scss
index ac57416dff..53d63b6220 100644
--- a/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.scss
+++ b/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.scss
@@ -1,18 +1,48 @@
-.app {
- &-task-detail-container {
- display: flex;
- }
+app-task-details-cloud-demo {
+ .app {
+ &-task-detail-container {
+ display: flex;
+ }
- &-task-title {
- margin-left: 15px;
- }
+ &-task-title {
+ margin-left: 15px;
+ }
- &-task-control {
- width: 70%;
- }
+ &-task-control {
+ width: 70%;
+ }
- &-demop-card-container {
- width: 30%;
- font-family: inherit;
+ &-demop-card-container {
+ width: 30%;
+ font-family: inherit;
+ }
+
+ &-task-details-cloud-column {
+ margin: 0;
+ flex-direction: column;
+
+ .app-task-details-cloud-row {
+ flex-direction: row;
+
+ adf-cloud-task-form {
+ flex: 1 1 100%;
+ flex-direction: column;
+ display: flex;
+ max-width: 80%;
+ }
+
+ adf-cloud-task-header {
+ flex: 1;
+ }
+ }
+ }
+
+ &-task-details-cloud-column, &-task-details-cloud-row {
+ height: 100%;
+ min-height: 100%;
+ min-width: 100%;
+ width: 100%;
+ display: flex;
+ }
}
}
diff --git a/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.ts
index ee0af477a1..dd064c2e4f 100644
--- a/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.ts
+++ b/demo-shell/src/app/components/cloud/task-details-cloud-demo.component.ts
@@ -15,15 +15,17 @@
* limitations under the License.
*/
-import { Component, ViewChild } from '@angular/core';
+import { Component, ViewChild, ViewEncapsulation } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { NotificationService } from '@alfresco/adf-core';
import { TaskHeaderCloudComponent } from '@alfresco/adf-process-services-cloud';
import { PreviewService } from '../../services/preview.service';
@Component({
+ selector: 'app-task-details-cloud-demo',
templateUrl: './task-details-cloud-demo.component.html',
- styleUrls: ['./task-details-cloud-demo.component.scss']
+ styleUrls: ['./task-details-cloud-demo.component.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class TaskDetailsCloudDemoComponent {
diff --git a/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.html b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.html
index 5840b27894..dea444b2ac 100644
--- a/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.html
+++ b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.html
@@ -1,72 +1,70 @@
-
-
-
-
-
-
-
-
-
-
- {{ 'SETTINGS_CLOUD.SELECTED_ROWS' | translate }}:
-
+
+
+
+
+
+
+
+
+
+ {{ 'SETTINGS_CLOUD.SELECTED_ROWS' | translate }}:
+
+
+
+
{{ 'SETTINGS_CLOUD.ACTION.ACTION_MENU' | translate }}:
+
+
+ {{ 'SETTINGS_CLOUD.ACTION.TASK_ID' | translate }}: {{ selectedAction.id }}
+ {{ 'SETTINGS_CLOUD.ACTION.ACTION_TYPE' | translate }}: {{ selectedAction.actionType }}
-
-
{{ 'SETTINGS_CLOUD.ACTION.ACTION_MENU' | translate }}:
-
-
- {{ 'SETTINGS_CLOUD.ACTION.TASK_ID' | translate }}: {{ selectedAction.id }}
- {{ 'SETTINGS_CLOUD.ACTION.ACTION_TYPE' | translate }}: {{ selectedAction.actionType }}
-
-
-
-
{{ 'SETTINGS_CLOUD.ACTION.CONTEX_MENU' | translate }}:
-
-
- {{ 'SETTINGS_CLOUD.ACTION.TASK_ID' | translate }}: {{ selectedContextAction.id }}
- {{ 'SETTINGS_CLOUD.ACTION.ACTION_TYPE' | translate }}: {{ selectedContextAction.actionType }}
-
+
+
+
{{ 'SETTINGS_CLOUD.ACTION.CONTEX_MENU' | translate }}:
+
+
+ {{ 'SETTINGS_CLOUD.ACTION.TASK_ID' | translate }}: {{ selectedContextAction.id }}
+ {{ 'SETTINGS_CLOUD.ACTION.ACTION_TYPE' | translate }}: {{ selectedContextAction.actionType }}
diff --git a/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.scss b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.scss
new file mode 100644
index 0000000000..e46fec9dcd
--- /dev/null
+++ b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.scss
@@ -0,0 +1,22 @@
+app-tasks-cloud-demo {
+ height: 100%;
+ min-height: 100%;
+ min-width: 100%;
+ width: 100%;
+
+ .adf-cloud-task-list-container {
+ box-sizing: border-box;
+ place-content: stretch space-between;
+ align-items: stretch;
+ margin-top: 2px;
+ }
+
+ &, .adf-cloud-task-list-container {
+ flex-direction: column;
+ display: flex;
+ }
+
+ .adf-cloud-task-list-container, .app-cloud-layout-overflow {
+ flex: 1;
+ }
+}
diff --git a/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.ts b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.ts
index 2e502896c3..be9f08555a 100644
--- a/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.ts
+++ b/demo-shell/src/app/components/cloud/tasks-cloud-demo.component.ts
@@ -15,9 +15,13 @@
* limitations under the License.
*/
-import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core';
-import { TaskListCloudComponent, TaskListCloudSortingModel, TaskFilterCloudModel } from '@alfresco/adf-process-services-cloud';
-import { UserPreferencesService, AppConfigService, DataCellEvent } from '@alfresco/adf-core';
+import { Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
+import {
+ TaskFilterCloudModel,
+ TaskListCloudComponent,
+ TaskListCloudSortingModel
+} from '@alfresco/adf-process-services-cloud';
+import { AppConfigService, DataCellEvent, UserPreferencesService } from '@alfresco/adf-core';
import { ActivatedRoute, Router } from '@angular/router';
import { CloudLayoutService } from './services/cloud-layout.service';
import { Subject } from 'rxjs';
@@ -28,7 +32,10 @@ const ACTION_DELETE = 'delete';
const TASK_FILTER_PROPERTY_KEYS = 'adf-edit-task-filter';
@Component({
- templateUrl: './tasks-cloud-demo.component.html'
+ selector: 'app-tasks-cloud-demo',
+ templateUrl: './tasks-cloud-demo.component.html',
+ styleUrls: ['./tasks-cloud-demo.component.scss'],
+ encapsulation: ViewEncapsulation.None
})
export class TasksCloudDemoComponent implements OnInit, OnDestroy {
@ViewChild('taskCloud')
diff --git a/demo-shell/src/app/components/files/custom-sources.component.html b/demo-shell/src/app/components/files/custom-sources.component.html
index b580d9ec68..4ebb97c10d 100644
--- a/demo-shell/src/app/components/files/custom-sources.component.html
+++ b/demo-shell/src/app/components/files/custom-sources.component.html
@@ -8,7 +8,7 @@
-
+
-
-
-
+
-
-
+
-