diff --git a/teammapper-backend/src/map/services/maps.service.ts b/teammapper-backend/src/map/services/maps.service.ts index bad78478..30394562 100644 --- a/teammapper-backend/src/map/services/maps.service.ts +++ b/teammapper-backend/src/map/services/maps.service.ts @@ -83,7 +83,6 @@ export class MapsService { this.logger.warn( `Parent with id ${clientNode.parent} does not exist for node ${clientNode.id} and map ${mapId}` ) - this.logger.warn(clientNodes.map((node) => [node.id, node.parent])) return accCreatedNodes } diff --git a/teammapper-frontend/src/app/modules/application/components/dialog-pictograms/dialog-pictograms.component.html b/teammapper-frontend/src/app/modules/application/components/dialog-pictograms/dialog-pictograms.component.html index 319159f0..90d40dd5 100644 --- a/teammapper-frontend/src/app/modules/application/components/dialog-pictograms/dialog-pictograms.component.html +++ b/teammapper-frontend/src/app/modules/application/components/dialog-pictograms/dialog-pictograms.component.html @@ -8,7 +8,7 @@

{{ 'MODALS.PICTOGRAMS.TITLE' | translate }}

- +
{{ 'MODALS.PICTOGRAMS.EMPTY' | translate }}
diff --git a/teammapper-frontend/src/app/modules/application/components/dialog-pictograms/dialog-pictograms.component.ts b/teammapper-frontend/src/app/modules/application/components/dialog-pictograms/dialog-pictograms.component.ts index c3399013..3a341526 100644 --- a/teammapper-frontend/src/app/modules/application/components/dialog-pictograms/dialog-pictograms.component.ts +++ b/teammapper-frontend/src/app/modules/application/components/dialog-pictograms/dialog-pictograms.component.ts @@ -1,7 +1,11 @@ import { Component, EventEmitter, HostListener } from '@angular/core'; import { IPictogramResponse } from 'src/app/core/services/pictograms/picto-types'; import { PictogramService } from 'src/app/core/services/pictograms/pictogram.service'; -import { Breakpoints, BreakpointObserver } from '@angular/cdk/layout'; +import { + Breakpoints, + BreakpointObserver, + BreakpointState, +} from '@angular/cdk/layout'; import { map } from 'rxjs/operators'; import { MmpService } from 'src/app/core/services/mmp/mmp.service'; import { UtilsService } from 'src/app/core/services/utils/utils.service'; @@ -16,18 +20,25 @@ export class DialogPictogramsComponent { public onPictogramAdd = new EventEmitter(); public searchTerm = ''; public cardLayout = this.breakpointObserver - .observe([Breakpoints.Handset]) + .observe([Breakpoints.WebLandscape, Breakpoints.TabletLandscape]) .pipe( - map(({ matches }) => { - if (matches) { + map((state: BreakpointState) => { + if (state.breakpoints[Breakpoints.TabletLandscape]) { return { - columns: 1, + columns: 2, + miniCard: { cols: 1, rows: 1 }, + }; + } + + if (state.breakpoints[Breakpoints.WebLandscape]) { + return { + columns: 4, miniCard: { cols: 1, rows: 1 }, }; } return { - columns: 4, + columns: 1, miniCard: { cols: 1, rows: 1 }, }; })