Merge pull request #223 from netgrif/dev

v6.3.2

Author: machacjozef

CHANGELOG.md

@@ -5,7 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-Full Changelog: [https://github.com/netgrif/components/commits/v6.3.1](https://github.com/netgrif/components/commits/v6.3.1)
+Full Changelog: [https://github.com/netgrif/components/commits/v6.3.2](https://github.com/netgrif/components/commits/v6.3.2)
+
+## [6.3.2](https://github.com/netgrif/components/releases/tag/v6.3.2) (2023-07-25)
+
+### Fixed
+
+- [NAE-1911] Autosave on text area in cooperation with button
+- [NAE-1914] revertToPreviousValue - change is always false
+- [NAE-1923] DateTime doesn't have locale and rework validation to isoWeekday
 
 ## [6.3.1](https://github.com/netgrif/components/releases/tag/v6.3.1) (2023-07-18)
 
@@ -56,6 +64,12 @@ Full Changelog: [https://github.com/netgrif/components/commits/v6.3.1](https://g
 - [NAE-1722] Set default view headers with the CreateMenuItem action method
 - [NAE-1711] Dashboard
 
+## [6.2.10](https://github.com/netgrif/components/releases/tag/v6.2.10) (2023-11-07)
+
+### Fixed
+
+- [NAE-1921] User field value cannot be cleared
+
 ## [6.2.9](https://github.com/netgrif/components/releases/tag/v6.2.9) (2023-05-04)
 
 ### Fixed

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netgrif/components-project",
-    "version": "6.3.1",
+    "version": "6.3.2",
     "description": "Netgrif Application Engine Frontend project. Project includes angular libraries as base for NAE applications.",
     "homepage": "https://components.netgrif.com",
     "license": "SEE LICENSE IN LICENSE",

projects/netgrif-components-core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@netgrif/components-core",
-    "version": "6.3.1",
+    "version": "6.3.2",
     "description": "Netgrif Application engine frontend core Angular library",
     "homepage": "https://components.netgrif.com",
     "license": "SEE LICENSE IN LICENSE",

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

@@ -18,6 +18,9 @@ import {TranslateLibModule} from '../../translate/translate-lib.module';
 import {MaterialModule} from '../../material/material.module';
 import {TranslateService} from '@ngx-translate/core';
 import {NAE_INFORM_ABOUT_INVALID_DATA} from '../models/invalid-data-policy-token';
+import {DateAdapter, MAT_DATE_LOCALE} from '@angular/material/core';
+import {LanguageService} from '../../translate/language.service';
+import {CustomDateAdapter} from './models/custom-date-adapter';
 
 describe('AbstractDateFieldComponent', () => {
     let component: TestDateFieldComponent;
@@ -36,6 +39,7 @@ describe('AbstractDateFieldComponent', () => {
                 {provide: AuthenticationService, useClass: MockAuthenticationService},
                 {provide: UserResourceService, useClass: MockUserResourceService},
                 {provide: ConfigurationService, useClass: TestConfigurationService},
+                {provide: DateAdapter, useClass: CustomDateAdapter}
             ],
             declarations: [
                 TestDateFieldComponent,
@@ -68,8 +72,11 @@ describe('AbstractDateFieldComponent', () => {
 })
 class TestDateFieldComponent extends AbstractDateFieldComponent {
     constructor(translate: TranslateService,
+                protected _adapter: DateAdapter<any>,
+                @Inject(MAT_DATE_LOCALE) protected _locale: string,
+                protected _languageService: LanguageService,
                 @Optional() @Inject(NAE_INFORM_ABOUT_INVALID_DATA) informAboutInvalidData: boolean | null) {
-        super(translate, informAboutInvalidData);
+        super(translate, _adapter, _locale, _languageService, informAboutInvalidData);
     }
 }
 

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

@@ -3,6 +3,8 @@ import {DateField} from './models/date-field';
 import {AbstractTimeInstanceFieldComponent} from '../time-instance-abstract-field/abstract-time-instance-field.component';
 import {TranslateService} from '@ngx-translate/core';
 import {NAE_INFORM_ABOUT_INVALID_DATA} from '../models/invalid-data-policy-token';
+import {DateAdapter, MAT_DATE_LOCALE} from '@angular/material/core';
+import {LanguageService} from '../../translate/language.service';
 
 @Component({
     selector: 'ncc-abstract-date-field',
@@ -13,8 +15,11 @@ export abstract class AbstractDateFieldComponent extends AbstractTimeInstanceFie
     @Input() public dataField: DateField;
 
     protected constructor(protected _translate: TranslateService,
+                          protected _adapter: DateAdapter<any>,
+                          @Inject(MAT_DATE_LOCALE) protected _locale: string,
+                          protected _languageService: LanguageService,
                           @Optional() @Inject(NAE_INFORM_ABOUT_INVALID_DATA) informAboutInvalidData: boolean | null) {
-        super(_translate, informAboutInvalidData);
+        super(_translate, _adapter, _locale, _languageService, informAboutInvalidData);
     }
 
     getErrorMessage() {

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

@@ -1,6 +1,6 @@
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
 import {AngularResizeEventModule} from 'angular-resize-event';
-import {NgxMatDatetimePickerModule} from '@angular-material-components/datetime-picker';
+import {NgxMatDateAdapter, NgxMatDatetimePickerModule} from '@angular-material-components/datetime-picker';
 import {HttpClientTestingModule} from '@angular/common/http/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Component, CUSTOM_ELEMENTS_SCHEMA, Inject, Optional} from '@angular/core';
@@ -21,6 +21,10 @@ import {MockUserResourceService} from '../../utility/tests/mocks/mock-user-resou
 import {TestConfigurationService} from '../../utility/tests/test-config';
 import {ConfigurationService} from '../../configuration/configuration.service';
 import {NAE_INFORM_ABOUT_INVALID_DATA} from '../models/invalid-data-policy-token';
+import {DateAdapter, MAT_DATE_LOCALE} from '@angular/material/core';
+import {LanguageService} from '../../translate/language.service';
+import {NgxMatMomentModule} from '@angular-material-components/moment-adapter';
+import {CustomDateAdapter} from '../date-field/models/custom-date-adapter';
 
 describe('AbstractDatetimeFieldComponent', () => {
     let component: TestDateTimeFieldComponent;
@@ -32,15 +36,17 @@ describe('AbstractDatetimeFieldComponent', () => {
                 MaterialModule,
                 AngularResizeEventModule,
                 NgxMatDatetimePickerModule,
+                NgxMatMomentModule,
                 TranslateLibModule,
                 HttpClientTestingModule,
-                NoopAnimationsModule
+                NoopAnimationsModule,
             ],
             providers: [
                 {provide: AuthenticationMethodService, useClass: MockAuthenticationMethodService},
                 {provide: AuthenticationService, useClass: MockAuthenticationService},
                 {provide: UserResourceService, useClass: MockUserResourceService},
-                {provide: ConfigurationService, useClass: TestConfigurationService}
+                {provide: ConfigurationService, useClass: TestConfigurationService},
+                {provide: DateAdapter, useClass: CustomDateAdapter}
             ],
             declarations: [
                 TestDateTimeFieldComponent,
@@ -72,8 +78,11 @@ describe('AbstractDatetimeFieldComponent', () => {
 })
 class TestDateTimeFieldComponent extends AbstractDateTimeFieldComponent {
     constructor(translate: TranslateService,
+                _adapter: NgxMatDateAdapter<any>,
+                @Inject(MAT_DATE_LOCALE) protected _locale: string,
+                _languageService: LanguageService,
                 @Optional() @Inject(NAE_INFORM_ABOUT_INVALID_DATA) informAboutInvalidData: boolean | null) {
-        super(translate, informAboutInvalidData);
+        super(translate, _adapter, _locale, _languageService, informAboutInvalidData);
     }
 }
 

projects/netgrif-components-core/src/lib/data-fields/date-time-field/abstract-date-time-field.component.ts

@@ -3,6 +3,9 @@ import {DateTimeField} from './models/date-time-field';
 import {AbstractTimeInstanceFieldComponent} from '../time-instance-abstract-field/abstract-time-instance-field.component';
 import {TranslateService} from '@ngx-translate/core';
 import {NAE_INFORM_ABOUT_INVALID_DATA} from '../models/invalid-data-policy-token';
+import {MAT_DATE_LOCALE} from '@angular/material/core';
+import {LanguageService} from '../../translate/language.service';
+import {NgxMatDateAdapter} from '@angular-material-components/datetime-picker';
 
 @Component({
     selector: 'ncc-abstract-date-time-field',
@@ -13,8 +16,11 @@ export abstract class AbstractDateTimeFieldComponent extends AbstractTimeInstanc
     @Input() public dataField: DateTimeField;
 
     protected constructor(protected _translate: TranslateService,
+                          protected _adapter: NgxMatDateAdapter<any>,
+                          @Inject(MAT_DATE_LOCALE) protected _locale: string,
+                          protected _languageService: LanguageService,
                           @Optional() @Inject(NAE_INFORM_ABOUT_INVALID_DATA) informAboutInvalidData: boolean | null) {
-        super(_translate, informAboutInvalidData);
+        super(_translate, _adapter, _locale, _languageService, informAboutInvalidData);
     }
 
     getErrorMessage() {

projects/netgrif-components-core/src/lib/data-fields/time-instance-abstract-field/abstract-time-instance-field.component.ts

@@ -2,18 +2,42 @@ import {AbstractDataFieldComponent} from '../models/abstract-data-field-componen
 import {AbstractTimeInstanceField, AbstractTimeInstanceFieldValidation} from './models/abstract-time-instance-field';
 import {TranslateService} from '@ngx-translate/core';
 import moment, {Moment} from 'moment';
-import {Component, Inject, Optional} from '@angular/core';
+import {Component, Inject, OnDestroy, Optional} from '@angular/core';
 import {NAE_INFORM_ABOUT_INVALID_DATA} from '../models/invalid-data-policy-token';
+import {DateAdapter, MAT_DATE_LOCALE} from '@angular/material/core';
+import {LanguageService} from '../../translate/language.service';
+import {Subscription} from 'rxjs';
 
 @Component({
     selector: 'ncc-abstract-time-instance-field',
     template: ''
 })
-export abstract class AbstractTimeInstanceFieldComponent extends AbstractDataFieldComponent {
-
+export abstract class AbstractTimeInstanceFieldComponent extends AbstractDataFieldComponent implements OnDestroy {
+    protected _subLang: Subscription;
     protected constructor(protected _translate: TranslateService,
+                          protected _adapter: DateAdapter<any>,
+                          @Inject(MAT_DATE_LOCALE) protected _locale: string,
+                          protected _languageService: LanguageService,
                           @Optional() @Inject(NAE_INFORM_ABOUT_INVALID_DATA) informAboutInvalidData: boolean | null) {
         super(informAboutInvalidData);
+        if (this._locale !== this._languageService.getLanguage()) {
+            this.setLangToAdapter(this._languageService.getLanguage());
+        }
+        this._subLang = this._languageService.getLangChange$().subscribe(lang => {
+            if (this._locale !== lang) {
+                this.setLangToAdapter(lang);
+            }
+        });
+    }
+
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        this._subLang.unsubscribe();
+    }
+
+    protected setLangToAdapter(lang: string) {
+        this._locale = lang
+        this._adapter.setLocale(this._locale);
     }
 
     public buildErrorMessage(dataField: AbstractTimeInstanceField) {

projects/netgrif-components-core/src/lib/data-fields/time-instance-abstract-field/models/abstract-time-instance-field.ts

@@ -108,12 +108,12 @@ export abstract class AbstractTimeInstanceField extends DataField<Moment> {
     }
 
     protected validWorkday(fc: FormControl) {
-        const dayOfWeek = !!fc.value ? fc.value.weekday() : null;
-        return dayOfWeek === 6 || dayOfWeek === 0 ? {validWorkday: true} : null;
+        const dayOfWeek = !!fc.value ? fc.value.isoWeekday() : null;
+        return dayOfWeek === 6 || dayOfWeek === 7 ? {validWorkday: true} : null;
     }
 
     protected validWeekend(fc: FormControl) {
-        const dayOfWeek = !!fc.value ? fc.value.weekday() : null;
-        return dayOfWeek >= 1 && dayOfWeek <= 5 && dayOfWeek !== 0 ? {validWeekend: true} : null;
+        const dayOfWeek = !!fc.value ? fc.value.isoWeekday() : null;
+        return dayOfWeek >= 1 && dayOfWeek <= 5 ? {validWeekend: true} : null;
     }
 }

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

@@ -65,4 +65,7 @@ export abstract class AbstractUserFieldComponent extends AbstractDataFieldCompon
         });
     }
 
+    public deleteUser() {
+        this.dataField.value = undefined;
+    }
 }