Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-28 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

SM-1181: Rename service accounts to machine accounts in routing (#8688)

Browse Source
This commit is contained in:
Colton Hurst 2024-04-18 11:01:14 -04:00 committed by GitHub
parent 2c8855692c
commit a45706cde7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.html
View File

@ -19,7 +19,7 @@
<bit-nav-item <bit-nav-item
icon="bwi-wrench" icon="bwi-wrench"
[text]="'machineAccounts' | i18n" [text]="'machineAccounts' | i18n"
route="service-accounts" route="machine-accounts"
[relativeTo]="route.parent" [relativeTo]="route.parent"
></bit-nav-item> ></bit-nav-item>
<bit-nav-item <bit-nav-item

2
bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.html
View File

@ -6,7 +6,7 @@
<bit-tab-link [route]="['secrets']">{{ "secrets" | i18n }}</bit-tab-link> <bit-tab-link [route]="['secrets']">{{ "secrets" | i18n }}</bit-tab-link>
<ng-container *ngIf="project.write"> <ng-container *ngIf="project.write">
<bit-tab-link [route]="['people']">{{ "people" | i18n }}</bit-tab-link> <bit-tab-link [route]="['people']">{{ "people" | i18n }}</bit-tab-link>
<bit-tab-link [route]="['service-accounts']">{{ "machineAccounts" | i18n }}</bit-tab-link> <bit-tab-link [route]="['machine-accounts']">{{ "machineAccounts" | i18n }}</bit-tab-link>
</ng-container> </ng-container>
</bit-tab-nav-bar> </bit-tab-nav-bar>
<sm-new-menu></sm-new-menu> <sm-new-menu></sm-new-menu>

2
bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-routing.module.ts
View File

@ -30,7 +30,7 @@ const routes: Routes = [
component: ProjectPeopleComponent, component: ProjectPeopleComponent,
}, },
{ {
path: "service-accounts", path: "machine-accounts",
component: ProjectServiceAccountsComponent, component: ProjectServiceAccountsComponent,
}, },
], ],

4
bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts
View File

@ -21,8 +21,8 @@ export const serviceAccountAccessGuard: CanActivateFn = async (route: ActivatedR
return createUrlTreeFromSnapshot(route, [ return createUrlTreeFromSnapshot(route, [
"/sm", "/sm",
route.params.organizationId, route.params.organizationId,
"service-accounts", "machine-accounts",
]); ]);
} }
return createUrlTreeFromSnapshot(route, ["/sm", route.params.organizationId, "service-accounts"]); return createUrlTreeFromSnapshot(route, ["/sm", route.params.organizationId, "machine-accounts"]);
}; };

4
bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts
View File

@ -43,7 +43,7 @@ export class ServiceAccountPeopleComponent implements OnInit, OnDestroy {
catchError(() => { catchError(() => {
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises // eslint-disable-next-line @typescript-eslint/no-floating-promises
this.router.navigate(["/sm", this.organizationId, "service-accounts"]); this.router.navigate(["/sm", this.organizationId, "machine-accounts"]);
return EMPTY; return EMPTY;
}), }),
); );
@ -200,7 +200,7 @@ export class ServiceAccountPeopleComponent implements OnInit, OnDestroy {
if (showAccessRemovalWarning) { if (showAccessRemovalWarning) {
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises // eslint-disable-next-line @typescript-eslint/no-floating-promises
this.router.navigate(["sm", this.organizationId, "service-accounts"]); this.router.navigate(["sm", this.organizationId, "machine-accounts"]);
} else if ( } else if (
this.accessPolicySelectorService.isAccessRemoval(currentAccessPolicies, selectedPolicies) this.accessPolicySelectorService.isAccessRemoval(currentAccessPolicies, selectedPolicies)
) { ) {

2
bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts
View File

@ -45,7 +45,7 @@ export class ServiceAccountComponent implements OnInit, OnDestroy {
catchError(() => { catchError(() => {
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
// eslint-disable-next-line @typescript-eslint/no-floating-promises // eslint-disable-next-line @typescript-eslint/no-floating-promises
this.router.navigate(["/sm", this.organizationId, "service-accounts"]).then(() => { this.router.navigate(["/sm", this.organizationId, "machine-accounts"]).then(() => {
this.platformUtilsService.showToast( this.platformUtilsService.showToast(
"error", "error",
null, null,

2
bitwarden_license/bit-web/src/app/secrets-manager/sm-routing.module.ts
View File

@ -54,7 +54,7 @@ const routes: Routes = [
}, },
}, },
{ {
path: "service-accounts", path: "machine-accounts",
loadChildren: () => ServiceAccountsModule, loadChildren: () => ServiceAccountsModule,
data: { data: {
titleId: "machineAccounts", titleId: "machineAccounts",