From d7383009d4bd5184ed731b3abd684d54697e9a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Wed, 1 Nov 2023 18:32:48 +0200 Subject: [PATCH] RED-3800: Moved pagination component to common-ui --- .../src/app/modules/admin/admin.module.ts | 2 + .../screens/audit/audit-screen.component.html | 8 +-- .../pagination/pagination.component.html | 26 -------- .../pagination/pagination.component.scss | 27 -------- .../pagination/pagination.component.ts | 62 ------------------- .../src/app/modules/shared/shared.module.ts | 2 - 6 files changed, 6 insertions(+), 121 deletions(-) delete mode 100644 apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.html delete mode 100644 apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.scss delete mode 100644 apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.ts diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index fc8df4e81..45deecfee 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -57,6 +57,7 @@ import { DossierTemplateActionsComponent } from './shared/components/dossier-tem import { IqserUsersModule } from '@iqser/common-ui/lib/users'; import { TenantPipe } from '@iqser/common-ui/lib/tenants'; import { SelectComponent } from '@shared/components/select/select.component'; +import { PaginationComponent } from '@common-ui/pagination/pagination.component'; const dialogs = [ AddEditCloneDossierTemplateDialogComponent, @@ -125,6 +126,7 @@ const components = [ IqserDenyDirective, TenantPipe, SelectComponent, + PaginationComponent, ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html index 4b864e455..2a5d31257 100644 --- a/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html @@ -16,15 +16,15 @@
- + >
ยท
-
+
@@ -116,8 +116,8 @@
diff --git a/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.html b/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.html deleted file mode 100644 index 8a0db3f0d..000000000 --- a/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.html +++ /dev/null @@ -1,26 +0,0 @@ -
-| -
- {{ displayValue(page) }} -
-| -
diff --git a/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.scss b/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.scss deleted file mode 100644 index fae36a8b2..000000000 --- a/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.scss +++ /dev/null @@ -1,27 +0,0 @@ -:host { - display: flex; - - > *:not(:last-child) { - margin-right: 12px; - } - - .disabled, - span { - opacity: 0.5; - pointer-events: none; - } - - .page { - cursor: pointer; - - &.disabled, - &.dots { - cursor: default; - } - - &.active { - color: var(--iqser-primary); - font-weight: bold; - } - } -} diff --git a/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.ts b/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.ts deleted file mode 100644 index 0c1a5ff74..000000000 --- a/apps/red-ui/src/app/modules/shared/components/pagination/pagination.component.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; - -@Component({ - selector: 'redaction-pagination', - templateUrl: './pagination.component.html', - styleUrls: ['./pagination.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class PaginationComponent { - displayedPages: (number | string)[]; - @Output() pageChanged = new EventEmitter(); - displayed; - - private _currentPage: number; - - get currentPage() { - return this._currentPage; - } - - private _totalPages: number; - - get totalPages() { - return this._totalPages; - } - - @Input() - set settings(value: { currentPage: number; totalPages: number }) { - this._currentPage = value.currentPage; - this._totalPages = value.totalPages; - this._updatePagesArray(); - } - - selectPage(page: number | string) { - if (page !== '...') { - this.pageChanged.emit(page as number); - } - } - - displayValue(page: number | string) { - return page === '...' ? page : (page as number) + 1; - } - - isNumber(page) { - return Number.isInteger(page); - } - - private _updatePagesArray() { - this.displayedPages = [0]; - if (Math.max(1, this.currentPage - 1) > 1) { - this.displayedPages.push('...'); - } - for (let page = Math.max(1, this.currentPage - 1); page <= Math.min(this.currentPage + 1, this.totalPages - 1); ++page) { - this.displayedPages.push(page); - } - if (Math.min(this.currentPage + 1, this.totalPages - 1) !== this.totalPages - 1) { - if (this.currentPage + 1 < this.totalPages - 2) { - this.displayedPages.push('...'); - } - this.displayedPages.push(this.totalPages - 1); - } - } -} diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index af66e23fb..d7330bd16 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ScrollingModule } from '@angular/cdk/scrolling'; -import { PaginationComponent } from './components/pagination/pagination.component'; import { FileDownloadBtnComponent } from './components/buttons/file-download-btn/file-download-btn.component'; import { MatConfigModule } from '../mat-config/mat-config.module'; import { IconsModule } from '../icons/icons.module'; @@ -54,7 +53,6 @@ import { MatDividerModule } from '@angular/material/divider'; const buttons = [FileDownloadBtnComponent]; const components = [ - PaginationComponent, AnnotationIconComponent, DictionaryManagerComponent, AssignUserDropdownComponent,