Fixing override issue and removed moment import (#295)

* Fixing override issue and removed moment import

* added new function  in formatters

---------

Co-authored-by: mohas22 <[email protected]>

Author: samhere06

packages/angular-sdk-components/src/lib/_components/field/date-time/date-time.component.ts

@@ -7,15 +7,13 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
 import { interval } from 'rxjs';
 import dayjs from 'dayjs';
-import moment from 'moment';
 import { AngularPConnectData, AngularPConnectService } from '../../../_bridge/angular-pconnect';
 import { Utils } from '../../../_helpers/utils';
 import { ComponentMapperComponent } from '../../../_bridge/component-mapper/component-mapper.component';
 import { dateFormatInfoDefault, getDateFormatInfo } from '../../../_helpers/date-format-utils';
 import { PConnFieldProps } from '../../../_types/PConnProps.interface';
 import { handleEvent } from '../../../_helpers/event-util';
-import { format } from '../../../_helpers/formatters';
-import DateFormatter from '../../../_helpers/formatters/date';
+import { format, convertToTimezone } from '../../../_helpers/formatters';
 
 interface DateTimeProps extends PConnFieldProps {
   // If any, enter additional props that only exist on DateTime here
@@ -94,7 +92,7 @@ export class DateTimeComponent implements OnInit, OnDestroy {
       this.formGroup$.addControl(this.controlName$, this.fieldControl);
       let dateTimeValue = this.value$ ?? '';
       if (this.value$) {
-        dateTimeValue = dayjs(DateFormatter?.convertToTimezone(this.value$, { timezone: this.timezone }))?.toISOString();
+        dateTimeValue = dayjs(convertToTimezone(this.value$, { timezone: this.timezone }))?.toISOString();
       }
       this.fieldControl.setValue(dateTimeValue);
       this.bHasForm$ = true;
@@ -142,7 +140,7 @@ export class DateTimeComponent implements OnInit, OnDestroy {
     this.value$ = this.configProps$?.value;
     let dateTimeValue = this.configProps$?.value ?? '';
     if (this.value$) {
-      dateTimeValue = dayjs(DateFormatter?.convertToTimezone(this.value$, { timezone: this.timezone }))?.toISOString();
+      dateTimeValue = dayjs(convertToTimezone(this.value$, { timezone: this.timezone }))?.toISOString();
     }
     this.fieldControl.setValue(dateTimeValue);
     // timeout and detectChanges to avoid ExpressionChangedAfterItHasBeenCheckedError
@@ -198,7 +196,7 @@ export class DateTimeComponent implements OnInit, OnDestroy {
     // this comes from the date pop up
     if (typeof event.value === 'object') {
       // convert date to pega "date" format
-      const dateTime = moment(event.value?.toISOString());
+      const dateTime = dayjs(event.value?.toISOString());
       const timeZoneDateTime = dayjs.tz(dateTime.format('YYYY-MM-DDTHH:mm:ss'), this.timezone);
       event.value = timeZoneDateTime && timeZoneDateTime.isValid() ? timeZoneDateTime.toISOString() : '';
     }

packages/angular-sdk-components/src/lib/_helpers/formatters/index.ts

@@ -141,3 +141,16 @@ export function format(value, type, options = {}): string {
   }
   return formattedValue;
 }
+
+export function convertToTimezone(value, options) {
+  if (value && options) {
+    const defaultOptions = {
+      type: 'customFormat',
+      format: 'YYYY-MM-DDTHH:mm:ss',
+      timezone: getCurrentTimezone()
+    };
+    const params = { ...defaultOptions, ...options };
+    return DateFormatter.convertToTimezone(value, params);
+  }
+  return value;
+}