From 325df8d75fcc7f4a14542419157d3cb7f2208e47 Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Wed, 6 Aug 2025 09:10:08 -0500 Subject: [PATCH] PM-23824 fixing failed types tests and removed unwanted import --- .../connect-dialog/connect-dialog-hec.component.ts | 8 ++++---- .../integrations/integrations.component.spec.ts | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts index eb80841b82c..d24dfc4b8dd 100644 --- a/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/integrations/integration-dialog/connect-dialog/connect-dialog-hec.component.ts @@ -68,10 +68,10 @@ export class ConnectHecDialogComponent implements OnInit { const result: HecConnectDialogResult = { integrationSettings: this.connectInfo.settings, - url: formJson.url, - bearerToken: formJson.bearerToken, - index: formJson.index, - service: formJson.service, + url: formJson.url || "", + bearerToken: formJson.bearerToken || "", + index: formJson.index || "", + service: formJson.service || "", success: true, error: null, }; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts index be4b5725ecc..5261fef2c90 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts @@ -9,7 +9,6 @@ import {} from "@bitwarden/web-vault/app/shared"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens"; -import { OrganizationIntegrationApiService } from "@bitwarden/bit-common/dirt/integrations"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { ThemeType } from "@bitwarden/common/platform/enums"; import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service"; @@ -17,6 +16,7 @@ import { ToastService } from "@bitwarden/components"; import { I18nPipe } from "@bitwarden/ui-common"; import { IntegrationCardComponent } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/integrations/integration-card/integration-card.component"; import { IntegrationGridComponent } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/integrations/integration-grid/integration-grid.component"; +import { OrganizationIntegrationService } from "@bitwarden/web-vault/app/admin-console/organizations/shared/components/integrations/services/organization-integration.service"; import { IntegrationsComponent } from "./integrations.component"; @@ -37,7 +37,7 @@ class MockNewMenuComponent {} describe("IntegrationsComponent", () => { let fixture: ComponentFixture; - const mockOrgIntegrationApiService = mock(); + const mockOrgIntegrationService = mock(); const activatedRouteMock = { snapshot: { paramMap: { get: jest.fn() } }, }; @@ -52,7 +52,7 @@ describe("IntegrationsComponent", () => { { provide: ThemeStateService, useValue: mock() }, { provide: SYSTEM_THEME_OBSERVABLE, useValue: of(ThemeType.Light) }, { provide: ActivatedRoute, useValue: activatedRouteMock }, - { provide: OrganizationIntegrationApiService, useValue: mockOrgIntegrationApiService }, + { provide: OrganizationIntegrationService, useValue: mockOrgIntegrationService }, { provide: ToastService, useValue: mock() }, { provide: I18nPipe, useValue: mock() }, { provide: I18nService, useValue: mockI18nService },