Skip to content

Commit ace87e3

Browse files
committed
TT-65 feat: Change Design of Time In Fields and add waitForAsync in tests
1 parent 97a5517 commit ace87e3

File tree

45 files changed

+232
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+232
-157
lines changed

package-lock.json

Lines changed: 43 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
"@angular/platform-browser": "~10.2.2",
2222
"@angular/platform-browser-dynamic": "~10.2.2",
2323
"@angular/router": "~10.2.2",
24+
"@azure/app-configuration": "^1.1.0",
25+
"@azure/identity": "^1.1.0",
2426
"@ngrx/effects": "^10.0.1",
2527
"@ngrx/store": "^10.0.1",
2628
"@ngrx/store-devtools": "^10.0.1",
2729
"@types/datatables.net-buttons": "^1.4.3",
2830
"angular-datatables": "^9.0.2",
29-
"@azure/app-configuration": "^1.1.0",
30-
"@azure/identity": "^1.1.0",
3131
"bootstrap": "^4.4.1",
3232
"datatables.net": "^1.10.21",
3333
"datatables.net-buttons": "^1.6.2",
@@ -40,6 +40,7 @@
4040
"msal": "^1.2.1",
4141
"ngx-cookie-service": "^11.0.2",
4242
"ngx-mask": "^9.1.2",
43+
"ngx-material-timepicker": "^5.5.3",
4344
"ngx-pagination": "^5.0.0",
4445
"ngx-toastr": "^12.0.1",
4546
"rxjs": "~6.6.3",
@@ -95,7 +96,7 @@
9596
},
9697
"config": {
9798
"commit-message-validator": {
98-
"pattern": "^(fix: #|feat: #|perf: #|build: #|ci: #|docs: #|refactor: #|style: #|test: #)[0-9].*",
99+
"pattern": "^(TT-)[0-9].*(fix: |feat: |perf: |build: |ci: |docs: |refactor: |style: |test: )",
99100
"errorMessage": "Your commit message needs to start with fix:, feat:, or perf: followed by issue number, e.g. fix: #43 any commit message"
100101
}
101102
},

src/app/app.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { TestBed, async } from '@angular/core/testing';
1+
import { TestBed, waitForAsync } from '@angular/core/testing';
22
import { RouterTestingModule } from '@angular/router/testing';
33
import { AppComponent } from './app.component';
44

55
describe('AppComponent', () => {
6-
beforeEach(async(() => {
6+
beforeEach(waitForAsync(() => {
77
TestBed.configureTestingModule({
88
imports: [
99
RouterTestingModule

src/app/app.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ import { DialogComponent } from './modules/shared/components/dialog/dialog.compo
7272
import { LoadingBarComponent } from './modules/shared/components/loading-bar/loading-bar.component';
7373
import { UsersComponent } from './modules/users/pages/users.component';
7474
import { UsersListComponent } from './modules/users/components/users-list/users-list.component';
75+
import {NgxMaterialTimepickerModule} from 'ngx-material-timepicker';
7576

7677
const maskConfig: Partial<IConfig> = {
7778
validation: false,
@@ -135,6 +136,7 @@ const maskConfig: Partial<IConfig> = {
135136
NgxPaginationModule,
136137
DataTablesModule,
137138
AutocompleteLibModule,
139+
NgxMaterialTimepickerModule,
138140
StoreModule.forRoot(reducers, {
139141
metaReducers,
140142
}),

src/app/modules/activities-management/components/activity-list/activity-list.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { provideMockStore, MockStore } from '@ngrx/store/testing';
2-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
2+
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
33

44
import { allActivities } from './../../store/activity-management.selectors';
55
import { ActivityState } from './../../store/activity-management.reducers';
@@ -19,7 +19,7 @@ describe('ActivityListComponent', () => {
1919
activityIdToEdit: '',
2020
};
2121

22-
beforeEach(async(() => {
22+
beforeEach(waitForAsync(() => {
2323
TestBed.configureTestingModule({
2424
declarations: [ActivityListComponent],
2525
providers: [provideMockStore({ initialState: state })],

src/app/modules/activities-management/components/create-activity/create-activity.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { FormBuilder } from '@angular/forms';
2-
import { async, TestBed, ComponentFixture } from '@angular/core/testing';
2+
import { waitForAsync, TestBed, ComponentFixture } from '@angular/core/testing';
33
import { provideMockStore, MockStore } from '@ngrx/store/testing';
44

55
import { CreateActivityComponent } from './create-activity.component';
@@ -36,7 +36,7 @@ describe('CreateActivityComponent', () => {
3636
description: 'It is good for learning',
3737
};
3838

39-
beforeEach(async(() => {
39+
beforeEach(waitForAsync(() => {
4040
TestBed.configureTestingModule({
4141
declarations: [CreateActivityComponent],
4242
providers: [FormBuilder, provideMockStore({ initialState: state })],

src/app/modules/activities-management/pages/activities-management.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { async, TestBed, ComponentFixture } from '@angular/core/testing';
1+
import { waitForAsync, TestBed, ComponentFixture } from '@angular/core/testing';
22
import { ActivitiesManagementComponent } from './activities-management.component';
33

44
describe('ActivitiesManagementComponent', () => {
55
let component: ActivitiesManagementComponent;
66
let fixture: ComponentFixture<ActivitiesManagementComponent>;
77

8-
beforeEach(async(() => {
8+
beforeEach(waitForAsync(() => {
99
TestBed.configureTestingModule({
1010
imports: [],
1111
declarations: [ActivitiesManagementComponent]

src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { LoadCustomerProjects, CleanCustomerProjects } from './../../../projects/components/store/project.actions';
22
import { LoadProjectTypes, CleanProjectTypes } from './../../../projects-type/store/project-type.actions';
3-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
3+
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
44
import { FormBuilder } from '@angular/forms';
55
import { MockStore, provideMockStore } from '@ngrx/store/testing';
66

@@ -27,7 +27,7 @@ describe('CreateCustomerComponent', () => {
2727
description: 'bb',
2828
};
2929

30-
beforeEach(async(() => {
30+
beforeEach(waitForAsync(() => {
3131
TestBed.configureTestingModule({
3232
declarations: [CreateCustomerComponent],
3333
providers: [

src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { MockStore, provideMockStore } from '@ngrx/store/testing';
33

44
import { NgxPaginationModule } from 'ngx-pagination';
@@ -29,7 +29,7 @@ describe('CustomerTableListComponent', () => {
2929
customerId: '',
3030
};
3131

32-
beforeEach(async(() => {
32+
beforeEach(waitForAsync(() => {
3333
TestBed.configureTestingModule({
3434
imports: [NgxPaginationModule, DataTablesModule],
3535
declarations: [CustomerListComponent],

src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
1+
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
22

33
import { ManagementCustomerProjectsComponent } from './management-customer-projects.component';
44
import { MockStore, provideMockStore } from '@ngrx/store/testing';
@@ -17,7 +17,7 @@ describe('ManagmentCustomerProjectsComponent', () => {
1717
customerId: '',
1818
};
1919

20-
beforeEach(async(() => {
20+
beforeEach(waitForAsync(() => {
2121
TestBed.configureTestingModule({
2222
declarations: [ManagementCustomerProjectsComponent],
2323
providers: [

0 commit comments

Comments
 (0)