conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import { CfOrgSpaceDataService } from '../../../shared/data-services/cf-org-space-service.service';
import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
=======
import { CfOrgSpaceDataService, initCfOrgSpaceService } from '../../../shared/data-services/cf-org-space-service.service';
import { GetAppStatsAction } from '../../../store/actions/app-metadata.actions';
>>>>>>>
import { CfOrgSpaceDataService, initCfOrgSpaceService } from '../../../shared/data-services/cf-org-space-service.service';
import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
<<<<<<<
private cfOrgSpaceService: CfOrgSpaceDataService
=======
private appListConfig: ListConfig<APIResource>,
private cfOrgSpaceService: CfOrgSpaceDataService,
private currentUserPermissionsService: CurrentUserPermissionsService
>>>>>>>
private appListConfig: ListConfig<APIResource>,
private cfOrgSpaceService: CfOrgSpaceDataService,
private currentUserPermissionsService: CurrentUserPermissionsService
<<<<<<<
=======
this.canCreateApplication = CurrentUserPermissions.APPLICATION_CREATE;
this.statsSub = dataSource.page$.pipe(
// The page observable will fire often, here we're only interested in updating the stats on actual page changes
distinctUntilChanged(distinctPageUntilChanged(dataSource)),
withLatestFrom(dataSource.pagination$),
// Ensure we keep pagination smooth
debounceTime(250),
tap(([page, pagination]) => {
if (!page) {
return;
}
page.forEach(app => {
const appState = app.entity.state;
const appGuid = app.metadata.guid;
const cfGuid = app.entity.cfGuid;
const dispatching = false;
if (appState === 'STARTED') {
this.store.dispatch(new GetAppStatsAction(appGuid, cfGuid));
}
});
}),
tag('stat-obs')).subscribe();
>>>>>>>
this.canCreateApplication = CurrentUserPermissions.APPLICATION_CREATE; |
<<<<<<<
import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs';
=======
import { Observable, Subject } from 'rxjs';
>>>>>>>
import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subject } from 'rxjs';
<<<<<<<
import {
cfEntityFactory,
cfUserEntityType,
organizationEntityType,
spaceEntityType,
} from '../../../../../../../cloud-foundry/src/cf-entity-factory';
import { UsersRolesClearUpdateState } from '../../../../../../../store/src/actions/users-roles.actions';
import { ChangeUserRole } from '../../../../../../../store/src/actions/users.actions';
import { CFAppState } from '../../../../../../../store/src/app-state';
import {
selectUsersRoles,
selectUsersRolesChangedRoles,
} from '../../../../../../../store/src/selectors/users-roles.selector';
import { APIResource } from '../../../../../../../store/src/types/api.types';
import { CfUser, OrgUserRoleNames, SpaceUserRoleNames } from '../../../../../../../store/src/types/user.types';
import { CfRoleChangeWithNames, UserRoleLabels } from '../../../../../../../store/src/types/users-roles.types';
import { IOrganization } from '../../../../../core/cf-api.types';
=======
import {
cfEntityFactory,
cfUserEntityType,
organizationEntityType,
spaceEntityType,
} from '../../../../../../../cloud-foundry/src/cf-entity-factory';
import { UsersRolesClearUpdateState } from '../../../../../../../store/src/actions/users-roles.actions';
import { ChangeUserRole } from '../../../../../../../store/src/actions/users.actions';
import { CFAppState } from '../../../../../../../store/src/app-state';
import {
selectUsersRoles,
selectUsersRolesChangedRoles,
} from '../../../../../../../store/src/selectors/users-roles.selector';
import { APIResource } from '../../../../../../../store/src/types/api.types';
import { CfUser, OrgUserRoleNames, SpaceUserRoleNames } from '../../../../../../../store/src/types/user.types';
import { CfRoleChangeWithNames, UserRoleLabels } from '../../../../../../../store/src/types/users-roles.types';
>>>>>>>
import {
cfEntityFactory,
cfUserEntityType,
organizationEntityType,
spaceEntityType,
} from '../../../../../../../cloud-foundry/src/cf-entity-factory';
import { UsersRolesClearUpdateState } from '../../../../../../../store/src/actions/users-roles.actions';
import { ChangeUserRole } from '../../../../../../../store/src/actions/users.actions';
import { CFAppState } from '../../../../../../../store/src/app-state';
import {
selectUsersRoles,
selectUsersRolesChangedRoles,
} from '../../../../../../../store/src/selectors/users-roles.selector';
import { APIResource } from '../../../../../../../store/src/types/api.types';
import { CfUser, OrgUserRoleNames, SpaceUserRoleNames } from '../../../../../../../store/src/types/user.types';
import { CfRoleChangeWithNames, UserRoleLabels } from '../../../../../../../store/src/types/users-roles.types';
import { IOrganization } from '../../../../../core/cf-api.types';
<<<<<<<
import { CfRolesService } from '../cf-roles.service';
=======
>>>>>>> |
<<<<<<<
}
export class SetSessionTimeoutAction implements Action {
constructor(public timeoutSession = true) { }
type = TIMEOUT_SESSION;
}
export class HydrateDashboardStateAction implements Action {
constructor(public dashboardState: DashboardState) { }
type = HYDRATE_DASHBOARD_STATE;
}
=======
}
export class EnableMobileNav implements Action {
type = ENABLE_SIDE_NAV_MOBILE_MODE;
}
export class DisableMobileNav implements Action {
type = DISABLE_SIDE_NAV_MOBILE_MODE;
}
>>>>>>>
}
export class EnableMobileNav implements Action {
type = ENABLE_SIDE_NAV_MOBILE_MODE;
}
export class DisableMobileNav implements Action {
type = DISABLE_SIDE_NAV_MOBILE_MODE;
}
export class SetSessionTimeoutAction implements Action {
constructor(public timeoutSession = true) { }
type = TIMEOUT_SESSION;
}
export class HydrateDashboardStateAction implements Action {
constructor(public dashboardState: DashboardState) { }
type = HYDRATE_DASHBOARD_STATE;
} |
<<<<<<<
import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
=======
import { IServiceBroker } from '../../../../../../core/src/core/cf-api-svc.types';
import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
>>>>>>>
import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
<<<<<<<
import { IServiceBroker } from '../../../../cf-api-svc.types';
import { ISpace } from '../../../../cf-api.types';
import { spaceEntityType } from '../../../../cf-entity-types';
import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
=======
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
>>>>>>>
import { IServiceBroker } from '../../../../cf-api-svc.types';
import { cfEntityCatalog } from '../../../../cf-entity-catalog'; |
<<<<<<<
new GetAppRoutes(appService.appGuid, appService.cfGuid),
getPaginationKey('route', appService.cfGuid, appService.appGuid),
=======
new GetAppRoutes(
appService.appGuid,
appService.cfGuid,
createEntityRelationPaginationKey(applicationSchemaKey, appService.appGuid),
),
createEntityRelationPaginationKey(applicationSchemaKey, appService.appGuid),
false,
>>>>>>>
new GetAppRoutes(
appService.appGuid,
appService.cfGuid,
createEntityRelationPaginationKey(applicationSchemaKey, appService.appGuid),
),
createEntityRelationPaginationKey(applicationSchemaKey, appService.appGuid), |
<<<<<<<
import { spaceEntityType } from '../../../../../../cloud-foundry/src/cf-entity-factory';
import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/selectors/api.selectors';
=======
import { spaceEntityType } from '../../../../../../cloud-foundry/src/cf-entity-factory';
import { getCFEntityKey } from '../../../../../../cloud-foundry/src/cf-entity-helpers';
>>>>>>>
import { spaceEntityType } from '../../../../../../cloud-foundry/src/cf-entity-factory';
<<<<<<<
=======
import { selectRequestInfo } from '../../../../../../store/src/selectors/api.selectors';
import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
>>>>>>>
import { EntityServiceFactory } from '../../../../core/entity-service-factory.service';
<<<<<<<
return this.store.select(selectCfRequestInfo(spaceEntityType, `${this.orgGuid}-${spaceName}`)).pipe(
=======
const entityGuid = `${this.orgGuid}-${this.spaceName.value}`;
const entityType = getCFEntityKey(spaceEntityType);
return this.store.select(selectRequestInfo(entityType, entityGuid)).pipe(
>>>>>>>
return this.store.select(selectCfRequestInfo(spaceEntityType, `${this.orgGuid}-${this.spaceName.value}`)).pipe( |
<<<<<<<
=======
import { GetAppStatsAction } from '../../../store/actions/app-metadata.actions';
import { tag } from 'rxjs-spy/operators/tag';
>>>>>>>
import { tag } from 'rxjs-spy/operators/tag'; |
<<<<<<<
import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
=======
import { EntityServiceFactory } from '../../../../../../../../core/src/core/entity-service-factory.service';
import {
ServiceInstanceLastOpComponent,
} from '../../../../../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
>>>>>>>
import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
import {
ServiceInstanceLastOpComponent,
} from '../../../../../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component'; |
<<<<<<<
import { ApplicationService } from '../../../../application.service';
import { EnvVarStratosProject } from '../build-tab/application-env-vars.service';
import { CFAppState } from '../../../../../../cf-app-state';
import { gitRepoEntityType, gitCommitEntityType, gitBranchesEntityType } from '../../../../../../cf-entity-factory';
=======
>>>>>>>
<<<<<<<
import { entityCatalogue } from '../../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
import { STRATOS_ENDPOINT_TYPE } from '../../../../../../../../core/src/base-entity-schemas';
=======
import { CFAppState } from '../../../../../../cf-app-state';
import { gitCommitEntityType } from '../../../../../../cf-entity-factory';
import { GitBranch } from '../../../../../../store/types/github.types';
import { ApplicationService } from '../../../../application.service';
import { EnvVarStratosProject } from '../build-tab/application-env-vars.service';
>>>>>>>
import { CFAppState } from '../../../../../../cf-app-state';
import { gitCommitEntityType, gitRepoEntityType, gitBranchesEntityType } from '../../../../../../cf-entity-factory';
import { GitBranch } from '../../../../../../store/types/github.types';
import { ApplicationService } from '../../../../application.service';
import { EnvVarStratosProject } from '../build-tab/application-env-vars.service';
import { entityCatalogue } from '../../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
<<<<<<<
getRepoAction
=======
new FetchGitHubRepoInfo(stProject)
>>>>>>>
getRepoAction
<<<<<<<
const gitBranchesEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, gitBranchesEntityType);
const fetchBranchesActionBuilder = gitBranchesEntity.actionOrchestrator.getActionBuilder('get');
const fetchBranchesAction = fetchBranchesActionBuilder(branchID, null, {projectName, scm});
this.gitBranchEntityService = this.entityServiceFactory.create(
=======
this.gitBranchEntityService = this.entityServiceFactory.create<GitBranch>(
>>>>>>>
const gitBranchesEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, gitBranchesEntityType);
const fetchBranchesActionBuilder = gitBranchesEntity.actionOrchestrator.getActionBuilder('get');
const fetchBranchesAction = fetchBranchesActionBuilder(branchID, null, { projectName, scm });
this.gitBranchEntityService = this.entityServiceFactory.create( |
<<<<<<<
import { createUserRoleInOrg } from '../store/types/user.types';
=======
import { getDefaultEndpointRoles } from '../store/types/current-user-roles.types';
export const testSCFGuid = '01ccda9d-8f40-4dd0-bc39-08eea68e364f';
>>>>>>>
import { getDefaultEndpointRoles } from '../store/types/current-user-roles.types';
import { createUserRoleInOrg } from '../store/types/user.types';
export const testSCFGuid = '01ccda9d-8f40-4dd0-bc39-08eea68e364f'; |
<<<<<<<
import { stackEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
=======
import { cfEntityFactory, stackEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-factory';
import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
>>>>>>>
import { entityCatalogue } from '../../../../../../../core/src/core/entity-catalogue/entity-catalogue.service';
<<<<<<<
import { cfEntityFactory } from '../../../../../cf-entity-factory';
=======
import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
>>>>>>>
import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
import { cfEntityFactory } from '../../../../../cf-entity-factory';
import { stackEntityType } from '../../../../../cf-entity-types'; |
<<<<<<<
{ provide: MockedNgZone, useValue: new MockedNgZone },
EndpointListHelper
=======
{ provide: MockedNgZone, useValue: new MockedNgZone() },
>>>>>>>
{ provide: MockedNgZone, useValue: new MockedNgZone() },
EndpointListHelper |
<<<<<<<
import { cnsisRegisteredEntitiesSelector } from '../../store/selectors/cnsis.selectors';
import { getPaginationObservables, getCurrentPageRequestInfo } from '../../store/reducers/pagination-reducer/pagination-reducer.helper';
import { GetAllOrganizations, OrganizationSchema } from '../../store/actions/organization.actions';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
=======
import { getPaginationObservables } from '../../store/reducers/pagination-reducer/pagination-reducer.helper';
import { cnsisRegisteredEntitiesSelector } from '../../store/selectors/cnsis.selectors';
>>>>>>>
import { getPaginationObservables, getCurrentPageRequestInfo } from '../../store/reducers/pagination-reducer/pagination-reducer.helper';
import { cnsisRegisteredEntitiesSelector } from '../../store/selectors/cnsis.selectors'; |
<<<<<<<
=======
import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
import { GetQuotaDefinitions } from '../../../../../cloud-foundry/src/actions/quota-definitions.actions';
import { quotaDefinitionEntityType, cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
import { CF_ENDPOINT_TYPE } from '../../../../../cloud-foundry/cf-types';
import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
>>>>>>> |
<<<<<<<
import { EndpointsService } from '../../../core/endpoints.service';
import { TableCellAppNameComponent } from '../../../shared/components/list/list-types/app/table-cell-app-name/table-cell-app-name.component';
import { Subscription } from 'rxjs/Subscription';
=======
import { EndpointsService } from '../../../core/endpoints.service';
import { Subscription } from 'rxjs/Subscription';
>>>>>>>
import { EndpointsService } from '../../../core/endpoints.service';
import { Subscription } from 'rxjs/Subscription';
<<<<<<<
endpointType?: string;
visible?: boolean;
=======
endpointType?: string;
hidden?: boolean;
>>>>>>>
endpointType?: string;
visible?: boolean;
hidden?: boolean;
<<<<<<<
this.sub = this.endpointsService.endpoints$.map(ep => {
var connectedTypes = {};
Object.values(ep).forEach(epData => {
connectedTypes[epData.cnsi_type] = connectedTypes[epData.cnsi_type] || (epData.connectionStatus === 'connected');
});
return connectedTypes;
}).do(connectedTypes => {
let index = 0;
this.tabs.forEach(tab => {
if (tab.endpointType) {
tab.visible = connectedTypes[tab.endpointType];
} else {
tab.visible = true;
}
});
}).subscribe();
=======
this.sub = this.endpointsService.endpoints$.map(ep => {
var connectedTypes = {};
Object.values(ep).forEach(epData => {
connectedTypes[epData.cnsi_type] = connectedTypes[epData.cnsi_type] || (epData.connectionStatus === 'connected');
});
return connectedTypes;
}).do(connectedTypes => {
let index = 0;
this.tabs.forEach(tab => {
if (tab.endpointType) {
tab.hidden = !connectedTypes[tab.endpointType];
} else {
tab.hidden = false;
}
});
}).subscribe();
>>>>>>>
this.sub = this.endpointsService.endpoints$.map(ep => {
const connectedTypes = {};
Object.values(ep).forEach(epData => {
connectedTypes[epData.cnsi_type] = connectedTypes[epData.cnsi_type] || (epData.connectionStatus === 'connected');
});
return connectedTypes;
}).do(connectedTypes => {
this.tabs.forEach(tab => {
if (tab.endpointType) {
tab.hidden = !connectedTypes[tab.endpointType];
} else {
tab.hidden = false;
}
});
}).subscribe(); |
<<<<<<<
=======
import { getPaginationKey } from '../../store/actions/pagination.actions';
import { filter, map, tap } from 'rxjs/operators';
import { Observable , Subscription } from 'rxjs';
import { RequestInfoState } from '../../store/reducers/api-request-reducer/types';
import { RouterNav } from '../../store/actions/router.actions';
>>>>>>> |
<<<<<<<
import { CreateApplicationModule } from '../applications/create-application/create-application.module';
import { SelectServiceComponent } from './add-service-instance/select-service/select-service.component';
=======
import { ServicePlansComponent } from './service-plans/service-plans.component';
import { ServiceTabsBaseComponent } from './service-tabs-base/service-tabs-base.component';
>>>>>>>
import { CreateApplicationModule } from '../applications/create-application/create-application.module';
import { SelectServiceComponent } from './add-service-instance/select-service/select-service.component';
import { ServicePlansComponent } from './service-plans/service-plans.component';
import { ServiceTabsBaseComponent } from './service-tabs-base/service-tabs-base.component';
<<<<<<<
SelectServiceComponent,
],
exports: [
AddServiceInstanceComponent
=======
ServicePlansComponent,
ServiceTabsBaseComponent,
>>>>>>>
SelectServiceComponent,
ServicePlansComponent,
ServiceTabsBaseComponent
],
exports: [
AddServiceInstanceComponent,
ServiceTabsBaseComponent, |
<<<<<<<
import { ServicesService } from '../../services.service';
import { getServiceInstancesInCf } from '../../services-helper';
=======
import { CreateServiceInstanceState } from '../../../../store/types/create-service-instance.types';
import { getServiceJsonParams, isMarketplaceMode, safeUnsubscribe } from '../../services-helper';
import { CreateServiceInstanceHelperServiceFactory } from '../create-service-instance-helper-service-factory.service';
import { CreateServiceInstanceHelperService } from '../create-service-instance-helper.service';
import { CsiGuidsService } from '../csi-guids.service';
>>>>>>>
import { ServicesService } from '../../services.service';
import { getServiceInstancesInCf } from '../../services-helper';
import { CreateServiceInstanceState } from '../../../../store/types/create-service-instance.types';
import { getServiceJsonParams, isMarketplaceMode, safeUnsubscribe } from '../../services-helper';
import { CreateServiceInstanceHelperServiceFactory } from '../create-service-instance-helper-service-factory.service';
import { CreateServiceInstanceHelperService } from '../create-service-instance-helper.service';
import { CsiGuidsService } from '../csi-guids.service';
<<<<<<<
this.orgs$ = this.initOrgsObservable();
const paginationKey = createEntityRelationPaginationKey(serviceInstancesSchemaKey, this.servicesService.serviceGuid);
this.allServiceInstances$ = this.initServiceInstances(paginationKey);
this.spaces$ = this.initSpacesObservable();
this.spaceScopeSub = this.servicesService.getSelectedServicePlanAccessibility()
.pipe(
map(o => o.spaceScoped),
tap(spaceScope => {
if (spaceScope) {
this.stepperForm.get('org').disable();
this.stepperForm.get('space').disable();
} else {
this.stepperForm.get('org').enable();
this.stepperForm.get('space').enable();
}
})).subscribe();
=======
onEnter = () => {
this.cSIHelperService = this.cSIHelperServiceFactory.create(this.csiGuidsService.cfGuid, this.csiGuidsService.serviceGuid);
this.allServiceInstances$ = this.initServiceInstances(this.csiGuidsService.cfGuid, this.csiGuidsService.serviceGuid);
>>>>>>>
onEnter = () => {
this.cSIHelperService = this.cSIHelperServiceFactory.create(this.csiGuidsService.cfGuid, this.csiGuidsService.serviceGuid);
this.allServiceInstances$ = this.initServiceInstances(this.csiGuidsService.cfGuid, this.csiGuidsService.serviceGuid);
<<<<<<<
initServiceInstances = (paginationKey: string) =>
getServiceInstancesInCf(this.servicesService.cfGuid, this.store, this.paginationMonitorFactory).pipe(
share(),
first()
=======
initServiceInstances = (cfGuid: string, paginationKey: string) => getPaginationObservables<APIResource<IServiceInstance>>({
store: this.store,
action: new GetServiceInstances(cfGuid, paginationKey),
paginationMonitor: this.paginationMonitorFactory.create(
paginationKey,
entityFactory(serviceInstancesSchemaKey)
)
}, true)
.entities$.pipe(
share(),
first()
>>>>>>>
initServiceInstances = (cfGuid: string, paginationKey: string) => getPaginationObservables<APIResource<IServiceInstance>>({
store: this.store,
action: new GetServiceInstances(cfGuid, paginationKey),
paginationMonitor: this.paginationMonitorFactory.create(
paginationKey,
entityFactory(serviceInstancesSchemaKey)
)
}, true)
.entities$.pipe(
share(),
first() |
<<<<<<<
},
{
path: ':cfId/:serviceInstanceId/edit',
component: AddServiceInstanceComponent
=======
},
{
path: ':cfId/:serviceInstanceId/detach',
component: DetachServiceInstanceComponent
>>>>>>>
},
{
path: ':cfId/:serviceInstanceId/edit',
component: AddServiceInstanceComponent
},
{
path: ':cfId/:serviceInstanceId/detach',
component: DetachServiceInstanceComponent |
<<<<<<<
import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
=======
import { Observable, of } from 'rxjs';
import { AppState } from '../../../../../store/src/app-state';
>>>>>>>
import { Observable, of } from 'rxjs';
import { AppState } from '../../../../../store/src/app-state';
<<<<<<<
public tabNavService: TabNavService,
private store: Store<DashboardOnlyAppState>
) { }
=======
private store: Store<AppState>,
private esf: EntityServiceFactory,
private activatedRoute: ActivatedRoute,
public tabNavService: TabNavService
) {
this.isMobile$ = this.store.select(selectIsMobile);
}
>>>>>>>
public tabNavService: TabNavService,
private store: Store<AppState>,
private esf: EntityServiceFactory,
private activatedRoute: ActivatedRoute,
) {
this.isMobile$ = this.store.select(selectIsMobile);
} |
<<<<<<<
loadChildren: '../../cloud-foundry/src/features/applications/applications.module#ApplicationsModule',
=======
loadChildren: () => import('../../cloud-foundry/src/features/applications/applications.module').then(m => m.ApplicationsModule),
>>>>>>>
loadChildren: () => import('../../cloud-foundry/src/features/applications/applications.module').then(m => m.ApplicationsModule),
<<<<<<<
=======
path: '',
loadChildren: () => import('./features/endpoints/endpoints.module').then(m => m.EndpointsModule),
},
{
>>>>>>>
<<<<<<<
path: 'services', loadChildren: '../../cloud-foundry/src/features/services/services.module#ServicesModule',
=======
path: 'services', loadChildren: () => import('../../cloud-foundry/src/features/services/services.module').then(m => m.ServicesModule),
>>>>>>>
path: 'services', loadChildren: () => import('../../cloud-foundry/src/features/services/services.module').then(m => m.ServicesModule),
<<<<<<<
path: 'cloud-foundry', loadChildren: '../../cloud-foundry/src/features/cloud-foundry/cloud-foundry.module#CloudFoundryModule',
=======
path: 'cloud-foundry', loadChildren: () => import('../../cloud-foundry/src/features/cloud-foundry/cloud-foundry.module').then(m => m.CloudFoundryModule),
>>>>>>>
path: 'cloud-foundry', loadChildren: () => import('../../cloud-foundry/src/features/cloud-foundry/cloud-foundry.module').then(m => m.CloudFoundryModule), |
<<<<<<<
import { AboutModule } from './features/about/about.module';
=======
import { CustomModule } from './custom.module';
import { AboutModule } from './features/about/about.module';
>>>>>>>
import { CustomModule } from './custom.module';
import { AboutModule } from './features/about/about.module';
<<<<<<<
import { XSRFModule } from './xsrf.module';
=======
>>>>>>>
import { XSRFModule } from './xsrf.module';
<<<<<<<
XSRFModule,
=======
CustomModule,
>>>>>>>
CustomModule,
XSRFModule, |
<<<<<<<
import { createEntityRelationKey } from '../../../../../entity-relations/entity-relations.types';
import { CFEntityServiceFactory } from '../../../../../cf-entity-service-factory.service';
=======
>>>>>>>
import { CFEntityServiceFactory } from '../../../../../cf-entity-service-factory.service';
import { createEntityRelationKey } from '../../../../../entity-relations/entity-relations.types'; |
<<<<<<<
import { applicationSchemaKey, entityFactory, spaceSchemaKey, routeSchemaKey, organizationSchemaKey
} from '../../../../../store/helpers/entity-factory';
=======
import {
applicationSchemaKey,
entityFactory,
routeSchemaKey,
spaceSchemaKey,
} from '../../../../../store/helpers/entity-factory';
import { createEntityRelationKey } from '../../../../../store/helpers/entity-relations.types';
>>>>>>>
import {
applicationSchemaKey,
entityFactory,
organizationSchemaKey,
routeSchemaKey,
spaceSchemaKey,
} from '../../../../../store/helpers/entity-factory';
import { createEntityRelationKey } from '../../../../../store/helpers/entity-relations.types';
<<<<<<<
import { createEntityRelationKey } from '../../../../../store/helpers/entity-relations.types';
import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
import { CreatePagination } from '../../../../../store/actions/pagination.actions';
=======
>>>>>>> |
<<<<<<<
=======
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'; |
<<<<<<<
onNext: StepOnNextFunction = () => {
return Observable.of({ success: true, data: this.deployer });
=======
onNext = () => {
return observableOf({ success: true, data: this.deployer });
>>>>>>>
onNext: StepOnNextFunction = () => {
return observableOf({ success: true, data: this.deployer }); |
<<<<<<<
import { CfOrgSpaceDataService } from '../../../../data-services/cf-org-space-service.service';
=======
import { CfOrgSpaceDataService, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service';
import { ApplicationStateService } from '../../../application-state/application-state.service';
>>>>>>>
import { CfOrgSpaceDataService, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service'; |
<<<<<<<
import { CfRolesService } from '../cf-roles.service';
import { CfRoleChangeWithNames, UserRoleLabels } from '../../../../../../../store/src/types/users-roles.types';
import {
cfUserSchemaKey,
entityFactory,
organizationSchemaKey,
spaceSchemaKey,
} from '../../../../../../../store/src/helpers/entity-factory';
import { ChangeUserRole } from '../../../../../../../store/src/actions/users.actions';
import { CFAppState } from '../../../../../../../store/src/app-state';
import { selectUsersRoles, selectUsersRolesChangedRoles } from '../../../../../../../store/src/selectors/users-roles.selector';
import { UsersRolesClearUpdateState } from '../../../../../../../store/src/actions/users-roles.actions';
import { APIResource } from '../../../../../../../store/src/types/api.types';
import { CfUser, OrgUserRoleNames, SpaceUserRoleNames } from '../../../../../../../store/src/types/user.types';
=======
>>>>>>>
<<<<<<<
constructor(private store: Store<CFAppState>, private cfRolesService: CfRolesService, private cfUserService: CfUserService) { }
=======
constructor(
private store: Store<AppState>,
private cfUserService: CfUserService) { }
>>>>>>>
constructor(private store: Store<CFAppState>, private cfUserService: CfUserService) { } |
<<<<<<<
this.cnis = cfGuid;
actions = this.actions;
=======
this.endpointGuid = cfGuid;
>>>>>>>
this.endpointGuid = cfGuid;
<<<<<<<
cnis: string;
}
export class GetAppRoutes extends ListRoutes implements PaginatedAction {
constructor(public guid: string, public cfGuid: string) {
super(guid, cfGuid, `apps/${guid}/routes`, [
RouteEvents.GET_APP_ALL,
RouteEvents.GET_APP_ALL_SUCCESS,
RouteEvents.GET_APP_ALL_FAILED
]);
}
}
export class GetSpaceRoutes extends ListRoutes implements PaginatedAction {
constructor(public spaceGuid: string, public cfGuid: string) {
super(spaceGuid, cfGuid, `spaces/${spaceGuid}/routes`, [
RouteEvents.GET_SPACE_ALL,
RouteEvents.GET_SPACE_ALL_SUCCESS,
RouteEvents.GET_SPACE_ALL_FAILED
]);
}
}
export class MapRouteSelected implements Action {
constructor(routeEntity: EntityInfo) {}
type = MAP_ROUTE_SELECTED;
=======
endpointGuid: string;
>>>>>>>
endpointGuid: string;
}
export class GetAppRoutes extends ListRoutes implements PaginatedAction {
constructor(public guid: string, public cfGuid: string) {
super(guid, cfGuid, `apps/${guid}/routes`, [
RouteEvents.GET_APP_ALL,
RouteEvents.GET_APP_ALL_SUCCESS,
RouteEvents.GET_APP_ALL_FAILED
]);
}
}
export class GetSpaceRoutes extends ListRoutes implements PaginatedAction {
constructor(public spaceGuid: string, public cfGuid: string) {
super(spaceGuid, cfGuid, `spaces/${spaceGuid}/routes`, [
RouteEvents.GET_SPACE_ALL,
RouteEvents.GET_SPACE_ALL_SUCCESS,
RouteEvents.GET_SPACE_ALL_FAILED
]);
}
}
export class MapRouteSelected implements Action {
constructor(routeEntity: EntityInfo) {}
type = MAP_ROUTE_SELECTED; |
<<<<<<<
system: IRequestEntityTypeState<SystemInfo>;
githubBranches: IRequestEntityTypeState<APIResource>;
githubCommits: IRequestEntityTypeState<APIResource>;
domain: IRequestEntityTypeState<APIResource>;
user: IRequestEntityTypeState<APIResource>;
buildpack: IRequestEntityTypeState<APIResource>;
=======
>>>>>>>
system: IRequestEntityTypeState<SystemInfo>;
<<<<<<<
system: IRequestEntityTypeState<RequestInfoState>;
githubBranches: IRequestEntityTypeState<RequestInfoState>;
githubCommits: IRequestEntityTypeState<APIResource>;
domain: IRequestEntityTypeState<RequestInfoState>;
user: IRequestEntityTypeState<RequestInfoState>;
buildpack: IRequestEntityTypeState<RequestInfoState>;
=======
>>>>>>>
system: IRequestEntityTypeState<RequestInfoState>;
<<<<<<<
buildpack: {},
=======
serviceInstance: {},
servicePlan: {},
service: {},
serviceBinding: {},
>>>>>>>
buildpack: {},
serviceInstance: {},
servicePlan: {},
service: {},
serviceBinding: {}, |
<<<<<<<
import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
import {
generateCfBaseTestModulesNoShared,
} from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
=======
import { EntityMonitorFactory } from '../../../../../../core/src/shared/monitors/entity-monitor.factory.service';
import { PaginationMonitorFactory } from '../../../../../../core/src/shared/monitors/pagination-monitor.factory';
import { generateCfBaseTestModulesNoShared } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
import { LongRunningCfOperationsService } from '../../../data-services/long-running-cf-op.service';
>>>>>>>
import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
import { generateCfBaseTestModulesNoShared } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
import { LongRunningCfOperationsService } from '../../../data-services/long-running-cf-op.service'; |
<<<<<<<
InverseConditionCellComponent,
KubernetesNamespaceLinkComponent
=======
KubernetesNamespaceLinkComponent,
KubeAppcreatedDateComponent,
KubeAppChartNameComponent,
KubeNamespacePodCountComponent,
PodNameLinkComponent,
NodePodCountComponent,
KubeAppVersionComponent
>>>>>>>
InverseConditionCellComponent,
KubernetesNamespaceLinkComponent,
KubeAppcreatedDateComponent,
KubeAppChartNameComponent,
KubeNamespacePodCountComponent,
PodNameLinkComponent,
NodePodCountComponent,
KubeAppVersionComponent |
<<<<<<<
import { CFAppState } from '../../store/src/app-state';
import { userProvidedServiceInstanceSchemaKey } from '../../store/src/helpers/entity-factory';
=======
import { AppState } from '../../store/src/app-state';
import {
addEntityToCache,
EntitySchema,
userProvidedServiceInstanceSchemaKey,
} from '../../store/src/helpers/entity-factory';
>>>>>>>
import { CFAppState } from '../../store/src/app-state';
import {
userProvidedServiceInstanceSchemaKey, spaceQuotaSchemaKey, quotaDefinitionSchemaKey,
} from '../../store/src/helpers/entity-factory';
<<<<<<<
userProvidedServiceInstance: {},
cloudFoundryInfo: {}
=======
[userProvidedServiceInstanceSchemaKey]: {},
quota_definition: {
'endpoint-all': {
pageCount: 1,
currentPage: 1,
totalResults: 1,
ids: {
'1': [
'037d050d-979e-4dbf-940d-51a8a90729c8',
]
},
pageRequests: {
'1': {
busy: false,
error: false,
message: '',
entityKey: 'quota_definition',
maxed: false
}
},
params: {
'results-per-page': 100,
page: 1,
'order-direction': 'asc',
q: []
},
clientPagination: {
pageSize: 9,
currentPage: 1,
filter: {
string: '',
items: {}
},
totalResults: 1
}
}
},
space_quota_definition: {
'endpoint-all': {
pageCount: 1,
currentPage: 1,
totalResults: 1,
ids: {
'1': [
'a42468c7-b66c-4570-9e25-7cdcf1f3591b'
]
},
pageRequests: {
'1': {
busy: false,
error: false,
message: '',
entityKey: 'space_quota_definition',
maxed: false
}
},
params: {
'results-per-page': 100,
page: 1,
'order-direction': 'asc',
q: []
},
clientPagination: {
pageSize: 9,
currentPage: 1,
filter: {
string: '',
items: {}
},
totalResults: 1
}
}
},
>>>>>>>
cloudFoundryInfo: {},
[userProvidedServiceInstanceSchemaKey]: {},
quota_definition: {
'endpoint-all': {
pageCount: 1,
currentPage: 1,
totalResults: 1,
ids: {
'1': [
'037d050d-979e-4dbf-940d-51a8a90729c8',
]
},
pageRequests: {
'1': {
busy: false,
error: false,
message: '',
maxed: false
}
},
params: {
'results-per-page': 100,
page: 1,
'order-direction': 'asc',
q: []
},
clientPagination: {
pageSize: 9,
currentPage: 1,
filter: {
string: '',
items: {}
},
totalResults: 1
}
}
},
space_quota_definition: {
'endpoint-all': {
pageCount: 1,
currentPage: 1,
totalResults: 1,
ids: {
'1': [
'a42468c7-b66c-4570-9e25-7cdcf1f3591b'
]
},
pageRequests: {
'1': {
busy: false,
error: false,
message: '',
maxed: false
}
},
params: {
'results-per-page': 100,
page: 1,
'order-direction': 'asc',
q: []
},
clientPagination: {
pageSize: 9,
currentPage: 1,
filter: {
string: '',
items: {}
},
totalResults: 1
}
}
}, |
<<<<<<<
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 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
=======
export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
>>>>>>>
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 type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
export function isValidJsonValidator(): ValidatorFn {
return (formField: AbstractControl): { [key: string]: any } => {
try {
if (formField.value) {
const jsonObj = JSON.parse(formField.value);
// Check if jsonObj is actually an obj
if (jsonObj.constructor !== {}.constructor) {
throw new Error('not an object');
}
}
} catch (e) {
return { notValidJson: { value: formField.value } };
}
return null;
};
}
>>>>>>> |
<<<<<<<
import { CF_ENDPOINT_TYPE } from '../../../../../../../../cloud-foundry/cf-types';
import { GetAppEnvVarsAction } from '../../../../../../../../store/src/actions/app-metadata.actions';
=======
import { CF_ENDPOINT_TYPE } from '../../../../../../../../cloud-foundry/cf-types';
import { appEnvVarsEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-factory';
import { GetAppEnvVarsAction } from '../../../../../../../../store/src/actions/app-metadata.actions';
>>>>>>>
import { CF_ENDPOINT_TYPE } from '../../../../../../../../cloud-foundry/cf-types';
import { appEnvVarsEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-factory';
import { GetAppEnvVarsAction } from '../../../../../../../../store/src/actions/app-metadata.actions';
<<<<<<<
import { appEnvVarsSchemaKey } from '../../../../../../../../store/src/helpers/entity-factory';
=======
>>>>>>>
<<<<<<<
FetchStratosProject(appEnvVars): EnvVarStratosProject {
if (!appEnvVars) {
return null;
=======
createEnvVarsObs(appGuid: string, cfGuid: string): PaginationObservables<APIResource> {
const catalogueEntity = entityCatalogue.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
const action = new GetAppEnvVarsAction(appGuid, cfGuid);
return getPaginationObservables<APIResource>({
store: this.store,
action,
paginationMonitor: this.paginationMonitorFactory.create(
action.paginationKey,
catalogueEntity.getSchema()
)
}, true);
>>>>>>>
FetchStratosProject(appEnvVars): EnvVarStratosProject {
if (!appEnvVars) {
return null; |
<<<<<<<
=======
import {
appEnvVarsSchemaKey,
appEventSchemaKey,
applicationSchemaKey,
appStatsSchemaKey,
appSummarySchemaKey,
buildpackSchemaKey,
cfUserSchemaKey,
domainSchemaKey,
endpointSchemaKey,
featureFlagSchemaKey,
githubBranchesSchemaKey,
organizationSchemaKey,
privateDomainsSchemaKey,
routeSchemaKey,
securityGroupSchemaKey,
serviceBindingSchemaKey,
serviceInstancesSchemaKey,
servicePlanSchemaKey,
serviceSchemaKey,
spaceQuotaSchemaKey,
spaceSchemaKey,
stackSchemaKey,
} from '../helpers/entity-factory';
>>>>>>>
import {
appEnvVarsSchemaKey,
appEventSchemaKey,
applicationSchemaKey,
appStatsSchemaKey,
appSummarySchemaKey,
buildpackSchemaKey,
cfUserSchemaKey,
domainSchemaKey,
endpointSchemaKey,
featureFlagSchemaKey,
githubBranchesSchemaKey,
metricSchemaKey,
organizationSchemaKey,
privateDomainsSchemaKey,
routeSchemaKey,
securityGroupSchemaKey,
serviceBindingSchemaKey,
serviceInstancesSchemaKey,
servicePlanSchemaKey,
serviceSchemaKey,
spaceQuotaSchemaKey,
spaceSchemaKey,
stackSchemaKey,
} from '../helpers/entity-factory';
<<<<<<<
import { AppEnvVarSchema, AppStatSchema, AppSummarySchema } from './app-metadata.types';
import { IMetrics } from './base-metric.types';
import { EndpointModel } from './endpoint.types';
=======
import { EndpointModel } from './endpoint.types';
import { GitBranch, GithubCommit } from './github.types';
import { CfService, CfServiceBinding, CfServiceInstance, CfServicePlan } from './service.types';
>>>>>>>
import { IMetrics } from './base-metric.types';
import { EndpointModel } from './endpoint.types';
import { GitBranch, GithubCommit } from './github.types';
import { CfService, CfServiceBinding, CfServiceInstance, CfServicePlan } from './service.types';
<<<<<<<
githubBranches: IRequestEntityTypeState<APIResource>;
githubCommits: IRequestEntityTypeState<APIResource>;
domain: IRequestEntityTypeState<APIResource>;
user: IRequestEntityTypeState<APIResource>;
caaspInfo: IRequestEntityTypeState<APIResource>;
metrics: IRequestEntityTypeState<IMetrics>;
=======
featureFlag: IRequestEntityTypeState<IFeatureFlag>;
application: IRequestEntityTypeState<APIResource<IApp>>;
stack: IRequestEntityTypeState<APIResource<IStack>>;
space: IRequestEntityTypeState<APIResource<ISpace>>;
organization: IRequestEntityTypeState<APIResource<IOrganization>>;
route: IRequestEntityTypeState<APIResource<IRoute>>;
event: IRequestEntityTypeState<APIResource>;
githubBranches: IRequestEntityTypeState<APIResource<GitBranch>>;
githubCommits: IRequestEntityTypeState<APIResource<GithubCommit>>;
domain: IRequestEntityTypeState<APIResource<IDomain>>;
user: IRequestEntityTypeState<APIResource<CfUser>>;
serviceInstance: IRequestEntityTypeState<APIResource<CfServiceInstance>>;
servicePlan: IRequestEntityTypeState<APIResource<CfServicePlan>>;
service: IRequestEntityTypeState<APIResource<CfService>>;
serviceBinding: IRequestEntityTypeState<APIResource<CfServiceBinding>>;
securityGroup: IRequestEntityTypeState<APIResource<ISecurityGroup>>;
>>>>>>>
featureFlag: IRequestEntityTypeState<IFeatureFlag>;
application: IRequestEntityTypeState<APIResource<IApp>>;
stack: IRequestEntityTypeState<APIResource<IStack>>;
space: IRequestEntityTypeState<APIResource<ISpace>>;
organization: IRequestEntityTypeState<APIResource<IOrganization>>;
route: IRequestEntityTypeState<APIResource<IRoute>>;
event: IRequestEntityTypeState<APIResource>;
githubBranches: IRequestEntityTypeState<APIResource<GitBranch>>;
githubCommits: IRequestEntityTypeState<APIResource<GithubCommit>>;
domain: IRequestEntityTypeState<APIResource<IDomain>>;
user: IRequestEntityTypeState<APIResource<CfUser>>;
serviceInstance: IRequestEntityTypeState<APIResource<CfServiceInstance>>;
servicePlan: IRequestEntityTypeState<APIResource<CfServicePlan>>;
service: IRequestEntityTypeState<APIResource<CfService>>;
serviceBinding: IRequestEntityTypeState<APIResource<CfServiceBinding>>;
securityGroup: IRequestEntityTypeState<APIResource<ISecurityGroup>>;
metrics: IRequestEntityTypeState<IMetrics>;
<<<<<<<
caaspInfo: IRequestEntityTypeState<RequestInfoState>;
=======
serviceInstance: IRequestEntityTypeState<RequestInfoState>;
servicePlan: IRequestEntityTypeState<RequestInfoState>;
service: IRequestEntityTypeState<RequestInfoState>;
serviceBinding: IRequestEntityTypeState<RequestInfoState>;
securityGroup: IRequestEntityTypeState<RequestInfoState>;
>>>>>>>
serviceInstance: IRequestEntityTypeState<RequestInfoState>;
servicePlan: IRequestEntityTypeState<RequestInfoState>;
service: IRequestEntityTypeState<RequestInfoState>;
serviceBinding: IRequestEntityTypeState<RequestInfoState>;
securityGroup: IRequestEntityTypeState<RequestInfoState>;
<<<<<<<
application: {},
stack: {},
space: {},
organization: {},
route: {},
event: {},
endpoint: {},
githubBranches: {},
user: {},
domain: {},
[AppEnvVarSchema.key]: {},
[AppStatSchema.key]: {},
[AppSummarySchema.key]: {},
caaspInfo: {},
metrics: {}
=======
[applicationSchemaKey]: {},
[stackSchemaKey]: {},
[spaceSchemaKey]: {},
[organizationSchemaKey]: {},
[routeSchemaKey]: {},
[appEventSchemaKey]: {},
[endpointSchemaKey]: {},
[githubBranchesSchemaKey]: {},
[cfUserSchemaKey]: {},
[domainSchemaKey]: {},
[appEnvVarsSchemaKey]: {},
[appStatsSchemaKey]: {},
[appSummarySchemaKey]: {},
[serviceInstancesSchemaKey]: {},
[servicePlanSchemaKey]: {},
[serviceSchemaKey]: {},
[serviceBindingSchemaKey]: {},
[buildpackSchemaKey]: {},
[securityGroupSchemaKey]: {},
[featureFlagSchemaKey]: {},
[privateDomainsSchemaKey]: {},
[spaceQuotaSchemaKey]: {}
>>>>>>>
[applicationSchemaKey]: {},
[stackSchemaKey]: {},
[spaceSchemaKey]: {},
[organizationSchemaKey]: {},
[routeSchemaKey]: {},
[appEventSchemaKey]: {},
[endpointSchemaKey]: {},
[githubBranchesSchemaKey]: {},
[cfUserSchemaKey]: {},
[domainSchemaKey]: {},
[appEnvVarsSchemaKey]: {},
[appStatsSchemaKey]: {},
[appSummarySchemaKey]: {},
[serviceInstancesSchemaKey]: {},
[servicePlanSchemaKey]: {},
[serviceSchemaKey]: {},
[serviceBindingSchemaKey]: {},
[buildpackSchemaKey]: {},
[securityGroupSchemaKey]: {},
[featureFlagSchemaKey]: {},
[privateDomainsSchemaKey]: {},
[spaceQuotaSchemaKey]: {},
[metricSchemaKey]: {} |
<<<<<<<
import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/cf-types';
import { userFavoritesEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
import { entityCatalogue } from '../../../core/src/core/entity-catalogue/entity-catalogue.service';
=======
import { updateOrganizationQuotaReducer } from './organization-quota.reducer';
import { updateSpaceQuotaReducer } from './space-quota.reducer';
>>>>>>>
<<<<<<<
[getCFEntityKey(spaceSchemaKey)]: [
=======
[spaceSchemaKey]: [
updateSpaceQuotaReducer,
>>>>>>>
[getCFEntityKey(spaceSchemaKey)]: [
updateSpaceQuotaReducer,
<<<<<<<
[getCFEntityKey(organizationSchemaKey)]: [
=======
[organizationSchemaKey]: [
updateOrganizationQuotaReducer,
>>>>>>>
[getCFEntityKey(organizationSchemaKey)]: [
updateOrganizationQuotaReducer, |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
const initialState = { ...getInitialTestStoreState() };
initialState.pagination = {
...initialState.pagination,
cfEvent: {
['app-events:mockCfGuidmockAppGuid']: {
pageCount: 1,
currentPage: 1,
totalResults: 0,
params: {
},
ids: {
},
pageRequests: {
},
clientPagination: {
pageSize: 5,
currentPage: 1,
totalResults: 0,
filter: {
string: '',
items: {}
},
}
}
}
};
>>>>>>>
<<<<<<<
.compileComponents();
const eventsConfig: EntityCatalogueEntityConfig = cfEntityFactory(appEventEntityType);
const mappedData = {
entities: {},
result: []
} as NormalizedResponse;
const pagAction: PaginatedAction = {
type: 'POPULATE_TEST_DATA',
...getPaginationAction(),
...eventsConfig,
paginationKey: 'app-events:mockCfGuidmockAppGuid'
};
const store = TestBed.get(Store);
store.dispatch(new WrapperRequestActionSuccess(mappedData, pagAction, 'fetch'));
=======
.compileComponents();
>>>>>>>
.compileComponents();
const eventsConfig: EntityCatalogueEntityConfig = cfEntityFactory(appEventEntityType);
const mappedData = {
entities: {},
result: []
} as NormalizedResponse;
const pagAction: PaginatedAction = {
type: 'POPULATE_TEST_DATA',
...getPaginationAction(),
...eventsConfig,
paginationKey: 'app-events:mockCfGuidmockAppGuid'
};
const store = TestBed.get(Store);
store.dispatch(new WrapperRequestActionSuccess(mappedData, pagAction, 'fetch')); |
<<<<<<<
import { GetUserFavoritesAction } from '../../../store/actions/user-favourites-actions/get-user-favorites-action';
=======
import { EndpointHealthCheck } from '../../../core/endpoints-health-checks';
import { GetCFInfo } from '../../../store/actions/cloud-foundry.actions';
>>>>>>>
import { GetUserFavoritesAction } from '../../../store/actions/user-favourites-actions/get-user-favorites-action';
import { EndpointHealthCheck } from '../../../core/endpoints-health-checks';
import { GetCFInfo } from '../../../store/actions/cloud-foundry.actions'; |
<<<<<<<
this.kubeTerminalEnabled$ = this.store.select('auth').pipe(
filter(auth => !!auth.sessionData['plugin-config']),
map(auth => auth.sessionData['plugin-config'].kubeTerminalEnabled === 'true')
);
const kubeDashboardStatus$ = this.entityServiceFactory.create<KubeDashboardStatus>(
this.kubeGuid,
new GetKubernetesDashboard(this.kubeGuid),
).waitForEntity$.pipe(
=======
const kubeDashboardStatus$ = kubeEntityCatalog.dashboard.store.getEntityService(this.kubeGuid).waitForEntity$.pipe(
>>>>>>>
this.kubeTerminalEnabled$ = this.store.select('auth').pipe(
filter(auth => !!auth.sessionData['plugin-config']),
map(auth => auth.sessionData['plugin-config'].kubeTerminalEnabled === 'true')
);
const kubeDashboardStatus$ = kubeEntityCatalog.dashboard.store.getEntityService(this.kubeGuid).waitForEntity$.pipe( |
<<<<<<<
import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
import { ServiceInstanceActionBuilders } from '../../../../../entity-action-builders/service-instance.action.builders';
=======
import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
>>>>>>>
import { cfEntityCatalog } from '../../../../../cf-entity-catalog'; |
<<<<<<<
import {
cfEntityFactory,
organizationEntityType,
spaceEntityType,
spaceQuotaEntityType,
} from '../../../../cloud-foundry/src/cf-entity-factory';
import { GetAllOrganizationSpaces } from '../../../../store/src/actions/organization.actions';
=======
import { spaceEntityType, organizationEntityType, cfEntityFactory, spaceQuotaEntityType } from '../../../../cloud-foundry/src/cf-entity-factory';
import { GetAllOrganizationSpaces } from '../../../../cloud-foundry/src/actions/organization.actions';
>>>>>>>
import { GetAllOrganizationSpaces } from '../../../../cloud-foundry/src/actions/organization.actions';
import { GetOrganizationSpaceQuotaDefinitions } from '../../../../cloud-foundry/src/actions/quota-definitions.actions';
import {
cfEntityFactory,
organizationEntityType,
spaceEntityType,
spaceQuotaEntityType,
} from '../../../../cloud-foundry/src/cf-entity-factory';
<<<<<<<
=======
import { ISpaceQuotaDefinition } from '../../core/cf-api.types';
import { createEntityRelationPaginationKey } from '../../../../store/src/helpers/entity-relations/entity-relations.types';
import { GetOrganizationSpaceQuotaDefinitions } from '../../../../cloud-foundry/src/actions/quota-definitions.actions';
>>>>>>> |
<<<<<<<
=======
import { GitSCMService } from './data-services/scm/scm.service';
>>>>>>>
import { GitSCMService } from './data-services/scm/scm.service';
<<<<<<<
MetricsRangeSelectorService,
=======
GitSCMService,
MetricsRangeSelectorService
>>>>>>>
MetricsRangeSelectorService,
GitSCMService,
MetricsRangeSelectorService |
<<<<<<<
'cnsi_client_id': action.clientID,
'cnsi_client_secret': action.clientSecret,
=======
'sso_allowed': action.ssoAllowed ? 'true' : 'false',
>>>>>>>
'cnsi_client_id': action.clientID,
'cnsi_client_secret': action.clientSecret,
'sso_allowed': action.ssoAllowed ? 'true' : 'false', |
<<<<<<<
actionHistory: [],
lists: {},
routing: {
currentState: null
}
};
/* tslint:enable */
=======
system: {},
private_domains: {},
space_quota_definition: {}
},
actionHistory: [],
lists: {}
};
/* tslint:enable */
>>>>>>>
system: {}
},
actionHistory: [],
lists: {},
routing: {
currentState: null
}
};
/* tslint:enable */ |
<<<<<<<
=======
import { map } from 'rxjs/operators';
import { isTCPRoute, getMappedApps } from '../../../../../features/applications/routes/routes.helper';
import { getAPIResourceGuid } from '../../../../../store/selectors/api.selectors';
export const RouteSchema = new schema.Entity('route', {}, {
idAttribute: getAPIResourceGuid
});
>>>>>>> |
<<<<<<<
import { FetchCFCellMetricsPaginatedAction } from '../../../actions/cf-metrics.actions';
import { GetAllRoutes } from '../../../actions/route.actions';
import { GetSpaceRoutes } from '../../../actions/space.actions';
=======
>>>>>>>
import { GetAllRoutes } from '../../../actions/route.actions';
import { GetSpaceRoutes } from '../../../actions/space.actions'; |
<<<<<<<
import { combineLatest, Observable, of as observableOf, ReplaySubject } from 'rxjs';
import { filter, first, map, multicast, publishReplay, refCount, switchMap } from 'rxjs/operators';
=======
import { combineLatest, Observable, of as observableOf } from 'rxjs';
import { filter, first, map, publishReplay, refCount, startWith, switchMap } from 'rxjs/operators';
>>>>>>>
import { combineLatest, Observable, of as observableOf, ReplaySubject } from 'rxjs';
import { filter, first, map, multicast, publishReplay, refCount, startWith, switchMap } from 'rxjs/operators';
<<<<<<<
import { CF_ENDPOINT_TYPE } from '../../cf-types';
import { UserActionBuilders } from '../../entity-action-builders/user.action-builders';
=======
import { CF_ENDPOINT_TYPE } from '../../cf-types';
>>>>>>>
import { CF_ENDPOINT_TYPE } from '../../cf-types';
import { UserActionBuilders } from '../../entity-action-builders/user.action-builders';
<<<<<<<
getUsers = (endpointGuid: string): Observable<APIResource<CfUser>[]> => {
return this.getAllUsers(endpointGuid).pipe(
switchMap(paginationObservables => combineLatest(paginationObservables.entities$, paginationObservables.pagination$)),
=======
getUsers = (endpointGuid: string, filterEmpty = true): Observable<APIResource<CfUser>[]> =>
this.getAllUsers(endpointGuid).pipe(
switchMap(paginationObservables => combineLatest(
// Entities should be subbed to so the api request is made
paginationObservables.entities$.pipe(
// In the event of maxed lists though entities never fires... so start with something
startWith(null),
),
paginationObservables.pagination$
)),
>>>>>>>
getUsers = (endpointGuid: string, filterEmpty = true): Observable<APIResource<CfUser>[]> =>
this.getAllUsers(endpointGuid).pipe(
switchMap(paginationObservables => combineLatest(
// Entities should be subbed to so the api request is made
paginationObservables.entities$.pipe(
// In the event of maxed lists though entities never fires... so start with something
startWith(null),
),
paginationObservables.pagination$
)), |
<<<<<<<
=======
import { AuthState } from '../../../store/src/reducers/auth.reducer';
import { RouterNav } from '../../../store/src/actions/router.actions';
import { endpointHealthChecks, EndpointHealthCheck } from '../../endpoints-health-checks';
import { getEndpointType } from '../features/endpoints/endpoint-helpers';
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
.map(cfGuid => {
// Return list of guid+error objects for those endpoints with errors
const cnsis = resData[cfGuid];
return cnsis.error ? {
error: cnsis.error,
guid: cfGuid
} : null;
})
.filter(cnsisError => !!cnsisError);
=======
.filter(guid => resData[guid] !== null)
.map(guid => {
const cnsis = resData[guid];
cnsis.guid = guid;
return cnsis;
})
.filter(cnsis => {
return cnsis.error;
});
>>>>>>>
.filter(guid => resData[guid] !== null)
.map(cfGuid => {
// Return list of guid+error objects for those endpoints with errors
const cnsis = resData[cfGuid];
return cnsis.error ? {
error: cnsis.error,
guid: cfGuid
} : null;
})
.filter(cnsisError => !!cnsisError);
<<<<<<<
switch (apiAction.entityLocation) {
case RequestEntityLocation.ARRAY: // The response is an array which contains the entities
return Object.keys(cfData).map(key => {
const guid = apiAction.guid + '-' + key;
const result = this.completeResourceEntity(cfData[key], cfGuid, guid);
result.entity.guid = guid;
return result;
});
case RequestEntityLocation.OBJECT: // The response is the entity
return this.completeResourceEntity(cfData, cfGuid, apiAction.guid);
case RequestEntityLocation.RESOURCE: // The response is an object and the entities list is within a 'resource' param
default:
if (!cfData.resources) {
// Treat the response as RequestEntityLocation.OBJECT
return this.completeResourceEntity(cfData, cfGuid, apiAction.guid);
}
totalResults += cfData['total_results'];
if (!cfData.resources.length) {
return null;
}
return cfData.resources.map(resource => {
return this.completeResourceEntity(resource, cfGuid, resource.guid);
});
=======
totalResults += cfData['total_results'];
if (cfData.resources) {
if (!cfData.resources.length) {
return null;
}
return cfData.resources.map(resource => {
if (resource.entity) {
// Inject `cfGuid` in nested entities
Object.keys(resource.entity).forEach(resourceKey => {
const nestedResourceEntity = resource.entity[resourceKey];
if (nestedResourceEntity &&
nestedResourceEntity.hasOwnProperty('entity') &&
nestedResourceEntity.hasOwnProperty('metadata')) {
resource.entity[resourceKey] = this.completeResourceEntity(nestedResourceEntity, cfGuid);
}
});
}
return this.completeResourceEntity(resource, cfGuid);
});
} else {
return this.completeResourceEntity(cfData, cfGuid);
>>>>>>>
switch (apiAction.entityLocation) {
case RequestEntityLocation.ARRAY: // The response is an array which contains the entities
return Object.keys(cfData).map(key => {
const guid = apiAction.guid + '-' + key;
const result = this.completeResourceEntity(cfData[key], cfGuid, guid);
result.entity.guid = guid;
return result;
});
case RequestEntityLocation.OBJECT: // The response is the entity
return this.completeResourceEntity(cfData, cfGuid, apiAction.guid);
case RequestEntityLocation.RESOURCE: // The response is an object and the entities list is within a 'resource' param
default:
if (!cfData.resources) {
// Treat the response as RequestEntityLocation.OBJECT
return this.completeResourceEntity(cfData, cfGuid, apiAction.guid);
}
totalResults += cfData['total_results'];
if (!cfData.resources.length) {
return null;
}
return cfData.resources.map(resource => {
return this.completeResourceEntity(resource, cfGuid, resource.guid);
}); |
<<<<<<<
import {
createBasicStoreModule,
createEntityStoreState,
TestStoreEntity,
} from '@stratosui/store/testing';
=======
>>>>>>> |
<<<<<<<
import { CNSISModel } from '../types/cnsis.types';
import {
IAPIAction,
StartNoneCFAction,
WrapperNoneCFActionFailed,
WrapperNoneCFActionSuccess,
} from '../types/request.types';
=======
import { CNSISModel, cnsisStoreNames } from '../types/cnsis.types';
import {
IAPIAction, NoneCFSuccessAction, StartNoneCFAction, WrapperNoneCFActionFailed, WrapperNoneCFActionSuccess
} from '../types/request.types';
>>>>>>>
import { CNSISModel, cnsisStoreNames } from '../types/cnsis.types';
import {
IAPIAction,
StartNoneCFAction,
WrapperNoneCFActionFailed,
WrapperNoneCFActionSuccess,
} from '../types/request.types';
<<<<<<<
entityKey: 'cnis',
guid: action.guid,
=======
entityKey: cnsisStoreNames.type,
guid: action.cnsiGuid,
>>>>>>>
entityKey: cnsisStoreNames.type,
guid: action.cnsiGuid, |
<<<<<<<
constructor(private store: Store<AppState>, private router: Router, @Inject(APP_TITLE) public title: string) {
=======
constructor(private store: Store<Pick<InternalAppState, 'uaaSetup' | 'auth'>>, private router: Router) {
>>>>>>>
constructor(private store: Store<Pick<InternalAppState, 'uaaSetup' | 'auth'>>, private router: Router, @Inject(APP_TITLE) public title: string) { |
<<<<<<<
import {
TableCellServiceNameComponent,
} from '../cf-spaces-service-instances/table-cell-service-name/table-cell-service-name.component';
import {
TableCellServicePlanComponent,
} from '../cf-spaces-service-instances/table-cell-service-plan/table-cell-service-plan.component';
import { RouterNav } from '../../../../../store/actions/router.actions';
import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service';
import { CurrentUserPermissions } from '../../../../../core/current-user-permissions.config';
=======
import { TableCellServiceNameComponent } from '../cf-spaces-service-instances/table-cell-service-name/table-cell-service-name.component';
import { TableCellServicePlanComponent } from '../cf-spaces-service-instances/table-cell-service-plan/table-cell-service-plan.component';
>>>>>>>
import {
TableCellServiceNameComponent,
} from '../cf-spaces-service-instances/table-cell-service-name/table-cell-service-name.component';
import {
TableCellServicePlanComponent,
} from '../cf-spaces-service-instances/table-cell-service-plan/table-cell-service-plan.component'; |
<<<<<<<
=======
import { SharedModule } from '../../../../../core/src/shared/shared.module';
>>>>>>>
import { SharedModule } from '../../../../../core/src/shared/shared.module';
<<<<<<<
import { getInitialTestStoreState, createBasicStoreModule } from '../../../../../core/test-framework/store-test-helper';
import { GetApplication } from '../../../../../store/src/actions/application.actions';
import { applicationSchemaKey, entityFactory } from '../../../../../store/src/helpers/entity-factory';
import { endpointStoreNames } from '../../../../../store/src/types/endpoint.types';
=======
import { createEmptyStoreModule } from '../../../../../core/test-framework/store-test-helper';
import { AppStoreExtensionsModule } from '../../../../../store/src/store.extensions.module';
>>>>>>>
import { createEmptyStoreModule } from '../../../../../core/test-framework/store-test-helper';
import { AppStoreExtensionsModule } from '../../../../../store/src/store.extensions.module';
<<<<<<<
import { CommonModule, DatePipe } from '@angular/common';
import { CoreModule } from '../../../../../core/src/core/core.module';
import { SharedModule } from '../../../../../core/src/shared/shared.module';
import {
ApplicationEnvVarsHelper
} from '../../../../../core/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
=======
import { applicationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
>>>>>>>
<<<<<<<
createBasicStoreModule(),
CfAutoscalerTestingModule
=======
ApplicationsModule,
createEmptyStoreModule(),
RouterTestingModule,
>>>>>>>
ApplicationsModule,
createEmptyStoreModule(),
RouterTestingModule, |
<<<<<<<
import { GetQuotaDefinition } from '../../../../../cloud-foundry/src/actions/quota-definitions.actions';
=======
import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../../../core/src/core/cf-api.types';
>>>>>>>
<<<<<<<
import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../cf-api.types';
=======
import { cfEntityCatalog } from '../../../cf-entity-catalog';
>>>>>>>
import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../cf-api.types';
import { cfEntityCatalog } from '../../../cf-entity-catalog'; |
<<<<<<<
TemplateRef,
ViewChild,
=======
>>>>>>>
TemplateRef,
ViewChild,
<<<<<<<
asapScheduler,
queueScheduler,
=======
isObservable,
asapScheduler,
>>>>>>>
queueScheduler,
isObservable,
asapScheduler,
<<<<<<<
combineLatest,
throttleTime,
=======
subscribeOn,
>>>>>>>
combineLatest,
throttleTime,
subscribeOn,
<<<<<<<
if (this.multiFilterChangesSub) {
this.multiFilterChangesSub.unsubscribe();
}
=======
this.pendingActions.forEach(sub => sub.unsubscribe());
>>>>>>>
if (this.multiFilterChangesSub) {
this.multiFilterChangesSub.unsubscribe();
}
this.pendingActions.forEach(sub => sub.unsubscribe()); |
<<<<<<<
export interface CFBasePipelineRequestActionMeta {
includeRelations?: string[];
populateMissing?: boolean;
flatten?: boolean;
}
// class CFBasePipelineRequestAction = BasePipelineRequestAction < { entity } >
export function registerCFEntities() {
generateCFEntities().forEach(entity => entityCatalogue.register(entity));
}
=======
>>>>>>>
export interface CFBasePipelineRequestActionMeta {
includeRelations?: string[];
populateMissing?: boolean;
flatten?: boolean;
}
// class CFBasePipelineRequestAction = BasePipelineRequestAction < { entity } >
export function registerCFEntities() {
generateCFEntities().forEach(entity => entityCatalogue.register(entity));
} |
<<<<<<<
deployApplication: {
cloudFoundryDetails: null,
},
appMetadata: {
values: {
'4e4858c4-24ab-4caf-87a8-7703d1da58a0': {
environmentVars: {
staging_env_json: {
http_proxy: '',
HTTP_PROXY: '',
https_proxy: '',
HTTPS_PROXY: '',
no_proxy: '',
NO_PROXY: ''
},
running_env_json: {
http_proxy: '',
HTTP_PROXY: '',
https_proxy: '',
HTTPS_PROXY: '',
no_proxy: '',
NO_PROXY: ''
},
environment_json: {},
system_env_json: {
VCAP_SERVICES: {}
},
application_env_json: {
VCAP_APPLICATION: {
cf_api: 'http://api.cf-dev.io',
limits: {
fds: 16384,
mem: 16,
disk: 16
},
application_name: 'go-env',
application_uris: [],
name: 'go-env',
space_name: 'dev',
space_id: 'd87ba175-51ec-4cc9-916c-bee26d00e498',
uris: [],
users: null,
application_id: '4e4858c4-24ab-4caf-87a8-7703d1da58a0',
version: '2dc814c5-2dbf-4bb0-9203-78ec06ef465c',
application_version: '2dc814c5-2dbf-4bb0-9203-78ec06ef465c'
}
}
},
instances: {
'0': {
state: 'RUNNING',
stats: {
name: 'go-env',
uris: [],
host: '172.17.0.27',
port: 60000,
uptime: 83821,
mem_quota: 16777216,
disk_quota: 16777216,
fds_quota: 16384,
usage: {
time: '2017-10-11T08:48:42.368008421Z',
cpu: 0.000507393284464085,
mem: 7696384,
disk: 2748416
}
}
}
},
summary: {}
}
},
requests: {
'4e4858c4-24ab-4caf-87a8-7703d1da58a0': {
environmentVars: {
fetching: false,
updating: false,
creating: false,
error: false,
message: ''
},
instances: {
fetching: false,
updating: false,
creating: false,
error: false,
message: ''
},
summary: {
fetching: false,
updating: false,
creating: false,
error: false,
message: ''
}
}
}
},
=======
>>>>>>>
deployApplication: {
cloudFoundryDetails: null,
}, |
<<<<<<<
import { CdkTableModule } from '@angular/cdk/table';
import { TableRowComponent } from './table-row/table-row.component';
=======
import { RunningInstancesComponent } from '../running-instances/running-instances.component';
>>>>>>>
import { CdkTableModule } from '@angular/cdk/table';
import { TableRowComponent } from './table-row/table-row.component';
import { RunningInstancesComponent } from '../running-instances/running-instances.component';
<<<<<<<
TableRowComponent
=======
RunningInstancesComponent
>>>>>>>
TableRowComponent,
RunningInstancesComponent |
<<<<<<<
=======
import { entityFactory } from '../../../../../store/src/helpers/entity-factory';
import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
>>>>>>>
<<<<<<<
new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy)
=======
this.action,
false
>>>>>>>
new UpdateAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid, this.currentPolicy) |
<<<<<<<
this.cardOneFetching$ = this.applicationService.app$
=======
this.appEdits = {
name: '',
instances: 0,
memory: 0,
enable_ssh: false
};
this.summaryDataChanging$ = this.applicationService.app$
>>>>>>>
this.summaryDataChanging$ = this.applicationService.app$
<<<<<<<
)
.map(([app, appEnvVars, appStatsGated]: [EntityInfo, AppMetadataInfo, AppMetadataInfo]) => {
const fetching = app.entityRequestInfo.fetching || appEnvVars.metadataRequestState.fetching ||
appStatsGated ? appStatsGated.metadataRequestState.fetching : false;
return Observable.of(app.entityRequestInfo.fetching || appEnvVars.metadataRequestState.fetching ||
appStatsGated.metadataRequestState.fetching);
=======
).map(([app, isFetchingApp, isUpdatingApp, appEnvVars, appStatsGated]: [any, boolean, boolean, AppMetadataInfo, any]) => {
const isFetching = isFetchingApp
|| (appEnvVars ? appEnvVars.metadataRequestState.fetching : false)
|| (appStatsGated ? appStatsGated.metadataRequestState.fetching : false);
const isUpdating = isUpdatingApp;
return isFetching || isUpdating;
>>>>>>>
).map(([app, isFetchingApp, isUpdatingApp, appEnvVars, appStatsGated]: [any, boolean, boolean, AppMetadataInfo, any]) => {
const isFetching = isFetchingApp
|| (appEnvVars ? appEnvVars.metadataRequestState.fetching : false)
|| (appStatsGated ? appStatsGated.metadataRequestState.fetching : false);
const isUpdating = isUpdatingApp;
return isFetching || isUpdating;
<<<<<<<
this.sub.push(this.cardOneFetching$
.filter((isFetching) => {
return !isFetching;
=======
this.sub.push(this.summaryDataChanging$
.filter((isChanging) => {
return !isChanging;
>>>>>>>
this.sub.push(this.summaryDataChanging$
.filter((isChanging) => {
return !isChanging; |
<<<<<<<
import { of as observableOf, Observable, combineLatest } from 'rxjs';
import { Component, OnInit, OnDestroy } from '@angular/core';
=======
import { Component, OnInit } from '@angular/core';
>>>>>>>
import { Component, OnDestroy } from '@angular/core';
<<<<<<<
import { first, map, tap } from 'rxjs/operators';
=======
import { combineLatest, Observable, of as observableOf } from 'rxjs';
import { first, map } from 'rxjs/operators';
>>>>>>>
import { combineLatest, Observable, of as observableOf } from 'rxjs';
import { first, map, tap } from 'rxjs/operators';
<<<<<<<
import { CurrentUserPermissions } from '../../../../../../core/current-user-permissions.config';
import { CurrentUserPermissionsService } from '../../../../../../core/current-user-permissions.service';
import { entityFactory, spaceSchemaKey } from '../../../../../../store/helpers/entity-factory';
=======
>>>>>>> |
<<<<<<<
import { Subscription } from 'rxjs';
=======
import { PLATFORM_ID, Inject } from '@angular/core';
import { Subscription } from 'rxjs/Subscription';
>>>>>>>
import { PLATFORM_ID, Inject } from '@angular/core';
import { Subscription } from 'rxjs'; |
<<<<<<<
import { Output, EventEmitter, Directive, Input, TemplateRef, ViewContainerRef, OnDestroy, ChangeDetectorRef } from '@angular/core';
import { Subscription } from 'rxjs';
=======
import { Output, EventEmitter, Directive, Input, TemplateRef, ViewContainerRef, OnDestroy, ChangeDetectorRef } from '@angular/core';
import { PLATFORM_ID, Inject } from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
import { Subscription } from 'rxjs/Subscription';
>>>>>>>
import { Output, EventEmitter, Directive, Input, TemplateRef, ViewContainerRef, OnDestroy, ChangeDetectorRef } from '@angular/core';
import { PLATFORM_ID, Inject } from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
import { Subscription } from 'rxjs'; |
<<<<<<<
import { UserProfileInfo } from './types/user-profile.types';
import { InternalEventsState } from './types/internal-events.types';
import { PermissionState } from './types/permissions.types';
import { ICurrentUserRolesState } from './types/current-user-roles.types';
=======
>>>>>>> |
<<<<<<<
import { CardNumberMetricComponent } from './components/cards/card-number-metric/card-number-metric.component';
import { CardCfRecentAppsComponent } from './components/cards/card-cf-recent-apps/card-cf-recent-apps.component';
import { CompactAppCardComponent } from './components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component';
import { StratosTitleComponent } from './components/stratos-title/stratos-title.component';
import { IntroScreenComponent } from './components/intro-screen/intro-screen.component';
import { CloudFoundryService } from './data-services/cloud-foundry.service';
import { CliInfoComponent } from './components/cli-info/cli-info.component';
import { CliCommandComponent } from './components/cli-info/cli-command/cli-command.component';
import { AppActionMonitorComponent } from './components/app-action-monitor/app-action-monitor.component';
import { AppActionMonitorIconComponent } from './components/app-action-monitor-icon/app-action-monitor-icon.component';
=======
import { UserProfileBannerComponent } from './components/user-profile-banner/user-profile-banner.component';
>>>>>>>
import { CardNumberMetricComponent } from './components/cards/card-number-metric/card-number-metric.component';
import { CardCfRecentAppsComponent } from './components/cards/card-cf-recent-apps/card-cf-recent-apps.component';
import { CompactAppCardComponent } from './components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component';
import { StratosTitleComponent } from './components/stratos-title/stratos-title.component';
import { IntroScreenComponent } from './components/intro-screen/intro-screen.component';
import { CloudFoundryService } from './data-services/cloud-foundry.service';
import { CliInfoComponent } from './components/cli-info/cli-info.component';
import { CliCommandComponent } from './components/cli-info/cli-command/cli-command.component';
import { AppActionMonitorComponent } from './components/app-action-monitor/app-action-monitor.component';
import { AppActionMonitorIconComponent } from './components/app-action-monitor-icon/app-action-monitor-icon.component';
import { UserProfileBannerComponent } from './components/user-profile-banner/user-profile-banner.component';
<<<<<<<
CliCommandComponent,
AppActionMonitorComponent,
AppActionMonitorIconComponent
=======
CliCommandComponent,
UserProfileBannerComponent
>>>>>>>
CliCommandComponent,
AppActionMonitorComponent,
AppActionMonitorIconComponent,
UserProfileBannerComponent |
<<<<<<<
private authTypesForEndpoint = [];
=======
private hasAttemptedConnect: boolean;
>>>>>>>
private hasAttemptedConnect: boolean;
private authTypesForEndpoint = [];
<<<<<<<
const { guid, authType, authValues } = this.endpointForm.value;
=======
this.hasAttemptedConnect = true;
const { guid, username, password } = this.endpointForm.value;
>>>>>>>
this.hasAttemptedConnect = true;
const { guid, authType, authValues } = this.endpointForm.value; |
<<<<<<<
=======
import { ISpace } from '../../../core/src/core/cf-api.types';
import {
EntityCatalogTestModuleManualStore,
TEST_CATALOGUE_ENTITIES,
} from '../../../store/src/entity-catalog-test.module';
import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
import {
createBasicStoreModule,
createEntityStoreState,
TestStoreEntity,
} from '@stratos/store/testing';
>>>>>>> |
<<<<<<<
...((api as ApiObject).replaceData ? {} : self.pristine),
=======
...(api && (api as ApiObject).replaceData ? {} : self.pristine),
>>>>>>>
...((api as ApiObject).replaceData ? {} : self.pristine),
<<<<<<<
self.reInitData(data, !!(api && (api as ApiObject).replaceData));
=======
self.reInitData(data, !!api && (api as ApiObject).replaceData);
>>>>>>>
self.reInitData(data, !!(api as ApiObject).replaceData);
<<<<<<<
self.updateData(
json.data,
{
__saved: Date.now()
},
!!api && (api as ApiObject).replaceData
);
=======
self.updateData(json.data, {
__saved: Date.now()
}, !!api && (api as ApiObject).replaceData);
>>>>>>>
self.updateData(
json.data,
{
__saved: Date.now()
},
!!api && (api as ApiObject).replaceData
); |
<<<<<<<
* Parses the given path template for segments. For example, a path template might be
*
* /foo/{fooId}/resources/{resourceId}
*
* In this case, this method will return [ "fooId", "resourceId" ]
*
* @param pathTemplate
* @return {Array}
*/
private parsePathTemplate(pathTemplate: string): string[] {
let segments: string[] = pathTemplate.split("{");
return segments.filter( (segment, idx) => {
return idx > 0 && segment.indexOf("}") != -1;
}).map( segment => {
return segment.substring(0, segment.indexOf("}")).trim();
});
}
/**
=======
>>>>>>>
<<<<<<<
let pathVars: string[] = this.parsePathTemplate(path);
this.reportIfInvalid("PAR-3-018", OasValidationRuleUtil.isValidEnumItem(node.name, pathVars), node, "name",
`Path Parameter "${node.name}" not found in path template.`);
=======
let pathSegs: PathSegment[] = this.getPathSegments(path);
this.reportIfInvalid("PAR-3-018", pathSegs.filter(pathSeg => pathSeg.formalName === node.name).length > 0, node, "name",
`Path Parameter not found in path template.`);
>>>>>>>
let pathSegs: PathSegment[] = this.getPathSegments(path);
this.reportIfInvalid("PAR-3-018", pathSegs.filter(pathSeg => pathSeg.formalName === node.name).length > 0, node, "name",
`Path Parameter "${node.name}" not found in path template.`); |
<<<<<<<
function toChildArray(children: ComponentChildren): Array<VNode | null>;
=======
function createRef<T = any>(): RefObject<T>;
function toChildArray(children: ComponentChildren): ComponentChild[];
>>>>>>>
function createRef<T = any>(): RefObject<T>;
function toChildArray(children: ComponentChildren): Array<VNode | null>; |
<<<<<<<
let lineText = text.split('\n').pop()
matches = lineText.match(/\.([^()#>*^ \[\]=$@{}]*)$/i)
if (matches) {
let parts = matches[matches.length - 1].split('.')
str = parts[parts.length - 1]
}
=======
let currentLine = lines[lines.length - 1]
let currentWord = currentLine.split(' ').pop()
matches = currentWord.match(/^\.([^.()#>*^ \[\]=$@{}]*)$/)
if (!matches) {
matches = currentWord.match(
new RegExp(
`^([A-Z][a-zA-Z0-9]*|[a-z][a-z0-9]*-[a-z0-9-]+|${htmlElements.join(
'|'
)}).*?\\.([^.()#>*^ \\[\\]=$@{}]*)$`
)
)
}
let parts = matches[matches.length - 1].split('.')
str = parts[parts.length - 1]
>>>>>>>
let currentLine = lines[lines.length - 1]
let currentWord = currentLine.split(' ').pop()
matches = currentWord.match(/^\.([^.()#>*^ \[\]=$@{}]*)$/)
if (!matches) {
matches = currentWord.match(
new RegExp(
`^([A-Z][a-zA-Z0-9]*|[a-z][a-z0-9]*-[a-z0-9-]+|${htmlElements.join(
'|'
)}).*?\\.([^.()#>*^ \\[\\]=$@{}]*)$`
)
)
}
if (matches) {
let parts = matches[matches.length - 1].split('.')
str = parts[parts.length - 1]
} |
<<<<<<<
updateUser(userObject: User): Promise<UpdateUsersAPIResponse>;
updateUsers(users: User[]): Promise<UpdateUsersAPIResponse>;
banUser(targetUserID: string, options: object): Promise<BanUserAPIResponse>;
unbanUser(targetUserID: string, options: object): Promise<UnbanUserAPIResponse>;
muteUser(targetUserID: string): Promise<MuteAPIResponse>;
unmuteUser(targetUserID: string): Promise<UnmuteAPIResponse>;
flagUser(userID: string): Promise<FlagAPIResponse>;
unflagUser(userID: string): Promise<UnflagAPIResponse>;
flagMessage(messageID: string): Promise<FlagAPIResponse>;
unflagMessage(messageID: string): Promise<UnflagAPIResponse>;
createChannelType(data: object): Promise<CreateChannelTypeAPIResponse>;
getChannelType(channelType: string, data: object): Promise<GetChannelTypeAPIResponse>;
updateChannelType(
channelType: string,
data: object,
): Promise<UpdateChannelTypeAPIResponse>;
deleteChannelType(channelType: string): Promise<DeleteChannelTypeAPIResponse>;
listChannelTypes(): Promise<ListChannelTypesAPIResponse>;
updateMessage(message: Message, user: string | User): Promise<UpdateMessageAPIResponse>;
deleteMessage(messageID: string): Promise<DeleteMessageAPIResponse>;
=======
updateUser(userObject: User): Promise<APIResponse>;
updateUsers(users: User[]): Promise<APIResponse>;
banUser(targetUserID: string, options: object): Promise<APIResponse>;
unbanUser(targetUserID: string, options: object): Promise<APIResponse>;
muteUser(targetUserID: string): Promise<APIResponse>;
unmuteUser(targetUserID: string): Promise<APIResponse>;
flagUser(userID: string): Promise<APIResponse>;
unflagUser(userID: string): Promise<APIResponse>;
flagMessage(messageID: string): Promise<APIResponse>;
unflagMessage(messageID: string): Promise<APIResponse>;
createChannelType(data: object): Promise<APIResponse>;
getChannelType(channelType: string, data: object): APIResponse;
updateChannelType(channelType: string, data: object): Promise<APIResponse>;
deleteChannelType(channelType: string): Promise<APIResponse>;
listChannelTypes(): Promise<APIResponse>;
updateMessage(message: Message, user: string | User): Promise<APIResponse>;
deleteMessage(messageID: string, hardDelete?: boolean): Promise<APIResponse>;
>>>>>>>
updateUser(userObject: User): Promise<UpdateUsersAPIResponse>;
updateUsers(users: User[]): Promise<UpdateUsersAPIResponse>;
banUser(targetUserID: string, options: object): Promise<BanUserAPIResponse>;
unbanUser(targetUserID: string, options: object): Promise<UnbanUserAPIResponse>;
muteUser(targetUserID: string): Promise<MuteAPIResponse>;
unmuteUser(targetUserID: string): Promise<UnmuteAPIResponse>;
flagUser(userID: string): Promise<FlagAPIResponse>;
unflagUser(userID: string): Promise<UnflagAPIResponse>;
flagMessage(messageID: string): Promise<FlagAPIResponse>;
unflagMessage(messageID: string): Promise<UnflagAPIResponse>;
createChannelType(data: object): Promise<CreateChannelTypeAPIResponse>;
getChannelType(channelType: string, data: object): Promise<GetChannelTypeAPIResponse>;
updateChannelType(
channelType: string,
data: object,
): Promise<UpdateChannelTypeAPIResponse>;
deleteChannelType(channelType: string): Promise<DeleteChannelTypeAPIResponse>;
listChannelTypes(): Promise<ListChannelTypesAPIResponse>;
updateMessage(message: Message, user: string | User): Promise<UpdateMessageAPIResponse>;
deleteMessage(messageID: string, hardDelete?: boolean): Promise<DeleteMessageAPIResponse>; |
<<<<<<<
<location filename="src/core/engine.cpp" line="191"/>
=======
<location filename="src/core/engine.cpp" line="216"/>
>>>>>>>
<location filename="src/core/engine.cpp" line="213"/>
<<<<<<<
<location filename="src/core/engine.cpp" line="353"/>
=======
<location filename="src/core/engine.cpp" line="378"/>
>>>>>>>
<location filename="src/core/engine.cpp" line="375"/>
<<<<<<<
<location filename="src/core/engine.cpp" line="431"/>
=======
<location filename="src/core/engine.cpp" line="456"/>
>>>>>>>
<location filename="src/core/engine.cpp" line="453"/>
<<<<<<<
<location filename="src/server/server.cpp" line="641"/>
=======
<location filename="src/server/server.cpp" line="663"/>
>>>>>>>
<location filename="src/server/server.cpp" line="635"/>
<<<<<<<
<location filename="src/server/server.cpp" line="875"/>
=======
<location filename="src/server/server.cpp" line="899"/>
>>>>>>>
<location filename="src/server/server.cpp" line="867"/>
<<<<<<<
<location filename="src/server/server.cpp" line="893"/>
=======
<location filename="src/server/server.cpp" line="917"/>
>>>>>>>
<location filename="src/server/server.cpp" line="885"/>
<<<<<<<
<location filename="src/server/server.cpp" line="902"/>
=======
<location filename="src/server/server.cpp" line="926"/>
>>>>>>>
<location filename="src/server/server.cpp" line="894"/>
<<<<<<<
<location filename="src/server/server.cpp" line="918"/>
=======
<location filename="src/server/server.cpp" line="942"/>
>>>>>>>
<location filename="src/server/server.cpp" line="910"/>
<<<<<<<
<location filename="src/server/server.cpp" line="544"/>
=======
<location filename="src/server/server.cpp" line="538"/>
<location filename="src/server/server.cpp" line="564"/>
>>>>>>>
<location filename="src/server/server.cpp" line="544"/>
<location filename="src/server/server.cpp" line="564"/> |
<<<<<<<
import "./src/migrations/schema_test.ts";
=======
import "./src/models/fields_test.ts";
>>>>>>>
import "./src/migrations/schema_test.ts";
import "./src/models/fields_test.ts"; |
<<<<<<<
import {DefaultWriteFileOpts} from './Datastore';
import {DatastoreCapabilities} from './Datastore';
import {NetworkLayer} from './Datastore';
import {GetFileOpts} from './Datastore';
import {Datastores} from './Datastores';
import {WriteFileOpts} from './Datastore';
=======
import {URLs} from '../util/URLs';
>>>>>>>
import {URLs} from '../util/URLs';
import {DefaultWriteFileOpts} from './Datastore';
import {DatastoreCapabilities} from './Datastore';
import {NetworkLayer} from './Datastore';
import {GetFileOpts} from './Datastore';
import {Datastores} from './Datastores';
import {WriteFileOpts} from './Datastore'; |
<<<<<<<
/**
* dirtyStorageName is used as a key to save offline dirty records states
* Default: __ds__dirty_records
*/
dirtyStorageName: string;
/**
* nodeStoragePath specifies the disk location to save records
* Default: ./records
*/
nodeStoragePath: string;
/**
* nodeStorageSize specifies maximum database size in megabytes
* Default: 5
*/
nodeStorageSize: number;
=======
/**
* blbalbla
*/
lazyConnect: boolean;
>>>>>>>
/**
* dirtyStorageName is used as a key to save offline dirty records states
* Default: __ds__dirty_records
*/
dirtyStorageName: string;
/**
* nodeStoragePath specifies the disk location to save records
* Default: ./records
*/
nodeStoragePath: string;
/**
* nodeStorageSize specifies maximum database size in megabytes
* Default: 5
*/
nodeStorageSize: number;
/**
* blbalbla
*/
lazyConnect: boolean; |
<<<<<<<
/**
* Return an instance of the {@link WpSource} package.
*
* @returns WpSource package.
*/
=======
/**
* The function that returns the wp-source package.
*
* @returns The wp-source package which includes its `state`, `actions` &
* `libraries`.
*/
>>>>>>>
/**
* Return an instance of the {@link WpSource} package which includes its
* `state`, `actions` & `libraries`.
*
* @returns WpSource package.
*/ |
<<<<<<<
import { ServerError } from "@frontity/source";
import { stringify } from "query-string";
=======
import { ServerError, isError, isSearch } from "@frontity/source";
>>>>>>>
import { stringify } from "query-string";
import { ServerError, isError, isSearch } from "@frontity/source";
<<<<<<<
// Always set link, route, query & page
source.data[link].link = link;
source.data[link].route = linkParams.route;
source.data[link].query = query;
source.data[link].page = page;
// Make sure isFetching is true before starting the fetch.
source.data[link].isFetching = true;
let redirectionPromise: Promise<Response>;
/**
* A tiny helper to lazily create a fetch of the redirection.
*
* @param link - The original link.
* @returns A Promise that resolves to the redirection or rejects if there is no
* redirection.
*/
const fetchRedirection = () =>
fetch("http://localhost:8080" + link, {
method: "HEAD",
});
=======
>>>>>>>
// Always set link, route, query & page
source.data[link].link = link;
source.data[link].route = linkParams.route;
source.data[link].query = query;
source.data[link].page = page;
// Make sure isFetching is true before starting the fetch.
source.data[link].isFetching = true;
let redirectionPromise: Promise<Response>;
/**
* A tiny helper to lazily create a fetch of the redirection.
*
* @param link - The original link.
* @returns A Promise that resolves to the redirection or rejects if there is no
* redirection.
*/
const fetchRedirection = () =>
fetch("http://localhost:8080" + link, {
method: "HEAD",
}); |
<<<<<<<
export type AsyncAction<
Pkg extends Package,
A1 = null,
A2 = null,
A3 = null,
A4 = null,
A5 = null,
A6 = null,
A7 = null,
A8 = null,
A9 = null,
A10 = null
> = [A1] extends [null]
=======
/**
* Type for asynchronous actions.
* The `Input` corresponds to the second (optional) curried parameter passed
* to the action.abs.
*
* @example
* ```
* import { AsyncAction } from '@frontity/types';
* interface Input = {
* input: string;
* }
*
* const actions: { myCustomAction: AsyncAction<MyPackage, Input> } = {
* myCustomAction: ({ state, libraries }) => async ({ input }) => {
* const result = await somePromise();
* console.log(input);
* }
* }
* ```
*
* Or simply:
* @example
* ```
* import { AsyncAction } from '@frontity/types';
*
* const actions: { myCustomAction: AsyncAction<MyPackage>} = {
* myCustomAction: async ({ state, libraries }) => {
* const result = await somePromise();
* }
* }
* ```
*
*/
export type AsyncAction<Pkg extends Package, Input = null> = [Input] extends [
null
]
>>>>>>>
/**
* Type for asynchronous actions.
* The `A1`..`A10` parameters correspond to the arguments passed
* to the action.abs.
*
* @example
* ```
* import { AsyncAction } from '@frontity/types';
* interface Input = {
* input: string;
* }
*
* const actions: { myCustomAction: AsyncAction<MyPackage, Input> } = {
* myCustomAction: ({ state, libraries }) => async ({ input }) => {
* const result = await somePromise();
* console.log(input);
* }
* }
* ```
*
* Or simply:
* @example
* ```
* import { AsyncAction } from '@frontity/types';
*
* const actions: { myCustomAction: AsyncAction<MyPackage>} = {
* myCustomAction: async ({ state, libraries }) => {
* const result = await somePromise();
* }
* }
* ```
*
*/
export type AsyncAction<
Pkg extends Package,
A1 = null,
A2 = null,
A3 = null,
A4 = null,
A5 = null,
A6 = null,
A7 = null,
A8 = null,
A9 = null,
A10 = null
> = [A1] extends [null]
<<<<<<<
}) => (
...args: Arguments<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>
) => Promise<void>;
=======
}) => (args: Input) => Promise<void>;
export type Context = Koa.ParameterizedContext<
Koa.DefaultState,
Koa.DefaultContext
>;
export type ServerAction<Pkg> = AsyncAction<Pkg, { ctx: Context }>;
>>>>>>>
}) => (
...args: Arguments<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>
) => Promise<void>;
export type Context = Koa.ParameterizedContext<
Koa.DefaultState,
Koa.DefaultContext
>;
export type ServerAction<Pkg> = AsyncAction<Pkg, { ctx: Context }>; |
<<<<<<<
import { Package, Action, AsyncAction, MergePackages } from "frontity/types";
=======
import { Package, Action, AsyncAction } from "frontity/types";
import { Data } from "@frontity/source/types";
>>>>>>>
import { Package, Action, AsyncAction, MergePackages } from "frontity/types";
import { Data } from "@frontity/source/types"; |
<<<<<<<
import { warn, observe } from "frontity";
import { RedirectionData, ErrorData } from "@frontity/source/types/data";
import { stringify } from "query-string";
=======
import { warn } from "frontity";
import { isError } from "@frontity/source";
>>>>>>>
import { warn, observe } from "frontity";
import { RedirectionData, ErrorData } from "@frontity/source/types/data";
import { stringify } from "query-string";
import { isError } from "@frontity/source";
<<<<<<<
const data = state.source.get(state.router.link) as RedirectionData &
ErrorData;
// Re-create the Frontity Options.
const options = {};
for (const [key, value] of Object.entries(state.frontity.options)) {
options[`frontity_${key}`] = value;
}
if (data?.isRedirection) {
// The query is always added to `data` and it's always an object, but
// can be empty if there were no search params.
const location =
Object.keys(data.query).length > 0
? data.location + "&" + stringify(options)
: data.location + "?" + stringify(options);
ctx.redirect(location);
// This error needs to be caught by the server in @frontity/core
throw new Error("Redirection");
} else if (data.isError) {
=======
const data = state.source.get(state.router.link);
if (isError(data)) {
>>>>>>>
const data = state.source.get(state.router.link) as RedirectionData &
ErrorData;
// Re-create the Frontity Options.
const options = {};
for (const [key, value] of Object.entries(state.frontity.options)) {
options[`frontity_${key}`] = value;
}
if (data?.isRedirection) {
// The query is always added to `data` and it's always an object, but
// can be empty if there were no search params.
const location =
Object.keys(data.query).length > 0
? data.location + "&" + stringify(options)
: data.location + "?" + stringify(options);
ctx.redirect(location);
// This error needs to be caught by the server in @frontity/core
throw new Error("Redirection");
} else if (isError(data)) {
const data = state.source.get(state.router.link);
if (isError(data)) { |
<<<<<<<
import { AsyncAction, Action, State, Derived, Package } from "frontity/types";
import Source, { DataEntity } from "@frontity/source/types";
=======
import { Action, State, Derived, Package } from "frontity/types";
import Source, { EntityData } from "@frontity/source/types";
>>>>>>>
import { Action, State, Derived, Package } from "frontity/types";
import Source, { DataEntity } from "@frontity/source/types"; |
<<<<<<<
import { UpdateProjectUserRequest } from '../domain/http';
=======
import { AddProjectUserRequest, UpdateProjectUserRequest, ListProjectUsersResponse, ProjectUserResponse } from '../domain/http';
>>>>>>>
import { AddProjectUserRequest, UpdateProjectUserRequest, ListProjectUsersResponse, ProjectUserResponse } from '../domain/http';
<<<<<<<
=======
import MailService from '../services/mail.service';
import { ApiOAuth2Auth, ApiUseTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
>>>>>>>
import MailService from '../services/mail.service';
import { ApiOAuth2Auth, ApiUseTags, ApiOperation, ApiResponse } from '@nestjs/swagger';
<<<<<<<
=======
@Post(':projectId/users')
@HttpCode(HttpStatus.CREATED)
@ApiOperation({ title: 'Grant access to a project to an existing user' })
@ApiResponse({ status: HttpStatus.CREATED, description: 'Created', type: ProjectUserResponse })
@ApiResponse({ status: HttpStatus.NOT_FOUND, description: 'Not found' })
@ApiResponse({ status: HttpStatus.BAD_REQUEST, description: 'Bad request' })
@ApiResponse({ status: HttpStatus.UNAUTHORIZED, description: 'Unauthorized' })
async create(@Req() req, @Param('projectId') projectId: string, @Body() addProjectUserRequest: AddProjectUserRequest) {
const requestingUser = this.auth.getRequestUserOrClient(req, { mustBeUser: true });
await this.auth.authorizeProjectAction(requestingUser, projectId, ProjectAction.AddProjectUser);
const targetUser = await this.userRepo.findOneOrFail({
where: { email: addProjectUserRequest.email },
});
const record = this.projectUserRepo.create({
project: { id: projectId },
user: targetUser,
role: addProjectUserRequest.role,
});
let newProjectUser = await this.projectUserRepo.save(record);
newProjectUser = await this.projectUserRepo.findOneOrFail({
where: { id: newProjectUser.id },
relations: ['user', 'project'],
});
this.mail.invitedToProject(newProjectUser);
return {
data: {
userId: newProjectUser.user.id,
role: newProjectUser.role,
name: newProjectUser.user.name,
email: newProjectUser.user.email,
},
};
}
>>>>>>> |
<<<<<<<
export class EventComponent extends React.PureComponent<
EventComponentProps,
any
> {}
export const Gallery: React.FC<GalleryProps>;
export const Image: React.FC<ImageProps>;
export const ImageModal: React.FC<ImageModalProps>;
=======
export const EventComponent: React.FC<EventComponentProps>;
export class Gallery extends React.PureComponent<GalleryProps, any> {}
export class Image extends React.PureComponent<ImageProps, any> {}
>>>>>>>
export const Gallery: React.FC<GalleryProps>;
export const Image: React.FC<ImageProps>;
export const ImageModal: React.FC<ImageModalProps>;
export const EventComponent: React.FC<EventComponentProps>; |
<<<<<<<
import { ProjectUser, ProjectRole } from '../entity/project-user.entity';
import { normalizeEmail } from '../domain/validators';
=======
>>>>>>>
<<<<<<<
async create(name: string, email: string, password: string): Promise<User> {
const normalizedEmail = normalizeEmail(email);
=======
async userExists(email: string): Promise<boolean> {
const normalizedEmail = this.normalizeEmail(email);
const user = await this.userRepo.findOne({ email: normalizedEmail });
return user != null;
}
async create({
grantType,
email,
name,
password,
}: {
grantType: GrantType;
email: string;
name: string;
password?: string;
}): Promise<{ user: User; isNewUser: boolean }> {
const normalizedEmail = this.normalizeEmail(email);
>>>>>>>
async userExists(email: string): Promise<boolean> {
const normalizedEmail = normalizeEmail(email);
const user = await this.userRepo.findOne({ email: normalizedEmail });
return user != null;
}
async create({
grantType,
email,
name,
password,
}: {
grantType: GrantType;
email: string;
name: string;
password?: string;
}): Promise<{ user: User; isNewUser: boolean }> {
const normalizedEmail = normalizeEmail(email);
<<<<<<<
async authenticate(email: string, password: string): Promise<User> {
const normalizedEmail = normalizeEmail(email);
=======
async authenticate({ grantType, email, password }: { grantType: GrantType; email: string; password?: string }): Promise<User> {
const normalizedEmail = this.normalizeEmail(email);
>>>>>>>
async authenticate({ grantType, email, password }: { grantType: GrantType; email: string; password?: string }): Promise<User> {
const normalizedEmail = normalizeEmail(email); |
<<<<<<<
import { FormFieldConfig } from "../dynamic";
import { getInstance } from "../util/instance-provider.function";
=======
import { RegexValidator } from "../util/regex-validator";
>>>>>>>
import { RegexValidator } from "../util/regex-validator";
import { FormFieldConfig } from "../dynamic";
import { getInstance } from "../util/instance-provider.function"; |
<<<<<<<
import { GetFeeRequest, GetFeeResponse } from '../generated/rpc/v1/fee_pb'
=======
import { GetFeeRequest } from '../generated/rpc/v1/fee_pb'
>>>>>>>
import { GetFeeRequest, GetFeeResponse } from '../generated/rpc/v1/fee_pb'
<<<<<<<
private async getMinimumFee(): Promise<XRPDropsAmount> {
const getFeeResponse = await this.getFee()
const fee = getFeeResponse.getDrops()
if (!fee) {
throw new Error(XpringClientErrorMessages.malformedResponse)
}
const minimumFee = fee.getMinimumFee()
if (!minimumFee) {
throw new Error(XpringClientErrorMessages.malformedResponse)
}
return minimumFee
}
private async getFee(): Promise<GetFeeResponse> {
const getFeeRequest = new GetFeeRequest()
return this.networkClient.getFee(getFeeRequest)
}
=======
// TODO(keefertaylor): Add tests for this method once send is hooked up.
private async getFee(): Promise<XRPDropsAmount> {
const getFeeRequest = new GetFeeRequest()
const getFeeResponse = await this.networkClient.getFee(getFeeRequest)
const fee = getFeeResponse.getDrops()
if (!fee) {
throw new Error(XpringClientErrorMessages.malformedResponse)
}
const minimumFee = fee.getMinimumFee()
if (!minimumFee) {
throw new Error(XpringClientErrorMessages.malformedResponse)
}
return minimumFee
}
>>>>>>>
private async getMinimumFee(): Promise<XRPDropsAmount> {
const getFeeResponse = await this.getFee()
const fee = getFeeResponse.getDrops()
if (!fee) {
throw new Error(XpringClientErrorMessages.malformedResponse)
}
const minimumFee = fee.getMinimumFee()
if (!minimumFee) {
throw new Error(XpringClientErrorMessages.malformedResponse)
}
return minimumFee
}
// TODO(keefertaylor): Add tests for this method once send is hooked up.
private async getFee(): Promise<GetFeeResponse> {
const getFeeRequest = new GetFeeRequest()
return this.networkClient.getFee(getFeeRequest)
} |
<<<<<<<
import { GetAccountInfoRequest } from "../terram/generated/get_account_info_request_pb";
import Wallet from "../terram/src/wallet";
import Signer from "../terram/src/signer";
import { Payment } from "../terram/generated/payment_pb";
import { Transaction } from "../terram/generated/transaction_pb";
import { XRPAmount } from "../terram/generated/xrp_amount_pb";
import { GetFeeRequest } from "../terram/generated/get_fee_request_pb";
import { SubmitSignedTransactionResponse } from "../terram/generated/submit_signed_transaction_response_pb";
import { SubmitSignedTransactionRequest } from "../terram/generated/submit_signed_transaction_request_pb";
/**
* The default network client to use.
*/
const defaultNetworkClient = new GRPCNetworkClient();
=======
import { GetAccountInfoRequest } from "../terram/generated/get_account_info_request_pb";
import { XRPAmount } from "../terram/generated/xrp_amount_pb";
>>>>>>>
import { GetAccountInfoRequest } from "../terram/generated/get_account_info_request_pb";
import Wallet from "../terram/src/wallet";
import Signer from "../terram/src/signer";
import { Payment } from "../terram/generated/payment_pb";
import { Transaction } from "../terram/generated/transaction_pb";
import { XRPAmount } from "../terram/generated/xrp_amount_pb";
import { GetFeeRequest } from "../terram/generated/get_fee_request_pb";
import { SubmitSignedTransactionResponse } from "../terram/generated/submit_signed_transaction_response_pb";
import { SubmitSignedTransactionRequest } from "../terram/generated/submit_signed_transaction_request_pb"; |
<<<<<<<
import { Wallet } from "xpring-common-js";
import { XpringClientDecorator } from "./xpring-client-decorator";
import LegacyDefaultXpringClient from "./legacy/legacy-default-xpring-client";
import TransactionStatus from "./transaction-status";
import ReliableSubmissionXpringClient from "./reliable-submission-xpring-client";
import DefaultXpringClient from "./default-xpring-client";
/* global BigInt */
=======
import { Wallet } from 'xpring-common-js'
import { XpringClientDecorator } from './xpring-client-decorator'
import LegacyDefaultXpringClient from './legacy/legacy-default-xpring-client'
import TransactionStatus from './transaction-status'
import ReliableSubmissionXpringClient from './reliable-submission-xpring-client'
>>>>>>>
import { Wallet } from 'xpring-common-js'
import { XpringClientDecorator } from './xpring-client-decorator'
import LegacyDefaultXpringClient from './legacy/legacy-default-xpring-client'
import TransactionStatus from './transaction-status'
import ReliableSubmissionXpringClient from './reliable-submission-xpring-client'
import DefaultXpringClient from './default-xpring-client'
/* global BigInt */
<<<<<<<
public constructor(grpcURL: string, useNewProtocolBuffers: boolean = false) {
var defaultXpringClient: XpringClientDecorator = LegacyDefaultXpringClient.defaultXpringClientWithEndpoint(
grpcURL
);
if (useNewProtocolBuffers) {
defaultXpringClient = DefaultXpringClient.defaultXpringClientWithEndpoint(
grpcURL
);
}
=======
public constructor(grpcURL: string) {
const defaultXpringClient = LegacyDefaultXpringClient.defaultXpringClientWithEndpoint(
grpcURL,
)
>>>>>>>
public constructor(grpcURL: string, useNewProtocolBuffers: boolean = false) {
var defaultXpringClient: XpringClientDecorator = LegacyDefaultXpringClient.defaultXpringClientWithEndpoint(
grpcURL,
)
if (useNewProtocolBuffers) {
defaultXpringClient = DefaultXpringClient.defaultXpringClientWithEndpoint(
grpcURL,
)
} |
<<<<<<<
return validateRequest(snapshot.data() as IRequest).catch(errors => {
console.error('Invalid Request Found: ', errors);
return db
.collection('requests')
.doc(context.params.requestId)
.delete();
});
=======
return validateRequest(snapshot.data() as IRequest)
.catch(errors => {
console.error('Invalid Request Found: ', errors);
return firestore()
.collection('requests')
.doc(context.params.requestId)
.delete();
})
.then(() => {
return indexRequest(snapshot);
});
>>>>>>>
return validateRequest(snapshot.data() as IRequest)
.then(() => {
return indexRequest(snapshot);
})
.catch(errors => {
console.error('Invalid Request Found: ', errors);
return firestore()
.collection('requests')
.doc(context.params.requestId)
.delete();
}); |
<<<<<<<
=======
import { validateOrReject } from 'class-validator';
import { firestore } from 'firebase-admin';
>>>>>>>
<<<<<<<
.onCreate(createRequest);
=======
.onCreate((snapshot: DocumentSnapshot, context: EventContext) => {
return validateRequest(snapshot.data() as IRequest)
.catch(errors => {
console.error('Invalid Request Found: ', errors);
return firestore()
.collection('requests')
.doc(context.params.requestId)
.delete();
})
.then(() => {
return indexRequest(snapshot);
});
});
>>>>>>>
.onCreate(createRequest);
<<<<<<<
.onUpdate(updateRequest);
=======
.onUpdate((change: Change<DocumentSnapshot>, context: EventContext) => {
return validateRequest(change.after.data() as IRequest)
.catch(errors => {
console.error('Invalid Request Found: ', errors);
return firestore()
.collection('requests')
.doc(context.params.requestId)
.delete();
})
.then(() => {
return Promise.all([
queueStatusUpdateTriggers(change),
queueRatingUpdatedTriggers(change),
indexRequest(change.after),
]);
});
});
>>>>>>>
.onUpdate(updateRequest); |
<<<<<<<
const rules = fs.readFileSync(`${__dirname}/../../../firebase/firestore.rules`, 'utf8');
=======
>>>>>>>
<<<<<<<
const userRef = db.collection('users').doc('user1');
return userRef
.set({ username: 'fsdfs' })
.then(() => {
return userRef.get();
})
.then(snap => {
console.log('snap.data: ', JSON.stringify(snap.data()));
const wrapped = test.wrap(triggerEventsWhenUserIsCreated);
return wrapped(snap);
})
.then(() => {
return userRef.get();
})
.then(snapAfter => {
console.log('snapAfter: ', snapAfter.data());
expect(snapAfter.exists).toBeFalsy();
});
=======
let userRef = db.collection('users').doc('user1');
return userRef.set({displayName: 'fsdfs'})
.then((result): Promise<firebase.firestore.DocumentSnapshot> =>{
return userRef.get()
})
.then(snap=>{
let wrapped = test.wrap(triggerEventsWhenUserIsCreated);
return wrapped(snap, {
params: {
userId: 'user1'
}
})
})
.then(()=>{
return userRef.get()
})
.then(snapAfter=>{
expect(snapAfter.exists).toBeFalsy();
})
>>>>>>>
const userRef = db.collection('users').doc('user1');
return userRef.set({ displayName: 'fsdfs' })
.then((): Promise<firebase.firestore.DocumentSnapshot> => {
return userRef.get();
})
.then(snap => {
const wrapped = test.wrap(triggerEventsWhenUserIsCreated);
return wrapped(snap, {
params: {
userId: 'user1',
},
});
})
.then(() => {
return userRef.get();
})
.then(snapAfter => {
expect(snapAfter.exists).toBeFalsy();
}); |
<<<<<<<
import { validateOrReject } from 'class-validator';
import { firestore } from 'firebase-admin';
=======
>>>>>>>
<<<<<<<
.onCreate((snapshot: DocumentSnapshot, context: EventContext) => {
return validateOffer(snapshot.data() as IOffer)
.catch(errors => {
console.error('Invalid Offer Found: ', errors);
return db
.collection('offers')
.doc(context.params.offerId)
.delete();
});
});
=======
.onCreate(offerCreate);
>>>>>>>
.onCreate(offerCreate);
<<<<<<<
.onUpdate((change: Change<DocumentSnapshot>, context: EventContext) => {
return validateOffer(change.after.data() as IOffer)
.then(() => {
return Promise.all([queueStatusUpdateTriggers(change)]);
})
.catch(errors => {
console.error('Invalid Offer Found: ', errors);
return db
.collection('offers')
.doc(context.params.offerId)
.delete();
});
});
=======
.onUpdate(offerUpdate);
>>>>>>>
.onUpdate(offerUpdate); |
<<<<<<<
import Timeline from './timeline';
=======
import Requests from './requests';
>>>>>>>
import Requests from './requests';
import Timeline from './timeline';
<<<<<<<
Timeline,
=======
Requests,
>>>>>>>
Requests,
Timeline, |
<<<<<<<
finishedRequests: initialRequestsState,
cancelledRequests: initialRequestsState,
closedRequests: initialRequestsState,
=======
cancelledRequests: initialRequestsState,
removedRequests: initialRequestsState,
>>>>>>>
cancelledRequests: initialRequestsState,
removedRequests: initialRequestsState,
<<<<<<<
[RequestStatus.finished]: 'finishedRequests',
[RequestStatus.cancelled]: 'cancelledRequests',
[RequestStatus.closed]: 'closedRequests',
};
const updateRequestState = (state: RequestState, payload) => {
state[
requestStatusMapper[payload.requestStatus]
].data = payload.snap.docs.reduce(
(acc, doc) => ({
...acc,
[doc.id]: doc.data(),
}),
{},
);
state[requestStatusMapper[payload.requestStatus]].loading = false;
state[
requestStatusMapper[payload.requestStatus]
].observerReceivedFirstUpdate = true;
=======
[RequestStatus.cancelled]: 'cancelledRequests',
[RequestStatus.removed]: 'removedRequests',
>>>>>>>
[RequestStatus.cancelled]: 'cancelledRequests',
[RequestStatus.removed]: 'removedRequests',
};
const updateRequestState = (state: RequestState, payload) => {
state[
requestStatusMapper[payload.requestStatus]
].data = payload.snap.docs.reduce(
(acc, doc) => ({
...acc,
[doc.id]: doc.data(),
}),
{},
);
state[requestStatusMapper[payload.requestStatus]].loading = false;
state[
requestStatusMapper[payload.requestStatus]
].observerReceivedFirstUpdate = true; |
<<<<<<<
import { IsInt, IsNotEmpty, IsNumber, IsObject, IsString, IsUrl, Max, Min } from 'class-validator';
=======
import { IsEnum, IsInt, IsNotEmpty, IsNumber, IsObject, IsString, Max, Min } from 'class-validator';
>>>>>>>
import { IsEnum, IsInt, IsNotEmpty, IsNumber, IsObject, IsString, IsUrl, Max, Min } from 'class-validator';
<<<<<<<
displayPicture: string | null;
=======
applicationPreference?: ApplicationPreference;
>>>>>>>
displayPicture: string | null;
applicationPreference?: ApplicationPreference;
<<<<<<<
@IsUrl()
private _displayPicture: string | null;
=======
@IsEnum(ApplicationPreference)
private _applicationPreference: ApplicationPreference;
>>>>>>>
@IsUrl()
private _displayPicture: string | null;
@IsEnum(ApplicationPreference)
private _applicationPreference: ApplicationPreference;
<<<<<<<
displayPicture: string | null = null,
=======
applicationPreference = ApplicationPreference.pin,
>>>>>>>
displayPicture: string | null = null,
applicationPreference = ApplicationPreference.pin,
<<<<<<<
this._displayPicture = displayPicture;
=======
this._applicationPreference = applicationPreference;
>>>>>>>
this._displayPicture = displayPicture;
this._applicationPreference = applicationPreference;
<<<<<<<
data.displayPicture,
=======
data.applicationPreference,
>>>>>>>
data.displayPicture,
data.applicationPreference,
<<<<<<<
get displayPicture(): string | null {
return this._displayPicture;
=======
get applicationPreference(): ApplicationPreference {
return this._applicationPreference;
}
set applicationPreference(value: ApplicationPreference) {
this._applicationPreference = value;
}
fromFirestore(data: IUser): User {
return User.factory(data);
>>>>>>>
get displayPicture(): string | null {
return this._displayPicture;
<<<<<<<
displayPicture: modelObject.displayPicture,
=======
applicationPreference: modelObject.applicationPreference,
>>>>>>>
displayPicture: modelObject.displayPicture,
applicationPreference: modelObject.applicationPreference, |
<<<<<<<
import { NonEnumerable } from '@d-fischer/shared-utils';
=======
>>>>>>>
import { NonEnumerable } from '@d-fischer/shared-utils';
<<<<<<<
constructor(clientId: string, accessToken?: string, scopes?: string[]) {
=======
constructor(clientId: string, accessToken?: string | AccessToken, scopes: string[] = []) {
>>>>>>>
constructor(clientId: string, accessToken?: string | AccessToken, scopes?: string[]) { |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.