From 879c5a6d2c7a5198d74f275b451f593c51197582 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 24 Oct 2023 15:48:36 +0100 Subject: [PATCH] [ACS-5645] card view dateitem parse fix (#9017) * card view dateitem parse fix * remove unused prop * remove dead link from demo shell --- .../app/components/app-layout/app-layout.component.ts | 3 +-- .../card-view-dateitem.component.spec.ts | 5 ----- .../card-view-dateitem/card-view-dateitem.component.ts | 9 +++------ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/demo-shell/src/app/components/app-layout/app-layout.component.ts b/demo-shell/src/app/components/app-layout/app-layout.component.ts index b1118b830f..0708e15d82 100644 --- a/demo-shell/src/app/components/app-layout/app-layout.component.ts +++ b/demo-shell/src/app/components/app-layout/app-layout.component.ts @@ -42,8 +42,7 @@ export class AppLayoutComponent { { href: '/form', icon: 'poll', title: 'Form' } ]}, { href: '/login', icon: 'vpn_key', title: 'Login' }, - { href: '/settings-layout', icon: 'settings', title: 'Settings' }, - { href: '/treeview', icon: 'nature', title: 'Tree View' } + { href: '/settings-layout', icon: 'settings', title: 'Settings' } ]; enableRedirect = true; diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts index 2dce8738c6..c787642079 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts @@ -61,10 +61,6 @@ describe('CardViewDateItemComponent', () => { afterEach(() => fixture.destroy()); - it('should pick date format from appConfigService', () => { - expect(component.dateFormat).toEqual('shortDate'); - }); - it('should render the label and value', () => { fixture.detectChanges(); @@ -319,7 +315,6 @@ describe('CardViewDateItemComponent', () => { component.property.editable = true; component.property.default = 'Jul 10 2017 00:01:00'; component.property.key = 'fake-key'; - component.dateFormat = 'M/d/yy, h:mm a'; component.property.value = new Date('Jul 10 2017 00:01:00'); const expectedDate = new Date('Jul 10 2018'); fixture.detectChanges(); diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts index 875b2ccd4e..87589f2405 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.ts @@ -20,7 +20,6 @@ import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; import { DatetimeAdapter, MAT_DATETIME_FORMATS, MatDatetimepickerComponent, MatDatetimepickerInputEvent } from '@mat-datetimepicker/core'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; import { UserPreferencesService, UserPreferenceValues } from '../../../common/services/user-preferences.service'; -import { AppConfigService } from '../../../app-config/app-config.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { BaseCardView } from '../base-card-view'; @@ -41,7 +40,8 @@ import { isValid } from 'date-fns'; selector: 'adf-card-view-dateitem', templateUrl: './card-view-dateitem.component.html', styleUrls: ['./card-view-dateitem.component.scss'], - encapsulation: ViewEncapsulation.None + encapsulation: ViewEncapsulation.None, + host: { class: 'adf-card-view-dateitem' } }) export class CardViewDateItemComponent extends BaseCardView implements OnInit, OnDestroy { @Input() @@ -60,19 +60,16 @@ export class CardViewDateItemComponent extends BaseCardView; valueDate: Date; - dateFormat: string; private onDestroy$ = new Subject(); constructor( private dateAdapter: DateAdapter, private userPreferencesService: UserPreferencesService, - private appConfig: AppConfigService, private clipboardService: ClipboardService, private translateService: TranslationService ) { super(); - this.dateFormat = this.appConfig.get('dateValues.defaultDateFormat'); } ngOnInit() { @@ -91,7 +88,7 @@ export class CardViewDateItemComponent extends BaseCardView