[NAE-2425] Allowing using seconds in dateTime field #327
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| export const DATE_FORMAT_STRING = 'DD.MM.YYYY'; | ||
| export const DATE_TIME_FORMAT_STRING = 'DD.MM.YYYY HH:mm'; | ||
| export const DATE_TIME_SECONDS_FORMAT_STRING = 'DD.MM.YYYY HH:mm:ss'; | ||
|
|
||
| // https://momentjs.com/docs/#/displaying/format/ | ||
| export const DATE_FORMAT = { | ||
|
|
@@ -25,3 +26,18 @@ export const DATE_TIME_FORMAT = { | |
| monthYearA11yLabel: 'MMMM YYYY', | ||
| }, | ||
| }; | ||
|
|
||
| export const DATE_TIME_SECONDS_FORMAT = { | ||
| parse: { | ||
| dateInput: [ | ||
| DATE_TIME_SECONDS_FORMAT_STRING, | ||
| DATE_TIME_FORMAT_STRING | ||
| ], | ||
| }, | ||
| display: { | ||
| dateInput: DATE_TIME_SECONDS_FORMAT_STRING, | ||
| monthYearLabel: 'MMM YYYY', | ||
| dateA11yLabel: 'Do MMMM YYYY HH:mm:ss', | ||
| monthYearA11yLabel: 'MMMM YYYY', | ||
| }, | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ | |
| import {UserField} from '../../data-fields/user-field/models/user-field'; | ||
| import {ButtonField} from '../../data-fields/button-field/models/button-field'; | ||
| import {FileField, FileUploadMIMEType} from '../../data-fields/file-field/models/file-field'; | ||
| import moment, {Moment} from 'moment'; | ||
| import {UserValue} from '../../data-fields/user-field/models/user-value'; | ||
| import {FieldTypeResource} from '../model/field-type-resource'; | ||
| import {FileListField} from '../../data-fields/file-list-field/models/file-list-field'; | ||
|
|
@@ -23,15 +23,16 @@ | |
| import {I18nField} from '../../data-fields/i18n-field/models/i18n-field'; | ||
| import {UserListField} from '../../data-fields/user-list-field/models/user-list-field'; | ||
| import {UserListValue} from '../../data-fields/user-list-field/models/user-list-value'; | ||
| import {decodeBase64, encodeBase64} from '../../utility/base64'; | ||
| import {CaseRefField} from '../../data-fields/case-ref-field/model/case-ref-field'; | ||
| import {StringCollectionField} from '../../data-fields/string-collection-field/models/string-collection-field'; | ||
|
|
||
| @Injectable({ | ||
| providedIn: 'root' | ||
| }) | ||
| export class FieldConverterService { | ||
|
|
||
| private textFieldNames = ['richtextarea', 'htmltextarea', 'editor', 'htmlEditor']; | ||
|
Check warning on line 35 in projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts
|
||
|
|
||
| constructor() { | ||
| } | ||
|
|
@@ -41,6 +42,7 @@ | |
| case FieldTypeResource.BOOLEAN: | ||
| return new BooleanField(item.stringId, item.name, item.value as boolean, item.behavior, | ||
| item.placeholder, item.description, item.layout, item.validations, item.component, item.parentTaskId); | ||
|
|
||
| case FieldTypeResource.TEXT: | ||
| if (this.textFieldNames.includes(item.component?.name)) { | ||
| return new TextAreaField(item.stringId, item.name, this.resolveTextValue(item, item.value), item.behavior, | ||
|
|
@@ -70,12 +72,7 @@ | |
| return new DateField(item.stringId, item.name, date, item.behavior, item.placeholder, | ||
| item.description, item.layout, item.validations, item.component, item.parentTaskId); | ||
| case FieldTypeResource.DATE_TIME: | ||
| return new DateTimeField(item.stringId, item.name, this.resolveDateTime(item.value), item.behavior, item.placeholder, item.description, item.layout, item.validations, item.component, item.parentTaskId); | ||
| case FieldTypeResource.USER: | ||
| let user; | ||
| if (item.value) { | ||
|
|
@@ -291,7 +288,7 @@ | |
| return new UserValue(value.id, value.name, value.surname, value.email); | ||
| } | ||
| if (this.resolveType(field) === FieldTypeResource.DATE_TIME) { | ||
| return this.resolveDateTime(value); | ||
| } | ||
| if (this.resolveType(field) === FieldTypeResource.MULTICHOICE) { | ||
| const array = []; | ||
|
|
@@ -317,8 +314,33 @@ | |
| return value; | ||
| } | ||
|
|
||
| protected resolveDateTime(value: any): Moment | undefined { | ||
| if (!value) { | ||
| return undefined; | ||
| } | ||
| if (moment.isMoment(value)) { | ||
| return value; | ||
| } | ||
| if (value instanceof Date) { | ||
| return moment(value); | ||
| } | ||
| if (Array.isArray(value)) { | ||
| const [year, month, day, hour = 0, minute = 0, second = 0, millisecond = 0] = value; | ||
| return moment({ | ||
| year, | ||
| month: month - 1, | ||
| date: day, | ||
| hour, | ||
| minute, | ||
| second, | ||
| millisecond | ||
| }); | ||
| } | ||
| return moment(value); | ||
| } | ||
|
Comment on lines
+317
to
+340
There was a problem hiding this comment. Handle falsy-but-valid input and invalid parse output in Line 318 currently treats Proposed fix protected resolveDateTime(value: any): Moment | undefined {
- if (!value) {
+ if (value === undefined || value === null || value === '') {
return undefined;
}
+ let parsed: Moment;
if (moment.isMoment(value)) {
- return value;
+ parsed = value;
+ } else if (value instanceof Date) {
+ parsed = moment(value);
+ } else if (Array.isArray(value)) {
+ const [year, month, day, hour = 0, minute = 0, second = 0, millisecond = 0] = value;
+ parsed = moment({
+ year,
+ month: month - 1,
+ date: day,
+ hour,
+ minute,
+ second,
+ millisecond
+ });
+ } else {
+ parsed = moment(value);
}
- if (value instanceof Date) {
- return moment(value);
- }
- if (Array.isArray(value)) {
- const [year, month, day, hour = 0, minute = 0, second = 0, millisecond = 0] = value;
- return moment({
- year,
- month: month - 1,
- date: day,
- hour,
- minute,
- second,
- millisecond
- });
- }
- return moment(value);
+ return parsed.isValid() ? parsed : undefined;
}🤖 Prompt for AI Agents |
||
|
|
||
| protected resolveAllowedTypes(allowTypes: string[]) { | ||
| return allowTypes?.length > 0 ? (allowTypes.length > 1 ? allowTypes as FileUploadMIMEType[] : allowTypes[0]) : null; | ||
|
Check warning on line 343 in projects/netgrif-components-core/src/lib/task-content/services/field-converter.service.ts
|
||
| } | ||
|
|
||
| protected resolveByteSize(bytesSize) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,11 +11,12 @@ | |
| <mat-datepicker-toggle matPrefix [for]="picker"></mat-datepicker-toggle> | ||
| <ngx-mat-datetime-picker #picker | ||
| [showSpinners]="true" | ||
| [showSeconds]="showSeconds" | ||
| [stepHour]="stepHour" | ||
| [stepMinute]="stepMinute" | ||
| [stepSecond]="stepSecond" | ||
| [color]="'primary'" | ||
| [enableMeridian]="enableMeridian"> | ||
| </ngx-mat-datetime-picker> | ||
| <mat-hint [ngClass]="{'mat-hint-disabled': formControlRef.disabled}">{{dataField.description}}</mat-hint> | ||
| <mat-error *ngIf="dataField.isInvalid(formControlRef)">{{getErrorMessage()}}</mat-error> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,28 +5,38 @@ import { | |
| DataFieldPortalData, | ||
| DateTimeField, | ||
| DATE_TIME_FORMAT, | ||
| DATE_TIME_SECONDS_FORMAT, | ||
| LanguageService | ||
| } from '@netgrif/components-core'; | ||
| import {TranslateService} from '@ngx-translate/core'; | ||
| import {NGX_MAT_DATE_FORMATS, NgxMatDateAdapter} from '@angular-material-components/datetime-picker'; | ||
| import {MAT_DATE_LOCALE} from '@angular/material/core'; | ||
|
|
||
| export function dateTimeDefaultFormatsFactory(dataFieldPortalData?: DataFieldPortalData<DateTimeField>) { | ||
| return dataFieldPortalData?.dataField?.showSeconds | ||
| ? DATE_TIME_SECONDS_FORMAT | ||
| : DATE_TIME_FORMAT; | ||
| } | ||
|
|
||
| @Component({ | ||
| selector: 'nc-date-time-default-field', | ||
| templateUrl: './date-time-default-field.component.html', | ||
| styleUrls: ['./date-time-default-field.component.scss'], | ||
| providers: [ | ||
| { | ||
| provide: NGX_MAT_DATE_FORMATS, | ||
| useFactory: dateTimeDefaultFormatsFactory, | ||
| deps: [[new Optional(), DATA_FIELD_PORTAL_DATA]] | ||
| } | ||
| ] | ||
| }) | ||
| export class DateTimeDefaultFieldComponent extends AbstractDateTimeDefaultFieldComponent { | ||
|
|
||
| constructor(_translate: TranslateService, | ||
| _adapter: NgxMatDateAdapter<any>, | ||
| @Inject(MAT_DATE_LOCALE) protected _locale: string, | ||
| _languageService: LanguageService, | ||
| @Optional() @Inject(DATA_FIELD_PORTAL_DATA) dataFieldPortalData: DataFieldPortalData<DateTimeField>) { | ||
| super(_translate, _adapter, _locale, _languageService, dataFieldPortalData); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion | 🟠 Major | 🏗️ Heavy lift
Decouple
DateTimeFieldmodel fromAbstractBaseDataFieldComponent.Importing a UI component class into a model for static parsing helpers couples layers unnecessarily. Move these parsers into a neutral utility (e.g., field-property parser util) and reuse from both model/component layers.
🤖 Prompt for AI Agents