bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 13:53:34 +00:00
Code Issues Releases Wiki Activity

add policy component form validation to policy edit component (#12150)

Browse Source
This commit is contained in:
Brandon Treston
2024-12-03 12:55:42 -05:00
committed by GitHub
parent 60e52dd2f2
commit 694f2c7da2
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
View File

@@ -15,7 +15,13 @@
</div> </div>
</ng-container> </ng-container>
<ng-container bitDialogFooter> <ng-container bitDialogFooter>
<button bitButton buttonType="primary" [disabled]="saveDisabled" bitFormButton type="submit"> <button
bitButton
buttonType="primary"
[disabled]="saveDisabled$ | async"
bitFormButton
type="submit"
>
{{ "save" | i18n }} {{ "save" | i18n }}
</button> </button>
<button bitButton buttonType="secondary" bitDialogClose type="button"> <button bitButton buttonType="secondary" bitDialogClose type="button">

7
apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
View File

@@ -8,6 +8,7 @@ import {
ViewContainerRef, ViewContainerRef,
} from "@angular/core"; } from "@angular/core";
import { FormBuilder } from "@angular/forms"; import { FormBuilder } from "@angular/forms";
import { Observable, map } from "rxjs";
import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { PolicyType } from "@bitwarden/common/admin-console/enums";
@@ -42,7 +43,7 @@ export class PolicyEditComponent implements AfterViewInit {
policyType = PolicyType; policyType = PolicyType;
loading = true; loading = true;
enabled = false; enabled = false;
saveDisabled = false; saveDisabled$: Observable<boolean>;
defaultTypes: any[]; defaultTypes: any[];
policyComponent: BasePolicyComponent; policyComponent: BasePolicyComponent;
@@ -73,7 +74,9 @@ export class PolicyEditComponent implements AfterViewInit {
this.policyComponent.policy = this.data.policy; this.policyComponent.policy = this.data.policy;
this.policyComponent.policyResponse = this.policyResponse; this.policyComponent.policyResponse = this.policyResponse;
this.saveDisabled = !this.policyResponse.canToggleState; this.saveDisabled$ = this.policyComponent.data.statusChanges.pipe(
map((status) => status !== "VALID" || !this.policyResponse.canToggleState),
);
this.cdr.detectChanges(); this.cdr.detectChanges();
} }