conflict_resolution
stringlengths
27
16k
<<<<<<< import { appReducers } from '../../../../../store/src/reducers.module'; import { TabNavService } from '../../../../tab-nav.service'; ======= import { createBasicStoreModule } from '../../../../test-framework/store-test-helper'; >>>>>>> import { TabNavService } from '../../../../tab-nav.service'; import { cre...
<<<<<<< // TODO: How do we handle metrics across endpoint types? export class MetricsAction implements EntityRequestAction { ======= // FIXME: Final solution for Metrics - STRAT-152 export class MetricsAction implements IRequestAction { >>>>>>> // FIXME: Final solution for Metrics - STRAT-152 export class MetricsAct...
<<<<<<< import { SetUAAScope, SetupUAA } from '../../../../../store/src/actions/setup.actions'; import { InternalAppState } from '../../../../../store/src/app-state'; ======= import { SetupUAA, SetupUAASave } from '../../../../../store/src/actions/setup.actions'; import { AppState } from '../../../../../store/src/app...
<<<<<<< ======= import { of as observableOf, BehaviorSubject, Observable, combineLatest as observableCombineLatest, Subscription } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount, startWith, takeWhile, tap, withLatestFrom, swi...
<<<<<<< }, { path: ':endpointId/console', component: KubeConsoleComponent, data: { uiNoMargin: true } ======= }, { path: ':endpointId/dashboard-config', component: KubedashConfigurationComponent, >>>>>>> }, { path: ':endpointId/dashboard-config', component: KubedashConfigurationComponent, }, { ...
<<<<<<< import { NoEndpointsNonAdminComponent } from './features/no-endpoints-non-admin/no-endpoints-non-admin.component'; import { ServiceCatalogModule } from './features/service-catalog/service-catalog.module'; import { UAASetupModule } from './features/uaa-setup/uaa-setup.module'; import { LoggedInService } from './...
<<<<<<< import { CFEntityConfig } from '../../../../cloud-foundry/cf-types'; import { getCFEntityKey } from '../../../../cloud-foundry/src/cf-entity-helpers'; ======= import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../../../cloud-foundry/cf-types'; import { appEnvVarsEntityType, applicationEntityType, appS...
<<<<<<< import { Component, Input } from '@angular/core'; ======= import { Component, OnInit } from '@angular/core'; >>>>>>> import { Component, Input, OnInit } from '@angular/core'; <<<<<<< ======= import { getEndpointTypes, getEndpointType } from '../../../../../../features/endpoints/endpoint-helpers'; >>>>>>>...
<<<<<<< import { organisationSchemaKey, spaceSchemaKey } from '../../../../store/actions/action-types'; import { DiscoverAppHelper } from './discover-app-helper'; import { HttpClient } from '@angular/common/http'; import { BehaviorSubject } from 'rxjs'; ======= import { organisationSchemaKey, spaceSchemaKey } from '....
<<<<<<< public message = ''; @ViewChild('terminal') container: ElementRef; ======= @ViewChild('terminal', { static: true }) container: ElementRef; >>>>>>> public message = ''; @ViewChild('terminal', { static: true }) container: ElementRef; <<<<<<< termSendData(d) { if (!this.msgSubscription.close...
<<<<<<< import { KubedashConfigurationComponent } from './kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component'; import { KubeConsoleComponent } from './kube-console/kube-console.component'; ======= >>>>>>> import { KubeConsoleComponent } from './kube-console/kube-console.component';
<<<<<<< ======= import { BaseHttpClientFetcher, flattenPagination, IPaginationFlattener, } from '../../../../store/src/helpers/paginated-request-helpers'; import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types'; import { endpointsRegisteredCFEntitiesSelector } from '../../../../s...
<<<<<<< import { RouterNav } from '../../../../../store/actions/router.actions'; ======= import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service'; import { CurrentUserPermissions } from '../../../../../core/current-user-permissions.config'; interface CanCache { [spaceGui...
<<<<<<< import { PaginatedAction } from '../../../../store/src/types/pagination.types'; import { EntityRequestAction } from '../../../../store/src/types/request.types'; import { IService, IServiceBroker, IServiceExtra, IServiceInstance, IServicePlan, IServicePlanExtra, IServicePlanVisibility, } from '../....
<<<<<<< import { MetricsConfig } from '../../../../../../shared/components/metrics-chart/metrics-chart.component'; import { MetricsLineChartConfig } from '../../../../../../shared/components/metrics-chart/metrics-chart.types'; import { FetchApplicationMetricsAction } from '../../../../../../store/actions/metrics.action...
<<<<<<< ======= import { QuotaFormValues, } from '../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component'; import { EntityInlineChildAction, EntityInlineParentAction, } from '../../../store/src/helpers/entity-relations/entity-relations.types'; >>>>>>> import { QuotaFor...
<<<<<<< gitCommitSchemaKey, serviceBrokerSchemaKey, userFavoritesSchemaKey, ======= >>>>>>> userFavoritesSchemaKey, <<<<<<< userFavorites: IRequestEntityTypeState<UserFavorite>; ======= // Extensibility [name: string]: IRequestEntityTypeState<any>; >>>>>>> userFavorites: IRequestEntityTypeState<U...
<<<<<<< import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service'; import { entityCatalogue } from './entity-catalog/entity-catalogue.service'; import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalogue.types'; ======= import { EntityMonitorFactory } from '../../core/src...
<<<<<<< import { AppStatSchema } from '../types/app-metadata.types'; import { NewApplication } from '../types/application.types'; import { PaginatedAction } from '../types/pagination.types'; import { ICFAction } from '../types/request.types'; import { CFStartAction } from './../types/request.types'; ======= import { ...
<<<<<<< import { createOrganizationStateObs, } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization-helper'; ======= import { createQuotaDefinition } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service'; >>>>>>> import { createOrganizationState...
<<<<<<< import { StepComponent } from './components/stepper/step/step.component'; import { SteppersComponent } from './components/stepper/steppers/steppers.component'; import { DisplayValueComponent } from './components/display-value/display-value.component'; import { EditableDisplayValueComponent } from './components/...
<<<<<<< this.externalDestroy(); ======= if (this.seedSyncSub) { this.seedSyncSub.unsubscribe(); } >>>>>>> if (this.seedSyncSub) { this.seedSyncSub.unsubscribe(); } this.externalDestroy();
<<<<<<< import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/cf-types'; import { GetAppStatsAction, GetAppSummaryAction } from '../../../../../../cloud-foundry/src/actions/app-metadata.actions'; import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state'; import { applicationEntityType } ...
<<<<<<< import { filter, switchMap, tap } from 'rxjs/operators'; ======= import { combineLatest, filter, map, switchMap, tap } from 'rxjs/operators'; >>>>>>> import { combineLatest, map, filter, switchMap, tap } from 'rxjs/operators';
<<<<<<< import { filter, map, switchMap } from 'rxjs/operators'; ======= import { first, map } from 'rxjs/operators'; >>>>>>> import { filter, map, switchMap, first } from 'rxjs/operators'; <<<<<<< constructor( private confirmDialog: ConfirmationDialogService, public cfUserService: CfUserService ) { ==...
<<<<<<< import { endpointEntitySchema } from '../../../../../core/src/base-entity-schemas'; import { EntityCatalogueHelpers } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.helper'; import { EntityCatalogueEntityConfig } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.types'; ...
<<<<<<< import { AppStat } from '../../../../cloud-foundry/src/store/types/app-metadata.types'; ======= >>>>>>> import { AppStat } from '../../../../cloud-foundry/src/store/types/app-metadata.types'; <<<<<<< import { getRoute, isTCPRoute } from './routes/routes.helper'; import { selectCfEntity } from '../../../../c...
<<<<<<< ======= import { IDomain } from '../../../../../../core/src/core/cf-api.types'; >>>>>>> <<<<<<< import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service'; import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service'; import { getDe...
<<<<<<< take, startWith, ======= >>>>>>> <<<<<<< import { CsiModeService } from '../csi-mode.service'; import { Observable, BehaviorSubject, Subscription, of as observableOf } from 'rxjs'; ======= >>>>>>> import { CsiModeService } from '../csi-mode.service'; <<<<<<< private snackBar: MatSnackBar, pr...
<<<<<<< import { IService, IServiceBroker, IServiceInstance, IServicePlan, IServicePlanVisibility } from '../../../cf-api-svc.types'; ======= import { cfEntityCatalog } from '../../../cf-entity-catalog'; >>>>>>> import { IService, IServiceBroker, IServiceInstance, IServicePlan, IServicePlanVisibility } from '../../....
<<<<<<< import { browser, by, element, ElementFinder, promise } from 'protractor'; ======= import { browser, by, element, promise, ElementFinder, protractor } from 'protractor'; >>>>>>> import { browser, by, element, ElementFinder, promise, protractor } from 'protractor';
<<<<<<< import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service'; ======= import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog'; >>>>>>> import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog'; <<...
<<<<<<< import { QParam, QParamJoiners } from '../shared/q-param'; ======= import { HttpParams, HttpRequest } from '@angular/common/http'; import { QParam, QParamJoiners } from '../../../store/src/q-param'; >>>>>>> import { HttpParams, HttpRequest } from '@angular/common/http';
<<<<<<< import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; ======= import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/an...
<<<<<<< import { organisationSchemaKey, spaceSchemaKey } from '../../../../store/actions/action-types'; import { DiscoverAppHelper } from './discover-app-helper'; import { HttpClient } from '@angular/common/http'; import { BehaviorSubject } from 'rxjs'; ======= import { organisationSchemaKey, spaceSchemaKey } from '....
<<<<<<< import { EditApplicationComponent } from './edit-application/edit-application.component'; ======= import { ApplicationTabsBaseComponent } from './application/application-tabs-base/application-tabs-base.component'; >>>>>>> import { EditApplicationComponent } from './edit-application/edit-application.component...
<<<<<<< import { GetSystemInfo } from '../../store/actions/system.actions'; ======= import { TableCellEndpointStatusComponent } from '../components/table/custom-cells/table-cell-endpoint-status/table-cell-endpoint-status.component'; >>>>>>> import { GetSystemInfo } from '../../store/actions/system.actions'; import...
<<<<<<< addServiceInstanceLink = () => [ '/service-catalog', this.servicesService.cfGuid, this.servicesService.serviceGuid, 'create' ] ======= getServiceLabel = (): Observable<string> => { return Observable.combineLatest(this.servicesService.service$, this.servicesService.serviceExtraInfo$...
<<<<<<< import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service'; import { getActionsFromExtensions, getTabsFromExtensions, StratosActionMetadata, StratosActionType, StratosTabType } from '../../../../../core/extension/extension-service'; ======= import { getAct...
<<<<<<< import { CFEntityConfig } from '../../../../cloud-foundry/cf-types'; ======= import { CFEntityConfig } from '../../../../cloud-foundry/cf-types'; import { spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-factory'; >>>>>>> import { CFEntityConfig } from '../../../../cloud-foundry/cf-types'; imp...
<<<<<<< orgs$: Observable<APIResource<CfOrg>[]>; info$: Observable<EntityInfo<APIResource<ICfV2Info>>>; cfInfoEntityService: EntityService<APIResource<ICfV2Info>>; ======= orgs$: Observable<APIResource<IOrganization>[]>; info$: Observable<EntityInfo<any>>; cfInfoEntityService: EntityService<any>; >>>>>>>...
<<<<<<< import { StratosBaseCatalogEntity, StratosCatalogEntity } from '../../../store/src/entity-catalog/entity-catalog-entity'; ======= import { IOrganization } from '../../../core/src/core/cf-api.types'; import { StratosBaseCatalogEntity, StratosCatalogEntity, } from '../../../store/src/entity-catalog/entity-c...
<<<<<<< import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/current-user-permissions.service'; ======= import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/permissions/current-user-permissions.service'; >>>>>>> import { CurrentUserPermissionsService } from 'fronte...
<<<<<<< ======= import { Action } from '@ngrx/store'; >>>>>>> <<<<<<< UNREGISTER_ENDPOINTS, ======= EndpointAction, UNREGISTER_ENDPOINTS, >>>>>>> UNREGISTER_ENDPOINTS, <<<<<<< import { UpdatePaginationMaxedState } from './../../actions/pagination.actions'; ======= import { ClearPaginationOfEntity, ...
<<<<<<< AppChipsComponent, CardNumberMetricComponent, CardCfRecentAppsComponent, ServiceIconComponent, EnvVarViewComponent, CompactAppCardComponent, ======= AppChipsComponent, ServiceIconComponent, EnvVarViewComponent >>>>>>> AppChipsComponent, CardNumberMetricComponent, ...
<<<<<<< import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/cf-types'; import { organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-factory'; import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/selectors/api.selectors'; ======= import { CF_ENDPOINT_TYPE } fr...
<<<<<<< ======= import { UserFavoritesEffect } from './effects/user-favorites-effect'; import { EndpointApiError } from './effects/endpoint-api-errors.effects'; >>>>>>> import { UserFavoritesEffect } from './effects/user-favorites-effect';
<<<<<<< public getAppsInOrg(org: APIResource<IOrganization>): Observable<APIResource<IApp>[]> { ======= public getAppsInOrgViaAllApps( org: APIResource<IOrganization> ): Observable<APIResource<IApp>[]> { >>>>>>> public getAppsInOrgViaAllApps(org: APIResource<IOrganization>): Observable<APIResource<IApp>[...
<<<<<<< endpointConfig: StratosCatalogEndpointEntity, endpointGuids: string[], ======= endpointConfig: StratosCatalogueEndpointEntity, endpointGuids: string | string[], >>>>>>> endpointConfig: StratosCatalogEndpointEntity, endpointGuids: string | string[],
<<<<<<< ======= import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service'; import { IEntityMetadata } from '../../../../../store/src/entity-catalog/entity-catalog.types'; import { SidePanelService } from '../../../shared/services/side-panel.service'; >>>>>>> import { SidePanelSer...
<<<<<<< import { CFStartAction, EntityRequestAction } from '../../../store/src/types/request.types'; ======= import { IRequestAction } from '../../../store/src/types/request.types'; >>>>>>> <<<<<<< // TODO: Can we get rid of this? export class GetCFUser extends CFStartAction implements EntityRequestAction { const...
<<<<<<< TableCellUsageComponent, ======= TableCellRouteComponent, TableCellTCPRouteComponent, >>>>>>> TableCellUsageComponent, TableCellRouteComponent, TableCellTCPRouteComponent,
<<<<<<< import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; ======= import { Observable } from 'rxjs/Observable'; import { filter, map, publishReplay, refCount } from 'rxjs/operators'; >>>>>>> import { Observable } from 'rxjs'; import { filter, map, publishReplay, refCount } from 'rxjs/o...
<<<<<<< githubBranches: IRequestEntityTypeState<APIResource>; githubCommits: IRequestEntityTypeState<APIResource>; domain: IRequestEntityTypeState<APIResource>; user: IRequestEntityTypeState<APIResource>; securityGroup: IRequestEntityTypeState<APIResource>; buildpack: IRequestEntityTypeState<APIResource>; ...
<<<<<<< import { APIResource, EntityInfo } from '../../../../store/types/api.types'; ======= import { APIResource } from '../../../../store/types/api.types'; import { CardStatus } from '../../application-state/application-state.service'; >>>>>>> import { APIResource } from '../../../../store/types/api.types'; <<<<<...
<<<<<<< import { UsageGaugeComponent } from './components/usage-gauge/usage-gauge.component'; import { PercentagePipe } from './pipes/percentage.pipe'; import { TableCellUsageComponent } from './components/table/custom-cells/table-cell-usage/table-cell-usage.component'; import { TableCellStatusDirective } from './compo...
<<<<<<< import { SimpleListComponent } from './components/list/simple-list/simple-list.component'; import { ListHostDirective } from './components/list/simple-list/list-host.directive'; ======= import { EndpointListHelper } from './components/list/list-types/endpoint/endpoint-list.helpers'; import { EndpointsListConf...
<<<<<<< // interface BaseEndpointTypeConfig { // type?: EndpointType; // subType?: string; // label: string; // urlValidation?: string; // allowTokenSharing?: boolean; // icon?: string; // iconFont?: string; // imagePath?: string; // authTypes?: string[]; // /** // * Get the link to the home page...
<<<<<<< import { CFEntityServiceFactory } from '../../../../cf-entity-service-factory.service'; import { entityCatalogue } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.service'; import { CF_ENDPOINT_TYPE } from '../../../../../cf-types'; import { spaceEntityType } from '../../../../cf-entity-...
<<<<<<< appMetadata: AppMetadata; ======= createApplication: CreateNewApplicationState; >>>>>>> appMetadata: AppMetadata; createApplication: CreateNewApplicationState;
<<<<<<< import { HttpRequest, HttpHeaders, HttpParams } from '@angular/common/http'; import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers'; ======= import { HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http'; >>>>>>> import { HttpHeaders, HttpParams, HttpRequest } from ...
<<<<<<< import { HttpClient, HttpHeaders, HttpParams, HttpRequest, HttpResponse } from '@angular/common/http'; ======= >>>>>>> import { HttpClient, HttpHeaders, HttpParams, HttpRequest, HttpResponse } from '@angular/common/http'; <<<<<<< import { Observable, of as observableOf, throwError as observableThrowError, t...
<<<<<<< featureFlag: {}, buildpack:{}, ======= service:{}, serviceBinding:{}, servicePlan: {}, serviceInstance: {}, >>>>>>> featureFlag: {}, buildpack:{}, service:{}, serviceBinding:{}, servicePlan: {}, serviceInstance: {}, <<<<<<< featur...
<<<<<<< import { applicationEntityType } from '../../../cloud-foundry/src/cf-entity-types'; ======= import { applicationEntityType } from '../../../cloud-foundry/src/cf-entity-factory'; import { createEntityRelationPaginationKey } from '../../../cloud-foundry/src/entity-relations/entity-relations.types'; >>>>>>> imp...
<<<<<<< buildpack:{}, ======= service:{}, serviceBinding:{}, servicePlan: {}, serviceInstance: {}, >>>>>>> buildpack:{}, service:{}, serviceBinding:{}, servicePlan: {}, serviceInstance: {}, <<<<<<< buildpack: {}, ======= service:{}, ser...
<<<<<<< import { OnDestroy } from '@angular/core/src/metadata/lifecycle_hooks'; ======= >>>>>>> <<<<<<< import { Subscription } from 'rxjs/Subscription'; import { EntityServiceFactory } from '../../../core/entity-service-factory.service'; import { ListConfig } from '../../../shared/components/list/list.component';...
<<<<<<< import { RunningInstancesComponent } from './components/running-instances/running-instances.component'; import { TableCellAppInstancesComponent } from './components/table/custom-cells/table-cell-app-instances/table-cell-app-instances.component'; ======= import { DialogConfirmComponent } from './components/...
<<<<<<< import { IServiceBinding } from '../../../cf-api-svc.types'; import { IApp, IRoute } from '../../../cf-api.types'; ======= import { cfEntityCatalog } from '../../../cf-entity-catalog'; >>>>>>> import { IServiceBinding } from '../../../cf-api-svc.types'; import { IApp, IRoute } from '../../../cf-api.types'; i...
<<<<<<< import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager'; import { PaginationMonitorFactory } from '../../../../monitors/pagination-monitor.factory'; import { EntityMonitorFactory } from '../../../../monitors/entity-monitor.factory.service'; ======= import { getFullEndpointApi...
<<<<<<< public clientID = '', public clientSecret = '', ======= public ssoAllowed: boolean, >>>>>>> public clientID = '', public clientSecret = '', public ssoAllowed: boolean,
<<<<<<< } export interface IBuildpack { name: string; position: number; enabled: boolean; locked: boolean; filename: string; ======= } export interface IStack { name: string; description: string; >>>>>>> } export interface IStack { name: string; description: string; } export interface IBuildpac...
<<<<<<< ======= import { SpecifyDetailsStepComponent } from './add-service-instance/specify-details-step/specify-details-step.component'; import { BindAppsStepComponent } from './add-service-instance/bind-apps-step/bind-apps-step.component'; import { AddServiceInstanceComponent } from './add-service-instance/add-serv...
<<<<<<< ======= import { IApp, ISpace } from '../../../../../../core/src/core/cf-api.types'; >>>>>>> <<<<<<< import { PaginatedAction } from '../../../../../../store/src/types/pagination.types'; import { IServiceInstance } from '../../../../cf-api-svc.types'; import { IApp, ISpace } from '../../../../cf-api.types';...
<<<<<<< system: IRequestEntityTypeState<SystemInfo>; githubBranches: IRequestEntityTypeState<APIResource>; githubCommits: IRequestEntityTypeState<APIResource>; domain: IRequestEntityTypeState<APIResource>; user: IRequestEntityTypeState<APIResource>; buildpack: IRequestEntityTypeState<APIResource>; ======= ...
<<<<<<< import { URLSearchParams } from 'url'; import { OAuthClient, IOAuthClient } from './OAuthClient'; ======= import { OAuthClient, IOAuthClient, IOAuthClientConfiguration } from './OAuthClient'; >>>>>>> import { URLSearchParams } from 'url'; import { OAuthClient, IOAuthClient, IOAuthClientConfiguration } from '...
<<<<<<< import { CFAppState } from '../../../../../../store/src/app-state'; import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper'; import { APIResource } from '../../../../../../store/src/types/api.types'; import { entityFactory, organizationSchemaK...
<<<<<<< import { UserProfileEffect, userProfilePasswordUpdatingKey } from '../../../store/src/effects/user-profile.effects'; import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog'; import { EntityMonitor } from '../../../store/src/monitors/entity-monitor'; import { ActionState, getDefaultActio...
<<<<<<< import { entityCatalog } from './../../../../../../store/src/entity-catalog/entity-catalog.service'; import { EntityCatalogSchemas, IStratosEndpointDefinition, } from './../../../../../../store/src/entity-catalog/entity-catalog.types'; ======= import { IStratosEndpointDefinition, EntityCatalogSchemas } fr...
<<<<<<< import { appStatsEntityType, cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory'; import { AppStat } from '../../../../../cloud-foundry/src/store/types/app-metadata.types'; ======= >>>>>>> <<<<<<< this.runningInstances$ = paginationMonitor.currentPage$ .pipe( ...
<<<<<<< import { createEmptyStoreModule } from '@stratosui/store/testing'; ======= import { createEmptyStoreModule } from '@stratos/store/testing'; >>>>>>> import { createEmptyStoreModule } from '@stratosui/store/testing'; <<<<<<< import { ApplicationServiceMock } from '../../../../../core/test-framework/applicatio...
<<<<<<< import { ServiceInstancesSchema, ServicePlanSchema, ServiceSchema, ServiceBindingsSchema } from '../actions/action-types'; ======= import { RouteSchema } from '../../shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source'; import { routeReducer } from './routes.reducer'; >>>>>>> import...
<<<<<<< import { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service'; import { getIdFromRoute } from '../../../../../core/src/core/utils.service'; import { CF_ENDPOINT_TYPE } from '../../../../cf-types'; ======= import { entityCatalog } from '../../../../../store/src/entity...
<<<<<<< import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material'; import { Subscription } from 'rxjs'; import { first, map, take } from 'rxjs/operators'; import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component'; ======= import { ErrorStateMatcher, MatSnac...
<<<<<<< import { distinctPageUntilChanged } from '../../../shared/data-sources/list-data-source'; import { ActionState } from '../api-request-reducer/types'; import { PaginationMonitor } from '../../../shared/monitors/pagination-monitor'; ======= >>>>>>> import { PaginationMonitor } from '../../../shared/monitors/pa...
<<<<<<< import { CapitalizeFirstPipe } from './pipes/capitalizeFirstLetter.pipe'; ======= import { CfEndpointsMissingComponent } from './components/cf-endpoints-missing/cf-endpoints-missing.component'; >>>>>>> import { CfEndpointsMissingComponent } from './components/cf-endpoints-missing/cf-endpoints-missing.compone...
<<<<<<< import { Customizations, CustomizationsMetadata } from '../../../core/customizations.types'; import { SessionData } from '../../../../../store/src/types/auth.types'; import { GeneralEntityAppState } from '../../../../../store/src/app-state'; ======= import { AppState } from '../../../../../store/src/app-stat...
<<<<<<< import { OrgUserRoleNames, SpaceUserRoleNames } from '../../../store/src/types/user.types'; ======= import { IRequestAction } from '../../../store/src/types/request.types'; import { OrgUserRoleNames, SpaceUserRoleNames } from '../store/types/user.types'; >>>>>>> import { OrgUserRoleNames, SpaceUserRoleNames ...
<<<<<<< ======= private authTypes = [ { name: 'Username and Password', value: 'creds', form: { username: ['', Validators.required], password: ['', Validators.required], }, types: new Array<EndpointType>('cf', 'metrics') }, { name: 'Single Sign-On (SSO)...
<<<<<<< import { ApplicationEnvVarsService } from './build-tab/application-env-vars.service'; ======= import { GetApplication, ApplicationSchema } from '../../../store/actions/application.actions'; import { ApplicationService } from '../application.service'; import { ApplicationStateService } from '../../../shared/co...
<<<<<<< securityGroup: IRequestEntityTypeState<APIResource>; ======= buildpack: IRequestEntityTypeState<APIResource>; >>>>>>> securityGroup: IRequestEntityTypeState<APIResource>; buildpack: IRequestEntityTypeState<APIResource>; <<<<<<< securityGroup: IRequestEntityTypeState<APIResource>; ======= build...
<<<<<<< export class SpecifyDetailsStepComponent implements OnDestroy, OnInit, AfterContentInit { selectCreateInstance$: Observable<CreateServiceInstanceState>; formModes = [ { label: 'Create Service Instance', key: FormMode.CreateServiceInstance }, { label: 'Bind Service Instance', ...
<<<<<<< import { EndpointListHelper } from './list-types/endpoint/endpoint-list.helpers'; import { EndpointCardComponent } from './list-types/endpoint/endpoint-card/endpoint-card.component'; import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state'; ======= >>>>>>>
<<<<<<< import { APIResource } from '../../store/types/api.types'; ======= import { ActiveRouteCfOrgSpace } from './cf-page.types'; >>>>>>> import { APIResource } from '../../store/types/api.types'; import { ActiveRouteCfOrgSpace } from './cf-page.types'; <<<<<<< export const getRowUniqueId = (entity: APIResource)...
<<<<<<< .connectAllEndpoints(ConsoleUserType.user) .connectAllEndpoints(ConsoleUserType.admin); ======= .connectAllEndpoints(ConsoleUserType.admin) .getInfo(); >>>>>>> .connectAllEndpoints(ConsoleUserType.user) .getInfo(); <<<<<<< // Select CF/Org/Space servicesHelperE2E...
<<<<<<< import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service'; import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service'; import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory'; ======= impor...
<<<<<<< ======= import { EndpointCardComponent } from '../custom-cards/endpoint-card/endpoint-card.component'; import { CfBuildpackCardComponent } from '../../list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component'; >>>>>>> import { CfBuildpackCardComponent } from '../../list-types/cf-buildpacks/cf-b...
<<<<<<< import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service'; ======= import { safeUnsubscribe } from '../../../../../core/src/core/utils.service'; import { ApplicationService } from '../../../../../core/src/features/applications/application.service'; >>>>>>...
<<<<<<< import { Component } from '../po/component.po'; ======= import { SSOLoginPage } from './sso-login.po'; import { ssoHelper } from '../helpers/sso-helper'; >>>>>>> import { ssoHelper } from '../helpers/sso-helper'; import { Component } from '../po/component.po'; import { SSOLoginPage } from './sso-login.po';
<<<<<<< ======= import { appEventEntityType, cfEntityFactory } from '../../../../../../../cloud-foundry/src/cf-entity-factory'; import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers'; import { AddParams, RemoveParams } from '../../../../../../../store/src/actions/pag...
<<<<<<< import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types'; ======= >>>>>>> <<<<<<< import { serviceBindingEntityType, serviceBindingNoBindingsEntityType } from '../../../../../cf-entity-types'; import { CF_ENDPOINT_TYPE } from '../../../../../cf-types'; ======= import { app...