Skip to content

Commit

Permalink
Rename billing entity components
Browse files Browse the repository at this point in the history
  • Loading branch information
ccremer committed Apr 14, 2023
1 parent 8cd6f9e commit a540249
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 27 deletions.
8 changes: 4 additions & 4 deletions src/app/billingentity/billing-entity-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { BillingEntityComponent } from './billing-entity.component';
import { BillingentityDetailComponent } from './billingentity-detail/billingentity-detail.component';
import { BillingEntityDetailComponent } from './billingentity-detail/billing-entity-detail.component';
import { KubernetesPermissionGuard } from '../kubernetes-permission.guard';
import { BillingEntityPermissions } from '../types/billing-entity';
import { BillingentityMembersComponent } from './billingentity-members/billingentity-members.component';
import { BillingEntityMembersComponent } from './billingentity-members/billing-entity-members.component';

const routes: Routes = [
{
Expand All @@ -17,15 +17,15 @@ const routes: Routes = [
},
{
path: ':name',
component: BillingentityDetailComponent,
component: BillingEntityDetailComponent,
canActivate: [KubernetesPermissionGuard],
data: {
requiredKubernetesPermissions: [{ ...BillingEntityPermissions, verb: 'list' }],
},
},
{
path: ':name/members',
component: BillingentityMembersComponent,
component: BillingEntityMembersComponent,
canActivate: [KubernetesPermissionGuard],
data: {
requiredKubernetesPermissions: [{ ...BillingEntityPermissions, verb: 'list' }],
Expand Down
16 changes: 8 additions & 8 deletions src/app/billingentity/billing-entity.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import { NgModule } from '@angular/core';
import { SharedModule } from '../shared/shared.module';
import { BillingEntityComponent } from './billing-entity.component';
import { BillingEntityRoutingModule } from './billing-entity-routing.module';
import { BillingentityDetailComponent } from './billingentity-detail/billingentity-detail.component';
import { BillingentityMembersComponent } from './billingentity-members/billingentity-members.component';
import { BillingentityViewComponent } from './billingentity-view/billingentity-view.component';
import { BillingentityFormComponent } from './billingentity-form/billingentity-form.component';
import { BillingEntityDetailComponent } from './billingentity-detail/billing-entity-detail.component';
import { BillingEntityMembersComponent } from './billingentity-members/billing-entity-members.component';
import { BillingEntityViewComponent } from './billingentity-view/billing-entity-view.component';
import { BillingEntityFormComponent } from './billingentity-form/billing-entity-form.component';

@NgModule({
declarations: [
BillingEntityComponent,
BillingentityDetailComponent,
BillingentityMembersComponent,
BillingentityViewComponent,
BillingentityFormComponent,
BillingEntityDetailComponent,
BillingEntityMembersComponent,
BillingEntityViewComponent,
BillingEntityFormComponent,
],
imports: [SharedModule, BillingEntityRoutingModule],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import { BillingEntityCollectionService } from '../../store/billingentity-collec

@Component({
selector: 'app-billingentity-detail',
templateUrl: './billingentity-detail.component.html',
styleUrls: ['./billingentity-detail.component.scss'],
templateUrl: './billing-entity-detail.component.html',
styleUrls: ['./billing-entity-detail.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class BillingentityDetailComponent implements OnInit {
export class BillingEntityDetailComponent implements OnInit {
viewModel$?: Observable<ViewModel>;
isEditing$?: Observable<boolean>;
billingEntityName = '';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</div>

<div class="col-12">
<div class="mb-4" *ngIf="isNewBe()">
<div class="mb-4" *ngIf="isNewBillingEntity()">
<small i18n>
By registering a billing address, you agree that you will get charged for using VSHN products.
You also agree to our
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import { filter } from 'rxjs';

@Component({
selector: 'app-billingentity-form',
templateUrl: './billingentity-form.component.html',
styleUrls: ['./billingentity-form.component.scss'],
templateUrl: './billing-entity-form.component.html',
styleUrls: ['./billing-entity-form.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class BillingentityFormComponent implements OnInit {
export class BillingEntityFormComponent implements OnInit {
@Input()
billingEntity!: BillingEntity;

Expand Down Expand Up @@ -123,7 +123,7 @@ export class BillingentityFormComponent implements OnInit {
emails: controls.accountingEmail.value,
},
};
if (this.isNewBe(be)) {
if (this.isNewBillingEntity(be)) {
this.billingService.add(be).subscribe({
next: (result) => this.saveOrUpdateSuccess(result),
error: (err) => this.saveOrUpdateFailure(err),
Expand All @@ -144,7 +144,7 @@ export class BillingentityFormComponent implements OnInit {
});
}

isNewBe(be?: BillingEntity): boolean {
isNewBillingEntity(be?: BillingEntity): boolean {
return be ? !!be.metadata.generateName : !!this.billingEntity.metadata.generateName;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ interface Payload {

@Component({
selector: 'app-billingentity-members',
templateUrl: './billingentity-members.component.html',
styleUrls: ['./billingentity-members.component.scss'],
templateUrl: './billing-entity-members.component.html',
styleUrls: ['./billing-entity-members.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class BillingentityMembersComponent implements OnInit, OnDestroy {
export class BillingEntityMembersComponent implements OnInit, OnDestroy {
payload$?: Observable<Payload>;

faWarning = faWarning;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { BillingEntity } from '../../types/billing-entity';

@Component({
selector: 'app-billingentity-view',
templateUrl: './billingentity-view.component.html',
styleUrls: ['./billingentity-view.component.scss'],
templateUrl: './billing-entity-view.component.html',
styleUrls: ['./billing-entity-view.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class BillingentityViewComponent {
export class BillingEntityViewComponent {
@Input()
billingEntity!: BillingEntity;

Expand Down

0 comments on commit a540249

Please sign in to comment.