Browse Source

Merge pull request #5133 from bitwarden/ac1202-shared-org-index

[AC-1202] Move shared organization index to admin-console
pull/5150/head
Vincent Salucci 3 years ago committed by GitHub
parent
commit
3fdc30c936
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.module.ts
  2. 2
      apps/web/src/app/admin-console/organizations/members/members.module.ts
  3. 3
      apps/web/src/app/admin-console/organizations/organization.module.ts
  4. 2
      apps/web/src/app/admin-console/organizations/shared/index.ts
  5. 2
      apps/web/src/app/organizations/shared/index.ts

2
apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.module.ts

@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
import { RadioButtonModule } from "@bitwarden/components";
import { SharedOrganizationModule } from "../../../../../organizations/shared";
import { SharedOrganizationModule } from "../../../shared";
import { MemberDialogComponent } from "./member-dialog.component";
import { NestedCheckboxComponent } from "./nested-checkbox.component";

2
apps/web/src/app/admin-console/organizations/members/members.module.ts

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
import { NgModule } from "@angular/core";
import { SharedOrganizationModule } from "../../../organizations/shared";
import { LooseComponentsModule } from "../../../shared";
import { SharedOrganizationModule } from "../shared";
import { BulkConfirmComponent } from "./components/bulk/bulk-confirm.component";
import { BulkRemoveComponent } from "./components/bulk/bulk-remove.component";

3
apps/web/src/app/admin-console/organizations/organization.module.ts

@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
import { NgModule } from "@angular/core";
import { SharedOrganizationModule } from "../../organizations/shared";
import { CoreOrganizationModule } from "./core";
import { GroupAddEditComponent } from "./manage/group-add-edit.component";
import { GroupsComponent } from "./manage/groups.component";
import { OrganizationsRoutingModule } from "./organization-routing.module";
import { SharedOrganizationModule } from "./shared";
import { AccessSelectorModule } from "./shared/components/access-selector";
@NgModule({

2
apps/web/src/app/admin-console/organizations/shared/index.ts

@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
export * from "./shared-organization.module";
export * from "./components/collection-dialog";

2
apps/web/src/app/organizations/shared/index.ts

@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
export * from "../../admin-console/organizations/shared/shared-organization.module";
export * from "../../admin-console/organizations/shared/components/collection-dialog";
Loading…
Cancel
Save