diff --git a/angular.json b/angular.json index 0d8a628e48..aea784c747 100644 --- a/angular.json +++ b/angular.json @@ -35,7 +35,11 @@ "src/favicon.ico", "src/assets" ], - "styles": ["./node_modules/leaflet/dist/leaflet.css", "src/styles.scss"], + "styles": [ + "./node_modules/leaflet/dist/leaflet.css", + "./node_modules/ngx-owl-carousel-o/lib/styles/prebuilt-themes/owl.carousel.min.css", + "./node_modules/ngx-owl-carousel-o/lib/styles/prebuilt-themes/owl.theme.default.min.css", + "src/styles.scss"], "scripts": [], "vendorChunk": true, "extractLicenses": false, diff --git a/cloudbuild-old.yaml b/cloudbuild-old.yaml index 1e335c6ba8..80aa2b7f3c 100644 --- a/cloudbuild-old.yaml +++ b/cloudbuild-old.yaml @@ -13,7 +13,7 @@ steps: }; EOF # Build the container image - - name: 'gcr.io/k8s-skaffold/pack' + - name: 'buildpacksio/pack' entrypoint: 'pack' args: - build diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 84c6d593b4..4b326fe57b 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -13,13 +13,13 @@ steps: }; EOF # Build the container image - - name: 'gcr.io/k8s-skaffold/pack' + - name: 'buildpacksio/pack' entrypoint: 'pack' args: - build - ${_REGION}-docker.pkg.dev/$PROJECT_ID/outofschool/oos-frontend:$SHORT_SHA - --cache-image=${_REGION}-docker.pkg.dev/$PROJECT_ID/outofschool/oos-cache:front - - --builder=paketobuildpacks/builder:base + - --builder=paketobuildpacks/builder-jammy-base:latest - --buildpack=paketo-buildpacks/web-servers - --buildpack=gcr.io/paketo-buildpacks/environment-variables - --env=BP_NODE_RUN_SCRIPTS=build:qa diff --git a/package.json b/package.json index 5a9e68f857..238df0115d 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "build": "ng build", "build:prod": "ng build --configuration production", "build:qa": "ng build --configuration qa", + "build:local": "ng build --configuration local", "test": "jest", "test:coverage": "jest --coverage", "test-watch": "jest --watch", @@ -21,11 +22,10 @@ "dependencies": { "@angular-slider/ngx-slider": "^16.0.1", "@angular/animations": "^16.2.12", - "@angular/cdk": "^16.2.14", + "@angular/cdk": "16.2.14", "@angular/common": "^16.2.12", "@angular/compiler": "^16.2.12", "@angular/core": "^16.2.12", - "@angular/flex-layout": "^15.0.0-beta.42", "@angular/forms": "^16.2.12", "@angular/material": "^16.2.14", "@angular/material-moment-adapter": "^16.2.14", @@ -44,10 +44,12 @@ "leaflet": "^1.9.4", "libphonenumber-js": "^1.10.51", "moment": "^2.30.1", - "ngx-image-cropper": "7.2.1", + "ngx-image-cropper": "8.0.0", "ngx-mat-intl-tel-input": "^5.0.0", "ngx-mat-timepicker": "^16.2.0", + "ngx-owl-carousel-o": "16.0.0", "ngx-pagination": "^6.0.3", + "ngx-window-token": "^7.0.0", "rxjs": "~7.8.0", "tslib": "^2.6.2", "zone.js": "~0.13.0" @@ -85,6 +87,7 @@ "karma-coverage": "~2.2.1", "lint-staged": "^15.2.7", "prettier": "^3.2.5", + "tailwindcss": "^3.4.15", "ts-jest": "^29.1.2", "ts-node": "~10.9.2", "typescript": "~5.1.3" diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5d76fc6d96..8c8b0ac4ad 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,10 +1,20 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -const routes: Routes = [{ path: 'data', loadChildren: () => import('./shell/admin-tools/data/data.module').then((m) => m.DataModule) }]; +const routes: Routes = [ + { + path: 'data', + loadChildren: () => import('./shell/admin-tools/data/data.module').then((m) => m.DataModule) + } +]; @NgModule({ - imports: [RouterModule.forRoot(routes, { useHash: true, scrollPositionRestoration: 'enabled' })], + imports: [ + RouterModule.forRoot(routes, { + useHash: true, + anchorScrolling: 'enabled' + }) + ], exports: [RouterModule] }) export class AppRoutingModule {} diff --git a/src/app/app.component.html b/src/app/app.component.html index 5eee7961a8..65bc19de25 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@ -
+
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 5e9bffafa7..b6c29bf0e5 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -9,6 +9,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; import { NgxsModule, Store } from '@ngxs/store'; +import { NavigationEnd, Router } from '@angular/router'; +import { ViewportScroller } from '@angular/common'; +import { Subject } from 'rxjs'; import { AppComponent } from './app.component'; describe('AppComponent', () => { @@ -16,8 +19,12 @@ describe('AppComponent', () => { let fixture: ComponentFixture; let store: Store; let mockMatSnackBar: MatSnackBar; + let routerEvents$: Subject; + let viewportScroller: ViewportScroller; beforeEach(async () => { + routerEvents$ = new Subject(); + await TestBed.configureTestingModule({ imports: [ RouterTestingModule, @@ -36,7 +43,14 @@ describe('AppComponent', () => { MockSidenavComponent, MockSidenavFilterComponent ], - providers: [DateAdapter] + providers: [ + DateAdapter, + { provide: Router, useValue: { events: routerEvents$.asObservable() } }, + { + provide: ViewportScroller, + useValue: { scrollToPosition: jest.fn() } + } + ] }).compileComponents(); }); @@ -45,9 +59,14 @@ describe('AppComponent', () => { component = fixture.componentInstance; store = TestBed.inject(Store); mockMatSnackBar = TestBed.inject(MatSnackBar); + viewportScroller = TestBed.inject(ViewportScroller); fixture.detectChanges(); }); + afterEach(() => { + routerEvents$.complete(); // Завершуємо потік подій після кожного тесту + }); + it('should create the app', () => { expect(component).toBeTruthy(); }); @@ -61,6 +80,26 @@ describe('AppComponent', () => { expect(component.onResize).toHaveBeenCalled(); expect(component.isMobileView).toBeTruthy(); }); + + it('should not scroll to top if routes are in ignore list', () => { + const previousEvent = new NavigationEnd(1, '/result', '/result'); + const currentEvent = new NavigationEnd(2, '/result', '/result'); + + routerEvents$.next(previousEvent); + routerEvents$.next(currentEvent); + + expect(viewportScroller.scrollToPosition).not.toHaveBeenCalled(); + }); + + it('should scroll to top if routes are not in ignore list', () => { + const previousEvent = new NavigationEnd(1, '/not-ignore', '/not-ignore'); + const currentEvent = new NavigationEnd(2, '/not-ignore', '/not-ignore'); + + routerEvents$.next(previousEvent); + routerEvents$.next(currentEvent); + + expect(viewportScroller.scrollToPosition).toHaveBeenCalledWith([0, 0]); + }); }); @Component({ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b9c789cbf0..e522422364 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,14 +1,16 @@ import { Component, HostListener, OnDestroy, OnInit } from '@angular/core'; import { DateAdapter } from '@angular/material/core'; -import { Router } from '@angular/router'; +import { Event, NavigationEnd, Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { Select, Store } from '@ngxs/store'; -import { Observable, Subject } from 'rxjs'; +import { Observable, pairwise, Subject } from 'rxjs'; import { ToggleMobileScreen } from 'shared/store/app.actions'; import { GetFeaturesList } from 'shared/store/meta-data.actions'; import { CheckAuth } from 'shared/store/registration.actions'; import { RegistrationState } from 'shared/store/registration.state'; +import { ViewportScroller } from '@angular/common'; +import { filter } from 'rxjs/operators'; @Component({ selector: 'app-root', @@ -23,13 +25,32 @@ export class AppComponent implements OnInit, OnDestroy { private destroy$: Subject = new Subject(); private previousMobileScreenValue: boolean; private selectedLanguage: string; + private readonly ignoreScrollToTopRoutes = ['/result']; constructor( private store: Store, private translateService: TranslateService, private dateAdapter: DateAdapter, - private router: Router - ) {} + private router: Router, + private viewportScroller: ViewportScroller + ) { + this.router.events + .pipe( + filter((event: Event) => event instanceof NavigationEnd), + pairwise() + ) + .subscribe(([previousEvent, currentEvent]: [NavigationEnd, NavigationEnd]) => { + const previousUrl = previousEvent.urlAfterRedirects; + const currentUrl = currentEvent.urlAfterRedirects; + + if ( + !this.ignoreScrollToTopRoutes.some((route) => previousUrl.includes(route)) || + !this.ignoreScrollToTopRoutes.some((route) => currentUrl.includes(route)) + ) { + this.viewportScroller.scrollToPosition([0, 0]); + } + }); + } @HostListener('window: resize', ['$event.target']) public onResize(event: Window): void { @@ -48,7 +69,7 @@ export class AppComponent implements OnInit, OnDestroy { * method defined window.width and assign isMobileView: boolean */ public isWindowMobile(event: Window): void { - this.isMobileView = event.innerWidth < 750; + this.isMobileView = event.innerWidth < 800; if (this.previousMobileScreenValue !== this.isMobileView) { this.store.dispatch(new ToggleMobileScreen(this.isMobileView)); this.previousMobileScreenValue = this.isMobileView; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5f8afe8304..cb5bb9dc45 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,8 +1,7 @@ import { registerLocaleData } from '@angular/common'; import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http'; import localeUk from '@angular/common/locales/uk'; -import { LOCALE_ID, NgModule } from '@angular/core'; -import { FlexLayoutModule } from '@angular/flex-layout'; +import { APP_INITIALIZER, LOCALE_ID, NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MAT_LEGACY_SELECT_CONFIG as MAT_SELECT_CONFIG } from '@angular/material/legacy-select'; import { BrowserModule } from '@angular/platform-browser'; @@ -11,8 +10,9 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { NgxsReduxDevtoolsPluginModule } from '@ngxs/devtools-plugin'; import { NgxsLoggerPluginModule } from '@ngxs/logger-plugin'; -import { NgxsStoragePluginModule, StorageOption } from '@ngxs/storage-plugin'; -import { NgxsModule } from '@ngxs/store'; +import { NgxsStoragePluginModule, LOCAL_STORAGE_ENGINE, SESSION_STORAGE_ENGINE } from '@ngxs/storage-plugin'; +import { NgxsModule, Store } from '@ngxs/store'; +import { Observable } from 'rxjs'; import { ErrorHandleInterceptor } from 'shared/interceptors/error-handle.interceptor'; import { RegistrationModule } from 'shared/modules/registration.module'; @@ -27,6 +27,7 @@ import { NavigationState } from 'shared/store/navigation.state'; import { NotificationState } from 'shared/store/notification.state'; import { ParentState } from 'shared/store/parent.state'; import { ProviderState } from 'shared/store/provider.state'; +import { CheckAuth } from 'shared/store/registration.actions'; import { RegistrationState } from 'shared/store/registration.state'; import { SharedUserState } from 'shared/store/shared-user.state'; import { environment } from '../environments/environment'; @@ -64,8 +65,16 @@ registerLocaleData(localeUk); ]), NgxsStoragePluginModule.forRoot({ - key: AppState, - storage: StorageOption.SessionStorage + key: [ + { + key: AppState, + engine: SESSION_STORAGE_ENGINE + }, + { + key: 'filter.previousResults', + engine: LOCAL_STORAGE_ENGINE + } + ] }), NgxsReduxDevtoolsPluginModule.forRoot({ disabled: environment.production @@ -73,7 +82,6 @@ registerLocaleData(localeUk); NgxsLoggerPluginModule.forRoot({ disabled: environment.production }), - FlexLayoutModule, ShellModule, RegistrationModule, HttpClientModule, @@ -91,6 +99,12 @@ registerLocaleData(localeUk); provide: MAT_SELECT_CONFIG, useValue: { overlayPanelClass: 'custom-overlay-panel' } }, + { + provide: APP_INITIALIZER, + useFactory: (store: Store) => (): Observable => store.dispatch(new CheckAuth()), + deps: [Store], + multi: true + }, { provide: HTTP_INTERCEPTORS, useClass: ErrorHandleInterceptor, diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 65d6596fe6..f6e9041b4e 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -1,8 +1,8 @@
{{ 'TRIAL_MESSAGE' | translate }}
-
-
+
+
@@ -13,7 +13,7 @@
-
+
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss index 012b619458..5a0ee471c3 100644 --- a/src/app/footer/footer.component.scss +++ b/src/app/footer/footer.component.scss @@ -10,13 +10,13 @@ margin-top: 1.5rem; } } - .footer { //TODO: Uncomment after removing trial-message //background-color: #ebebeb; padding: 2.375rem 5rem; bottom: 0; width: 100%; + box-sizing: border-box; .min-logo { height: 41px; diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 3e08808691..7ceb29ef03 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -1,9 +1,10 @@
-
+
+ @@ -41,7 +42,7 @@
-
+

{{ headerTitle }}

{{ headerSubtitle }}

@@ -73,7 +74,7 @@

{{ headerSubtitle }}

@@ -124,7 +125,7 @@

{{ headerSubtitle }}

- + @@ -139,11 +140,16 @@

{{ headerSubtitle }}

{{ 'ENUM.NAV_BAR_NAME.MESSAGES' | translate }} - + + + + - diff --git a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.scss b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.scss index 390bc9e3c7..6c6b1132a3 100644 --- a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.scss +++ b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.scss @@ -1,28 +1,31 @@ @import 'src/app/shared/styles/buttons.scss'; -:host ::ng-deep .mat-dialog-container { - min-width: 411px; - min-height: 178px; - background: #ffffff; - box-shadow: 0px 6px 16px rgba(0, 0, 0, 0.08); - border-radius: 5px; -} -:host ::ng-deep .mat-dialog-actions { - padding-bottom: 2rem; -} -:host ::ng-deep.mat-dialog-actions .mat-button-base + .mat-button-base { - margin-left: 1rem !important; -} -:host ::ng-deep .mat-dialog-title { - text-align: center; - margin-bottom: 0; - font-family: Innerspace; - font-style: normal; - font-weight: bold; - font-size: 18px; - line-height: 20px; - color: #444444; +:host ::ng-deep .mat-mdc-dialog { + &-actions { + padding-bottom: 8px; + + .mat-button-base + .mat-button-base { + margin-left: 1rem !important; + } + } + + &-title { + text-align: center; + margin-bottom: 0; + padding-bottom: 0; + font-family: Innerspace; + font-style: normal; + font-weight: bold; + font-size: 18px; + line-height: 20px; + color: #444444; + + &::before { + height: 32px; + } + } } + .confirmation { text-align: center; font-family: Open Sans; @@ -31,19 +34,10 @@ font-size: 16px; line-height: 18px; color: #333333; - margin-top: 1rem; + margin-top: 1.5rem; margin-bottom: 0; } .btn { margin-top: 1rem; } -@media (max-width: 750px) { - :host ::ng-deep .mat-dialog-container { - min-width: fit-content; - min-height: 178px; - background: #ffffff; - box-shadow: 0px 6px 16px rgba(0, 0, 0, 0.08); - border-radius: 5px; - } -} diff --git a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.spec.ts b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.spec.ts index 98f493d0d5..aeea6f0ed0 100644 --- a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.spec.ts +++ b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.spec.ts @@ -1,12 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { - MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; import { TranslateModule } from '@ngx-translate/core'; import { ModalConfirmationTypeWithQuotes } from 'shared/enum/modal-confirmation'; diff --git a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.ts b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.ts index 40b7873970..37797d1403 100644 --- a/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.ts +++ b/src/app/shared/components/confirmation-modal-window/confirmation-modal-window.component.ts @@ -1,6 +1,6 @@ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ModalConfirmationText, diff --git a/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.html b/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.html index 78938e26a3..ffe4590780 100644 --- a/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.html +++ b/src/app/shared/components/confirmation-modal-window/reason-modal-window/reason-modal-window.component.html @@ -1,9 +1,9 @@ -
+

{{ modalTitle | translate }}

{{ modalConfirmationText | translate }}

-
-
+ +
+
error diff --git a/src/app/shared/components/filters-list/age-filter/age-filter.component.html b/src/app/shared/components/filters-list/age-filter/age-filter.component.html index 4bfa3677eb..10b06d1c8b 100644 --- a/src/app/shared/components/filters-list/age-filter/age-filter.component.html +++ b/src/app/shared/components/filters-list/age-filter/age-filter.component.html @@ -1,14 +1,14 @@

{{ 'SELECT_AGE' | translate }}

-
+
{{ 'EXACT_MATCH' | translate }}
-
+
-
+

{{ 'FROM' | translate }}

@@ -28,7 +28,7 @@
-
+

{{ 'TO' | translate }}

diff --git a/src/app/shared/components/filters-list/category-check-box/category-check-box.component.html b/src/app/shared/components/filters-list/category-check-box/category-check-box.component.html index b39511fceb..5122b1e3c1 100644 --- a/src/app/shared/components/filters-list/category-check-box/category-check-box.component.html +++ b/src/app/shared/components/filters-list/category-check-box/category-check-box.component.html @@ -1,6 +1,6 @@

{{ 'DIRECTIONS' | translate }}

-
+
diff --git a/src/app/shared/components/filters-list/category-check-box/category-check-box.component.scss b/src/app/shared/components/filters-list/category-check-box/category-check-box.component.scss index ba1cadcd77..3d46cc8eac 100644 --- a/src/app/shared/components/filters-list/category-check-box/category-check-box.component.scss +++ b/src/app/shared/components/filters-list/category-check-box/category-check-box.component.scss @@ -11,6 +11,10 @@ margin: 1rem 0.5rem; } +:host ::ng-deep .mat-form-field-infix { + padding: 0; +} + .list-wrapper { max-height: 200px; overflow: auto; @@ -38,22 +42,13 @@ button { height: 100%; } -:host ::ng-deep .mat-form-field-wrapper { - padding: 0; -} - -:host ::ng-deep .mat-form-field-infix { - border: none; -} - :host ::ng-deep .mat-stroked-button { min-width: inherit; padding: 0; } -:host ::ng-deep .mat-checkbox-label { +:host ::ng-deep .mat-mdc-checkbox .mdc-label { font-family: 'Open Sans', sans-serif; font-weight: 400; - font-size: 13px; line-height: 17.7px; } diff --git a/src/app/shared/components/filters-list/category-check-box/category-check-box.component.spec.ts b/src/app/shared/components/filters-list/category-check-box/category-check-box.component.spec.ts index d85cf09126..985678920b 100644 --- a/src/app/shared/components/filters-list/category-check-box/category-check-box.component.spec.ts +++ b/src/app/shared/components/filters-list/category-check-box/category-check-box.component.spec.ts @@ -1,7 +1,7 @@ -import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyCheckbox as MatCheckbox, MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatCheckboxChange, MatCheckboxModule } from '@angular/material/checkbox'; import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -59,7 +59,7 @@ describe('CategoryCheckBoxComponent', () => { it('should dispatch SetDirections and select direction id when onDirectionCheck called with checked', () => { jest.spyOn(store, 'dispatch'); - component.onDirectionCheck(mockDirections[0], { checked: true } as MatCheckbox); + component.onDirectionCheck(mockDirections[0], { checked: true } as MatCheckboxChange); expect(component.selectedDirectionIds).toContainEqual(mockDirections[0].id); expect(store.dispatch).toHaveBeenCalledWith(new SetDirections(component.selectedDirectionIds)); @@ -68,7 +68,7 @@ describe('CategoryCheckBoxComponent', () => { it('should dispatch SetDirections and deselect direction id when onDirectionCheck called with not checked', () => { jest.spyOn(store, 'dispatch'); - component.onDirectionCheck(mockDirections[1], { checked: false } as MatCheckbox); + component.onDirectionCheck(mockDirections[1], { checked: false } as MatCheckboxChange); expect(component.selectedDirectionIds.length).toBeFalsy(); expect(store.dispatch).toHaveBeenCalledWith(new SetDirections(component.selectedDirectionIds)); diff --git a/src/app/shared/components/filters-list/category-check-box/category-check-box.component.ts b/src/app/shared/components/filters-list/category-check-box/category-check-box.component.ts index c302087f83..951ef26164 100644 --- a/src/app/shared/components/filters-list/category-check-box/category-check-box.component.ts +++ b/src/app/shared/components/filters-list/category-check-box/category-check-box.component.ts @@ -1,6 +1,6 @@ -import { AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { MatLegacyCheckboxChange as MatCheckboxChange } from '@angular/material/legacy-checkbox'; +import { MatCheckboxChange } from '@angular/material/checkbox'; import { Select, Store } from '@ngxs/store'; import { Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, takeUntil } from 'rxjs/operators'; @@ -33,17 +33,24 @@ export class CategoryCheckBoxComponent implements OnInit, AfterViewInit, OnDestr private allDirections: Direction[] = []; private destroy$: Subject = new Subject(); - constructor(private store: Store) {} + constructor( + private readonly store: Store, + private readonly cdr: ChangeDetectorRef + ) {} public ngOnInit(): void { this.store.dispatch(new GetDirections()); this.directions$.pipe(filter(Boolean), takeUntil(this.destroy$)).subscribe((directions) => { this.allDirections = directions; this.filteredDirections = directions; + this.cdr.markForCheck(); }); this.directionSearchFormControl.valueChanges - .pipe(takeUntil(this.destroy$), debounceTime(300), distinctUntilChanged()) - .subscribe((value: string) => this.filterDirections(value)); + .pipe(debounceTime(300), distinctUntilChanged(), takeUntil(this.destroy$)) + .subscribe((value: string) => { + this.filterDirections(value); + this.cdr.markForCheck(); + }); } public ngAfterViewInit(): void { diff --git a/src/app/shared/components/filters-list/city-filter/city-filter.component.html b/src/app/shared/components/filters-list/city-filter/city-filter.component.html index d64ff02339..1da6b5bd61 100644 --- a/src/app/shared/components/filters-list/city-filter/city-filter.component.html +++ b/src/app/shared/components/filters-list/city-filter/city-filter.component.html @@ -1,4 +1,4 @@ - +
-
-

+

+

{{ 'YOU_ARE_IN_A_SETTLEMENT' | translate }} {{ settlement?.settlement }}?

- clear + clear
-
+
diff --git a/src/app/shared/components/filters-list/filters-list.component.html b/src/app/shared/components/filters-list/filters-list.component.html index 289ada150d..d8098795c4 100644 --- a/src/app/shared/components/filters-list/filters-list.component.html +++ b/src/app/shared/components/filters-list/filters-list.component.html @@ -1,8 +1,10 @@
-
- +
+ + +
+ +
+ +
+

{{ 'TO' | translate }}

+
+ + clear +
+ +
+ + + +
- - + + + + - + + + diff --git a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.scss b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.scss index 68a744349c..9684b33a81 100644 --- a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.scss +++ b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.scss @@ -11,6 +11,3 @@ small.warning { .image-cropper-wrapper { min-height: 50vh; } -.btn-wrapper { - padding-bottom: 2rem; -} diff --git a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.spec.ts b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.spec.ts index e7e2536e79..203862cafc 100644 --- a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.spec.ts +++ b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.spec.ts @@ -1,25 +1,31 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { ImageCroppedEvent, LoadedImage } from 'ngx-image-cropper'; +import { NgxsModule, Store } from '@ngxs/store'; +import { TranslateModule } from '@ngx-translate/core'; -import { - MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, - MatLegacyDialogModule as MatDialogModule, - MatLegacyDialogRef as MatDialogRef -} from '@angular/material/legacy-dialog'; -import { ImageCropperModule } from 'ngx-image-cropper'; +import { ShowMessageBar } from 'shared/store/app.actions'; +import { SnackbarText } from 'shared/enum/enumUA/message-bar'; import { Cropper } from '../../models/cropper'; import { ImageCropperModalComponent } from './image-cropper-modal.component'; describe('ImageCropperModalComponent', () => { let component: ImageCropperModalComponent; let fixture: ComponentFixture; + let mockDialogRef: MatDialogRef; + let store: Store; + + const testImage = new Event('test'); + const testCropperConfig = { cropperAspectRatio: 1, cropperMinWidth: 100, cropperMinHeight: 100 } as Cropper; beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ImageCropperModule, MatDialogModule], + imports: [MatDialogModule, NgxsModule.forRoot(), TranslateModule.forRoot()], declarations: [ImageCropperModalComponent], providers: [ - { provide: MAT_DIALOG_DATA, useValue: {} }, - { provide: MatDialogRef, useValue: {} } + { provide: MAT_DIALOG_DATA, useValue: { image: testImage, cropperConfig: testCropperConfig } }, + { provide: MatDialogRef, useValue: { close: jest.fn() } }, + { provide: Store, useValue: { dispatch: jest.fn() } } ] }).compileComponents(); }); @@ -27,12 +33,53 @@ describe('ImageCropperModalComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(ImageCropperModalComponent); component = fixture.componentInstance; - component.data.cropperConfig = {} as Cropper; - component.data.cropperConfig.cropperAspectRatio = 1; + + mockDialogRef = TestBed.inject(MatDialogRef); + store = TestBed.inject(Store); + + component.data.cropperConfig = testCropperConfig; + fixture.detectChanges(); }); it('should create', () => { expect(component).toBeTruthy(); }); + + it('should initialize with provided MAT_DIALOG_DATA', () => { + expect(component.data.image).toBe(testImage); + expect(component.data.cropperConfig).toEqual(testCropperConfig); + }); + + it('should call dialogRef.close with the imageFile when onConfirm is called', () => { + const testImageFile = new File(['test'], 'test-image.png'); + component.imageFile = testImageFile; + + component.onConfirm(); + + expect(mockDialogRef.close).toHaveBeenCalledWith(testImageFile); + }); + + it('should set croppedImage and imageFile when imageCropped is called', () => { + const mockEvent: ImageCroppedEvent = { + base64: null, + blob: new Blob(['test image'], { type: 'image/png' }), + objectUrl: 'http://test.com/test.png', + width: 800, + height: 600, + cropperPosition: { x1: 0, y1: 0, x2: 0, y2: 0 }, + imagePosition: { x1: 0, y1: 0, x2: 0, y2: 0 } + }; + + component.imageCropped(mockEvent); + + expect(component.croppedImage).toBe(mockEvent.objectUrl); + expect(component.imageFile).toEqual(mockEvent.blob); + }); + + it('should dispatch ShowMessageBar action with error message when loadImageFailed is called', () => { + component.loadImageFailed(); + + expect(store.dispatch).toHaveBeenCalledWith(new ShowMessageBar({ message: SnackbarText.errorToLoadImg, type: 'error' })); + }); }); diff --git a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.ts b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.ts index 86ad41a37c..44b8cb7c3a 100644 --- a/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.ts +++ b/src/app/shared/components/image-cropper-modal/image-cropper-modal.component.ts @@ -1,8 +1,11 @@ import { Component, Inject } from '@angular/core'; -import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; -import { ImageCroppedEvent, LoadedImage, base64ToFile } from 'ngx-image-cropper'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ImageCroppedEvent } from 'ngx-image-cropper'; +import { Store } from '@ngxs/store'; import { Cropper } from 'shared/models/cropper'; +import { ShowMessageBar } from 'shared/store/app.actions'; +import { SnackbarText } from 'shared/enum/enumUA/message-bar'; @Component({ selector: 'app-image-cropper-modal', @@ -10,38 +13,31 @@ import { Cropper } from 'shared/models/cropper'; styleUrls: ['./image-cropper-modal.component.scss'] }) export class ImageCropperModalComponent { - public imageChangedEvent = ''; public croppedImage = ''; public imageFile: Blob; - public invalidMinRequirements = false; constructor( @Inject(MAT_DIALOG_DATA) public data: { - image: string; + image: Event; cropperConfig: Cropper; }, - public dialogRef: MatDialogRef + public dialogRef: MatDialogRef, + private readonly store: Store ) {} public onConfirm(): void { this.dialogRef.close(this.imageFile); } - public fileChangeEvent(event: string): void { - this.imageChangedEvent = event; - } - public imageCropped(event: ImageCroppedEvent): void { - this.imageFile = base64ToFile(event.base64); - this.croppedImage = event.base64; + this.croppedImage = event.objectUrl; + this.imageFile = event.blob; } - public imageLoaded(image: LoadedImage): void { - const { height, width } = image.original.size; - this.invalidMinRequirements = height < this.data.cropperConfig.cropperMinHeight || width < this.data.cropperConfig.cropperMinWidth; + public loadImageFailed(): void { + this.store.dispatch(new ShowMessageBar({ message: SnackbarText.errorToLoadImg, type: 'error' })); } - public loadImageFailed(): void {} public cropperReady(): void {} } diff --git a/src/app/shared/components/image-form-control/image-form-control.component.html b/src/app/shared/components/image-form-control/image-form-control.component.html index 123b41cdde..ad93493d80 100644 --- a/src/app/shared/components/image-form-control/image-form-control.component.html +++ b/src/app/shared/components/image-form-control/image-form-control.component.html @@ -1,7 +1,7 @@
{{ label }}
-
Додайте фото натистувши на “+”. Максимум {{ imgMaxAmount }} фото
+
{{ 'BANNERS.ADD_IMG_SUBHEADER' | translate }} {{ imgMaxAmount }}