From e35ff3c798d56dc1c6aed306832207f5161178ad Mon Sep 17 00:00:00 2001 From: michael sorens Date: Sat, 2 May 2020 19:49:45 -0700 Subject: [PATCH] Compatibility fix for `moment` update Running `ng build` after updating all the packages revealed a problem with just one: moment going from 2.24.0 => 2.25.1 ``` WARNING in ./node_modules/moment/src/lib/locale/locales.js Module not found: Error: Can't resolve './locale' in '/Users/msorens/code/go/src/github.com/chef/automate/components/automate-ui/node_modules/moment/src/lib/locale' ``` The issue was encountered by many: https://github.com/moment/moment/issues/4505#issuecomment-570734085 The particular comment in the thread I linked to has a suggested workaround, though I had to modify it to get it to work. Using it exactly as is in that thread generated this error on every `moment` use: ``` This module is declared with using 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. ``` But I found that I could retain `import *...` instead of `import moment...` to solve the original issue without encountering the follow-up issue. This commit, then, makes that simple change in 57 files. One file imported `moment` slightly differently so adjusted that as well. Signed-off-by: michael sorens --- .../components/calendar/calendar.component.ts | 28 +++++++++---------- .../confirm-apply-stop-modal.component.ts | 2 +- .../app/entities/license/license.effects.ts | 2 +- .../src/app/entities/license/license.model.ts | 2 +- .../service-groups/service-groups.facade.ts | 2 +- .../entities/userperms/userperms.effects.ts | 2 +- .../history-selection.spec.ts | 2 +- .../history-selection/history-selection.ts | 2 +- .../license-apply.component.spec.ts | 2 +- .../license-apply/license-apply.component.ts | 2 +- .../license-lockout.component.spec.ts | 2 +- .../license-lockout.component.ts | 2 +- .../nodes/nodes-list/nodes-list.component.ts | 2 +- ...vent-feed-guitar-strings.component.spec.ts | 2 +- .../event-feed-guitar-strings.component.ts | 2 +- .../event-feed-table.component.spec.ts | 2 +- .../event-feed-table.component.ts | 2 +- .../job-schedule-form.component.ts | 2 +- .../run-history/run-history.component.ts | 2 +- .../run-summary/run-summary.component.ts | 2 +- .../components/credentials-list-row.ts | 2 +- .../reporting-node.component.ts | 2 +- .../reporting-nodes.component.ts | 2 +- .../overview-trend.component.ts | 2 +- .../reporting-overview.component.spec.ts | 2 +- .../reporting-overview.component.ts | 2 +- .../reporting-profile.component.spec.ts | 2 +- .../reporting-profile.component.ts | 2 +- .../reporting-profiles.component.ts | 2 +- .../reporting-searchbar.component.spec.ts | 2 +- .../reporting-searchbar.component.ts | 2 +- .../+reporting/reporting.component.spec.ts | 2 +- .../+reporting/reporting.component.ts | 2 +- .../job-scans-list.component.ts | 2 +- .../jobs-list/jobs-list.component.spec.ts | 2 +- .../jobs-list/jobs-list.component.ts | 2 +- .../reporting/report-data.service.spec.ts | 2 +- .../shared/reporting/report-query.service.ts | 2 +- .../shared/reporting/stats.service.spec.ts | 2 +- .../shared/reporting/stats.service.ts | 2 +- .../reporting/suggestions.service.spec.ts | 2 +- .../client-runs/client-runs.component.ts | 2 +- .../demo-calendar/demo-calendar.component.ts | 2 +- .../pages/event-feed/event-feed.component.ts | 2 +- .../app/pages/job-add/job-add.component.ts | 2 +- .../app/pages/job-edit/job-edit.component.ts | 2 +- .../src/app/pipes/datetime.pipe.spec.ts | 2 +- .../src/app/pipes/datetime.pipe.ts | 2 +- .../src/app/pipes/time-duration.pipe.ts | 2 +- .../src/app/pipes/time-from-now.pipe.spec.ts | 2 +- .../src/app/pipes/time-from-now.pipe.ts | 2 +- .../event-feed/event-feed.reducer.spec.ts | 2 +- .../services/event-feed/event-feed.reducer.ts | 2 +- .../event-feed/event-feed.service.spec.ts | 2 +- .../services/event-feed/event-feed.service.ts | 2 +- .../node-details/node-runs.service.ts | 2 +- components/automate-ui/src/app/types/types.ts | 2 +- 57 files changed, 70 insertions(+), 70 deletions(-) diff --git a/components/automate-ui/src/app/components/calendar/calendar.component.ts b/components/automate-ui/src/app/components/calendar/calendar.component.ts index 23d9099943a..c55efb81a9c 100644 --- a/components/automate-ui/src/app/components/calendar/calendar.component.ts +++ b/components/automate-ui/src/app/components/calendar/calendar.component.ts @@ -3,7 +3,7 @@ import { Component, Output, EventEmitter, ChangeDetectionStrategy } from '@angular/core'; -import * as m from 'moment'; +import * as moment from 'moment/moment'; import { concat, range, rangeRight, @@ -17,8 +17,8 @@ import { concat, }) export class CalendarComponent { - private _date: m.Moment = m.utc(); - private _selected: m.Moment = m.utc(); + private _date: moment.Moment = moment.utc(); + private _selected: moment.Moment = moment.utc(); private _month: string; private _year: number; @@ -34,9 +34,9 @@ export class CalendarComponent { @Input() set date(input) { - const date = m.isMoment(input) ? input : m.utc(input); + const date = moment.isMoment(input) ? input : moment.utc(input); this._date = date; - this._month = m.months(date.month()); + this._month = moment.months(date.month()); this._year = date.year(); } get date() { @@ -45,7 +45,7 @@ export class CalendarComponent { @Input() set selected(input) { - const date = m.isMoment(input) ? input : m.utc(input); + const date = moment.isMoment(input) ? input : moment.utc(input); this._selected = date; } get selected() { @@ -58,7 +58,7 @@ export class CalendarComponent { this.date.month(input); // Set the normalized internal month to its string // representation for display. - this._month = m.months(this.date.month()); + this._month = moment.months(this.date.month()); } get month(): string { return this._month; @@ -79,10 +79,10 @@ export class CalendarComponent { const vy = this.date.year(); const sm = this.selected.month(); const sy = this.selected.year(); - const today = m.utc().month() === this.date.month() ? m.utc().date() : null; + const today = moment.utc().month() === this.date.month() ? moment.utc().date() : null; const selected = (vm === sm && vy === sy) ? this.selected.date() : null; - const tag = (marker) => (d: m.Moment) => [marker, d]; - const tagActive = (d: m.Moment) => { + const tag = (marker) => (d: moment.Moment) => [marker, d]; + const tagActive = (d: moment.Moment) => { switch (d.date()) { case selected: return tag('a s')(d); @@ -101,13 +101,13 @@ export class CalendarComponent { // returns the names of the weekdays in a minimal form: // [Mo, Tu, We, Th, Fr, Sa, Su] get weekdays(): string[] { - return m.weekdaysMin(); + return moment.weekdaysMin(); } // When the first of the month is on any day other than the first // day of the week, we need to fill in those extra days. This // method returns the last few days of the previous month. - private daysBefore(): m.Moment[] { + private daysBefore(): moment.Moment[] { const lastMonth = this .date .clone() @@ -125,7 +125,7 @@ export class CalendarComponent { } // Returns the range of dates during the month - private daysDuring(): m.Moment[] { + private daysDuring(): moment.Moment[] { const daysInThisMonth = this .date .daysInMonth(); @@ -135,7 +135,7 @@ export class CalendarComponent { // Returns the first few days of the next month to fill out // the rest of the week. - private daysAfter(): m.Moment[] { + private daysAfter(): moment.Moment[] { const nextMonth = this .date .clone() diff --git a/components/automate-ui/src/app/components/confirm-apply-stop-modal/confirm-apply-stop-modal.component.ts b/components/automate-ui/src/app/components/confirm-apply-stop-modal/confirm-apply-stop-modal.component.ts index 8e5fb14fd7a..5b2e07f5057 100644 --- a/components/automate-ui/src/app/components/confirm-apply-stop-modal/confirm-apply-stop-modal.component.ts +++ b/components/automate-ui/src/app/components/confirm-apply-stop-modal/confirm-apply-stop-modal.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges, Output, EventEmitter } from '@angular/core'; import { ApplyRulesStatus } from 'app/entities/projects/project.reducer'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; @Component({ selector: 'app-confirm-apply-stop-modal', diff --git a/components/automate-ui/src/app/entities/license/license.effects.ts b/components/automate-ui/src/app/entities/license/license.effects.ts index 82a8ded6063..6f0a09707e2 100644 --- a/components/automate-ui/src/app/entities/license/license.effects.ts +++ b/components/automate-ui/src/app/entities/license/license.effects.ts @@ -5,7 +5,7 @@ import { Injectable } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; import { Actions, Effect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { find } from 'lodash'; import { NgrxStateAtom } from '../../ngrx.reducers'; diff --git a/components/automate-ui/src/app/entities/license/license.model.ts b/components/automate-ui/src/app/entities/license/license.model.ts index 0b7b2840840..43633f92a7a 100644 --- a/components/automate-ui/src/app/entities/license/license.model.ts +++ b/components/automate-ui/src/app/entities/license/license.model.ts @@ -1,6 +1,6 @@ import { HttpErrorResponse } from '@angular/common/http'; import { EntityStatus } from '../entities'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { DateTime } from '../../helpers/datetime/datetime'; // Example JSON returned from gateway: diff --git a/components/automate-ui/src/app/entities/service-groups/service-groups.facade.ts b/components/automate-ui/src/app/entities/service-groups/service-groups.facade.ts index c9cb3469961..0c3fcff1064 100644 --- a/components/automate-ui/src/app/entities/service-groups/service-groups.facade.ts +++ b/components/automate-ui/src/app/entities/service-groups/service-groups.facade.ts @@ -3,7 +3,7 @@ import { Store } from '@ngrx/store'; import { HttpErrorResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { includes } from 'lodash/fp'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { EntityStatus } from '../../entities/entities'; import { TelemetryService } from 'app/services/telemetry/telemetry.service'; diff --git a/components/automate-ui/src/app/entities/userperms/userperms.effects.ts b/components/automate-ui/src/app/entities/userperms/userperms.effects.ts index 742a225e3a4..b2487f78f75 100644 --- a/components/automate-ui/src/app/entities/userperms/userperms.effects.ts +++ b/components/automate-ui/src/app/entities/userperms/userperms.effects.ts @@ -11,7 +11,7 @@ import { switchMap } from 'rxjs/operators'; import { of } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { NgrxStateAtom } from 'app/ngrx.reducers'; import { IndexedEntities } from 'app/entities/entities'; diff --git a/components/automate-ui/src/app/helpers/history-selection/history-selection.spec.ts b/components/automate-ui/src/app/helpers/history-selection/history-selection.spec.ts index 46a40eeea59..68a16ba315d 100644 --- a/components/automate-ui/src/app/helpers/history-selection/history-selection.spec.ts +++ b/components/automate-ui/src/app/helpers/history-selection/history-selection.spec.ts @@ -1,5 +1,5 @@ import { HistorySelection } from './history-selection'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; describe('HistorySelection', () => { it('contains the correct list of selections for the selector component', () => { diff --git a/components/automate-ui/src/app/helpers/history-selection/history-selection.ts b/components/automate-ui/src/app/helpers/history-selection/history-selection.ts index b0aa8c358b4..592f4c57a14 100644 --- a/components/automate-ui/src/app/helpers/history-selection/history-selection.ts +++ b/components/automate-ui/src/app/helpers/history-selection/history-selection.ts @@ -1,5 +1,5 @@ // TODO eng-ex discuss if this should be turned into a module -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { Injectable } from '@angular/core'; type Moment = moment.Moment; diff --git a/components/automate-ui/src/app/modules/license/license-apply/license-apply.component.spec.ts b/components/automate-ui/src/app/modules/license/license-apply/license-apply.component.spec.ts index 64609e8f0c0..6c895894f13 100644 --- a/components/automate-ui/src/app/modules/license/license-apply/license-apply.component.spec.ts +++ b/components/automate-ui/src/app/modules/license/license-apply/license-apply.component.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { Store, StoreModule } from '@ngrx/store'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { MockComponent } from 'ng2-mock-component'; import { using } from 'app/testing/spec-helpers'; import { DateTime } from 'app/helpers/datetime/datetime'; diff --git a/components/automate-ui/src/app/modules/license/license-apply/license-apply.component.ts b/components/automate-ui/src/app/modules/license/license-apply/license-apply.component.ts index 3fe15a75546..ad2676d313e 100644 --- a/components/automate-ui/src/app/modules/license/license-apply/license-apply.component.ts +++ b/components/automate-ui/src/app/modules/license/license-apply/license-apply.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component, EventEmitter, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Subscription } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { LicenseFacadeService, LicenseApplyReason } from 'app/entities/license/license.facade'; import { HttpStatus } from 'app/types/types'; diff --git a/components/automate-ui/src/app/modules/license/license-lockout/license-lockout.component.spec.ts b/components/automate-ui/src/app/modules/license/license-lockout/license-lockout.component.spec.ts index eb69d4f5a25..ec8907cb6d6 100644 --- a/components/automate-ui/src/app/modules/license/license-lockout/license-lockout.component.spec.ts +++ b/components/automate-ui/src/app/modules/license/license-lockout/license-lockout.component.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { StoreModule, Store } from '@ngrx/store'; import { MockComponent } from 'ng2-mock-component'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { of as observableOf } from 'rxjs'; import { DateTime } from 'app/helpers/datetime/datetime'; diff --git a/components/automate-ui/src/app/modules/license/license-lockout/license-lockout.component.ts b/components/automate-ui/src/app/modules/license/license-lockout/license-lockout.component.ts index 02a47888d95..499ff351b85 100644 --- a/components/automate-ui/src/app/modules/license/license-lockout/license-lockout.component.ts +++ b/components/automate-ui/src/app/modules/license/license-lockout/license-lockout.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component, EventEmitter, Output } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Subscription } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { LicenseFacadeService, LicenseApplyReason } from 'app/entities/license/license.facade'; diff --git a/components/automate-ui/src/app/modules/nodes/nodes-list/nodes-list.component.ts b/components/automate-ui/src/app/modules/nodes/nodes-list/nodes-list.component.ts index c490c1caa95..ea082d8fd18 100644 --- a/components/automate-ui/src/app/modules/nodes/nodes-list/nodes-list.component.ts +++ b/components/automate-ui/src/app/modules/nodes/nodes-list/nodes-list.component.ts @@ -8,7 +8,7 @@ import { DateTime } from 'app/helpers/datetime/datetime'; import * as actions from '../../../entities/nodes/nodes.actions'; import * as selectors from '../../../entities/nodes/nodes.selectors'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; @Component({ diff --git a/components/automate-ui/src/app/page-components/event-feed-guitar-strings/event-feed-guitar-strings.component.spec.ts b/components/automate-ui/src/app/page-components/event-feed-guitar-strings/event-feed-guitar-strings.component.spec.ts index b6d94fc0ce9..62720804876 100644 --- a/components/automate-ui/src/app/page-components/event-feed-guitar-strings/event-feed-guitar-strings.component.spec.ts +++ b/components/automate-ui/src/app/page-components/event-feed-guitar-strings/event-feed-guitar-strings.component.spec.ts @@ -17,7 +17,7 @@ import { RespEventCount, GuitarStringCollection } from '../../types/types'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { find } from 'lodash'; import { initialState } from '../../services/event-feed/event-feed.reducer'; import { ChefPipesModule } from 'app/pipes/chef-pipes.module'; diff --git a/components/automate-ui/src/app/page-components/event-feed-guitar-strings/event-feed-guitar-strings.component.ts b/components/automate-ui/src/app/page-components/event-feed-guitar-strings/event-feed-guitar-strings.component.ts index e3a7ce9549d..faa69c86e36 100644 --- a/components/automate-ui/src/app/page-components/event-feed-guitar-strings/event-feed-guitar-strings.component.ts +++ b/components/automate-ui/src/app/page-components/event-feed-guitar-strings/event-feed-guitar-strings.component.ts @@ -10,7 +10,7 @@ import { SimpleChanges, ViewChild } from '@angular/core'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { reduce } from 'lodash/fp'; import * as d3 from 'd3'; import { GuitarString, diff --git a/components/automate-ui/src/app/page-components/event-feed-table/event-feed-table.component.spec.ts b/components/automate-ui/src/app/page-components/event-feed-table/event-feed-table.component.spec.ts index 66ce6061820..48cd4c8d9af 100644 --- a/components/automate-ui/src/app/page-components/event-feed-table/event-feed-table.component.spec.ts +++ b/components/automate-ui/src/app/page-components/event-feed-table/event-feed-table.component.spec.ts @@ -9,7 +9,7 @@ import { ChefEventCollection, ChefEvent } from '../../types/types'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { ChefPipesModule } from 'app/pipes/chef-pipes.module'; class MockEventFeedService { diff --git a/components/automate-ui/src/app/page-components/event-feed-table/event-feed-table.component.ts b/components/automate-ui/src/app/page-components/event-feed-table/event-feed-table.component.ts index abba64a88a1..f4ea0cbb5af 100644 --- a/components/automate-ui/src/app/page-components/event-feed-table/event-feed-table.component.ts +++ b/components/automate-ui/src/app/page-components/event-feed-table/event-feed-table.component.ts @@ -4,7 +4,7 @@ import { Subject, Observable } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; import { ChefEvent, ChefEventCollection, EventFeedFilter, Chicklet } from '../../types/types'; import { EventFeedService } from '../../services/event-feed/event-feed.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { DateTime } from 'app/helpers/datetime/datetime'; const ENTITY_TYPE_TAG = 'event-type'; diff --git a/components/automate-ui/src/app/page-components/job-schedule-form/job-schedule-form.component.ts b/components/automate-ui/src/app/page-components/job-schedule-form/job-schedule-form.component.ts index b868d1fe663..2eed6c1d46d 100644 --- a/components/automate-ui/src/app/page-components/job-schedule-form/job-schedule-form.component.ts +++ b/components/automate-ui/src/app/page-components/job-schedule-form/job-schedule-form.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { RRule } from 'rrule'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; @Component({ selector: 'chef-job-schedule-form', diff --git a/components/automate-ui/src/app/page-components/run-history/run-history.component.ts b/components/automate-ui/src/app/page-components/run-history/run-history.component.ts index d06e0731fab..1386c9ce8c2 100644 --- a/components/automate-ui/src/app/page-components/run-history/run-history.component.ts +++ b/components/automate-ui/src/app/page-components/run-history/run-history.component.ts @@ -12,7 +12,7 @@ import { NodeRunsService } from '../../services/node-details/node-runs.service'; import { HistorySelection } from '../../helpers/history-selection/history-selection'; import { RunHistoryStore } from '../../services/run-history-store/run-history.store'; import { Subscription } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { saveAs } from 'file-saver'; import { finalize diff --git a/components/automate-ui/src/app/page-components/run-summary/run-summary.component.ts b/components/automate-ui/src/app/page-components/run-summary/run-summary.component.ts index 4dc6d84b84d..7cc3495e603 100644 --- a/components/automate-ui/src/app/page-components/run-summary/run-summary.component.ts +++ b/components/automate-ui/src/app/page-components/run-summary/run-summary.component.ts @@ -3,7 +3,7 @@ import { Component, OnChanges, SimpleChange, Input, AfterContentInit, import { NodeDetailsService } from '../../services/node-details/node-details.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { NodeRun } from '../../types/types'; import { DateTime } from 'app/helpers/datetime/datetime'; diff --git a/components/automate-ui/src/app/pages/+compliance/+credentials/components/credentials-list-row.ts b/components/automate-ui/src/app/pages/+compliance/+credentials/components/credentials-list-row.ts index 678aa801688..cadf7c2c777 100644 --- a/components/automate-ui/src/app/pages/+compliance/+credentials/components/credentials-list-row.ts +++ b/components/automate-ui/src/app/pages/+compliance/+credentials/components/credentials-list-row.ts @@ -1,6 +1,6 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; import { Credential } from '../credentials.state'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { DateTime } from '../../../../helpers/datetime/datetime'; import { CredentialsLogic } from '../credentials.logic'; diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-node/reporting-node.component.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-node/reporting-node.component.ts index 3fc64cc5322..30067e7fc33 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-node/reporting-node.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-node/reporting-node.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { StatsService } from '../../shared/reporting/stats.service'; import { Subject } from 'rxjs'; import { ReportQueryService, ReturnParams } from '../../shared/reporting/report-query.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { DateTime } from 'app/helpers/datetime/datetime'; import { LayoutFacadeService, Sidebar } from 'app/entities/layout/layout.facade'; import { takeUntil } from 'rxjs/operators'; diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-nodes/reporting-nodes.component.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-nodes/reporting-nodes.component.ts index cdbf782c6ab..017dfa0f76f 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-nodes/reporting-nodes.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-nodes/reporting-nodes.component.ts @@ -2,7 +2,7 @@ import { takeUntil } from 'rxjs/operators'; import { Component, OnInit, OnDestroy } from '@angular/core'; import { Subject } from 'rxjs'; import { groupBy } from 'lodash'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { FilterC } from '../types'; import { paginationOverride } from '../shared'; import { diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/overview-trend/overview-trend.component.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/overview-trend/overview-trend.component.ts index 2acb065739e..ce2e42f228f 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/overview-trend/overview-trend.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/overview-trend/overview-trend.component.ts @@ -11,7 +11,7 @@ import { } from '@angular/core'; import { DOCUMENT } from '@angular/common'; import * as d3 from 'd3'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { DateTime } from 'app/helpers/datetime/datetime'; export interface TrendData { diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.spec.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.spec.ts index 8d7990b3aef..d0d5c4bc95d 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.spec.ts @@ -4,7 +4,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { CookieModule } from 'ngx-cookie'; import { of as observableOf } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { Router } from '@angular/router'; import { ReportingOverviewComponent } from './reporting-overview.component'; import { ChefSessionService } from 'app/services/chef-session/chef-session.service'; diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.ts index 4ef555dbbed..0efc48e9ebf 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.ts @@ -9,7 +9,7 @@ import { } from '../../shared/reporting'; import { ActivatedRoute, Router } from '@angular/router'; import { union } from 'lodash/fp'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; type Tab = 'Node Status' | 'Profile Status'; diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.spec.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.spec.ts index 34f17cec3df..3804bd3921c 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.spec.ts @@ -12,7 +12,7 @@ import { StatsService, ReportQueryService, ScanResultsService, ReportQuery } from '../../shared/reporting'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { of as observableOf } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; describe('ReportingProfileComponent', () => { let store: Store; diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.ts index 84d095d7484..bfc86fa9a92 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.ts @@ -10,7 +10,7 @@ import { StatsService } from '../../shared/reporting/stats.service'; import { ReportQueryService, ReportQuery, ReturnParams } from '../../shared/reporting/report-query.service'; import { ScanResultsService } from '../../shared/reporting/scan-results.service'; import { paginationOverride } from '../shared'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { FilterC } from '../../+reporting/types'; import { LayoutFacadeService, Sidebar } from 'app/entities/layout/layout.facade'; diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profiles/reporting-profiles.component.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profiles/reporting-profiles.component.ts index f04037bad84..6909e7a3119 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profiles/reporting-profiles.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-profiles/reporting-profiles.component.ts @@ -7,7 +7,7 @@ import { paginationOverride } from '../shared'; import { StatsService, ReportQueryService, ReportDataService, ReportQuery } from '../../shared/reporting'; import { ChefSessionService } from '../../../../services/chef-session/chef-session.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { ActivatedRoute, Router } from '@angular/router'; @Component({ diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/reporting-searchbar/reporting-searchbar.component.spec.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/reporting-searchbar/reporting-searchbar.component.spec.ts index 26fc1502e9b..978a1de40d9 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/reporting-searchbar/reporting-searchbar.component.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/reporting-searchbar/reporting-searchbar.component.spec.ts @@ -2,7 +2,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; import { ReportingSearchbarComponent } from './reporting-searchbar.component'; import { using } from 'app/testing/spec-helpers'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { ReportQueryService } from 'app/pages/+compliance/shared/reporting'; diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/reporting-searchbar/reporting-searchbar.component.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/reporting-searchbar/reporting-searchbar.component.ts index a63df85a29b..dd3f9575efe 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/reporting-searchbar/reporting-searchbar.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/reporting-searchbar/reporting-searchbar.component.ts @@ -14,7 +14,7 @@ import { debounceTime, switchMap, distinctUntilChanged } from 'rxjs/operators'; import { FilterC } from '../types'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { Chicklet } from 'app/types/types'; import { ReportQueryService diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/reporting.component.spec.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/reporting.component.spec.ts index 226213b81ca..5bd103e699d 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/reporting.component.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/reporting.component.spec.ts @@ -21,7 +21,7 @@ import { } from '../shared/reporting'; import { TelemetryService } from '../../../services/telemetry/telemetry.service'; import { FeatureFlagsService } from 'app/services/feature-flags/feature-flags.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { DatetimePipe } from 'app/pipes/datetime.pipe'; import { using } from 'app/testing/spec-helpers'; diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/reporting.component.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/reporting.component.ts index cf898ad5473..996791c80aa 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/reporting.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/reporting.component.ts @@ -14,7 +14,7 @@ import { } from '@angular/core'; import { ActivatedRoute, Router, ParamMap } from '@angular/router'; import { Subject, Observable } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { StatsService, SuggestionsService, diff --git a/components/automate-ui/src/app/pages/+compliance/+scanner/containers/job-scans-list/job-scans-list.component.ts b/components/automate-ui/src/app/pages/+compliance/+scanner/containers/job-scans-list/job-scans-list.component.ts index 9b736a773a5..f7d3c932503 100644 --- a/components/automate-ui/src/app/pages/+compliance/+scanner/containers/job-scans-list/job-scans-list.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+scanner/containers/job-scans-list/job-scans-list.component.ts @@ -4,7 +4,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { NgrxStateAtom } from '../../../../../ngrx.reducers'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { LayoutFacadeService, Sidebar } from 'app/entities/layout/layout.facade'; import * as selectors from '../../state/scanner.selectors'; import * as actions from '../../state/scanner.actions'; diff --git a/components/automate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.spec.ts b/components/automate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.spec.ts index 695377c6c20..901403761b7 100644 --- a/components/automate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.spec.ts @@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { Router } from '@angular/router'; import { Store, StoreModule } from '@ngrx/store'; import { NgrxStateAtom, ngrxReducers, runtimeChecks } from 'app/ngrx.reducers'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { ChefSessionService } from 'app/services/chef-session/chef-session.service'; import { MockChefSessionService } from 'app/testing/mock-chef-session.service'; import { JobsListComponent } from './jobs-list.component'; diff --git a/components/automate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.ts b/components/automate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.ts index eeb49af92b1..5dc9014bba5 100644 --- a/components/automate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.ts +++ b/components/automate-ui/src/app/pages/+compliance/+scanner/containers/jobs-list/jobs-list.component.ts @@ -5,7 +5,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { NgrxStateAtom } from '../../../../../ngrx.reducers'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import * as selectors from '../../state/scanner.selectors'; import * as actions from '../../state/scanner.actions'; import { DateTime } from 'app/helpers/datetime/datetime'; diff --git a/components/automate-ui/src/app/pages/+compliance/shared/reporting/report-data.service.spec.ts b/components/automate-ui/src/app/pages/+compliance/shared/reporting/report-data.service.spec.ts index e7d6e9aadcc..bd7392d0a98 100644 --- a/components/automate-ui/src/app/pages/+compliance/shared/reporting/report-data.service.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/shared/reporting/report-data.service.spec.ts @@ -5,7 +5,7 @@ import { StatsService } from './stats.service'; import { ReportDataService } from './report-data.service'; import { TelemetryService } from '../../../../services/telemetry/telemetry.service'; import { ReportQuery } from './report-query.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; class MockTelemetryService { track() { } diff --git a/components/automate-ui/src/app/pages/+compliance/shared/reporting/report-query.service.ts b/components/automate-ui/src/app/pages/+compliance/shared/reporting/report-query.service.ts index 292211cb96a..803d293f81d 100644 --- a/components/automate-ui/src/app/pages/+compliance/shared/reporting/report-query.service.ts +++ b/components/automate-ui/src/app/pages/+compliance/shared/reporting/report-query.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { FilterC } from '../../+reporting/types'; import { DateTime } from 'app/helpers/datetime/datetime'; import { ReportingFilterTypes } from 'app/types/types'; diff --git a/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.spec.ts b/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.spec.ts index 518b9951e0e..7a93af6a091 100644 --- a/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.spec.ts @@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { ChefSessionService } from 'app/services/chef-session/chef-session.service'; import { MockChefSessionService } from 'app/testing/mock-chef-session.service'; import { StatsService } from './stats.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { environment } from '../../../../../environments/environment'; import { ReportQuery } from './report-query.service'; diff --git a/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.ts b/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.ts index 2d7e5246b1b..568b2dc8b61 100644 --- a/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.ts +++ b/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.ts @@ -2,7 +2,7 @@ import { map } from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { omitBy, isNil } from 'lodash'; import { environment } from '../../../../../environments/environment'; import { ReportQuery } from './report-query.service'; diff --git a/components/automate-ui/src/app/pages/+compliance/shared/reporting/suggestions.service.spec.ts b/components/automate-ui/src/app/pages/+compliance/shared/reporting/suggestions.service.spec.ts index 78a19091c7c..93943410d2a 100644 --- a/components/automate-ui/src/app/pages/+compliance/shared/reporting/suggestions.service.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/shared/reporting/suggestions.service.spec.ts @@ -5,7 +5,7 @@ import { SuggestionsService } from './suggestions.service'; import { StatsService } from './stats.service'; import { environment } from '../../../../../environments/environment'; import { ReportQuery } from './report-query.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; const COMPLIANCE_URL = environment.compliance_url; diff --git a/components/automate-ui/src/app/pages/client-runs/client-runs.component.ts b/components/automate-ui/src/app/pages/client-runs/client-runs.component.ts index 0b52b5a040a..4b9f9f4fb62 100644 --- a/components/automate-ui/src/app/pages/client-runs/client-runs.component.ts +++ b/components/automate-ui/src/app/pages/client-runs/client-runs.component.ts @@ -36,7 +36,7 @@ import { UpdateNodeFilters, GetWorkflowEnabled, GetNodeSuggestions, DeleteNodes, UpdateColumns } from '../../entities/client-runs/client-runs.actions'; import { TelemetryService } from '../../services/telemetry/telemetry.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { saveAs } from 'file-saver'; import { AuthorizedChecker } from 'app/helpers/auth/authorized'; import { diff --git a/components/automate-ui/src/app/pages/component-library/demos/demo-calendar/demo-calendar.component.ts b/components/automate-ui/src/app/pages/component-library/demos/demo-calendar/demo-calendar.component.ts index 721c276dd46..98510e9d8da 100644 --- a/components/automate-ui/src/app/pages/component-library/demos/demo-calendar/demo-calendar.component.ts +++ b/components/automate-ui/src/app/pages/component-library/demos/demo-calendar/demo-calendar.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; @Component({ selector: 'app-demo-calendar', diff --git a/components/automate-ui/src/app/pages/event-feed/event-feed.component.ts b/components/automate-ui/src/app/pages/event-feed/event-feed.component.ts index 5a9ea08ff1a..261658d7d9f 100644 --- a/components/automate-ui/src/app/pages/event-feed/event-feed.component.ts +++ b/components/automate-ui/src/app/pages/event-feed/event-feed.component.ts @@ -18,7 +18,7 @@ import { Status } from '../../services/event-feed/event-feed.reducer'; import { Chicklet, SearchBarCategoryItem } from '../../types/types'; import { sumBy } from 'lodash'; import { initialState } from '../../services/event-feed/event-feed.reducer'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { some, pickBy } from 'lodash/fp'; import { eventFeedState diff --git a/components/automate-ui/src/app/pages/job-add/job-add.component.ts b/components/automate-ui/src/app/pages/job-add/job-add.component.ts index 06669515d48..6d333cb0e03 100644 --- a/components/automate-ui/src/app/pages/job-add/job-add.component.ts +++ b/components/automate-ui/src/app/pages/job-add/job-add.component.ts @@ -6,7 +6,7 @@ import { Observable, Subject } from 'rxjs'; import { Store } from '@ngrx/store'; import { clamp, isEqual } from 'lodash/fp'; import { RRule } from 'rrule'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { NgrxStateAtom } from '../../ngrx.reducers'; diff --git a/components/automate-ui/src/app/pages/job-edit/job-edit.component.ts b/components/automate-ui/src/app/pages/job-edit/job-edit.component.ts index fa80578e754..e1f55fe99d0 100644 --- a/components/automate-ui/src/app/pages/job-edit/job-edit.component.ts +++ b/components/automate-ui/src/app/pages/job-edit/job-edit.component.ts @@ -7,7 +7,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { clamp, find, isEqual } from 'lodash/fp'; import { RRule } from 'rrule'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { NgrxStateAtom } from '../../ngrx.reducers'; diff --git a/components/automate-ui/src/app/pipes/datetime.pipe.spec.ts b/components/automate-ui/src/app/pipes/datetime.pipe.spec.ts index f02b6a1f5ec..8f63067d400 100644 --- a/components/automate-ui/src/app/pipes/datetime.pipe.spec.ts +++ b/components/automate-ui/src/app/pipes/datetime.pipe.spec.ts @@ -1,4 +1,4 @@ -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { DatetimePipe } from './datetime.pipe'; diff --git a/components/automate-ui/src/app/pipes/datetime.pipe.ts b/components/automate-ui/src/app/pipes/datetime.pipe.ts index 2615e1eda9f..5a47c5125cb 100644 --- a/components/automate-ui/src/app/pipes/datetime.pipe.ts +++ b/components/automate-ui/src/app/pipes/datetime.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; /** * The datetime pipe formats datetime strings or moment objects. It's diff --git a/components/automate-ui/src/app/pipes/time-duration.pipe.ts b/components/automate-ui/src/app/pipes/time-duration.pipe.ts index 821bef05300..8e0f01bd5f7 100644 --- a/components/automate-ui/src/app/pipes/time-duration.pipe.ts +++ b/components/automate-ui/src/app/pipes/time-duration.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; @Pipe({ name: 'timeDuration' diff --git a/components/automate-ui/src/app/pipes/time-from-now.pipe.spec.ts b/components/automate-ui/src/app/pipes/time-from-now.pipe.spec.ts index eb315f9568b..26e5594621f 100644 --- a/components/automate-ui/src/app/pipes/time-from-now.pipe.spec.ts +++ b/components/automate-ui/src/app/pipes/time-from-now.pipe.spec.ts @@ -1,4 +1,4 @@ -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { TimeFromNowPipe } from './time-from-now.pipe'; diff --git a/components/automate-ui/src/app/pipes/time-from-now.pipe.ts b/components/automate-ui/src/app/pipes/time-from-now.pipe.ts index 2fc98ff2f8f..074a79bcfd0 100644 --- a/components/automate-ui/src/app/pipes/time-from-now.pipe.ts +++ b/components/automate-ui/src/app/pipes/time-from-now.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; @Pipe({ name: 'timeFromNow' diff --git a/components/automate-ui/src/app/services/event-feed/event-feed.reducer.spec.ts b/components/automate-ui/src/app/services/event-feed/event-feed.reducer.spec.ts index 182a450a045..e9039b0a411 100644 --- a/components/automate-ui/src/app/services/event-feed/event-feed.reducer.spec.ts +++ b/components/automate-ui/src/app/services/event-feed/event-feed.reducer.spec.ts @@ -1,5 +1,5 @@ import { initialState } from './event-feed.reducer'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; describe('eventFeedReducer', () => { it('ensure the end date is at the end of the local time zone\'s day', () => { diff --git a/components/automate-ui/src/app/services/event-feed/event-feed.reducer.ts b/components/automate-ui/src/app/services/event-feed/event-feed.reducer.ts index e86c05eccf2..fba533ae8fa 100644 --- a/components/automate-ui/src/app/services/event-feed/event-feed.reducer.ts +++ b/components/automate-ui/src/app/services/event-feed/event-feed.reducer.ts @@ -27,7 +27,7 @@ import { GET_SUGGESTIONS_SUCCESS, GET_SUGGESTIONS_ERROR, EventFeedAction } from './event-feed.actions'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { set, diff --git a/components/automate-ui/src/app/services/event-feed/event-feed.service.spec.ts b/components/automate-ui/src/app/services/event-feed/event-feed.service.spec.ts index 2733b72bac1..d40d92ebe7d 100644 --- a/components/automate-ui/src/app/services/event-feed/event-feed.service.spec.ts +++ b/components/automate-ui/src/app/services/event-feed/event-feed.service.spec.ts @@ -11,7 +11,7 @@ import { } from '../../types/types'; import { EventFeedService } from './event-feed.service'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; import { initialState } from './event-feed.reducer'; describe('EventFeedService', () => { diff --git a/components/automate-ui/src/app/services/event-feed/event-feed.service.ts b/components/automate-ui/src/app/services/event-feed/event-feed.service.ts index 88e1526c182..92c1912474e 100644 --- a/components/automate-ui/src/app/services/event-feed/event-feed.service.ts +++ b/components/automate-ui/src/app/services/event-feed/event-feed.service.ts @@ -22,7 +22,7 @@ import { ChefEvent, } from '../../types/types'; import { initialState } from './event-feed.reducer'; import { environment } from '../../../environments/environment'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; const GATEWAY_URL = environment.gateway_url; const CONFIG_MGMT_URL = environment.config_mgmt_url; const ENTITY_TYPE_TAG = 'entity_type'; diff --git a/components/automate-ui/src/app/services/node-details/node-runs.service.ts b/components/automate-ui/src/app/services/node-details/node-runs.service.ts index 66bca5183e8..638eaa0c4b0 100644 --- a/components/automate-ui/src/app/services/node-details/node-runs.service.ts +++ b/components/automate-ui/src/app/services/node-details/node-runs.service.ts @@ -15,7 +15,7 @@ import { PolicyCookbooks } from '../../types/types'; import { environment } from '../../../environments/environment'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; const CONFIG_MGMT_URL = environment.config_mgmt_url; @Injectable() diff --git a/components/automate-ui/src/app/types/types.ts b/components/automate-ui/src/app/types/types.ts index bb5984286fa..9f3dff51044 100644 --- a/components/automate-ui/src/app/types/types.ts +++ b/components/automate-ui/src/app/types/types.ts @@ -1,5 +1,5 @@ import { merge } from 'lodash'; -import * as moment from 'moment'; +import * as moment from 'moment/moment'; export type Status = 'success' | 'failure' | 'missing' | 'skipped'; export type Compliance = 'compliant' | 'uncompliant' | 'skipped';