refactor: move organizations folder to admin-console, refs AC-1202 (#5118)

apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts

@@ -15,7 +15,7 @@ import { CollectionDetailsResponse } from "@bitwarden/common/admin-console/model
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { DialogService } from "@bitwarden/components";
 
-import { GroupService, GroupView } from "../../../organizations/core";
+import { GroupService, GroupView } from "../core";
 import {
   AccessItemType,
   AccessItemValue,

apps/web/src/app/admin-console/organizations/manage/groups.component.ts

@@ -33,7 +33,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { DialogService } from "@bitwarden/components";
 
-import { GroupService, GroupView } from "../../../organizations/core";
+import { GroupService, GroupView } from "../core";
 
 import {
   GroupAddEditDialogResultType,

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

@@ -22,7 +22,7 @@ import {
   GroupView,
   OrganizationUserAdminView,
   UserAdminService,
-} from "../../../../../organizations/core";
+} from "../../../core";
 import {
   AccessItemType,
   AccessItemValue,

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

@@ -3,8 +3,9 @@ import { RouterModule, Routes } from "@angular/router";
 
 import { canAccessMembersTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 
-import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
-import { PeopleComponent } from "../../admin-console/organizations/members/people.component";
+import { OrganizationPermissionsGuard } from "../guards/org-permissions.guard";
+
+import { PeopleComponent } from "./people.component";
 
 const routes: Routes = [
   {

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

@@ -1,16 +1,16 @@
 import { NgModule } from "@angular/core";
 
-import { UserDialogModule } from "../../admin-console/organizations/members/components/member-dialog";
-import { ResetPasswordComponent } from "../../admin-console/organizations/members/components/reset-password.component";
-import { PeopleComponent } from "../../admin-console/organizations/members/people.component";
-import { LooseComponentsModule } from "../../shared";
-import { SharedOrganizationModule } from "../shared";
+import { SharedOrganizationModule } from "../../../organizations/shared";
+import { LooseComponentsModule } from "../../../shared";
 
 import { BulkConfirmComponent } from "./components/bulk/bulk-confirm.component";
 import { BulkRemoveComponent } from "./components/bulk/bulk-remove.component";
 import { BulkRestoreRevokeComponent } from "./components/bulk/bulk-restore-revoke.component";
 import { BulkStatusComponent } from "./components/bulk/bulk-status.component";
+import { UserDialogModule } from "./components/member-dialog";
+import { ResetPasswordComponent } from "./components/reset-password.component";
 import { MembersRoutingModule } from "./members-routing.module";
+import { PeopleComponent } from "./people.component";
 
 @NgModule({
   imports: [

apps/web/src/app/admin-console/organizations/members/people.component.ts

@@ -55,13 +55,13 @@ import {
 
 import { EntityEventsComponent } from "../../../admin-console/organizations/manage/entity-events.component";
 import { BasePeopleComponent } from "../../../common/base.people.component";
-import { GroupService } from "../../../organizations/core";
-import { OrganizationUserView } from "../../../organizations/core/views/organization-user.view";
-import { BulkConfirmComponent } from "../../../organizations/members/components/bulk/bulk-confirm.component";
-import { BulkRemoveComponent } from "../../../organizations/members/components/bulk/bulk-remove.component";
-import { BulkRestoreRevokeComponent } from "../../../organizations/members/components/bulk/bulk-restore-revoke.component";
-import { BulkStatusComponent } from "../../../organizations/members/components/bulk/bulk-status.component";
+import { GroupService } from "../core";
+import { OrganizationUserView } from "../core/views/organization-user.view";
 
+import { BulkConfirmComponent } from "./components/bulk/bulk-confirm.component";
+import { BulkRemoveComponent } from "./components/bulk/bulk-remove.component";
+import { BulkRestoreRevokeComponent } from "./components/bulk/bulk-restore-revoke.component";
+import { BulkStatusComponent } from "./components/bulk/bulk-status.component";
 import {
   MemberDialogResult,
   MemberDialogTab,

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

@@ -51,7 +51,7 @@ const routes: Routes = [
       },
       {
         path: "members",
-        loadChildren: () => import("../../organizations/members").then((m) => m.MembersModule),
+        loadChildren: () => import("./members").then((m) => m.MembersModule),
       },
       {
         path: "groups",

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

@@ -1,8 +1,8 @@
 import { NgModule } from "@angular/core";
 
-import { CoreOrganizationModule } from "../../organizations/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";

apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts

@@ -2,7 +2,7 @@ import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enum
 import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
 import { SelectItemView } from "@bitwarden/components";
 
-import { CollectionAccessSelectionView } from "../../../../../organizations/core";
+import { CollectionAccessSelectionView } from "../../../core";
 
 /**
  * Permission options that replace/correspond with readOnly and hidePassword server fields.

apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts

@@ -17,7 +17,7 @@ import {
   CollectionAdminView,
   GroupService,
   GroupView,
-} from "../../../../../organizations/core";
+} from "../../../core";
 import {
   AccessItemType,
   AccessItemValue,

apps/web/src/app/admin-console/organizations/shared/components/search-input/search-input.stories.ts

@@ -4,7 +4,7 @@ import { Meta, moduleMetadata, Story } from "@storybook/angular";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { InputModule } from "@bitwarden/components/src/input/input.module";
 
-import { PreloadedEnglishI18nModule } from "../../../../tests/preloaded-english-i18n.module";
+import { PreloadedEnglishI18nModule } from "../../../../../tests/preloaded-english-i18n.module";
 
 import { SearchInputComponent } from "./search-input.component";
 

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

@@ -1,9 +1,9 @@
 import { NgModule } from "@angular/core";
 
-import { AccessSelectorModule } from "../../admin-console/organizations/shared/components/access-selector/access-selector.module";
-import { CollectionDialogModule } from "../../admin-console/organizations/shared/components/collection-dialog";
-import { SharedModule } from "../../shared/shared.module";
+import { SharedModule } from "../../../shared/shared.module";
 
+import { AccessSelectorModule } from "./components/access-selector/access-selector.module";
+import { CollectionDialogModule } from "./components/collection-dialog";
 import { SearchInputComponent } from "./components/search-input/search-input.component";
 
 @NgModule({

apps/web/src/app/common/base.people.component.ts

@@ -19,8 +19,8 @@ import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console
 import { Utils } from "@bitwarden/common/misc/utils";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 
+import { OrganizationUserView } from "../admin-console/organizations/core/views/organization-user.view";
 import { UserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component";
-import { OrganizationUserView } from "../organizations/core/views/organization-user.view";
 
 type StatusType = OrganizationUserStatusType | ProviderUserStatusType;
 

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

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

apps/web/src/app/vault/individual-vault/pipes/get-group-name.pipe.ts

@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from "@angular/core";
 
-import { GroupView } from "../../../organizations/core";
+import { GroupView } from "../../../admin-console/organizations/core";
 
 @Pipe({
   name: "groupNameFromId",

apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts

@@ -28,7 +28,7 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 
-import { CollectionAdminView } from "../../../../organizations/core";
+import { CollectionAdminView } from "../../../../admin-console/organizations/core";
 import {
   CipherTypeFilter,
   CollectionFilter,

apps/web/src/app/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts

@@ -3,7 +3,7 @@ import { ITreeNodeObject } from "@bitwarden/common/src/models/domain/tree-node";
 import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view";
 import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 
-import { CollectionAdminView } from "../../../../../organizations/core";
+import { CollectionAdminView } from "../../../../../admin-console/organizations/core";
 
 export type CipherStatus = "all" | "favorites" | "trash" | CipherType;
 

apps/web/src/app/vault/individual-vault/vault-items.component.ts

@@ -23,7 +23,7 @@ import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService, Icons } from "@bitwarden/components";
 
-import { CollectionAdminView, GroupView } from "../../organizations/core";
+import { CollectionAdminView, GroupView } from "../../admin-console/organizations/core";
 
 import {
   BulkDeleteDialogResult,

apps/web/src/app/vault/org-vault/group-badge/group-name-badge.component.ts

@@ -3,7 +3,7 @@ import { Component, Input, OnChanges } from "@angular/core";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request";
 
-import { GroupView } from "../../../organizations/core";
+import { GroupView } from "../../../admin-console/organizations/core";
 
 @Component({
   selector: "app-group-badge",

apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts

@@ -14,8 +14,8 @@ import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 
-import { CollectionAdminView } from "../../../organizations/core";
-import { CollectionAdminService } from "../../../organizations/core/services/collection-admin.service";
+import { CollectionAdminView } from "../../../admin-console/organizations/core";
+import { CollectionAdminService } from "../../../admin-console/organizations/core/services/collection-admin.service";
 import { VaultFilterService as BaseVaultFilterService } from "../../individual-vault/vault-filter/services/vault-filter.service";
 import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type";
 

apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts

@@ -18,12 +18,15 @@ import {
   SimpleDialogType,
 } from "@bitwarden/components";
 
+import {
+  CollectionAdminService,
+  CollectionAdminView,
+} from "../../../admin-console/organizations/core";
 import {
   CollectionDialogResult,
   CollectionDialogTabType,
   openCollectionDialog,
 } from "../../../admin-console/organizations/shared/components/collection-dialog";
-import { CollectionAdminService, CollectionAdminView } from "../../../organizations/core";
 import { VaultFilterService } from "../../individual-vault/vault-filter/services/abstractions/vault-filter.service";
 import { VaultFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.model";
 import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type";

apps/web/src/app/vault/org-vault/vault-items.component.ts

@@ -20,13 +20,13 @@ import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/pa
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
 
+import { CollectionAdminView } from "../../admin-console/organizations/core";
+import { GroupService } from "../../admin-console/organizations/core/services/group/group.service";
 import {
   CollectionDialogResult,
   CollectionDialogTabType,
   openCollectionDialog,
 } from "../../admin-console/organizations/shared/components/collection-dialog";
-import { CollectionAdminView } from "../../organizations/core";
-import { GroupService } from "../../organizations/core/services/group/group.service";
 import {
   BulkDeleteDialogResult,
   openBulkDeleteDialog,

bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-confirm.component.ts

@@ -3,12 +3,12 @@ import { Component, Input } from "@angular/core";
 import { ProviderUserStatusType } from "@bitwarden/common/admin-console/enums/provider-user-status-type";
 import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk-confirm.request";
 import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request";
-import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "@bitwarden/web-vault/app/organizations/members/components/bulk/bulk-confirm.component";
-import { BulkUserDetails } from "@bitwarden/web-vault/app/organizations/members/components/bulk/bulk-status.component";
+import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-confirm.component";
+import { BulkUserDetails } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-status.component";
 
 @Component({
   templateUrl:
-    "../../../../../../../../apps/web/src/app/organizations/members/components/bulk/bulk-confirm.component.html",
+    "../../../../../../../../apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.html",
 })
 export class BulkConfirmComponent extends OrganizationBulkConfirmComponent {
   @Input() providerId: string;

bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-remove.component.ts

@@ -1,11 +1,11 @@
 import { Component, Input } from "@angular/core";
 
 import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request";
-import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from "@bitwarden/web-vault/app/organizations/members/components/bulk/bulk-remove.component";
+import { BulkRemoveComponent as OrganizationBulkRemoveComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-remove.component";
 
 @Component({
   templateUrl:
-    "../../../../../../../../apps/web/src/app/organizations/members/components/bulk/bulk-remove.component.html",
+    "../../../../../../../../apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.html",
 })
 export class BulkRemoveComponent extends OrganizationBulkRemoveComponent {
   @Input() providerId: string;

bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.ts

@@ -22,8 +22,8 @@ import { ProviderUserBulkResponse } from "@bitwarden/common/admin-console/models
 import { ProviderUserUserDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { EntityEventsComponent } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
+import { BulkStatusComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-status.component";
 import { BasePeopleComponent } from "@bitwarden/web-vault/app/common/base.people.component";
-import { BulkStatusComponent } from "@bitwarden/web-vault/app/organizations/members/components/bulk/bulk-status.component";
 
 import { BulkConfirmComponent } from "./bulk/bulk-confirm.component";
 import { BulkRemoveComponent } from "./bulk/bulk-remove.component";

bitwarden_license/bit-web/src/app/secrets-manager/shared/sm-shared.module.ts

@@ -1,8 +1,8 @@
 import { NgModule } from "@angular/core";
 
 import { MultiSelectModule } from "@bitwarden/components";
+import { CoreOrganizationModule } from "@bitwarden/web-vault/app/admin-console/organizations/core";
 import { ProductSwitcherModule } from "@bitwarden/web-vault/app/layouts/product-switcher/product-switcher.module";
-import { CoreOrganizationModule } from "@bitwarden/web-vault/app/organizations/core";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
 
 import { AccessSelectorComponent } from "./access-policies/access-selector.component";