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 { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
<<<<<<<
StoreModule.forRoot(
appReducers
)
],
providers: [TabNavService]
=======
createBasicStoreModule()
]
>>>>>>>
createBasicStoreModule()
],
providers: [TabNavService] |
<<<<<<<
// 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 MetricsAction implements EntityRequestAction { |
<<<<<<<
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-state';
>>>>>>>
import { SetupUAA } from '../../../../../store/src/actions/setup.actions';
import { InternalAppState } from '../../../../../store/src/app-state'; |
<<<<<<<
=======
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,
switchMap,
} from 'rxjs/operators';
>>>>>>> |
<<<<<<<
},
{
path: ':endpointId/console',
component: KubeConsoleComponent,
data: {
uiNoMargin: true
}
=======
},
{
path: ':endpointId/dashboard-config',
component: KubedashConfigurationComponent,
>>>>>>>
},
{
path: ':endpointId/dashboard-config',
component: KubedashConfigurationComponent,
},
{
path: ':endpointId/console',
component: KubeConsoleComponent,
data: {
uiNoMargin: true
} |
<<<<<<<
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 './logged-in.service';
=======
import { SetupModule } from './features/setup/setup.module';
>>>>>>>
import { NoEndpointsNonAdminComponent } from './features/no-endpoints-non-admin/no-endpoints-non-admin.component';
import { ServiceCatalogModule } from './features/service-catalog/service-catalog.module';
import { SetupModule } from './features/setup/setup.module';
import { LoggedInService } from './logged-in.service'; |
<<<<<<<
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,
appStatsEntityType,
domainEntityType,
organizationEntityType,
routeEntityType,
serviceBindingEntityType,
spaceEntityType,
stackEntityType,
} from '../../../../cloud-foundry/src/cf-entity-factory';
>>>>>>>
import { CFEntityConfig } from '../../../../cloud-foundry/cf-types';
import {
appEnvVarsEntityType,
applicationEntityType,
appStatsEntityType,
domainEntityType,
organizationEntityType,
routeEntityType,
serviceBindingEntityType,
spaceEntityType,
stackEntityType,
} from '../../../../cloud-foundry/src/cf-entity-factory';
import { getCFEntityKey } from '../../../../cloud-foundry/src/cf-entity-helpers';
<<<<<<<
import {
appEnvVarsSchemaKey,
applicationSchemaKey,
appStatsSchemaKey,
domainSchemaKey,
organizationSchemaKey,
routeSchemaKey,
serviceBindingSchemaKey,
spaceSchemaKey,
stackSchemaKey,
} from '../../../../store/src/helpers/entity-factory';
=======
>>>>>>>
<<<<<<<
const orgEntityKey = getCFEntityKey(organizationSchemaKey);
=======
const orgEntityKey = EntityCatalogueHelpers.buildEntityKey(organizationEntityType, CF_ENDPOINT_TYPE);
>>>>>>>
const orgEntityKey = getCFEntityKey(organizationEntityType); |
<<<<<<<
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 { getEndpointType } from '../../../../../../features/endpoints/endpoint-helpers';
<<<<<<<
export class TableCellEndpointNameComponent extends TableCellCustom<EndpointModel> {
=======
export class TableCellEndpointNameComponent<T> extends TableCellCustom<T> implements OnInit {
public canShowLink = false;
>>>>>>>
export class TableCellEndpointNameComponent extends TableCellCustom<EndpointModel> implements OnInit {
public canShowLink = false; |
<<<<<<<
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 '../../../../store/helpers/entity-factory';
import { CfAppsDataSource } from '../../../../shared/components/list/list-types/app/cf-apps-data-source';
>>>>>>>
import { organisationSchemaKey, spaceSchemaKey } from '../../../../store/helpers/entity-factory';
import { CfAppsDataSource } from '../../../../shared/components/list/list-types/app/cf-apps-data-source';
import { DiscoverAppHelper } from './discover-app-helper';
import { HttpClient } from '@angular/common/http';
import { BehaviorSubject } from 'rxjs';
<<<<<<<
catchError(e => {
return [];
}),
share(),
map(message => {
const json = JSON.parse(message);
return json;
}),
filter(l => !!l),
tap((log) => {
// Deal with control messages
if (log.type !== SocketEventTypes.DATA) {
this.processWebSocketMessage(log);
}
}),
filter((log) => log.type === SocketEventTypes.DATA),
map((log) => log.message)
=======
catchError(e => {
return [];
}),
share(),
map(message => {
const json = JSON.parse(message);
return json;
}),
filter(l => !!l),
tap((log) => {
// Deal with control messages
if (log.type !== SocketEventTypes.DATA) {
this.updateTitle(log);
}
}),
filter((log) => log.type === SocketEventTypes.DATA),
map((log) => {
const timesString = moment(log.timestamp * 1000).format('DD/MM/YYYY hh:mm:ss A');
return (
`${timesString}: ${log.message}`
);
})
>>>>>>>
catchError(e => {
return [];
}),
share(),
map(message => {
const json = JSON.parse(message);
return json;
}),
filter(l => !!l),
tap((log) => {
// Deal with control messages
if (log.type !== SocketEventTypes.DATA) {
this.processWebSocketMessage(log);
}
}),
filter((log) => log.type === SocketEventTypes.DATA),
map((log) => log.message)
<<<<<<<
this.deploying = true;
if (!this.appDetectionHelper) {
this.appDetectionHelper = new DiscoverAppHelper(this.http, this.appData.cloudFoundry, this.appData.space, this.appData.Name);
this.appDetectionHelper.startDetection(this.validate);
}
=======
this.store.dispatch(new GetAllApplications(CfAppsDataSource.paginationKey));
>>>>>>>
this.deploying = true;
if (!this.appDetectionHelper) {
this.appDetectionHelper = new DiscoverAppHelper(this.http, this.appData.cloudFoundry, this.appData.space, this.appData.Name);
this.appDetectionHelper.startDetection(this.validate);
}
<<<<<<<
this.deploying = false;
if (this.appDetectionHelper) {
this.appDetectionHelper.stopDetection();
}
=======
this.apps$ = this.store.select(selectEntities('application')).pipe(
tap(apps => {
Object.values(apps).forEach(app => {
if (
app.entity.space_guid === this.appData.space &&
app.entity.cfGuid === this.appData.cloudFoundry &&
app.entity.name === this.appData.Name
) {
this.appGuid = app.metadata.guid;
this.validate = Observable.of(true);
}
});
})
).subscribe();
>>>>>>>
this.deploying = false;
if (this.appDetectionHelper) {
this.appDetectionHelper.stopDetection();
} |
<<<<<<<
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.closed) {
this.sshInput.next(JSON.stringify({ key: d }));
}
}
termResize(size) {
if (!this.msgSubscription.closed && this.sshInput) {
this.sshInput.next(JSON.stringify({ cols: size.cols, rows: size.rows }));
}
}
private isWindowTitle(data: string): boolean {
const chars = data.split(' ');
if (chars.length > 4 &&
parseInt(chars[0], 16) === 27 &&
parseInt(chars[1], 16) === 93 &&
parseInt(chars[2], 16) === 50 &&
parseInt(chars[3], 16) === 59) {
let title = '';
for (let i = 4; i < chars.length - 1; i++) {
title += String.fromCharCode(parseInt(chars[i], 16));
}
this.message = title;
}
return false;
}
=======
>>>>>>>
private isWindowTitle(data: string): boolean {
const chars = data.split(' ');
if (chars.length > 4 &&
parseInt(chars[0], 16) === 27 &&
parseInt(chars[1], 16) === 93 &&
parseInt(chars[2], 16) === 50 &&
parseInt(chars[3], 16) === 59) {
let title = '';
for (let i = 4; i < chars.length - 1; i++) {
title += String.fromCharCode(parseInt(chars[i], 16));
}
this.message = title;
}
return false;
} |
<<<<<<<
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 '../../../../store/src/selectors/endpoint.selectors';
import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
import { EndpointModel, INewlyConnectedEndpointInfo } from '../../../../store/src/types/endpoint.types';
import { BasePaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
>>>>>>>
<<<<<<<
import { BasePaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
import { BaseHttpClientFetcher, PaginationFlattener, flattenPagination } from '../../../../store/src/helpers/paginated-request-helpers';
import { endpointsRegisteredCFEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
import { INewlyConnectedEndpointInfo, EndpointModel } from '../../../../store/src/types/endpoint.types';
=======
>>>>>>>
import { BasePaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
import { BaseHttpClientFetcher, PaginationFlattener, flattenPagination } from '../../../../store/src/helpers/paginated-request-helpers';
import { endpointsRegisteredCFEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
import { INewlyConnectedEndpointInfo, EndpointModel } from '../../../../store/src/types/endpoint.types'; |
<<<<<<<
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 {
[spaceGuid: string]: Observable<boolean>;
}
>>>>>>>
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 {
[spaceGuid: string]: Observable<boolean>;
}
<<<<<<<
private listActionEdit: IListAction<APIResource> = {
action: (item: APIResource<IServiceInstance>) =>
this.serviceActionHelperService.editServiceBinding(item.metadata.guid, item.entity.cfGuid),
label: 'Edit',
description: 'Edit Service Instance',
// createVisible: (row: APIResource) => Observable.of(true),
// createEnabled: (row: APIResource) => Observable.of(true)
};
=======
private can(cache: CanCache, perm: CurrentUserPermissions, cfGuid: string, spaceGuid: string): Observable<boolean> {
let can = cache[spaceGuid];
if (!can) {
can = this.currentUserPermissionsService.can(perm, cfGuid, spaceGuid);
cache[spaceGuid] = can;
}
return can;
}
>>>>>>>
private listActionEdit: IListAction<APIResource> = {
action: (item: APIResource<IServiceInstance>) =>
this.serviceActionHelperService.editServiceBinding(item.metadata.guid, item.entity.cfGuid),
label: 'Edit',
description: 'Edit Service Instance',
// createVisible: (row: APIResource) => Observable.of(true),
// createEnabled: (row: APIResource) => Observable.of(true)
};
private can(cache: CanCache, perm: CurrentUserPermissions, cfGuid: string, spaceGuid: string): Observable<boolean> {
let can = cache[spaceGuid];
if (!can) {
can = this.currentUserPermissionsService.can(perm, cfGuid, spaceGuid);
cache[spaceGuid] = can;
}
return can;
} |
<<<<<<<
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 '../../cf-api-svc.types';
=======
>>>>>>>
import {
IService,
IServiceBroker,
IServiceExtra,
IServiceInstance,
IServicePlan,
IServicePlanExtra,
IServicePlanVisibility,
} from '../../cf-api-svc.types'; |
<<<<<<<
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.actions';
import { AppState } from '../../../../../../store/app-state';
=======
import { AppState } from '../../../../../../store/app-state';
>>>>>>>
import { AppState } from '../../../../../../store/app-state';
<<<<<<<
import { IMetricMatrixResult } from '../../../../../../store/types/base-metric.types';
=======
>>>>>>>
<<<<<<<
constructor(
private route: ActivatedRoute,
private applicationService: ApplicationService,
private store: Store<AppState>
) { }
appService = this.applicationService;
=======
constructor(private route: ActivatedRoute, public applicationService: ApplicationService, private store: Store<AppState>) { }
>>>>>>>
constructor(
private route: ActivatedRoute,
private applicationService: ApplicationService,
private store: Store<AppState>
) { }
<<<<<<<
this.appService.appSummary$
=======
this.applicationService.appSummary$
>>>>>>>
this.applicationService.appSummary$ |
<<<<<<<
=======
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 {
QuotaFormValues,
} from '../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component'; |
<<<<<<<
gitCommitSchemaKey,
serviceBrokerSchemaKey,
userFavoritesSchemaKey,
=======
>>>>>>>
userFavoritesSchemaKey,
<<<<<<<
userFavorites: IRequestEntityTypeState<UserFavorite>;
=======
// Extensibility
[name: string]: IRequestEntityTypeState<any>;
>>>>>>>
userFavorites: IRequestEntityTypeState<UserFavorite>;
// Extensibility
[name: string]: IRequestEntityTypeState<any>;
<<<<<<<
userFavorites: IRequestEntityTypeState<RequestInfoState>;
=======
// Extensibility
[name: string]: IRequestEntityTypeState<RequestInfoState>;
>>>>>>>
userFavorites: IRequestEntityTypeState<RequestInfoState>;
// Extensibility
[name: string]: IRequestEntityTypeState<RequestInfoState>; |
<<<<<<<
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/shared/monitors/entity-monitor.factory.service';
import { entityCatalog } from './entity-catalog/entity-catalog.service';
import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalog.types';
>>>>>>>
import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service';
import { entityCatalog } from './entity-catalog/entity-catalog.service';
import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalog.types'; |
<<<<<<<
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 { PaginatedAction } from '../types/pagination.types';
import { CfApplication } from '../types/application.types';
import { pick } from '../helpers/reducer.helper';
>>>>>>>
import { AppStatSchema } from '../types/app-metadata.types';
import { CfApplication } from '../types/application.types';
import { PaginatedAction } from '../types/pagination.types';
import { ICFAction } from '../types/request.types';
import { CFStartAction } from './../types/request.types'; |
<<<<<<<
import {
createOrganizationStateObs,
} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization-helper';
=======
import { createQuotaDefinition } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
>>>>>>>
import {
createOrganizationStateObs,
} from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization-helper';
import { createQuotaDefinition } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
<<<<<<<
import { EntityMonitorFactory } from '../../../../../monitors/entity-monitor.factory.service';
import { PaginationMonitorFactory } from '../../../../../monitors/pagination-monitor.factory';
=======
import { PaginationMonitorFactory } from '../../../../../monitors/pagination-monitor.factory';
>>>>>>>
import { EntityMonitorFactory } from '../../../../../monitors/entity-monitor.factory.service';
import { PaginationMonitorFactory } from '../../../../../monitors/pagination-monitor.factory';
<<<<<<<
private confirmDialog: ConfirmationDialogService,
private paginationMonitorFactory: PaginationMonitorFactory,
private emf: EntityMonitorFactory
=======
private confirmDialog: ConfirmationDialogService,
private paginationMonitorFactory: PaginationMonitorFactory,
>>>>>>>
private confirmDialog: ConfirmationDialogService,
private paginationMonitorFactory: PaginationMonitorFactory,
private emf: EntityMonitorFactory
<<<<<<<
const allApps$: Observable<APIResource<IApp>[]> = this.cfEndpointService.hasAllApps$.pipe(
switchMap(hasAll => hasAll ? this.cfEndpointService.getAppsInOrg(this.row) : observableOf(null))
);
this.appCount$ = allApps$.pipe(
switchMap(allApps => allApps ? observableOf(allApps.length) : CloudFoundryEndpointService.fetchAppCount(
this.store,
this.paginationMonitorFactory,
this.cfEndpointService.cfGuid,
this.row.metadata.guid
))
);
=======
const allApps$: Observable<APIResource<IApp>[]> = this.cfEndpointService.hasAllApps$.pipe(
switchMap(hasAll => hasAll ? this.cfEndpointService.getAppsInOrgViaAllApps(this.row) : observableOf(null))
);
this.appCount$ = allApps$.pipe(
switchMap(allApps => allApps ? observableOf(allApps.length) : CloudFoundryEndpointService.fetchAppCount(
this.store,
this.paginationMonitorFactory,
this.cfEndpointService.cfGuid,
this.row.metadata.guid
))
);
>>>>>>>
const allApps$: Observable<APIResource<IApp>[]> = this.cfEndpointService.hasAllApps$.pipe(
switchMap(hasAll => hasAll ? this.cfEndpointService.getAppsInOrgViaAllApps(this.row) : observableOf(null))
);
this.appCount$ = allApps$.pipe(
switchMap(allApps => allApps ? observableOf(allApps.length) : CloudFoundryEndpointService.fetchAppCount(
this.store,
this.paginationMonitorFactory,
this.cfEndpointService.cfGuid,
this.row.metadata.guid
))
);
<<<<<<<
if (apps) {
this.setAppsDependentCounts(apps);
this.memoryTotal = this.cfEndpointService.getMetricFromApps(apps, 'memory');
this.normalisedMemoryUsage = this.memoryTotal / this.memoryLimit * 100;
}
const quotaDefinition = this.row.entity.quota_definition || {
entity: {
memory_limit: -1,
app_instance_limit: -1,
instance_memory_limit: -1,
name: 'None assigned',
organization_guid: this.orgGuid,
total_services: -1,
total_routes: -1
},
metadata: null
};
=======
if (apps) {
this.setAppsDependentCounts(apps);
this.memoryTotal = this.cfEndpointService.getMetricFromApps(apps, 'memory');
this.normalisedMemoryUsage = this.memoryTotal / this.memoryLimit * 100;
}
const quotaDefinition = this.row.entity.quota_definition || createQuotaDefinition(this.orgGuid);
>>>>>>>
if (apps) {
this.setAppsDependentCounts(apps);
this.memoryTotal = this.cfEndpointService.getMetricFromApps(apps, 'memory');
this.normalisedMemoryUsage = this.memoryTotal / this.memoryLimit * 100;
}
const quotaDefinition = this.row.entity.quota_definition || createQuotaDefinition(this.orgGuid); |
<<<<<<<
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/editable-display-value/editable-display-value.component';
import { MbToHumanSizePipe } from './pipes/mb-to-human-size.pipe';
=======
import { SteppersModule } from './components/stepper/steppers.module';
>>>>>>>
import { SteppersModule } from './components/stepper/steppers.module';
import { MbToHumanSizePipe } from './pipes/mb-to-human-size.pipe'; |
<<<<<<<
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 } from '../../../../../../cloud-foundry/src/cf-entity-factory';
import { IAppFavMetadata } from '../../../../../../cloud-foundry/src/cf-metadata-types';
=======
>>>>>>>
import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/cf-types';
import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
import { applicationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-factory';
import { IAppFavMetadata } from '../../../../../../cloud-foundry/src/cf-metadata-types';
<<<<<<<
scmService: GitSCMService,
private favoritesConfigMapper: FavoritesConfigMapper,
=======
scmService: GitSCMService,
private appPollingService: ApplicationPollingService
>>>>>>>
scmService: GitSCMService,
private favoritesConfigMapper: FavoritesConfigMapper,
private appPollingService: ApplicationPollingService |
<<<<<<<
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
) {
=======
constructor(public store: Store<AppState>, private confirmDialog: ConfirmationDialogService) {
>>>>>>>
constructor(
public store: Store<AppState>,
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 { CF_ENDPOINT_TYPE } from '../../../../../cloud-foundry/cf-types';
import { entityCatalogue } from '../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
>>>>>>>
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';
<<<<<<<
} from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
import { testSCFEntity, testSCFGuid } from '../../../../../core/test-framework/store-test-helper';
import { EntityRelationSpecHelper } from '../../../../../store/src/helpers/entity-relations/entity-relations-spec-helper';
import { NormalizedResponse } from '../../../../../store/src/types/api.types';
import { WrapperRequestActionSuccess } from '../../../../../store/src/types/request.types';
import { cfEntityFactory, organizationEntityType, spaceEntityType } from '../../../cf-entity-factory';
=======
} from '../../../../../core/test-framework/cloud-foundry-endpoint-service.helper';
import {
createBasicStoreModule,
getInitialTestStoreState,
testSCFGuid,
} from '../../../../../core/test-framework/store-test-helper';
import { EntityRelationSpecHelper } from '../../../../../store/src/helpers/entity-relations/entity-relations-spec-helper';
import { organizationEntityType, spaceEntityType } from '../../../cf-entity-factory';
>>>>>>>
} from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
import { cfEntityFactory, organizationEntityType, spaceEntityType } from '../../../cf-entity-factory';
<<<<<<<
=======
const store = getInitialTestStoreState();
store.requestData[orgCatalogEntity.entityKey][orgGuid] = helper.createEmptyOrg(orgGuid, 'org-name');
store.requestData[spaceCatalogEntity.entityKey][spaceGuid] = helper.createEmptySpace(spaceGuid, 'space-name', orgGuid);
>>>>>>> |
<<<<<<<
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 '../../../../cloud-foundry/src/store/selectors/api.selectors';
import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
import { rootUpdatingKey, ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
=======
import { AppStat } from '../../store/types/app-metadata.types';
import { selectCfEntity } from '../../store/selectors/api.selectors';
import { rootUpdatingKey, ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
>>>>>>>
import { selectCfEntity } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
import { rootUpdatingKey, ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service'; |
<<<<<<<
=======
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 { getDefaultRequestState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
=======
import {
ActionState,
getDefaultRequestState,
RequestInfoState,
} from '../../../../../../store/src/reducers/api-request-reducer/types';
>>>>>>>
import {
ActionState,
getDefaultRequestState,
RequestInfoState,
} from '../../../../../../store/src/reducers/api-request-reducer/types';
<<<<<<<
import { IDomain } from '../../../../cf-api.types';
import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
=======
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
>>>>>>>
import { IDomain } from '../../../../cf-api.types';
import { cfEntityCatalog } from '../../../../cf-entity-catalog'; |
<<<<<<<
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,
private csiGuidsService: CsiGuidsService,
private modeService: CsiModeService
=======
private csiGuidsService: CsiGuidsService
>>>>>>>
private csiGuidsService: CsiGuidsService,
private modeService: CsiModeService
<<<<<<<
return this.handleException();
} else if (!this.modeService.isEditServiceInstanceMode()) {
=======
return observableOf({ success: false, message: `Failed to create service instance: ${request.message}` });
} else {
>>>>>>>
return observableOf({ success: false, message: `Failed to create service instance: ${request.message}` });
} else if (!this.modeService.isEditServiceInstanceMode()) {
<<<<<<<
routeToServices = (cfGuid: string = null, appGuid: string = null) => {
if (this.modeService.isAppServicesMode()) {
=======
routeToServices = (cfGuid: string = null, appGuid: string = null): StepOnNextResult => {
if (this.cSIHelperService.isAppServices()) {
>>>>>>>
routeToServices = (cfGuid: string = null, appGuid: string = null): StepOnNextResult => {
if (this.cSIHelperService.isAppServices()) { |
<<<<<<<
import { IService, IServiceBroker, IServiceInstance, IServicePlan, IServicePlanVisibility } from '../../../cf-api-svc.types';
=======
import { cfEntityCatalog } from '../../../cf-entity-catalog';
>>>>>>>
import { IService, IServiceBroker, IServiceInstance, IServicePlan, IServicePlanVisibility } from '../../../cf-api-svc.types';
import { cfEntityCatalog } from '../../../cf-entity-catalog'; |
<<<<<<<
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 { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
=======
import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
>>>>>>>
import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
import { CF_ENDPOINT_TYPE } from '../../../../../cf-types'; |
<<<<<<<
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/animations';
import { RouterTestingModule } from '@angular/router/testing';
>>>>>>>
import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';
<<<<<<<
import { CoreModule } from '../../../core/core.module';
import { SharedModule } from '../../../shared/shared.module';
import { initEndpointTypes } from '../endpoint-helpers';
import { EndpointsModule } from '../endpoints.module';
import { ConnectEndpointDialogComponent } from './connect-endpoint-dialog.component';
=======
import { CoreModule } from '../../../core/core.module';
import { SharedModule } from '../../../shared/shared.module';
import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component';
import { ConnectEndpointConfig } from '../connect.service';
import { CredentialsAuthFormComponent } from './auth-forms/credentials-auth-form.component';
import { ConnectEndpointDialogComponent } from './connect-endpoint-dialog.component';
>>>>>>>
import { CoreModule } from '../../../core/core.module';
import { SharedModule } from '../../../shared/shared.module';
import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component';
import { ConnectEndpointConfig } from '../connect.service';
import { CredentialsAuthFormComponent } from './auth-forms/credentials-auth-form.component';
import { ConnectEndpointDialogComponent } from './connect-endpoint-dialog.component';
<<<<<<<
type = 'metrics';
subType = null;
=======
type = 'cf';
ssoAllowed = false;
>>>>>>>
type = 'metrics';
subType = null;
ssoAllowed = false;
<<<<<<<
declarations: [],
=======
declarations: [
ConnectEndpointDialogComponent,
ConnectEndpointComponent,
CredentialsAuthFormComponent
],
>>>>>>>
declarations: [
ConnectEndpointDialogComponent,
ConnectEndpointComponent,
CredentialsAuthFormComponent
],
<<<<<<<
createBasicStoreModule(),
EndpointsModule
],
})
.compileComponents();
initEndpointTypes([]);
=======
createBasicStoreModule()
]
}).overrideModule(BrowserDynamicTestingModule, {
set: {
entryComponents: [CredentialsAuthFormComponent],
}
});
testingModule.compileComponents();
>>>>>>>
createBasicStoreModule()
]
}).overrideModule(BrowserDynamicTestingModule, {
set: {
entryComponents: [CredentialsAuthFormComponent],
}
});
testingModule.compileComponents(); |
<<<<<<<
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 '../../../../store/helpers/entity-factory';
import { CfAppsDataSource } from '../../../../shared/components/list/list-types/app/cf-apps-data-source';
>>>>>>>
import { organisationSchemaKey, spaceSchemaKey } from '../../../../store/helpers/entity-factory';
import { CfAppsDataSource } from '../../../../shared/components/list/list-types/app/cf-apps-data-source';
import { DiscoverAppHelper } from './discover-app-helper';
import { HttpClient } from '@angular/common/http';
import { BehaviorSubject } from 'rxjs';
<<<<<<<
catchError(e => {
return [];
}),
share(),
map(message => {
const json = JSON.parse(message);
return json;
}),
filter(l => !!l),
tap((log) => {
// Deal with control messages
if (log.type !== SocketEventTypes.DATA) {
this.processWebSocketMessage(log);
}
}),
filter((log) => log.type === SocketEventTypes.DATA),
map((log) => {
return log.message;
})
=======
catchError(e => {
return [];
}),
share(),
map(message => {
const json = JSON.parse(message);
return json;
}),
filter(l => !!l),
tap((log) => {
// Deal with control messages
if (log.type !== SocketEventTypes.DATA) {
this.updateTitle(log);
}
}),
filter((log) => log.type === SocketEventTypes.DATA),
map((log) => {
const timesString = moment(log.timestamp * 1000).format('DD/MM/YYYY hh:mm:ss A');
return (
`${timesString}: ${log.message}`
);
})
>>>>>>>
catchError(e => {
return [];
}),
share(),
map(message => {
const json = JSON.parse(message);
return json;
}),
filter(l => !!l),
tap((log) => {
// Deal with control messages
if (log.type !== SocketEventTypes.DATA) {
this.processWebSocketMessage(log);
}
}),
filter((log) => log.type === SocketEventTypes.DATA),
map((log) => {
return log.message;
})
<<<<<<<
this.deploying = true;
this.appDetectionHelper = new DiscoverAppHelper(this.http, this.appData.cloudFoundry, this.appData.space, this.appData.Name);
this.validate = this.appDetectionHelper.app$.filter(a => !!a)
.do(v => {
this.appDetectionHelper.stopDetection();
this.appGuid = v.metadata.guid;
this.store.dispatch(new GetAllApplications('applicationWall'));
})
.map(v => !!v);
this.appDetectionHelper.startDetection();
=======
this.store.dispatch(new GetAllApplications(CfAppsDataSource.paginationKey));
>>>>>>>
this.deploying = true;
this.appDetectionHelper = new DiscoverAppHelper(this.http, this.appData.cloudFoundry, this.appData.space, this.appData.Name);
this.validate = this.appDetectionHelper.app$.filter(a => !!a)
.do(v => {
this.appDetectionHelper.stopDetection();
this.appGuid = v.metadata.guid;
this.store.dispatch(new GetAllApplications(CfAppsDataSource.paginationKey));
})
.map(v => !!v);
this.appDetectionHelper.startDetection();
<<<<<<<
this.deploying = false;
if (this.appDetectionHelper) {
this.appDetectionHelper.stopDetection();
}
=======
this.apps$ = this.store.select(selectEntities('application')).pipe(
tap(apps => {
Object.values(apps).forEach(app => {
if (
app.entity.space_guid === this.appData.space &&
app.entity.cfGuid === this.appData.cloudFoundry &&
app.entity.name === this.appData.Name
) {
this.appGuid = app.metadata.guid;
this.validate = Observable.of(true);
}
});
})
).subscribe();
>>>>>>>
this.deploying = false;
if (this.appDetectionHelper) {
this.appDetectionHelper.stopDetection();
} |
<<<<<<<
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 { ApplicationTabsBaseComponent } from './application/application-tabs-base/application-tabs-base.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 {
TableCellEndpointStatusComponent
} from '../components/table/custom-cells/table-cell-endpoint-status/table-cell-endpoint-status.component'; |
<<<<<<<
addServiceInstanceLink = () => [
'/service-catalog',
this.servicesService.cfGuid,
this.servicesService.serviceGuid,
'create'
]
=======
getServiceLabel = (): Observable<string> => {
return Observable.combineLatest(this.servicesService.service$, this.servicesService.serviceExtraInfo$).pipe(
first(),
map(([a, b]) => !!b ? b.displayName : a.entity.label)
);
}
>>>>>>>
addServiceInstanceLink = () => [
'/service-catalog',
this.servicesService.cfGuid,
this.servicesService.serviceGuid,
'create'
]
getServiceLabel = (): Observable<string> => {
return Observable.combineLatest(this.servicesService.service$, this.servicesService.serviceExtraInfo$).pipe(
first(),
map(([a, b]) => !!b ? b.displayName : a.entity.label)
);
} |
<<<<<<<
import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service';
import {
getActionsFromExtensions,
getTabsFromExtensions,
StratosActionMetadata,
StratosActionType,
StratosTabType
} from '../../../../../core/extension/extension-service';
=======
import {
getActionsFromExtensions,
getTabsFromExtensions,
StratosActionMetadata,
StratosActionType,
StratosTabType,
} from '../../../../../core/extension/extension-service';
>>>>>>>
import {
getActionsFromExtensions,
getTabsFromExtensions,
StratosActionMetadata,
StratosActionType,
StratosTabType
} from '../../../../../core/extension/extension-service';
<<<<<<<
import { IPageSideNavTab } from '../../../../dashboard/page-side-nav/page-side-nav.component';
import { canUpdateOrgSpaceRoles, getActiveRouteCfOrgSpaceProvider } from '../../../cf.helpers';
=======
import { getActiveRouteCfOrgSpaceProvider } from '../../../cf.helpers';
>>>>>>>
import { IPageSideNavTab } from '../../../../dashboard/page-side-nav/page-side-nav.component';
import { getActiveRouteCfOrgSpaceProvider } from '../../../cf.helpers';
<<<<<<<
=======
>>>>>>> |
<<<<<<<
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';
import {
cfEntityFactory,
organizationEntityType,
spaceEntityType,
spaceQuotaEntityType,
} from '../../../../cloud-foundry/src/cf-entity-factory';
<<<<<<<
import { getPaginationKey } from '../../../../store/src/actions/pagination.actions';
import { GetOrganizationSpaceQuotaDefinitions } from '../../../../store/src/actions/quota-definitions.actions';
import { CFAppState } from '../../../../store/src/app-state';
import {
entityFactory,
organizationSchemaKey,
spaceQuotaSchemaKey,
spaceSchemaKey,
} from '../../../../store/src/helpers/entity-factory';
import { createEntityRelationPaginationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types';
=======
import { getPaginationKey } from '../../../../store/src/actions/pagination.actions';
import { CFAppState } from '../../../../store/src/app-state';
>>>>>>>
import { getPaginationKey } from '../../../../store/src/actions/pagination.actions';
import { GetOrganizationSpaceQuotaDefinitions } from '../../../../store/src/actions/quota-definitions.actions';
import { CFAppState } from '../../../../store/src/app-state';
import { createEntityRelationPaginationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types';
<<<<<<<
import { ISpaceQuotaDefinition } from '../../core/cf-api.types';
import { StepOnNextResult } from '../../shared/components/stepper/step/step.component';
import { PaginationMonitorFactory } from '../../shared/monitors/pagination-monitor.factory';
import { ActiveRouteCfOrgSpace } from './cf-page.types';
=======
import { StepOnNextResult } from '../../shared/components/stepper/step/step.component';
import { PaginationMonitorFactory } from '../../shared/monitors/pagination-monitor.factory';
import { ActiveRouteCfOrgSpace } from './cf-page.types';
>>>>>>>
import { ISpaceQuotaDefinition } from '../../core/cf-api.types';
import { StepOnNextResult } from '../../shared/components/stepper/step/step.component';
import { PaginationMonitorFactory } from '../../shared/monitors/pagination-monitor.factory';
import { ActiveRouteCfOrgSpace } from './cf-page.types'; |
<<<<<<<
orgs$: Observable<APIResource<CfOrg>[]>;
info$: Observable<EntityInfo<APIResource<ICfV2Info>>>;
cfInfoEntityService: EntityService<APIResource<ICfV2Info>>;
=======
orgs$: Observable<APIResource<IOrganization>[]>;
info$: Observable<EntityInfo<any>>;
cfInfoEntityService: EntityService<any>;
>>>>>>>
orgs$: Observable<APIResource<IOrganization>[]>;
info$: Observable<EntityInfo<APIResource<ICfV2Info>>>;
cfInfoEntityService: EntityService<APIResource<ICfV2Info>>; |
<<<<<<<
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-catalog-entity/entity-catalog-entity';
>>>>>>>
import {
StratosBaseCatalogEntity,
StratosCatalogEntity,
} from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity'; |
<<<<<<<
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 'frontend/packages/core/src/core/permissions/current-user-permissions.service';
<<<<<<<
=======
// Add edit
this.cardMenu.push({
label: 'Edit endpoint',
action: () => this.editEndpoint(),
can: this.currentUserPermissionsService.can(StratosCurrentUserPermissions.ENDPOINT_REGISTER)
});
this.cardMenu.push(createMetaCardMenuItemSeparator());
>>>>>>> |
<<<<<<<
=======
import { Action } from '@ngrx/store';
>>>>>>>
<<<<<<<
UNREGISTER_ENDPOINTS,
=======
EndpointAction,
UNREGISTER_ENDPOINTS,
>>>>>>>
UNREGISTER_ENDPOINTS,
<<<<<<<
import { UpdatePaginationMaxedState } from './../../actions/pagination.actions';
=======
import {
ClearPaginationOfEntity,
ClearPaginationOfType,
CreatePagination,
ResetPagination,
} from './../../actions/pagination.actions';
>>>>>>>
import { UpdatePaginationMaxedState } from './../../actions/pagination.actions';
<<<<<<<
import { getActionPaginationEntityKey, getActionType, getPaginationKeyFromAction } from './pagination-reducer.helper';
=======
import {
getActionKey,
getActionType,
getDefaultPaginationEntityState,
getPaginationKeyFromAction,
} from './pagination-reducer.helper';
>>>>>>>
import { getActionPaginationEntityKey, getActionType, getPaginationKeyFromAction } from './pagination-reducer.helper';
<<<<<<<
function paginationReducer(updatePagination) {
return function (state, action) {
=======
function paginationReducer(updatePagination, types) {
return (state, action) => {
>>>>>>>
function paginationReducer(updatePagination) {
return (state, action) => { |
<<<<<<<
AppChipsComponent,
CardNumberMetricComponent,
CardCfRecentAppsComponent,
ServiceIconComponent,
EnvVarViewComponent,
CompactAppCardComponent,
=======
AppChipsComponent,
ServiceIconComponent,
EnvVarViewComponent
>>>>>>>
AppChipsComponent,
CardNumberMetricComponent,
CardCfRecentAppsComponent,
CompactAppCardComponent,
ServiceIconComponent,
EnvVarViewComponent
<<<<<<<
AppChipsComponent,
CardNumberMetricComponent,
CardCfRecentAppsComponent,
EnvVarViewComponent,
ServiceIconComponent,
CompactAppCardComponent,
=======
AppChipsComponent,
EnvVarViewComponent,
ServiceIconComponent
>>>>>>>
AppChipsComponent,
CardNumberMetricComponent,
CardCfRecentAppsComponent,
CompactAppCardComponent,
EnvVarViewComponent,
ServiceIconComponent |
<<<<<<<
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 } from '../../../../../../cloud-foundry/cf-types';
import {
cfEntityFactory,
organizationEntityType,
quotaDefinitionEntityType,
} from '../../../../../../cloud-foundry/src/cf-entity-factory';
import { getCFEntityKey } from '../../../../../../cloud-foundry/src/cf-entity-helpers';
>>>>>>>
import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/cf-types';
import {
cfEntityFactory,
organizationEntityType,
quotaDefinitionEntityType,
} from '../../../../../../cloud-foundry/src/cf-entity-factory';
<<<<<<<
=======
import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
import {
createEntityRelationPaginationKey,
} from '../../../../../../store/src/helpers/entity-relations/entity-relations.types';
>>>>>>>
import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
import {
createEntityRelationPaginationKey,
} from '../../../../../../store/src/helpers/entity-relations/entity-relations.types';
<<<<<<<
import { IOrganization } from '../../../../core/cf-api.types';
import { entityCatalogue } from '../../../../core/entity-catalogue/entity-catalogue.service';
=======
import { IOrganization, IOrgQuotaDefinition } from '../../../../core/cf-api.types';
import { entityCatalogue } from '../../../../core/entity-catalogue/entity-catalogue.service';
>>>>>>>
import { IOrganization, IOrgQuotaDefinition } from '../../../../core/cf-api.types';
import { entityCatalogue } from '../../../../core/entity-catalogue/entity-catalogue.service';
<<<<<<<
return this.store.select(selectCfRequestInfo(organizationEntityType, orgName)).pipe(
=======
const orgEntityType = getCFEntityKey(organizationEntityType);
return this.store.select(selectRequestInfo(orgEntityType, this.orgName.value)).pipe(
>>>>>>>
return this.store.select(selectCfRequestInfo(organizationEntityType, this.orgName.value)).pipe( |
<<<<<<<
=======
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>[]> {
<<<<<<<
public getAppsInSpace(space: APIResource<ISpace>): Observable<APIResource<IApp>[]> {
=======
public getAppsInSpaceViaAllApps(
space: APIResource<ISpace>
): Observable<APIResource<IApp>[]> {
>>>>>>>
public getAppsInSpaceViaAllApps(space: APIResource<ISpace>): Observable<APIResource<IApp>[]> {
<<<<<<<
public getAggregateStat(org: APIResource<IOrganization>, statMetric: string): Observable<number> {
return this.getAppsInOrg(org).pipe(
map(apps => this.getMetricFromApps(apps, statMetric))
);
}
public getMetricFromApps(apps: APIResource<IApp>[], statMetric: string): number {
=======
public getMetricFromApps(
apps: APIResource<IApp>[],
statMetric: string
): number {
>>>>>>>
public getMetricFromApps(apps: APIResource<IApp>[], statMetric: string): number { |
<<<<<<<
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 { SidePanelService } from '../../../shared/services/side-panel.service'; |
<<<<<<<
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 {
constructor(
public guid: string,
public endpointGuid: string,
) {
super();
this.options = new RequestOptions();
this.options.url = `users/${guid}/summary`;
this.options.method = 'get';
}
actions = [GET_CF_USER, GET_CF_USER_SUCCESS, GET_CF_USER_FAILED];
entity = cfEntityFactory(cfUserEntityType);
entityType = cfUserEntityType;
options: RequestOptions;
}
// TODO: Where do these action sit within the entity catalogue?
// They are user role actions that have the entity type or either space of organization.
export class ChangeUserRole extends CFStartAction implements EntityRequestAction {
=======
// FIXME: These actions are user related however return either an org or space entity. These responses can be ignored and not stored, need
// a flag somewhere to handle that - https://jira.capbristol.com/browse/STRAT-119
export class ChangeUserRole extends CFStartAction implements IRequestAction {
>>>>>>>
// FIXME: These actions are user related however return either an org or space entity. These responses can be ignored and not stored, need
// a flag somewhere to handle that - https://jira.capbristol.com/browse/STRAT-119
export class ChangeUserRole extends CFStartAction implements EntityRequestAction { |
<<<<<<<
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/operators'; |
<<<<<<<
githubBranches: IRequestEntityTypeState<APIResource>;
githubCommits: IRequestEntityTypeState<APIResource>;
domain: IRequestEntityTypeState<APIResource>;
user: IRequestEntityTypeState<APIResource>;
securityGroup: IRequestEntityTypeState<APIResource>;
buildpack: IRequestEntityTypeState<APIResource>;
=======
>>>>>>>
<<<<<<<
githubBranches: IRequestEntityTypeState<RequestInfoState>;
githubCommits: IRequestEntityTypeState<APIResource>;
domain: IRequestEntityTypeState<RequestInfoState>;
user: IRequestEntityTypeState<RequestInfoState>;
securityGroup: IRequestEntityTypeState<APIResource>;
buildpack: IRequestEntityTypeState<RequestInfoState>;
=======
>>>>>>> |
<<<<<<<
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 { safeUnsubscribe } from '../../../../core/utils.service';
import { CardStatus } from '../../cards/card-status/card-status.component';
=======
>>>>>>>
import { CardStatus } from '../../cards/card-status/card-status.component'; |
<<<<<<<
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 './components/table/table-cell-status.directive';
=======
import { TableCellRouteComponent } from './components/table/custom-cells/table-cell-route/table-cell-route.component';
import { TableCellTCPRouteComponent } from './components/table/custom-cells/table-cell-tcproute/table-cell-tcproute.component';
>>>>>>>
import { UsageGaugeComponent } from './components/usage-gauge/usage-gauge.component';
import { PercentagePipe } from './pipes/percentage.pipe';
import { TableCellRouteComponent } from './components/table/custom-cells/table-cell-route/table-cell-route.component';
import { TableCellTCPRouteComponent } from './components/table/custom-cells/table-cell-tcproute/table-cell-tcproute.component';
import { TableCellUsageComponent } from './components/table/custom-cells/table-cell-usage/table-cell-usage.component';
import { TableCellStatusDirective } from './components/table/table-cell-status.directive';
<<<<<<<
UsageGaugeComponent,
TableCellUsageComponent,
TableCellStatusDirective,
=======
TableCellRouteComponent,
TableCellTCPRouteComponent,
>>>>>>>
UsageGaugeComponent,
TableCellUsageComponent,
TableCellRouteComponent,
TableCellTCPRouteComponent,
TableCellStatusDirective, |
<<<<<<<
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 { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service';
>>>>>>>
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 { EndpointsListConfigService } from './components/list/list-types/endpoint/endpoints-list-config.service'; |
<<<<<<<
// 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 for the given endpoint GUID
// */
// homeLink?: (s) => string[];
// /**
// * Schema keys associated with this endpoint type (used when clearing pagination)
// */
// entitySchemaKeys?: string[];
// /**
// * Show custom content in the endpoints list. Should be Type<EndpointListDetailsComponent>
// */
// listDetailsComponent?: any;
// /**
// * When all endpoints are displayed together use the order to define the position. Lower number = earlier position
// */
// order?: number;
// /**
// * Indicates if this endpoint types can not be connected (optional - default is false)
// */
// doesNotSupportConnect?: boolean;
// }
=======
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 for the given endpoint GUID
*/
homeLink?: (s) => string[];
/**
* Schema keys associated with this endpoint type (used when clearing pagination)
*/
entitySchemaKeys?: string[];
/**
* Show custom content in the endpoints list. Should be Type<EndpointListDetailsComponent>
*/
listDetailsComponent?: any;
/**
* When all endpoints are displayed together use the order to define the position. Lower number = earlier position
*/
order?: number;
/**
* Indicates if this endpoint types can not be connected (optional - default is false)
*/
doesNotSupportConnect?: boolean;
/**
* Indicates if this endpoint type is in tech preview and should only be shown when tech preview mode is enabled
*/
techPreview?: boolean;
}
>>>>>>>
// 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 for the given endpoint GUID
// */
// homeLink?: (s) => string[];
// /**
// * Schema keys associated with this endpoint type (used when clearing pagination)
// */
// entitySchemaKeys?: string[];
// /**
// * Show custom content in the endpoints list. Should be Type<EndpointListDetailsComponent>
// */
// listDetailsComponent?: any;
// /**
// * When all endpoints are displayed together use the order to define the position. Lower number = earlier position
// */
// order?: number;
// /**
// * Indicates if this endpoint types can not be connected (optional - default is false)
// */
// doesNotSupportConnect?: boolean;
// /**
// * Indicates if this endpoint type is in tech preview and should only be shown when tech preview mode is enabled
// */
// techPreview?: boolean;
// } |
<<<<<<<
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-factory';
=======
>>>>>>>
import { entityCatalogue } from '../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
import { spaceEntityType } from '../../../../cf-entity-factory';
<<<<<<<
getSpaceAction,
true,
=======
new GetSpace(spaceGuid, this.servicesService.cfGuid)
>>>>>>>
getSpaceAction |
<<<<<<<
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 '@angular/common/http';
<<<<<<<
=======
import { environment } from '../../../../core/src/environments/environment';
import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers';
>>>>>>>
import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers'; |
<<<<<<<
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, timer as observableTimer } from 'rxjs';
import { catchError, filter, map, switchMap, take } from 'rxjs/operators';
import { AppState } from '../../../../../store/src/app-state';
import { selectNewAppState } from '../../../../../store/src/effects/create-app-effects';
import { environment } from '../../../environments/environment';
=======
import { Observable, of as observableOf, throwError as observableThrowError, timer as observableTimer } from 'rxjs';
import { catchError, combineLatest, map, switchMap, take } from 'rxjs/operators';
import { AppState } from '../../../../../store/src/app-state';
import { selectNewAppState } from '../../../../../store/src/effects/create-app-effects';
import { environment } from '../../../environments/environment.prod';
>>>>>>>
import { Observable, of as observableOf, throwError as observableThrowError, timer as observableTimer } from 'rxjs';
import { catchError, filter, map, switchMap, take } from 'rxjs/operators';
import { AppState } from '../../../../../store/src/app-state';
import { selectNewAppState } from '../../../../../store/src/effects/create-app-effects';
import { environment } from '../../../environments/environment.prod'; |
<<<<<<<
featureFlag: {},
buildpack:{},
=======
service:{},
serviceBinding:{},
servicePlan: {},
serviceInstance: {},
>>>>>>>
featureFlag: {},
buildpack:{},
service:{},
serviceBinding:{},
servicePlan: {},
serviceInstance: {},
<<<<<<<
featureFlag: {},
buildpack: {},
=======
service:{},
serviceBinding:{},
servicePlan: {},
serviceInstance: {},
>>>>>>>
featureFlag: {},
buildpack: {},
service:{},
serviceBinding:{},
servicePlan: {},
serviceInstance: {}, |
<<<<<<<
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';
>>>>>>>
import { applicationEntityType } from '../../../cloud-foundry/src/cf-entity-types';
import { createEntityRelationPaginationKey } from '../../../cloud-foundry/src/entity-relations/entity-relations.types'; |
<<<<<<<
buildpack:{},
=======
service:{},
serviceBinding:{},
servicePlan: {},
serviceInstance: {},
>>>>>>>
buildpack:{},
service:{},
serviceBinding:{},
servicePlan: {},
serviceInstance: {},
<<<<<<<
buildpack: {},
=======
service:{},
serviceBinding:{},
servicePlan: {},
serviceInstance: {},
>>>>>>>
buildpack: {},
service:{},
serviceBinding:{},
servicePlan: {},
serviceInstance: {}, |
<<<<<<<
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 { CfAppRoutesDataSource } from '../../../shared/data-sources/cf-app-routes-data-source';
import { CfAppRoutesListConfigService } from '../../../shared/list-configs/cf-app-routes-list-config.service';
import { DomainSchema, FetchAllDomains } from '../../../store/actions/domains.actions';
=======
import { CfAppRoutesDataSource } from '../../../shared/components/list/list-types/app-route/cf-app-routes-data-source';
import {
CfAppRoutesListConfigService,
} from '../../../shared/components/list/list-types/app-route/cf-app-routes-list-config.service';
import { ListConfig } from '../../../shared/components/list/list.component.types';
>>>>>>>
import { CfAppRoutesDataSource } from '../../../shared/components/list/list-types/app-route/cf-app-routes-data-source';
import {
CfAppRoutesListConfigService,
} from '../../../shared/components/list/list-types/app-route/cf-app-routes-list-config.service';
import { ListConfig } from '../../../shared/components/list/list.component.types';
<<<<<<<
import { getPaginationObservables } from '../../../store/reducers/pagination-reducer/pagination-reducer.helper';
import { APIResource } from '../../../store/types/api.types';
import { ApplicationService } from '../application.service';
=======
import { EntityInfo } from '../../../store/types/api.types';
import { ApplicationService } from '../application.service';
>>>>>>>
import { EntityInfo } from '../../../store/types/api.types';
import { ApplicationService } from '../application.service';
<<<<<<<
private listConfig: ListConfig,
private entityServiceFactory: EntityServiceFactory
=======
private listConfig: ListConfig<EntityInfo>
>>>>>>>
private listConfig: ListConfig<EntityInfo> |
<<<<<<<
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/dialog-confirm/dialog-confirm.component';
import { ConfirmationDialogService } from './components/confirmation-dialog.service';
>>>>>>>
import { RunningInstancesComponent } from './components/running-instances/running-instances.component';
import {
import { DialogConfirmComponent } from './components/dialog-confirm/dialog-confirm.component';
import { ConfirmationDialogService } from './components/confirmation-dialog.service';
TableCellAppInstancesComponent
} from './components/table/custom-cells/table-cell-app-instances/table-cell-app-instances.component';
<<<<<<<
RunningInstancesComponent,
TableCellAppInstancesComponent,
=======
DialogConfirmComponent,
>>>>>>>
RunningInstancesComponent,
DialogConfirmComponent,
TableCellAppInstancesComponent, |
<<<<<<<
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';
import { cfEntityCatalog } from '../../../cf-entity-catalog'; |
<<<<<<<
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 { getFullEndpointApiUrl } from '../../../../../features/endpoints/endpoint-helpers';
>>>>>>>
import { getFullEndpointApiUrl } from '../../../../../features/endpoints/endpoint-helpers';
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'; |
<<<<<<<
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 IBuildpack {
name: string;
position: number;
enabled: boolean;
locked: boolean;
filename: string; |
<<<<<<<
=======
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-service-instance/add-service-instance.component';
import { SelectPlanStepComponent } from './add-service-instance/select-plan-step/select-plan-step.component';
import { CreateApplicationModule } from '../applications/create-application/create-application.module';
import { SelectServiceComponent } from './add-service-instance/select-service/select-service.component';
>>>>>>>
<<<<<<<
ServiceSummaryComponent,
=======
],
exports: [
AddServiceInstanceComponent,
// NoServicePlansComponent,
ServiceTabsBaseComponent,
],
entryComponents: [
NoServicePlansComponent
>>>>>>>
ServiceSummaryComponent,
],
exports: [
AddServiceInstanceComponent,
// NoServicePlansComponent,
ServiceTabsBaseComponent,
],
entryComponents: [
NoServicePlansComponent |
<<<<<<<
=======
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';
import { cfEntityFactory } from '../../../../cf-entity-factory';
import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
import { ApplicationActionBuilders } from '../../../../entity-action-builders/application.action-builders';
import { ServiceInstanceActionBuilders } from '../../../../entity-action-builders/service-instance.action.builders';
import { SpaceActionBuilders } from '../../../../entity-action-builders/space.action-builders';
=======
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
>>>>>>>
import { IApp, ISpace } from '../../../../cf-api.types';
import { cfEntityCatalog } from '../../../../cf-entity-catalog'; |
<<<<<<<
system: IRequestEntityTypeState<SystemInfo>;
githubBranches: IRequestEntityTypeState<APIResource>;
githubCommits: IRequestEntityTypeState<APIResource>;
domain: IRequestEntityTypeState<APIResource>;
user: IRequestEntityTypeState<APIResource>;
buildpack: IRequestEntityTypeState<APIResource>;
=======
>>>>>>>
<<<<<<<
system: IRequestEntityTypeState<RequestInfoState>;
githubBranches: IRequestEntityTypeState<RequestInfoState>;
githubCommits: IRequestEntityTypeState<APIResource>;
domain: IRequestEntityTypeState<RequestInfoState>;
user: IRequestEntityTypeState<RequestInfoState>;
buildpack: IRequestEntityTypeState<RequestInfoState>;
=======
>>>>>>>
<<<<<<<
buildpack: {},
=======
serviceInstance: {},
servicePlan: {},
service: {},
serviceBinding: {},
>>>>>>>
serviceInstance: {},
servicePlan: {},
service: {},
serviceBinding: {},
buildpack: {}, |
<<<<<<<
import { URLSearchParams } from 'url';
import { OAuthClient, IOAuthClient } from './OAuthClient';
=======
import { OAuthClient, IOAuthClient, IOAuthClientConfiguration } from './OAuthClient';
>>>>>>>
import { URLSearchParams } from 'url';
import { OAuthClient, IOAuthClient, IOAuthClientConfiguration } from './OAuthClient'; |
<<<<<<<
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, organizationSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
import { UpdateOrganization } from '../../../../../../store/src/actions/organization.actions';
import { selectRequestInfo } from '../../../../../../store/src/selectors/api.selectors';
=======
>>>>>>> |
<<<<<<<
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, getDefaultActionState, rootUpdatingKey } from '../../../store/src/reducers/api-request-reducer/types';
=======
import { userProfilePasswordUpdatingKey } from '../../../store/src/effects/user-profile.effects';
import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
import { EntityService } from '../../../store/src/entity-service';
import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
import { ActionState, getDefaultActionState, rootUpdatingKey } from '../../../store/src/reducers/api-request-reducer/types';
>>>>>>>
import { userProfilePasswordUpdatingKey } from '../../../store/src/effects/user-profile.effects';
import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
import { EntityService } from '../../../store/src/entity-service';
import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
import { ActionState, getDefaultActionState, rootUpdatingKey } from '../../../store/src/reducers/api-request-reducer/types';
<<<<<<<
constructor(
private store: Store<AppState>,
) {
=======
constructor(
private store: Store<AppState>,
esf: EntityServiceFactory
) {
>>>>>>>
constructor(
private store: Store<AppState>,
esf: EntityServiceFactory
) {
<<<<<<<
this.entityMonitor = this.stratosUserConfig.store.getEntityMonitor(UserProfileEffect.guid);
=======
this.entityService = this.createFetchUserAction().pipe(
first(),
map(action => esf.create<UserProfileInfo>(action.guid, action)),
publishReplay(1),
refCount()
);
>>>>>>>
this.entityService = this.createFetchUserAction().pipe(
first(),
map(action => esf.create<UserProfileInfo>(action.guid, action)),
publishReplay(1),
refCount()
); |
<<<<<<<
import { entityCatalog } from './../../../../../../store/src/entity-catalog/entity-catalog.service';
import {
EntityCatalogSchemas,
IStratosEndpointDefinition,
} from './../../../../../../store/src/entity-catalog/entity-catalog.types';
=======
import { IStratosEndpointDefinition, EntityCatalogSchemas } from './../../../../../../store/src/entity-catalog/entity-catalog.types';
import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
>>>>>>>
import {
EntityCatalogSchemas,
IStratosEndpointDefinition,
} from './../../../../../../store/src/entity-catalog/entity-catalog.types'; |
<<<<<<<
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(
map((appInstancesPages) => {
const allInstances = [].concat.apply([], Object.values(appInstancesPages || [])).filter(instance => !!instance);
return allInstances.filter((stat) => stat.state === 'RUNNING').length;
})
);
=======
>>>>>>> |
<<<<<<<
import { createEmptyStoreModule } from '@stratosui/store/testing';
=======
import { createEmptyStoreModule } from '@stratos/store/testing';
>>>>>>>
import { createEmptyStoreModule } from '@stratosui/store/testing';
<<<<<<<
import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper';
=======
>>>>>>> |
<<<<<<<
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 { 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 { 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-catalog/entity-catalog.service';
import { CF_ENDPOINT_TYPE } from '../../../cf-types';
>>>>>>>
import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
import { CF_ENDPOINT_TYPE } from '../../../cf-types'; |
<<<<<<<
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, MatSnackBar, ShowOnDirtyErrorStateMatcher } from '@angular/material';
import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
import { CurrentUserPermissionsService } from '../../../core/current-user-permissions.service';
>>>>>>>
import {
ErrorStateMatcher,
ShowOnDirtyErrorStateMatcher,
} from '@angular/material';
import { Subscription } from 'rxjs';
import { first, map, take } from 'rxjs/operators';
import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
import { CurrentUserPermissionsService } from '../../../core/current-user-permissions.service';
import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
<<<<<<<
=======
private snackBar: MatSnackBar,
private currentUserPermissionsService: CurrentUserPermissionsService,
>>>>>>>
private currentUserPermissionsService: CurrentUserPermissionsService,
<<<<<<<
// Wire up to permissions and only allow password change if user has the 'password.write' group
private canChangePassword = true;
=======
private errorSnack;
// Only allow password change if user has the 'password.write' group
private canChangePassword = this.currentUserPermissionsService.can(CurrentUserPermissions.PASSWORD_CHANGE);
>>>>>>>
// Only allow password change if user has the 'password.write' group
private canChangePassword = this.currentUserPermissionsService.can(CurrentUserPermissions.PASSWORD_CHANGE); |
<<<<<<<
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/pagination-monitor';
import { ActionState } from '../api-request-reducer/types'; |
<<<<<<<
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.component';
import { CapitalizeFirstPipe } from './pipes/capitalizeFirstLetter.pipe';
<<<<<<<
CapitalizeFirstPipe,
=======
CfEndpointsMissingComponent,
>>>>>>>
CfEndpointsMissingComponent,
CapitalizeFirstPipe,
<<<<<<<
BindAppsStepComponent,
CapitalizeFirstPipe,
=======
BindAppsStepComponent,
CfEndpointsMissingComponent
>>>>>>>
BindAppsStepComponent,
CapitalizeFirstPipe,
CfEndpointsMissingComponent |
<<<<<<<
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-state';
>>>>>>>
import { GeneralEntityAppState } from '../../../../../store/src/app-state'; |
<<<<<<<
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 } from '../store/types/user.types'; |
<<<<<<<
=======
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)',
value: 'sso',
form: {},
types: new Array<EndpointType>('cf')
},
];
>>>>>>>
<<<<<<<
const authVal = authValues;
if (this.endpointForm.value.authType === 'kubeconfig') {
this.bodyContent = this.kubeconfig;
}
=======
>>>>>>>
const authVal = authValues;
if (this.endpointForm.value.authType === 'kubeconfig') {
this.bodyContent = this.kubeconfig;
} |
<<<<<<<
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/components/application-state/application-state.service';
>>>>>>>
import { GetApplication, ApplicationSchema } from '../../../store/actions/application.actions';
import { ApplicationService } from '../application.service';
import { ApplicationStateService } from '../../../shared/components/application-state/application-state.service';
<<<<<<<
import { ApplicationStateService } from '../../../shared/components/application-state/application-state.service';
import { EntityServiceFactory } from '../../../core/entity-service-factory.service';
=======
import { ApplicationEnvVarsService } from './application-tabs-base/tabs/build-tab/application-env-vars.service';
import { GetAppSummaryAction } from '../../../store/actions/app-metadata.actions';
>>>>>>>
import { ApplicationEnvVarsService } from './application-tabs-base/tabs/build-tab/application-env-vars.service';
import { GetAppSummaryAction } from '../../../store/actions/app-metadata.actions';
<<<<<<<
this.isFetching$ = this.applicationService.isFetchingApp$;
// TODO: RC
=======
>>>>>>>
// TODO: RC
<<<<<<<
// this.sub.push(this.entityService.poll(10000, this.autoRefreshString).do(() => {
// this.store.dispatch(new GetAppSummaryAction(appGuid, cfGuid));
// }).subscribe());
const initialFetch$ = Observable.combineLatest(
this.applicationService.isFetchingApp$,
this.applicationService.isFetchingEnvVars$,
this.applicationService.isFetchingStats$,
).map(([isFetchingApp, isFetchingEnvVars, isFetchingStats]) => {
return isFetchingApp || isFetchingEnvVars || isFetchingStats;
}).distinctUntilChanged();
=======
this.entityServiceAppRefresh$ = this.entityService.poll(10000, this.autoRefreshString).do(() => {
this.store.dispatch(new GetAppSummaryAction(appGuid, cfGuid));
}).subscribe();
>>>>>>>
this.entityServiceAppRefresh$ = this.entityService.poll(10000, this.autoRefreshString).do(() => {
// this.store.dispatch(new GetAppSummaryAction(appGuid, cfGuid));
}).subscribe(); |
<<<<<<<
securityGroup: IRequestEntityTypeState<APIResource>;
=======
buildpack: IRequestEntityTypeState<APIResource>;
>>>>>>>
securityGroup: IRequestEntityTypeState<APIResource>;
buildpack: IRequestEntityTypeState<APIResource>;
<<<<<<<
securityGroup: IRequestEntityTypeState<APIResource>;
=======
buildpack: IRequestEntityTypeState<RequestInfoState>;
>>>>>>>
securityGroup: IRequestEntityTypeState<APIResource>;
buildpack: IRequestEntityTypeState<RequestInfoState>;
<<<<<<<
securityGroup: {},
=======
buildpack: {},
>>>>>>>
securityGroup: {},
buildpack: {}, |
<<<<<<<
export class SpecifyDetailsStepComponent implements OnDestroy, OnInit, AfterContentInit {
selectCreateInstance$: Observable<CreateServiceInstanceState>;
formModes = [
{
label: 'Create Service Instance',
key: FormMode.CreateServiceInstance
},
{
label: 'Bind Service Instance',
key: FormMode.BindServiceInstance
}
];
@Input('showModeSelection')
showModeSelection = false;
formMode: FormMode;
selectExistingInstanceForm: FormGroup;
createNewInstanceForm: FormGroup;
serviceInstances$: Observable<APIResource<IServiceInstance>[]>;
marketPlaceMode: boolean;
=======
export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit {
>>>>>>>
export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit {
selectCreateInstance$: Observable<CreateServiceInstanceState>;
formModes = [
{
label: 'Create Service Instance',
key: FormMode.CreateServiceInstance
},
{
label: 'Bind Service Instance',
key: FormMode.BindServiceInstance
}
];
@Input('showModeSelection')
showModeSelection = false;
formMode: FormMode;
selectExistingInstanceForm: FormGroup;
createNewInstanceForm: FormGroup;
serviceInstances$: Observable<APIResource<IServiceInstance>[]>;
marketPlaceMode: boolean;
<<<<<<<
validate: BehaviorSubject<boolean> = new BehaviorSubject(false);
=======
validate: Observable<boolean>;
>>>>>>>
validate: BehaviorSubject<boolean> = new BehaviorSubject(false);
<<<<<<<
=======
this.stepperForm = new FormGroup({
name: new FormControl('', [Validators.required, this.nameTakenValidator()]),
params: new FormControl('', SpecifyDetailsStepComponent.isValidJsonValidatorFn()),
tags: new FormControl(''),
});
>>>>>>>
this.stepperForm = new FormGroup({
name: new FormControl('', [Validators.required, this.nameTakenValidator()]),
params: new FormControl('', SpecifyDetailsStepComponent.isValidJsonValidatorFn()),
tags: new FormControl(''),
});
<<<<<<<
this.marketPlaceMode = isMarketplaceMode(this.activatedRoute);
if (this.marketPlaceMode) {
this.orgs$ = this.cSIHelperService.getOrgsForSelectedServicePlan();
this.spaces$ = this.initSpacesObservable();
}
this.allServiceInstances$ = this.cSIHelperService.getServiceInstancesForService(null, null, this.csiGuidsService.cfGuid);
this.subscriptions.push(this.setupFormValidatorData());
this.serviceInstances$ = this.selectCreateInstance$.pipe(
distinctUntilChanged((x, y) => {
return !(x.cfGuid === y.cfGuid && x.servicePlanGuid === y.servicePlanGuid && x.spaceGuid === y.spaceGuid);
}),
switchMap(guids => this.cSIHelperService.getServiceInstancesForService(
guids.servicePlanGuid,
guids.spaceGuid,
guids.cfGuid
)),
publishReplay(1),
refCount(),
);
this.initialised = true;
}
resetForms = (mode: FormMode) => {
this.validate.next(false);
this.createNewInstanceForm.reset();
this.selectExistingInstanceForm.reset();
if (mode === FormMode.CreateServiceInstance) {
this.tags = [];
this.bindExistingInstance = false;
} else if (mode === FormMode.BindServiceInstance) {
this.bindExistingInstance = true;
}
}
private setupFormValidatorData(): Subscription {
return this.allServiceInstances$.pipe(switchMap(instances => {
if (isMarketplaceMode(this.activatedRoute)) {
return this.createNewInstanceForm.controls.space.statusChanges.pipe(map(c => {
return instances.filter(s => s.entity.space_guid === this.createNewInstanceForm.controls.space.value);
}), tap(o => {
this.allServiceInstanceNames = o.map(s => s.entity.name);
}));
} else {
return this.store.select(selectCreateServiceInstanceSpaceGuid).pipe(
filter(p => !!p),
map(spaceGuid => instances.filter(s => s.entity.space_guid === spaceGuid)), tap(o => {
this.allServiceInstanceNames = o.map(s => s.entity.name);
}));
}
})).subscribe();
}
private InitOrgAndSpaceObs() {
this.orgs$ = this.initOrgsObservable();
this.spaces$ = this.initSpacesObservable();
}
private setupForms() {
this.createNewInstanceForm = new FormGroup({
name: new FormControl('', [Validators.required, this.nameTakenValidator()]),
org: new FormControl('', Validators.required),
space: new FormControl('', Validators.required),
params: new FormControl('', SpecifyDetailsStepComponent.isValidJsonValidatorFn()),
tags: new FormControl(''),
});
this.selectExistingInstanceForm = new FormGroup({
serviceInstances: new FormControl('', [Validators.required]),
});
this.formMode = FormMode.CreateServiceInstance;
}
ngOnInit(): void {
if (!isMarketplaceMode(this.activatedRoute)) {
this.RemoveOrgAndSpaceFields();
} else {
this.subscriptions.push(this.cSIHelperService.getSelectedServicePlanAccessibility()
.pipe(
map(o => o.spaceScoped),
tap(spaceScope => {
if (spaceScope) {
this.disableOrgAndSpaceFields();
} else {
this.enableOrgAndSpaceFields();
}
})).subscribe());
}
=======
this.allServiceInstances$ = this.initServiceInstances(this.csiGuidsService.cfGuid, this.csiGuidsService.serviceGuid);
>>>>>>>
this.allServiceInstances$ = this.cSIHelperService.getServiceInstancesForService(null, null, this.csiGuidsService.cfGuid);
this.subscriptions.push(this.setupFormValidatorData());
this.serviceInstances$ = this.selectCreateInstance$.pipe(
distinctUntilChanged((x, y) => {
return !(x.cfGuid === y.cfGuid && x.servicePlanGuid === y.servicePlanGuid && x.spaceGuid === y.spaceGuid);
}),
switchMap(guids => this.cSIHelperService.getServiceInstancesForService(
guids.servicePlanGuid,
guids.spaceGuid,
guids.cfGuid
)),
publishReplay(1),
refCount(),
);
this.initialised = true;
}
resetForms = (mode: FormMode) => {
this.validate.next(false);
this.createNewInstanceForm.reset();
this.selectExistingInstanceForm.reset();
if (mode === FormMode.CreateServiceInstance) {
this.tags = [];
this.bindExistingInstance = false;
} else if (mode === FormMode.BindServiceInstance) {
this.bindExistingInstance = true;
}
}
private setupFormValidatorData(): Subscription {
return this.allServiceInstances$.pipe(switchMap(instances => {
return this.store.select(selectCreateServiceInstanceSpaceGuid).pipe(
filter(p => !!p),
map(spaceGuid => instances.filter(s => s.entity.space_guid === spaceGuid)), tap(o => {
this.allServiceInstanceNames = o.map(s => s.entity.name);
}));
})).subscribe();
}
private InitOrgAndSpaceObs() {
this.orgs$ = this.initOrgsObservable();
this.spaces$ = this.initSpacesObservable();
}
private setupForms() {
this.createNewInstanceForm = new FormGroup({
name: new FormControl('', [Validators.required, this.nameTakenValidator()]),
params: new FormControl('', SpecifyDetailsStepComponent.isValidJsonValidatorFn()),
tags: new FormControl(''),
});
this.selectExistingInstanceForm = new FormGroup({
serviceInstances: new FormControl('', [Validators.required]),
});
this.formMode = FormMode.CreateServiceInstance;
<<<<<<<
this.subscriptions.forEach(s => s.unsubscribe());
}
initOrgsObservable = (): Observable<APIResource<IOrganization>[]> => {
return this.cSIHelperService.getOrgsForSelectedServicePlan();
=======
safeUnsubscribe(this.spaceScopeSub);
>>>>>>>
this.subscriptions.forEach(s => s.unsubscribe());
}
initOrgsObservable = (): Observable<APIResource<IOrganization>[]> => {
return this.cSIHelperService.getOrgsForSelectedServicePlan();
<<<<<<<
this.setupValidate();
if (this.marketPlaceMode) {
this.subscriptions.push(this.orgs$.pipe(
filter(p => !!p && p.length > 0),
tap(o => {
const orgWithSpaces = o.filter(org => org.entity.spaces.length > 0);
if (orgWithSpaces.length > 0) {
const selectedOrgId = orgWithSpaces[0].metadata.guid;
this.createNewInstanceForm.controls.org.setValue(selectedOrgId);
this.store.dispatch(new SetCreateServiceInstanceOrg(selectedOrgId));
}
})
).subscribe());
}
=======
this.validate = this.stepperForm.statusChanges
.map(() => {
return this.stepperForm.valid;
});
>>>>>>>
this.setupValidate();
<<<<<<<
const name = this.createNewInstanceForm.controls.name.value;
let spaceGuid = '';
let cfGuid = '';
if (!this.marketPlaceMode) {
spaceGuid = createServiceInstance.spaceGuid;
} else {
spaceGuid = this.createNewInstanceForm.controls.space.value;
}
cfGuid = createServiceInstance.cfGuid;
=======
const name = this.stepperForm.controls.name.value;
const { spaceGuid, cfGuid } = createServiceInstance;
>>>>>>>
const name = this.stepperForm.controls.name.value;
const { spaceGuid, cfGuid } = createServiceInstance; |
<<<<<<<
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) => {
return entity.metadata ? entity.metadata.guid : null;
};
=======
export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
if (activatedRoute.snapshot.params[id]) {
return activatedRoute.snapshot.params[id];
} else if (activatedRoute.parent) {
return getIdFromRoute(activatedRoute.parent, id);
}
return null;
}
export function getActiveRouteCfOrgSpace(activatedRoute: ActivatedRoute) {
return ({
cfGuid: getIdFromRoute(activatedRoute, 'cfId'),
orgGuid: getIdFromRoute(activatedRoute, 'orgId'),
spaceGuid: getIdFromRoute(activatedRoute, 'spaceId')
});
}
export const getActiveRouteCfOrgSpaceProvider = {
provide: ActiveRouteCfOrgSpace,
useFactory: getActiveRouteCfOrgSpace,
deps: [
ActivatedRoute,
]
};
>>>>>>>
export const getRowUniqueId = (entity: APIResource) => entity.metadata ? entity.metadata.guid : null;
export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
if (activatedRoute.snapshot.params[id]) {
return activatedRoute.snapshot.params[id];
} else if (activatedRoute.parent) {
return getIdFromRoute(activatedRoute.parent, id);
}
return null;
}
export function getActiveRouteCfOrgSpace(activatedRoute: ActivatedRoute) {
return ({
cfGuid: getIdFromRoute(activatedRoute, 'cfId'),
orgGuid: getIdFromRoute(activatedRoute, 'orgId'),
spaceGuid: getIdFromRoute(activatedRoute, 'spaceId')
});
}
export const getActiveRouteCfOrgSpaceProvider = {
provide: ActiveRouteCfOrgSpace,
useFactory: getActiveRouteCfOrgSpace,
deps: [
ActivatedRoute,
]
}; |
<<<<<<<
.connectAllEndpoints(ConsoleUserType.user)
.connectAllEndpoints(ConsoleUserType.admin);
=======
.connectAllEndpoints(ConsoleUserType.admin)
.getInfo();
>>>>>>>
.connectAllEndpoints(ConsoleUserType.user)
.getInfo();
<<<<<<<
// Select CF/Org/Space
servicesHelperE2E.setCfOrgSpace();
createServiceInstance.stepper.next();
// Select Service
servicesHelperE2E.setServiceSelection(e2e.secrets.getDefaultCFEndpoint().services.publicService.name);
createServiceInstance.stepper.next();
// Select Service Plan
servicesHelperE2E.setServicePlan();
createServiceInstance.stepper.next();
// Bind App
servicesHelperE2E.setBindApp();
createServiceInstance.stepper.next();
createServiceInstance.stepper.cancel();
servicesWall.isActivePage();
=======
browser.wait(servicesHelperE2E.canBindAppStep()
.then(canBindApp => {
// Select CF/Org/Space
servicesHelperE2E.setCfOrgSpace();
createServiceInstance.stepper.next();
// Select Service
servicesHelperE2E.setServiceSelection();
createServiceInstance.stepper.next();
// Select Service Plan
servicesHelperE2E.setServicePlan();
createServiceInstance.stepper.next();
if (canBindApp) {
// Bind App
servicesHelperE2E.setBindApp();
createServiceInstance.stepper.next();
}
createServiceInstance.stepper.cancel();
servicesWall.isActivePage();
}));
>>>>>>>
browser.wait(servicesHelperE2E.canBindAppStep()
.then(canBindApp => {
// Select CF/Org/Space
servicesHelperE2E.setCfOrgSpace();
createServiceInstance.stepper.next();
// Select Service
servicesHelperE2E.setServiceSelection(e2e.secrets.getDefaultCFEndpoint().services.publicService.name);
createServiceInstance.stepper.next();
// Select Service Plan
servicesHelperE2E.setServicePlan();
createServiceInstance.stepper.next();
if (canBindApp) {
// Bind App
servicesHelperE2E.setBindApp();
createServiceInstance.stepper.next();
}
createServiceInstance.stepper.cancel();
servicesWall.isActivePage();
})); |
<<<<<<<
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';
=======
import { IApp, IOrgQuotaDefinition, IRoute, ISpace, ISpaceQuotaDefinition } from '../../../../../core/src/core/cf-api.types';
import { getStartedAppInstanceCount } from '../../../../../core/src/core/cf.helpers';
import {
CloudFoundryUserProvidedServicesService,
} from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
>>>>>>>
import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
<<<<<<<
import { IApp, IOrgQuotaDefinition, IRoute, ISpace, ISpaceQuotaDefinition } from '../../../cf-api.types';
import { CF_ENDPOINT_TYPE } from '../../../cf-types';
import { getStartedAppInstanceCount } from '../../../cf.helpers';
=======
import { cfEntityCatalog } from '../../../cf-entity-catalog';
>>>>>>>
import { IApp, IOrgQuotaDefinition, IRoute, ISpace, ISpaceQuotaDefinition } from '../../../cf-api.types';
import { cfEntityCatalog } from '../../../cf-entity-catalog';
import { getStartedAppInstanceCount } from '../../../cf.helpers'; |
<<<<<<<
=======
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-buildpack-card/cf-buildpack-card.component';
<<<<<<<
CfStacksCardComponent,
CfSecurityGroupsCardComponent,
=======
CfBuildpackCardComponent,
CfStacksCardComponent
>>>>>>>
CfStacksCardComponent,
CfSecurityGroupsCardComponent,
CfBuildpackCardComponent |
<<<<<<<
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 { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
import { safeUnsubscribe } from '../../../../../core/src/core/utils.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/pagination.actions';
>>>>>>>
<<<<<<<
import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
=======
import { PaginationEntityState, QParam } from '../../../../../../../store/src/types/pagination.types';
>>>>>>>
import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types'; |
<<<<<<<
import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
=======
>>>>>>>
<<<<<<<
import { serviceBindingEntityType, serviceBindingNoBindingsEntityType } from '../../../../../cf-entity-types';
import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
=======
import {
applicationEntityType,
serviceBindingEntityType,
serviceBindingNoBindingsEntityType,
} from '../../../../../cf-entity-types';
import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
>>>>>>>
import {
applicationEntityType,
serviceBindingEntityType,
serviceBindingNoBindingsEntityType,
} from '../../../../../cf-entity-types'; |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.