Merge pull request #303 from netgrif/NAE-2217

[NAE-2217] Single Task View

Author: machacjozef

projects/netgrif-components-core/src/lib/panel/public-api.ts

@@ -2,8 +2,6 @@
 export * from './abstract-panel.component';
 export * from './case-panel/abstract-case-panel.component';
 export * from './task-panel/abstract-task-panel.component';
-export * from './task-panel-list/abstract-task-list.component';
-export * from './task-panel-list/task-panel-list-pagination/abstract-task-list-pagination.component';
 export * from './workflow-panel/abstract-workflow-panel.component';
 export * from './abstract/tabbed-virtual-scroll.component';
 export * from './immediate/abstract-immediate-filter-text.component';
@@ -12,7 +10,7 @@ export * from './panel-item/abstract-panel-item.component';
 export * from './task-panel-single/abstract-single-task.component';
 
 /* DATA */
-export * from './task-panel-list/task-panel-data/task-panel-data';
+export * from './task-panel-data/task-panel-data';
 export * from './task-panel/models/disable-functions';
 export * from './abstract/featured-value';
 export * from './immediate/model/filter-text-injection-token';

…-list/task-panel-data/task-panel-data.ts …panel/task-panel-data/task-panel-data.tsprojects/netgrif-components-core/src/lib/panel/task-panel-list/task-panel-data/task-panel-data.ts renamed to projects/netgrif-components-core/src/lib/panel/task-panel-data/task-panel-data.ts projects/netgrif-components-core/src/lib/panel/task-panel-list/task-panel-data/task-panel-data.ts renamed to projects/netgrif-components-core/src/lib/panel/task-panel-data/task-panel-data.ts

@@ -1,6 +1,6 @@
-import {Task} from '../../../resources/interface/task';
+import {Task} from '../../resources/interface/task';
 import {Subject} from 'rxjs';
-import {ChangedFields} from '../../../data-fields/models/changed-fields';
+import {ChangedFields} from '../../data-fields/models/changed-fields';
 
 
 export interface TaskPanelData {

projects/netgrif-components-core/src/lib/panel/task-panel-single/abstract-single-task.component.spec.ts

@@ -29,7 +29,7 @@ import {AllowedNetsService} from '../../allowed-nets/services/allowed-nets.servi
 import {AllowedNetsServiceFactory} from '../../allowed-nets/services/factory/allowed-nets-service-factory';
 import {ActivatedRoute} from '@angular/router';
 import { AbstractSingleTaskComponent } from './abstract-single-task.component';
-import { TaskPanelData } from '../task-panel-list/task-panel-data/task-panel-data';
+import { TaskPanelData } from '../task-panel-data/task-panel-data';
 
 
 describe('AbstractSingleTaskComponent', () => {

projects/netgrif-components-core/src/lib/panel/task-panel-single/abstract-single-task.component.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Inject, Input, OnDestroy, Optional, Output, TemplateRef } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
-import { TaskPanelData } from '../task-panel-list/task-panel-data/task-panel-data';
+import { TaskPanelData } from '../task-panel-data/task-panel-data';
 import { MatExpansionPanel } from '@angular/material/expansion';
 import { HeaderColumn } from '../../header/models/header-column';
 import { TaskEventNotification } from '../../task-content/model/task-event-notification';

projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.spec.ts

@@ -36,7 +36,7 @@ import {SearchService} from '../../search/search-service/search.service';
 import {TestTaskBaseFilterProvider, TestTaskViewAllowedNetsFactory} from '../../utility/tests/test-factory-methods';
 import {ErrorSnackBarComponent} from '../../snack-bar/components/error-snack-bar/error-snack-bar.component';
 import {SuccessSnackBarComponent} from '../../snack-bar/components/success-snack-bar/success-snack-bar.component';
-import {TaskPanelData} from '../task-panel-list/task-panel-data/task-panel-data';
+import {TaskPanelData} from '../task-panel-data/task-panel-data';
 import {AssignPolicy, DataFocusPolicy, FinishPolicy} from '../../task-content/model/policy';
 import {ChangedFields} from '../../data-fields/models/changed-fields';
 import {HeaderColumn, HeaderColumnType} from '../../header/models/header-column';

projects/netgrif-components-core/src/lib/panel/task-panel/abstract-task-panel.component.ts

@@ -15,7 +15,7 @@ import {MatExpansionPanel} from '@angular/material/expansion';
 import {ComponentPortal} from '@angular/cdk/portal';
 import {TaskContentService} from '../../task-content/services/task-content.service';
 import {LoggerService} from '../../logger/services/logger.service';
-import {TaskPanelData} from '../task-panel-list/task-panel-data/task-panel-data';
+import {TaskPanelData} from '../task-panel-data/task-panel-data';
 import {Observable, Subscription} from 'rxjs';
 import {TaskViewService} from '../../view/task-view/service/task-view.service';
 import {filter, map, take} from 'rxjs/operators';
@@ -53,6 +53,7 @@ import { FinishPolicyService } from '../../task/services/finish-policy.service';
 import {NAE_TAB_DATA} from '../../tabs/tab-data-injection-token/tab-data-injection-token';
 import {InjectedTabData} from '../../tabs/interfaces';
 import {AfterAction} from '../../utility/call-chain/after-action';
+import {UnlimitedTaskContentService} from "../../task-content/services/unlimited-task-content.service";
 
 @Component({
     selector: 'ncc-abstract-legal-notice',
@@ -257,6 +258,17 @@ export abstract class AbstractTaskPanelComponent extends AbstractPanelWithImmedi
     @Input()
     public set taskPanelData(data: TaskPanelData) {
         this._taskPanelData = data;
+        if (this._taskContentService instanceof UnlimitedTaskContentService && this.panelRef) {
+            this.collapse();
+            this._taskContentService.task = this._taskPanelData.task;
+            if (this._sub) {
+                this._sub.unsubscribe();
+            }
+            this._sub = this._taskPanelData.changedFields.subscribe(chFields => {
+                this._taskContentService.updateFromChangedFields(chFields);
+            });
+            this.expand();
+        }
         this.resolveFeaturedFieldsValues();
     }
 

projects/netgrif-components-core/src/lib/task-content/model/task-content-injection-token.ts

@@ -0,0 +1,4 @@
+import {InjectionToken} from '@angular/core';
+import {TaskContentServiceType} from './task-content-service-type';
+
+export const NAE_TASK_CONTENT_SERVICE_TYPE = new InjectionToken<TaskContentServiceType>('NaeTaskContentServiceType');

projects/netgrif-components-core/src/lib/task-content/model/task-content-service-type.ts

@@ -0,0 +1,10 @@
+export enum TaskContentServiceType {
+    /**
+     * Type for creating SingleTaskContentService
+     */
+    SINGLE = 'single',
+    /**
+     * Type for creating UnlimitedTaskContentService
+     */
+    UNLIMITED = 'unlimited'
+}

projects/netgrif-components-core/src/lib/task-content/public-api.ts

@@ -4,6 +4,7 @@ export * from './services/field-converter.service';
 export * from './services/task-content.service';
 export * from './services/single-task-content.service';
 export * from './services/unlimited-task-content.service';
+export * from './services/task-content-service-factory';
 
 /* MODELS */
 export * from './model/policy';
@@ -17,6 +18,8 @@ export * from './model/async-rendering-configuration-injection-token';
 export * from './model/subgrid';
 export * from './model/split-data-group';
 export * from './model/task-fields';
+export * from './model/task-content-service-type';
+export * from './model/task-content-injection-token';
 
 /* MODULES */
 export * from './task-content/abstract-task-content.component';

projects/netgrif-components-core/src/lib/task-content/services/task-content-service-factory.ts

@@ -0,0 +1,28 @@
+import {Injectable, Injector} from "@angular/core";
+import {LoggerService} from "../../logger/services/logger.service";
+import {FieldConverterService} from "./field-converter.service";
+import {SnackBarService} from "../../snack-bar/services/snack-bar.service";
+import {TranslateService} from "@ngx-translate/core";
+import {SingleTaskContentService} from "./single-task-content.service";
+import {UnlimitedTaskContentService} from "./unlimited-task-content.service";
+
+@Injectable({
+    providedIn: 'root'
+})
+export class TaskContentServiceFactory {
+
+    constructor(protected _fieldConverterService: FieldConverterService,
+                protected _snackBarService: SnackBarService,
+                protected _translate: TranslateService,
+                protected _log: LoggerService,
+                protected _injector: Injector) {
+    }
+
+    public createSingleTaskContentService(): SingleTaskContentService {
+        return new SingleTaskContentService(this._fieldConverterService, this._snackBarService, this._translate, this._log, this._injector);
+    }
+
+    public createUnlimitedTaskContentService(): UnlimitedTaskContentService {
+        return new UnlimitedTaskContentService(this._fieldConverterService, this._snackBarService, this._translate, this._log, this._injector);
+    }
+}