diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bcfe1fb4..fef83a1c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ "mounts": [ "source=design-angular-kit-bundle-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume" // deps volume ], - "remoteUser": "root", + // "remoteUser": "root", "postCreateCommand": "sh .devcontainer/scripts/postCreateCommand.sh", // "postStartCommand": "/bin/bash -c '.devcontainer/scripts/postStartCommand.sh \"${containerWorkspaceFolder}\"'", "postStartCommand": "sh .devcontainer/scripts/postStartCommand.sh \"${containerWorkspaceFolder}\"", diff --git a/.devcontainer/scripts/postCreateCommand.sh b/.devcontainer/scripts/postCreateCommand.sh index 3019de0a..180bb1af 100644 --- a/.devcontainer/scripts/postCreateCommand.sh +++ b/.devcontainer/scripts/postCreateCommand.sh @@ -1,9 +1,9 @@ #/bin/bash echo "lifecycle hook: postCreateCommand => start" -# echo "Set node_modules permission" -# sudo chown -R node:node node_modules -# echo "Set node_modules permission: done" +echo "Set node_modules permission" +sudo chown -R node:node node_modules +echo "Set node_modules permission: done" echo "Installing deps" npm i diff --git a/projects/design-angular-kit/src/lib/components/form/transfer/transfer-list/transfer-list.component.spec.ts b/projects/design-angular-kit/src/lib/components/form/transfer/transfer-list/transfer-list.component.spec.ts index a8953f07..f7c9c796 100644 --- a/projects/design-angular-kit/src/lib/components/form/transfer/transfer-list/transfer-list.component.spec.ts +++ b/projects/design-angular-kit/src/lib/components/form/transfer/transfer-list/transfer-list.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HostAttributeToken } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; +import { tb_base } from 'projects/design-angular-kit/src/test'; import { TransferStore } from '../store/transfer.store'; import { ItTransferListComponent } from './transfer-list.component'; @@ -10,11 +10,13 @@ describe('ItTransferListComponent', () => { let fixture: ComponentFixture>; beforeEach(async () => { + const { imports, providers } = tb_base; + await TestBed.configureTestingModule({ - imports: [ItTransferListComponent], + imports, providers: [ + ...providers, TransferStore, - TranslateService, { provide: new HostAttributeToken('title'), useValue: 'title' }, { provide: new HostAttributeToken('sourceType'), useValue: 'source' }, ], diff --git a/projects/design-angular-kit/src/lib/components/form/transfer/transfer-list/transfer-list.component.ts b/projects/design-angular-kit/src/lib/components/form/transfer/transfer-list/transfer-list.component.ts index 625e5690..a0e51036 100644 --- a/projects/design-angular-kit/src/lib/components/form/transfer/transfer-list/transfer-list.component.ts +++ b/projects/design-angular-kit/src/lib/components/form/transfer/transfer-list/transfer-list.component.ts @@ -5,7 +5,6 @@ import { combineLatest, distinctUntilChanged, map, shareReplay, skip, startWith, import { ItAbstractComponent } from '../../../../abstracts/abstract.component'; import { TransferStore } from '../store/transfer.store'; import { TranslateModule } from '@ngx-translate/core'; -import { ItIconComponent } from 'projects/design-angular-kit/src/public_api'; import { SourceType, TransferItem } from '../transfer.model'; interface SelectableTransferItem extends TransferItem { @@ -15,7 +14,7 @@ interface SelectableTransferItem extends TransferItem { @Component({ selector: 'it-transfer-list', standalone: true, - imports: [ItIconComponent, TranslateModule, AsyncPipe, TitleCasePipe], + imports: [TranslateModule, AsyncPipe, TitleCasePipe], templateUrl: './transfer-list.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) diff --git a/projects/design-angular-kit/src/lib/components/form/transfer/transfer.component.spec.ts b/projects/design-angular-kit/src/lib/components/form/transfer/transfer.component.spec.ts index 9e7120d1..ef5e6894 100644 --- a/projects/design-angular-kit/src/lib/components/form/transfer/transfer.component.spec.ts +++ b/projects/design-angular-kit/src/lib/components/form/transfer/transfer.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslateFakeLoader, TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; +import { tb_base } from 'projects/design-angular-kit/src/test'; import { TransferStore } from './store/transfer.store'; import { ItTransferComponent } from './transfer.component'; @@ -9,18 +9,11 @@ describe('ItTransferComponent', () => { let fixture: ComponentFixture; beforeEach(async () => { + const { imports, providers } = tb_base; + await TestBed.configureTestingModule({ - imports: [ - ItTransferComponent, - //https://stackoverflow.com/a/52461467/2642723 - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useClass: TranslateFakeLoader, - }, - }), - ], - providers: [TransferStore, TranslateService], + imports, + providers: [...providers, TransferStore], }).compileComponents(); fixture = TestBed.createComponent(ItTransferComponent); diff --git a/projects/design-angular-kit/src/lib/components/form/transfer/transfer.component.ts b/projects/design-angular-kit/src/lib/components/form/transfer/transfer.component.ts index d2f2fa36..1e064c71 100644 --- a/projects/design-angular-kit/src/lib/components/form/transfer/transfer.component.ts +++ b/projects/design-angular-kit/src/lib/components/form/transfer/transfer.component.ts @@ -19,7 +19,7 @@ import { ItIconComponent } from 'projects/design-angular-kit/src/public_api'; selector: 'it-transfer', standalone: true, templateUrl: './transfer.component.html', - imports: [ItIconComponent, TranslateModule, ItTransferListComponent, NgClass, AsyncPipe, ReactiveFormsModule], + imports: [TranslateModule, ItIconComponent, ItTransferListComponent, NgClass, AsyncPipe, ReactiveFormsModule], providers: [TransferStore], changeDetection: ChangeDetectionStrategy.OnPush, })