diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d7f88852d6..d63da0fd7e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "ab-testing", - "version": "4.2.0", + "version": "4.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ab-testing", - "version": "4.2.0", + "version": "4.3.0", "license": "MIT", "dependencies": { "@angular/animations": "^15.2.8", @@ -19,6 +19,7 @@ "@angular/platform-browser": "^15.2.8", "@angular/platform-browser-dynamic": "^15.2.8", "@angular/router": "^15.2.8", + "@danielmoncada/angular-datetime-picker": "^16.0.1", "@ngrx/effects": "^15.4.0", "@ngrx/entity": "^15.4.0", "@ngrx/router-store": "^15.4.0", @@ -36,8 +37,6 @@ "lodash.find": "^4.6.0", "lodash.groupby": "^4.6.0", "lodash.isequal": "^4.5.0", - "moment": "^2.29.4", - "ng-pick-datetime-ex": "^15.0.0", "ngx-skeleton-loader": "^7.0.0", "rxjs": "7.8.0", "tslib": "^2.0.0", @@ -2466,6 +2465,19 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@danielmoncada/angular-datetime-picker": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/@danielmoncada/angular-datetime-picker/-/angular-datetime-picker-16.0.1.tgz", + "integrity": "sha512-HvpGYYdeGpnLQtBc0yyQ3QBiS/2rpUbJiCy7Lempk0jVEvUaW1ICPgL40ss+FlMP+R/3pZHzLxrSA9cr1H2N8A==", + "dependencies": { + "tslib": "^2.3.1" + }, + "peerDependencies": { + "@angular/cdk": "^13.0.3 || ^14.0.0 || ^15.0.0 || ^16.0.0", + "@angular/common": "^13.0.3 || ^14.0.0 || ^15.0.0 || ^16.0.0", + "@angular/core": "^13.0.3 || ^14.0.0 || ^15.0.0 || ^16.0.0" + } + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -16523,14 +16535,6 @@ "node": ">=0.10.0" } }, - "node_modules/moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", - "engines": { - "node": "*" - } - }, "node_modules/mrmime": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", @@ -16645,19 +16649,6 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, - "node_modules/ng-pick-datetime-ex": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/ng-pick-datetime-ex/-/ng-pick-datetime-ex-15.0.0.tgz", - "integrity": "sha512-NV5rgD8iDQzCJARPPwhOfMqZQ37bdLFOAbsG7SXC7KmHzjTOTshbLlHnF3p1eiHTXkytIKJ2D33ByT9YJOUJxA==", - "dependencies": { - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/cdk": "^15.0.4", - "@angular/common": "^15.0.4", - "@angular/core": "^15.0.4" - } - }, "node_modules/ngx-skeleton-loader": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/ngx-skeleton-loader/-/ngx-skeleton-loader-7.0.0.tgz", @@ -23494,6 +23485,14 @@ } } }, + "@danielmoncada/angular-datetime-picker": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/@danielmoncada/angular-datetime-picker/-/angular-datetime-picker-16.0.1.tgz", + "integrity": "sha512-HvpGYYdeGpnLQtBc0yyQ3QBiS/2rpUbJiCy7Lempk0jVEvUaW1ICPgL40ss+FlMP+R/3pZHzLxrSA9cr1H2N8A==", + "requires": { + "tslib": "^2.3.1" + } + }, "@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -34364,11 +34363,6 @@ "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", "dev": true }, - "moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" - }, "mrmime": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz", @@ -34455,14 +34449,6 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, - "ng-pick-datetime-ex": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/ng-pick-datetime-ex/-/ng-pick-datetime-ex-15.0.0.tgz", - "integrity": "sha512-NV5rgD8iDQzCJARPPwhOfMqZQ37bdLFOAbsG7SXC7KmHzjTOTshbLlHnF3p1eiHTXkytIKJ2D33ByT9YJOUJxA==", - "requires": { - "tslib": "^2.3.0" - } - }, "ngx-skeleton-loader": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/ngx-skeleton-loader/-/ngx-skeleton-loader-7.0.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 3fc38b3062..7bda63f037 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -45,6 +45,7 @@ "@angular/platform-browser": "^15.2.8", "@angular/platform-browser-dynamic": "^15.2.8", "@angular/router": "^15.2.8", + "@danielmoncada/angular-datetime-picker": "^16.0.1", "@ngrx/effects": "^15.4.0", "@ngrx/entity": "^15.4.0", "@ngrx/router-store": "^15.4.0", @@ -62,7 +63,6 @@ "lodash.find": "^4.6.0", "lodash.groupby": "^4.6.0", "lodash.isequal": "^4.5.0", - "ng-pick-datetime-ex": "^15.0.0", "ngx-skeleton-loader": "^7.0.0", "rxjs": "7.8.0", "tslib": "^2.0.0", diff --git a/frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-schedule/experiment-schedule.component.spec.ts b/frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-schedule/experiment-schedule.component.spec.ts index aafd9e645d..b5ceebf0d0 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-schedule/experiment-schedule.component.spec.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-schedule/experiment-schedule.component.spec.ts @@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ExperimentScheduleComponent } from './experiment-schedule.component'; import { TestingModule } from '../../../../../../testing/testing.module'; -import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime-ex'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; xdescribe('ExperimentScheduleComponent', () => { let component: ExperimentScheduleComponent; diff --git a/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/experiment-end-criteria/experiment-end-criteria.component.spec.ts b/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/experiment-end-criteria/experiment-end-criteria.component.spec.ts index 4b48c5c81d..e667131446 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/experiment-end-criteria/experiment-end-criteria.component.spec.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/experiment-end-criteria/experiment-end-criteria.component.spec.ts @@ -4,7 +4,7 @@ import { ExperimentEndCriteriaComponent } from './experiment-end-criteria.compon import { TestingModule } from '../../../../../../../testing/testing.module'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ExperimentService } from '../../../../../../core/experiments/experiments.service'; -import { OwlNativeDateTimeModule, OwlDateTimeModule } from 'ng-pick-datetime-ex'; +import { OwlNativeDateTimeModule, OwlDateTimeModule } from '@danielmoncada/angular-datetime-picker'; import { TestMockData } from '../../../../../../../testing/test.mock.data'; xdescribe('ExperimentEndCriteriaComponent', () => { diff --git a/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/experiment-status/experiment-status.component.spec.ts b/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/experiment-status/experiment-status.component.spec.ts index 73eff138a3..dac361ceaa 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/experiment-status/experiment-status.component.spec.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/experiment-status/experiment-status.component.spec.ts @@ -3,7 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { ExperimentStatusComponent } from './experiment-status.component'; import { TestingModule } from '../../../../../../../testing/testing.module'; import { ExperimentService } from '../../../../../../core/experiments/experiments.service'; -import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime-ex'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TestMockData } from '../../../../../../../testing/test.mock.data'; diff --git a/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/new-experiment/new-experiment.component.spec.ts b/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/new-experiment/new-experiment.component.spec.ts index 53687aa8f2..e0a38ead44 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/new-experiment/new-experiment.component.spec.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/home/components/modal/new-experiment/new-experiment.component.spec.ts @@ -7,7 +7,7 @@ import { ExperimentOverviewComponent } from '../../experiment-overview/experimen import { ExperimentDesignComponent } from '../../experiment-design/experiment-design.component'; import { ExperimentScheduleComponent } from '../../experiment-schedule/experiment-schedule.component'; import { ExperimentPostConditionComponent } from '../../experiment-post-condition/experiment-post-condition.component'; -import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime-ex'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; xdescribe('NewExperimentComponent', () => { diff --git a/frontend/projects/upgrade/src/app/features/dashboard/home/home.module.ts b/frontend/projects/upgrade/src/app/features/dashboard/home/home.module.ts index 844f5d56ca..745dc4511b 100644 --- a/frontend/projects/upgrade/src/app/features/dashboard/home/home.module.ts +++ b/frontend/projects/upgrade/src/app/features/dashboard/home/home.module.ts @@ -20,7 +20,7 @@ import { EnrollmentOverTimeComponent } from './components/enrollment-over-time/e import { EnrollmentConditionTableComponent } from './components/enrollment-condition-table/enrollment-condition-table.component'; import { EnrollmentPointPartitionTableComponent } from './components/enrollment-point-partition-table/enrollment-point-partition-table.component'; import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { OwlDateTimeModule, OwlNativeDateTimeModule } from 'ng-pick-datetime-ex'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; import { ExperimentPostConditionComponent } from './components/experiment-post-condition/experiment-post-condition.component'; import { TableRowComponent } from './components/table-row/table-row.component'; import { QueriesModalComponent } from './components/modal/queries-modal/queries-modal.component'; diff --git a/frontend/projects/upgrade/src/styles.scss b/frontend/projects/upgrade/src/styles.scss index bc751fe19b..c12a35fdba 100755 --- a/frontend/projects/upgrade/src/styles.scss +++ b/frontend/projects/upgrade/src/styles.scss @@ -1,5 +1,6 @@ @use '@angular/material' as mat; -@use 'node_modules/ng-pick-datetime-ex/assets/style/picker.min.css'; + +@import '@danielmoncada/angular-datetime-picker/assets/style/picker.min.css'; @import url('https://fonts.googleapis.com/css?family=Roboto:400,700|Material+Icons'); @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600,700,800&display=swap');