Skip to content

Commit 3f54a0e

Browse files
committed
fix(arc-saas): pagination and cleaning
pagination and cleaning GH-34
1 parent 2ed4ada commit 3f54a0e

File tree

55 files changed

+87
-53
lines changed

Some content is hidden

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

55 files changed

+87
-53
lines changed

projects/saas-ui/src/app/main/add-plan/add-plan.component.html renamed to projects/saas-ui/src/app/main/components/add-plan/add-plan.component.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ <h2>{{ isEditMode ? 'Edit Plan' : 'Add New Plan' }}</h2>
5151
formControlName="price"
5252
nbInput
5353
/>
54+
<div *ngIf="price?.['pattern'] && price.touched">
55+
Please enter a valid number.
56+
</div>
5457
</div>
5558
</div>
5659

projects/saas-ui/src/app/main/add-plan/add-plan.component.scss renamed to projects/saas-ui/src/app/main/components/add-plan/add-plan.component.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@
4242
.regbtn {
4343
text-align: right;
4444
}
45+
input.ng-invalid.ng-touched {
46+
border: 1px solid red;
47+
}

projects/saas-ui/src/app/main/add-plan/add-plan.component.ts renamed to projects/saas-ui/src/app/main/components/add-plan/add-plan.component.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms';
33
import {ActivatedRoute, Router} from '@angular/router';
44
import {NbToastrService} from '@nebular/theme';
55
import {Location} from '@angular/common';
6-
import {OnBoardingService} from '../../on-boarding/on-boarding-service';
6+
import {OnBoardingService} from '../../../on-boarding/on-boarding-service';
77
import {catchError, of, pipe, takeUntil} from 'rxjs';
8-
import {TenantStatus} from '../enums/tenant-status.enum';
8+
import {TenantStatus} from '../../enums/tenant-status.enum';
99
import {AnyObject} from '@project-lib/core/api';
10-
import {IAnyObject} from '../../../../../../../angular-boilerplate/projects/arc-lib/src/lib/core/i-any-object';
10+
import {IAnyObject} from '../../../../../../arc-lib/src/lib/core/i-any-object';
1111
import {APP_CONFIG} from '@project-lib/app-config';
12-
import {BillingPlanService} from '../services/billing-plan-service';
12+
import {BillingPlanService} from '../../services/billing-plan-service';
1313
@Component({
1414
selector: 'add-plan',
1515
templateUrl: './add-plan.component.html',
@@ -38,7 +38,7 @@ export class AddPlanComponent implements OnInit {
3838
this.addPlanForm = this.fb.group({
3939
name: ['', Validators.required],
4040
description: ['', Validators.required],
41-
price: ['', Validators.required],
41+
price: ['', Validators.pattern('[0-9]')],
4242
currencyId: ['', Validators.required],
4343
billingCycleId: [null, Validators.required],
4444
tier: [null, Validators.required],
@@ -60,7 +60,7 @@ export class AddPlanComponent implements OnInit {
6060
this.billingplanService.addPlan(domainData).subscribe(
6161
() => {
6262
this.toasterService.show('Plan added Successfully');
63-
this.router.navigate(['/main/plan-items']);
63+
this.router.navigate(['/main/plans']);
6464
},
6565
(error: string) => {
6666
console.error('Login error:', error); //NOSONAR
@@ -94,7 +94,7 @@ export class AddPlanComponent implements OnInit {
9494
this.billingplanService
9595
.editPlan(domainData, this.activateRoute.snapshot.params.id)
9696
.subscribe(res => {
97-
this.router.navigate(['/main/plan-items']);
97+
this.router.navigate(['/main/plans']);
9898
});
9999
}
100100

projects/saas-ui/src/app/main/billing-plan/billing-plan.component.html renamed to projects/saas-ui/src/app/main/components/billing-plan/billing-plan.component.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ <h2>Billing Details</h2>
88
class="ag-theme-quartz"
99
[rowData]="rowData"
1010
[columnDefs]="colDefs"
11+
[pagination]="pagination"
12+
[paginationPageSize]="paginationPageSize"
13+
[paginationPageSizeSelector]="paginationPageSizeSelector"
1114
>
1215
</ag-grid-angular>
1316
</nb-card-body>

projects/saas-ui/src/app/main/billing-plan/billing-plan.component.ts renamed to projects/saas-ui/src/app/main/components/billing-plan/billing-plan.component.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {RouteComponentBaseDirective} from '@project-lib/core/route-component-bas
55
import {ColDef} from 'ag-grid-community';
66
import {takeUntil} from 'rxjs';
77
import {Location} from '@angular/common';
8-
import {SubscriptionStatus} from '../enums/subscription-status.enum';
9-
import {BillingPlanService} from '../services/billing-plan-service';
8+
import {SubscriptionStatus} from '../../enums/subscription-status.enum';
9+
import {BillingPlanService} from '../../services/billing-plan-service';
1010

1111
@Component({
1212
selector: 'app-billing-plan',
@@ -29,6 +29,10 @@ export class BillingPlanComponent
2929
rowData: AnyObject = [];
3030
data: AnyObject = [];
3131
tenants: AnyObject[];
32+
// for Pagination
33+
pagination = true;
34+
paginationPageSize = 5;
35+
paginationPageSizeSelector = [5, 10, 20, 50, 100];
3236

3337
constructor(
3438
protected override readonly location: Location,

0 commit comments

Comments
 (0)