[ACS-5857] fixed imports

This commit is contained in:
SheenaMalhotra182
2023-10-09 23:47:14 +05:30
parent 8c1e5c9448
commit ec2d09a118
6 changed files with 16 additions and 16 deletions
@@ -21,7 +21,7 @@ import { FormFieldTypes } from './form-field-types';
import { isNumberValue } from './form-field-utils'; import { isNumberValue } from './form-field-utils';
import { FormFieldModel } from './form-field.model'; import { FormFieldModel } from './form-field.model';
import { isAfter, isBefore, isValid } from 'date-fns'; import { isAfter, isBefore, isValid } from 'date-fns';
import { DateFnsUtils } from '../../../../common/utils/date-fns-utils'; import { DateFnsUtils } from '../../../../common';
export interface FormFieldValidator { export interface FormFieldValidator {
@@ -18,7 +18,7 @@
import { FormFieldTypes } from './form-field-types'; import { FormFieldTypes } from './form-field-types';
import { FormFieldModel } from './form-field.model'; import { FormFieldModel } from './form-field.model';
import { FormModel } from './form.model'; import { FormModel } from './form.model';
import { DateFnsUtils } from '../../../../common/utils/date-fns-utils'; import { DateFnsUtils } from '../../../../common';
describe('FormFieldModel', () => { describe('FormFieldModel', () => {
@@ -29,7 +29,7 @@ import { isNumberValue } from './form-field-utils';
import { VariableConfig } from './form-field-variable-options'; import { VariableConfig } from './form-field-variable-options';
import { DataColumn } from '../../../../datatable/data/data-column.model'; import { DataColumn } from '../../../../datatable/data/data-column.model';
import { isValid } from 'date-fns'; import { isValid } from 'date-fns';
import { DateFnsUtils } from '../../../../common/utils/date-fns-utils'; import { DateFnsUtils } from '../../../../common';
// Maps to FormFieldRepresentation // Maps to FormFieldRepresentation
@@ -24,7 +24,7 @@ import { FormService } from '../../../services/form.service';
import { WidgetComponent } from '../widget.component'; import { WidgetComponent } from '../widget.component';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { DateFnsUtils } from '../../../../common/utils/date-fns-utils'; import { DateFnsUtils } from '../../../../common';
import { TranslationService } from '../../../../../../../core/src/lib/translation/translation.service'; import { TranslationService } from '../../../../../../../core/src/lib/translation/translation.service';
import { FormFieldModel } from '../core'; import { FormFieldModel } from '../core';
import { isValid } from 'date-fns'; import { isValid } from 'date-fns';
@@ -17,12 +17,12 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { DateCloudWidgetComponent } from './date-cloud.widget'; import { DateCloudWidgetComponent } from './date-cloud.widget';
import { FormFieldModel, FormModel, FormFieldTypes } from '@alfresco/adf-core'; import { FormFieldModel, FormModel, FormFieldTypes, DateFnsUtils } from '@alfresco/adf-core';
import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { DATE_FORMAT_CLOUD } from '../../../../models/date-format-cloud.model'; import { DATE_FORMAT_CLOUD } from '../../../../models/date-format-cloud.model';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { addDays, format, subDays } from 'date-fns'; import { addDays, subDays } from 'date-fns';
describe('DateWidgetComponent', () => { describe('DateWidgetComponent', () => {
@@ -52,7 +52,7 @@ describe('DateWidgetComponent', () => {
widget.ngOnInit(); widget.ngOnInit();
const expected = format(new Date(minValue), DATE_FORMAT_CLOUD); const expected = DateFnsUtils.formatDate(new Date(minValue), DATE_FORMAT_CLOUD);
expect(widget.minDate).toEqual(expected); expect(widget.minDate).toEqual(expected);
}); });
@@ -75,7 +75,7 @@ describe('DateWidgetComponent', () => {
}); });
widget.ngOnInit(); widget.ngOnInit();
const expected = format(new Date(maxValue), DATE_FORMAT_CLOUD); const expected = DateFnsUtils.formatDate(new Date(maxValue), DATE_FORMAT_CLOUD);
expect(widget.maxDate).toEqual(expected); expect(widget.maxDate).toEqual(expected);
}); });
@@ -92,7 +92,7 @@ describe('DateWidgetComponent', () => {
widget.field = field; widget.field = field;
const todayDate = new Date(); const todayDate = new Date();
widget.onDateChanged({ value: format(todayDate, DATE_FORMAT_CLOUD) }); widget.onDateChanged({ value: DateFnsUtils.formatDate(todayDate, DATE_FORMAT_CLOUD) });
expect(widget.onFieldChanged).toHaveBeenCalledWith(field); expect(widget.onFieldChanged).toHaveBeenCalledWith(field);
}); });
@@ -294,7 +294,7 @@ describe('DateWidgetComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
const todayDate = new Date(); const todayDate = new Date();
const expected = format(subDays(todayDate, widget.field.minDateRangeValue), DATE_FORMAT_CLOUD); const expected = DateFnsUtils.formatDate(subDays(todayDate, widget.field.minDateRangeValue), DATE_FORMAT_CLOUD);
expect(widget.minDate).toEqual(expected); expect(widget.minDate).toEqual(expected);
}); });
@@ -344,7 +344,7 @@ describe('DateWidgetComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
const todayDate = new Date(); const todayDate = new Date();
const expected = format(addDays(todayDate, widget.field.maxDateRangeValue), DATE_FORMAT_CLOUD); const expected = DateFnsUtils.formatDate(addDays(todayDate, widget.field.maxDateRangeValue), DATE_FORMAT_CLOUD);
expect(widget.maxDate).toEqual(expected); expect(widget.maxDate).toEqual(expected);
}); });
@@ -404,7 +404,7 @@ describe('DateWidgetComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
const currentDate = new Date(); const currentDate = new Date();
const expectedMinValueString = format(subDays(currentDate, 1), DATE_FORMAT_CLOUD); const expectedMinValueString = DateFnsUtils.formatDate(subDays(currentDate, 1), DATE_FORMAT_CLOUD);
expect(widget.field.minValue).toEqual(expectedMinValueString); expect(widget.field.minValue).toEqual(expectedMinValueString);
expect(widget.maxDate).toBeUndefined(); expect(widget.maxDate).toBeUndefined();
@@ -424,7 +424,7 @@ describe('DateWidgetComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
const currentDate = new Date(); const currentDate = new Date();
const expectedMaxValueString = format(addDays(currentDate, 8), DATE_FORMAT_CLOUD); const expectedMaxValueString = DateFnsUtils.formatDate(addDays(currentDate, 8), DATE_FORMAT_CLOUD);
expect(widget.field.maxValue).toEqual(expectedMaxValueString); expect(widget.field.maxValue).toEqual(expectedMaxValueString);
expect(widget.minDate).toBeUndefined(); expect(widget.minDate).toBeUndefined();
@@ -462,8 +462,8 @@ describe('DateWidgetComponent', () => {
await fixture.whenStable(); await fixture.whenStable();
const currentDate = new Date(); const currentDate = new Date();
const expectedMaxValueString = format(addDays(currentDate, 8), DATE_FORMAT_CLOUD); const expectedMaxValueString = DateFnsUtils.formatDate(addDays(currentDate, 8), DATE_FORMAT_CLOUD);
const expectedMinValueString = format(subDays(currentDate, 10), DATE_FORMAT_CLOUD); const expectedMinValueString = DateFnsUtils.formatDate(subDays(currentDate, 10), DATE_FORMAT_CLOUD);
expect(widget.field.maxValue).toEqual(expectedMaxValueString); expect(widget.field.maxValue).toEqual(expectedMaxValueString);
expect(widget.field.minValue).toEqual(expectedMinValueString); expect(widget.field.minValue).toEqual(expectedMinValueString);
@@ -15,4 +15,4 @@
* limitations under the License. * limitations under the License.
*/ */
export const DATE_FORMAT_CLOUD = 'yyyy-MM-dd'; export const DATE_FORMAT_CLOUD = 'YYYY-MM-DD';