mirror of
https://github.com/bitwarden/browser
synced 2025-12-21 02:33:46 +00:00
[SM-896] When org is disabled disable the logic and show warning symbols (#6225)
* When org is disabled disable the logic and show warning symbols * fixing org enabled logic * removing unused code * Adding route gaurd logic and new org suspended page * fixing lint issue * fixing issues * Requested changes * adding back code that was accidentally removed from organization-switcher * Update bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> * Removing unused code and updating storybook to set enabled:true * removing onDestroy * Will's suggestions * will's suggested change * fix nav-item color in story * Thomas Rittson's suggested changes * adding back removed spaces * Adding back white space * updating guard * Update bitwarden_license/bit-web/src/app/secrets-manager/guards/sm-org-enabled.guard.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * removing ununsed data * Updating incorrect messages --------- Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> Co-authored-by: William Martin <contact@willmartian.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
This commit is contained in:
@@ -70,6 +70,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
|
||||
protected userIsAdmin: boolean;
|
||||
protected showOnboarding = false;
|
||||
protected loading = true;
|
||||
protected organizationEnabled = false;
|
||||
|
||||
protected view$: Observable<{
|
||||
allProjects: ProjectListView[];
|
||||
@@ -107,6 +108,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
|
||||
this.organizationName = org.name;
|
||||
this.userIsAdmin = org.isAdmin;
|
||||
this.loading = true;
|
||||
this.organizationEnabled = org.enabled;
|
||||
});
|
||||
|
||||
const projects$ = combineLatest([
|
||||
@@ -208,6 +210,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
|
||||
data: {
|
||||
organizationId: this.organizationId,
|
||||
operation: OperationType.Edit,
|
||||
organizationEnabled: this.organizationEnabled,
|
||||
projectId: projectId,
|
||||
},
|
||||
});
|
||||
@@ -218,6 +221,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
|
||||
data: {
|
||||
organizationId: this.organizationId,
|
||||
operation: OperationType.Add,
|
||||
organizationEnabled: this.organizationEnabled,
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -227,6 +231,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
|
||||
data: {
|
||||
organizationId: this.organizationId,
|
||||
operation: OperationType.Add,
|
||||
organizationEnabled: this.organizationEnabled,
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -246,6 +251,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
|
||||
data: {
|
||||
organizationId: this.organizationId,
|
||||
operation: OperationType.Add,
|
||||
organizationEnabled: this.organizationEnabled,
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -256,6 +262,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
|
||||
organizationId: this.organizationId,
|
||||
operation: OperationType.Edit,
|
||||
secretId: secretId,
|
||||
organizationEnabled: this.organizationEnabled,
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -273,6 +280,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
|
||||
data: {
|
||||
organizationId: this.organizationId,
|
||||
operation: OperationType.Add,
|
||||
organizationEnabled: this.organizationEnabled,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user