[NAE-2101] release 6.4.2

projects/netgrif-components-core/src/assets/i18n/sk.json

@@ -515,6 +515,6 @@
         "pageAmount": "Strana {{page}} z {{amountPages}}"
     },
     "export": {
-        "errorExportDownload": "File failed to download!"
+        "errorExportDownload": "Stiahnutie súboru zlyhalo!"
     }
 }

projects/netgrif-components-core/src/lib/data-fields/file-field/file-default-field/abstract-file-default-field.component.spec.ts

@@ -105,9 +105,8 @@ class TestFileComponent extends AbstractFileDefaultFieldComponent {
                 translate: TranslateService,
                 sanitizer: DomSanitizer,
                 eventService: EventService,
-                @Optional() protected _taskContentService: TaskContentService,
                 @Optional() @Inject(DATA_FIELD_PORTAL_DATA) dataFieldPortalData: DataFieldPortalData<FileField>) {
-        super(taskResourceService, log, snackbar, translate, eventService, sanitizer, _taskContentService, dataFieldPortalData);
+        super(taskResourceService, log, snackbar, translate, eventService, sanitizer, dataFieldPortalData);
     }
 }
 

projects/netgrif-components-core/src/lib/data-fields/file-field/file-default-field/abstract-file-default-field.component.ts

@@ -26,7 +26,6 @@ import {DATA_FIELD_PORTAL_DATA, DataFieldPortalData} from "../../models/data-fie
 import {FILE_FIELD_HEIGHT, FILE_FIELD_PADDING, PREVIEW, PREVIEW_BUTTON} from '../models/file-field-constants';
 import {FileFieldRequest} from "../../../resources/interface/file-field-request-body";
 import {AbstractFileFieldDefaultComponent} from '../../models/abstract-file-field-default-component';
-import {TaskContentService} from "../../../task-content/services/task-content.service";
 
 export interface FileState {
     progress: number;
@@ -107,7 +106,6 @@ export abstract class AbstractFileDefaultFieldComponent extends AbstractFileFiel
      * @param _eventService used for parsing of backend response
      * Option injected trough `NAE_INFORM_ABOUT_INVALID_DATA` InjectionToken
      * @param _sanitizer Sanitize url of image preview
-     * @param _taskContentService for validating datafields on setData, optional dependency
      * @param dataFieldPortalData Field and form control data if field is provided with portal
      */
     protected constructor(protected _taskResourceService: TaskResourceService,
@@ -116,7 +114,6 @@ export abstract class AbstractFileDefaultFieldComponent extends AbstractFileFiel
                           protected _translate: TranslateService,
                           protected _eventService: EventService,
                           protected _sanitizer: DomSanitizer,
-                          @Optional() protected _taskContentService: TaskContentService,
                           @Optional() @Inject(DATA_FIELD_PORTAL_DATA) dataFieldPortalData: DataFieldPortalData<FileField>) {
         super(_log, _snackbar, _translate, dataFieldPortalData);
         this.state = this.defaultState;
@@ -213,9 +210,6 @@ export abstract class AbstractFileDefaultFieldComponent extends AbstractFileFiel
         if (!this.checkAllowedTypes()) {
             return;
         }
-        if (this.dataField.component?.properties?.validateData === 'true' && this._taskContentService && !this._taskContentService.validateTaskData()) {
-            return;
-        }
         this.state = this.defaultState;
         this.state.uploading = true;
         const fileFormData = new FormData();

projects/netgrif-components-core/src/lib/data-fields/file-list-field/file-list-default-field/abstract-file-list-default-field.component.spec.ts

@@ -28,7 +28,6 @@ import {DATA_FIELD_PORTAL_DATA, DataFieldPortalData} from "../../models/data-fie
 import {AbstractFileListDefaultFieldComponent} from "./abstract-file-list-default-field.component";
 import {FormControl} from "@angular/forms";
 import {WrappedBoolean} from "../../data-field-template/models/wrapped-boolean";
-import {TaskContentService} from "../../../task-content/services/task-content.service";
 
 describe('AbstractFileListDefaultFieldComponent', () => {
     let component: TestFileListComponent;
@@ -102,9 +101,8 @@ class TestFileListComponent extends AbstractFileListDefaultFieldComponent {
                 snackbar: SnackBarService,
                 translate: TranslateService,
                 eventService: EventService,
-                @Optional() protected _taskContentService: TaskContentService,
                 @Optional() @Inject(DATA_FIELD_PORTAL_DATA) dataFieldPortalData: DataFieldPortalData<FileListField>) {
-        super(taskResourceService, log, snackbar, translate, eventService, _taskContentService, dataFieldPortalData);
+        super(taskResourceService, log, snackbar, translate, eventService, dataFieldPortalData);
     }
 }
 

projects/netgrif-components-core/src/lib/data-fields/file-list-field/file-list-default-field/abstract-file-list-default-field.component.ts

@@ -22,7 +22,6 @@ import {take} from "rxjs/operators";
 import {FileFieldValue} from "../../file-field/models/file-field-value";
 import {FileFieldRequest} from "../../../resources/interface/file-field-request-body";
 import {AbstractFileFieldDefaultComponent} from '../../models/abstract-file-field-default-component';
-import {TaskContentService} from "../../../task-content/services/task-content.service";
 
 export interface FilesState {
     progress: number;
@@ -56,7 +55,6 @@ export abstract class AbstractFileListDefaultFieldComponent extends AbstractFile
                           protected _snackbar: SnackBarService,
                           protected _translate: TranslateService,
                           protected _eventService: EventService,
-                          @Optional() protected _taskContentService: TaskContentService,
                           @Optional() @Inject(DATA_FIELD_PORTAL_DATA) dataFieldPortalData: DataFieldPortalData<FileListField>) {
         super(_log, _snackbar, _translate, dataFieldPortalData);
         this.state = this.defaultState;
@@ -155,9 +153,6 @@ export abstract class AbstractFileListDefaultFieldComponent extends AbstractFile
         if (!this.checkAllowedTypes()) {
             return;
         }
-        if (this.dataField.component?.properties?.validateData === 'true' && this._taskContentService && !this._taskContentService.validateTaskData()) {
-            return;
-        }
 
         this.state = this.defaultState;
         this.state.uploading = true;

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

@@ -36,6 +36,7 @@ import {ChangedFieldsMap} from '../../event/services/interfaces/changed-fields-m
 import {TaskFields} from '../../task-content/model/task-fields';
 import {EnumerationField} from "../../data-fields/enumeration-field/models/enumeration-field";
 import {FrontActionService} from "../../actions/services/front-action.service";
+import {ButtonField} from "../../data-fields/button-field/models/button-field";
 
 /**
  * Handles the loading and updating of data fields and behaviour of
@@ -200,8 +201,9 @@ export class TaskDataService extends TaskHandlingService implements OnDestroy {
                     this._taskContentService.taskFieldsIndex[parentTaskId].fields[field.stringId] = field;
                     field.valueChanges().subscribe(() => {
                         if (this.wasFieldUpdated(field)) {
-                            if (field.component?.properties?.validateData === 'true' && !this._taskContentService.validateTaskData()) {
+                            if (field instanceof ButtonField && field.component?.properties?.validateData === 'true' && !this._taskContentService.validateTaskData()) {
                                 field.waitingForResponse = false;
+                                field.changed = false;
                                 return;
                             }
                             if (field instanceof DynamicEnumerationField) {

projects/netgrif-components/package.json

@@ -29,7 +29,7 @@
         "nae frontend"
     ],
     "peerDependencies": {
-        "@netgrif/components-core": "6.4.2-rc.6",
+        "@netgrif/components-core": "6.4.2",
         "@angular-material-components/datetime-picker": "~7.0.1",
         "@angular-material-components/moment-adapter": "~7.0.0",
         "@angular/animations": "~13.3.1",

projects/netgrif-components/src/lib/data-fields/file-field/file-default-field/file-default-field.component.ts

@@ -5,8 +5,7 @@ import {
     LoggerService,
     SnackBarService,
     TaskResourceService,
-    AbstractFileDefaultFieldComponent,
-    TaskContentService
+    AbstractFileDefaultFieldComponent
 } from "@netgrif/components-core";
 import {TranslateService} from "@ngx-translate/core";
 import {DomSanitizer} from "@angular/platform-browser";
@@ -27,9 +26,8 @@ export class FileDefaultFieldComponent extends AbstractFileDefaultFieldComponent
                 eventService: EventService,
                 protected _sanitizer: DomSanitizer,
                 protected dialog: MatDialog,
-                @Optional() _taskContentService: TaskContentService,
                 @Optional() @Inject(DATA_FIELD_PORTAL_DATA) dataFieldPortalData: DataFieldPortalData<FileField>) {
-        super(taskResourceService, log, snackbar, translate, eventService, _sanitizer, _taskContentService, dataFieldPortalData);
+        super(taskResourceService, log, snackbar, translate, eventService, _sanitizer, dataFieldPortalData);
     }
 
     public showPreviewDialog() {

projects/netgrif-components/src/lib/data-fields/file-list-field/file-list-default-field/file-list-default-field.component.ts

@@ -7,8 +7,7 @@ import {
     EventService,
     DATA_FIELD_PORTAL_DATA,
     DataFieldPortalData,
-    FileListField, AbstractFileListDefaultFieldComponent,
-    TaskContentService
+    FileListField, AbstractFileListDefaultFieldComponent
 } from '@netgrif/components-core'
 
 @Component({
@@ -23,8 +22,7 @@ export class FileListDefaultFieldComponent extends AbstractFileListDefaultFieldC
                 snackbar: SnackBarService,
                 translate: TranslateService,
                 eventService: EventService,
-                @Optional() _taskContentService: TaskContentService,
                 @Optional() @Inject(DATA_FIELD_PORTAL_DATA) dataFieldPortalData: DataFieldPortalData<FileListField>) {
-        super(taskResourceService, log, snackbar, translate, eventService, _taskContentService, dataFieldPortalData);
+        super(taskResourceService, log, snackbar, translate, eventService, dataFieldPortalData);
     }
 }

projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/default-tabbed-case-view/default-tabbed-case-view.component.ts

@@ -234,6 +234,8 @@ export class DefaultTabbedCaseViewComponent extends AbstractTabbedCaseViewCompon
     }
 
     ngOnDestroy(): void {
+        super.ngOnDestroy();
+        this._headersSub?.unsubscribe();
         this.loading$.complete()
     }
 }