conflict_resolution
stringlengths
27
16k
<<<<<<< if (androidSDK < 21 || !response.getResponseHeaders) { ======= if (android.os.Build.VERSION.SDK_INT < 21) { >>>>>>> if (android.os.Build.VERSION.SDK_INT < 21 || !response.getResponseHeaders) {
<<<<<<< import { UserAvatarModule } from '../user-avatar/user-avatar.module'; ======= import { InlineEditorModule } from '../inline-editor/inline-editor.module'; >>>>>>> import { UserAvatarModule } from '../user-avatar/user-avatar.module'; import { InlineEditorModule } from '../inline-editor/inline-editor.module'; ...
<<<<<<< import { MatSlideToggleModule } from '@angular/material/slide-toggle'; ======= import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; >>>>>>> import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { ConfirmationDialogComponent } from '../con...
<<<<<<< import { AuthService } from '../../services/auth/auth.service'; import { AuditInfo } from '../../shared/models/audit-info.model'; ======= import { LayerListItemActionsType } from '../layer-list-item/layer-list-item.component'; >>>>>>> import { AuthService } from '../../services/auth/auth.service'; import { A...
<<<<<<< import { RouterService } from './../../services/router/router.service'; import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DataStoreService } from '../../serv...
<<<<<<< required: [false], fieldType: new FormControl(this.fieldTypes[0]), ======= fieldTypeOption: new FormControl(this.fieldTypeOptions[0]), >>>>>>> required: [false], fieldTypeOption: new FormControl(this.fieldTypeOptions[0]), <<<<<<< let field: Field = { id: fieldId, ...
<<<<<<< import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; import { DataStoreService } from '../../services/data-store/data-store.service'; import { Subscription } from 'rxjs'...
<<<<<<< declare module "lodash/uniqBy" declare module 'intersperse'; ======= declare module "lodash/uniqBy"; declare module "raf"; >>>>>>> declare module "lodash/uniqBy"; declare module 'intersperse'; declare module "raf";
<<<<<<< /** * Add an appender, if not already added, that writes logs to Azure Function's context.log. * The benefit of doing so, vs. just using console.log, is that the logs get associated with the request * in the Azure Portal. Otherwise the only way to see the logs is as a jumbled mess in Applica...
<<<<<<< const response = await AlexaAPI.apiCall(options); if (response.status >= 400) { ======= const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line if (response.httpStatus === 401) { return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_...
<<<<<<< import { EmotionName, EmotionIntensity } from './core/Interfaces'; ======= import { AmazonPay } from './modules/AmazonPay'; >>>>>>> import { EmotionName, EmotionIntensity } from './core/Interfaces'; import { AmazonPay } from './modules/AmazonPay'; <<<<<<< interface AppAlexaConfig { Alexa?: Config; } ===...
<<<<<<< testInjector.register("gradleCommandService", GradleCommandService); testInjector.register("gradleBuildService", GradleBuildService); testInjector.register("gradleBuildArgsService", GradleBuildArgsService); ======= testInjector.register("cleanupService", { setShouldDispose: (shouldDispose: boolean): v...
<<<<<<< testInjector.register("timers", {}); testInjector.register("iOSSigningService", IOSSigningService); testInjector.register("xcodebuildService", XcodebuildService); testInjector.register("xcodebuildCommandService", XcodebuildCommandService); testInjector.register("xcodebuildArgsService", XcodebuildArgsServic...
<<<<<<< import { Device, FilesPayload } from "nativescript-preview-sdk"; import { APP_RESOURCES_FOLDER_NAME, APP_FOLDER_NAME } from "../../../constants"; ======= import { FilePayload, Device, FilesPayload } from "nativescript-preview-sdk"; import { PreviewSdkEventNames, PreviewAppLiveSyncEvents } from "./preview-app-...
<<<<<<< const formattedPlatformsList = helpers.formatListOfNames(this.$platformCommandHelper.getAvailablePlatforms(this.$projectData), "and"); this.$logger.out("Available platforms for this OS: ", formattedPlatformsList); this.$logger.out("No installed platforms found. Use $ tns platform add"); ======= co...
<<<<<<< // Other dependencies declare var jIO: any declare module 'mnemonicjs' ======= // For Quentin's test interface Window { muteTest: { insert: (index: number, text: string) => void, delete: (index: number, length: number) => void getText: (index?: number, length?: number) => string } } // Other ...
<<<<<<< ======= public pulsarOn: boolean constructor( private zone: NgZone, private route: ActivatedRoute, private cryptoService: CryptoService, private pulsarService: PulsarService ) { this.route.paramMap.subscribe((params) => { this.pulsarOn = params.get('pulsar') === 'true' ? true ...
<<<<<<< Document, ======= DocumentNode, FragmentDefinitionNode, >>>>>>> DocumentNode, FragmentDefinitionNode, <<<<<<< ======= // This interface is deprecated because we no longer pass around fragments separately in the core. export interface DeprecatedWatchQueryOptions extends ModifiableWatchQueryOption...
<<<<<<< function isStringValue(value: Value): value is StringValue { ======= import isObject = require('lodash/isObject'); function isStringValue(value: ValueNode): value is StringValueNode { >>>>>>> function isStringValue(value: Value): value is StringValueNode {
<<<<<<< export function getMutationDefinition(doc: Document): OperationDefinition { ======= import countBy = require('lodash/countBy'); import identity = require('lodash/identity'); import uniq = require('lodash/uniq'); export function getMutationDefinition(doc: DocumentNode): OperationDefinitionNode { >>>>>>> exp...
<<<<<<< ): NetworkInterface { return new MockBatchedNetworkInterface(mockedResponses); ======= ): BatchedNetworkInterface { return new MockBatchedNetworkInterface(...mockedResponses); >>>>>>> ): BatchedNetworkInterface { return new MockBatchedNetworkInterface(mockedResponses);
<<<<<<< import { DataProxy, } from '../data/proxy'; ======= import { PureQueryOptions, } from './types'; >>>>>>> import { DataProxy, } from '../data/proxy'; import { PureQueryOptions, } from './types'; <<<<<<< refetchQueries?: string[]; update?: (proxy: DataProxy, mutationResult: Object) => void; =...
<<<<<<< public watchQuery<T>(options: WatchQueryOptions): ObservableQuery<T> { ======= public watchQuery<T, TVariables = OperationVariables>( options: WatchQueryOptions<TVariables>, ): ObservableQuery<T> { this.initQueryManager(); >>>>>>> public watchQuery<T, TVariables = OperationVariables>( op...
<<<<<<< let obs: Observable<FetchResult>; let updatedContext = {}; const clientQuery = this.localState.clientQuery(document); const serverQuery = this.localState.serverQuery(document); if (serverQuery) { const operation = this.buildOperationForLink(serverQuery, variables, { ...
<<<<<<< ======= if (observer.next) { if (this.isDifferentResult(lastResult, resultFromStore)) { lastResult = resultFromStore; observer.next(this.transformResult<T>(resultFromStore)); } } >>>>>>> <<<<<<< this.fetchQuery(queryId, options) ...
<<<<<<< declare module 'lodash.find' { import main = require('~lodash/index'); export = main.find; } ======= declare module 'lodash.flatten' { import main = require('~lodash/index'); export = main.flatten; } declare module 'lodash.pick' { import main = require('~lodash/index'); export = main.pick; } >...
<<<<<<< describe('directives', () => { it('should be able to send a query with a skip directive true', (done) => { const query = gql` query { fortuneCookie @skip(if: true) }`; const result = {}; const networkInterface = mockNetworkInterface( { request:...
<<<<<<< import { DataWrite } from '../src/actions'; ======= import {getOperationName} from '../src/queries/getFromAST'; >>>>>>> import { DataWrite } from '../src/actions'; import {getOperationName} from '../src/queries/getFromAST'; <<<<<<< assert.deepEqual<DataWrite[]>(writes, [ ======= const document...
<<<<<<< /** * Something resembling the monadic fixpoint combinatior for Now. */ function mfixNow<M extends BehaviorObject, O>( comp: (m: M) => Now<[M, O]> ): Now<[M, O]> { return new MfixNow(comp); } export function isGeneratorFunction<A, T>(fn: any): fn is ((a: A) => Iterator<T>) { return fn !== undefined ...
<<<<<<< // either "nextinput" or "default" // If nextinput, <Tab> after gi brings selects the next input // If default, <Tab> selects the next selectable element, e.g. a link "gistyle": "nextinput", // either "nextinput" or "default" ======= "theme": "default", // currently available: "defaul...
<<<<<<< * * @param urlarr * - if first word looks like it has a schema, treat as a URI * - else if the first word contains a dot, treat as a domain name * - else if the first word is a key of [[SEARCH_URLS]], treat all following terms as search parameters for that provider * - else treat...
<<<<<<< export interface SelectMenuProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> { initialTab?: string } export interface SelectMenuModalProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> { title?: string } export interface SelectMenuListP...
<<<<<<< export const ButtonTableList: React.FunctionComponent<ButtonTableListProps> ======= export const ButtonGroup: React.FunctionComponent<BoxProps> >>>>>>> export const ButtonTableList: React.FunctionComponent<ButtonTableListProps> export const ButtonGroup: React.FunctionComponent<BoxProps> <<<<<<< decl...
<<<<<<< export interface Configuration { willSaveTextDocumentWaitUntilRequest?: boolean | ((textDocument: TextDocument) => boolean); } ======= export enum RevealOutputChannelOn { Info = 1, Warn = 2, Error = 3, Never = 4 } >>>>>>> export interface Configuration { willSaveTextDocumentWaitUntilRequest?: boolean...
<<<<<<< import * as progress from './protocol.progress.proposed'; ======= import * as sr from './protocol.selectionRange.proposed'; >>>>>>> import * as progress from './protocol.progress.proposed'; import * as sr from './protocol.selectionRange.proposed';
<<<<<<< import { WindowProgressFeature } from './progress.proposed'; ======= import { CallHierarchyFeature } from './callHierarchy.proposed'; >>>>>>> import { WindowProgressFeature } from './progress.proposed'; import { CallHierarchyFeature } from './callHierarchy.proposed'; <<<<<<< new SelectionRangeFeature(cli...
<<<<<<< import { Base64ImageComponent } from './base64-image/base64-image.component'; import { CustomMarkdownComponent } from './custom-markdown/custom-markdown.component'; ======= import { PlotlyComponent } from './plotly/plotly.component'; >>>>>>> import { PlotlyComponent } from './plotly/plotly.component'; import...
<<<<<<< if (index > -1) { this.lastDeletedCard = this.cards[index]; this.cards.splice(index, 1); } ======= if (index > -1 && index < this.cards.length) { this.cards.splice(index, 1); } >>>>>>> if (index > -1 && index < this.cards.length) { this.la...
<<<<<<< import { HighlightPipe } from './classes/highlight.pipe'; import { AnsiColorizePipe } from './classes/ansi-colorize.pipe'; import { RunScriptsDirective } from './classes/run-scripts.directive'; ======= import {PreviewPipe} from "./classes/preview.pipe"; >>>>>>> import { HighlightPipe } from './classes/highl...
<<<<<<< import { entityFactory } from '../helpers/entity-factory'; import { cfUserSchemaKey } from '../helpers/entity-factory'; ======= import { UserSchema } from '../types/user.types'; import { OrgUserRoles } from '../../features/cloud-foundry/cf.helpers'; >>>>>>> import { entityFactory } from '../helpers/entity-fa...
<<<<<<< import { CreateNewApplication } from '../../../../store/actions/application.actions'; import { GetOrganisation } from '../../../../store/actions/organisation.actions'; ======= import { AssociateRouteWithAppApplication, CreateNewApplication } from '../../../../store/actions/application.actions'; import { GetOr...
<<<<<<< ======= import { combineLatest } from 'rxjs/observable/combineLatest'; import { map } from 'rxjs/operators'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { combineAll } from 'rxjs/operator/combineAll'; >>>>>>>
<<<<<<< import { combineLatest } from 'rxjs/observable/combineLatest'; import { distinctUntilChanged, filter, map, pairwise } from 'rxjs/operators'; ======= import { combineLatest } from 'rxjs/observable/combineLatest'; import { map, pairwise, tap } from 'rxjs/operators'; >>>>>>> import { combineLatest } from 'rxjs/...
<<<<<<< import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service'; ======= import { IApp } from '../../../../../../core/src/core/cf-api.types'; >>>>>>> <<<<<<< import { IApp } from '../../../../cf-api.types'; import { appStatsEntityType } from '../../../../cf-entity-types'; i...
<<<<<<< import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service'; import { getIdFromRoute } from '../../../core/utils.service'; ======= import { getIdFromRoute } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers'; import { entityCatalog } from '../../../../../st...
<<<<<<< import { IntroScreenComponent } from './components/intro-screen/intro-screen.component'; ======= import { GithubCommitAuthorComponent } from './components/github-commit-author/github-commit-author.component'; import { IntroScreenComponent } from './components/intro-screen/intro-screen.component'; >>>>>>> imp...
<<<<<<< import { browser, promise } from 'protractor'; ======= import { browser, protractor } from 'protractor'; >>>>>>> import { browser, promise, protractor } from 'protractor'; <<<<<<< import { E2E, e2e } from '../e2e'; import { CFHelpers } from '../helpers/cf-helpers'; ======= import { e2e } from '../e2e';...
<<<<<<< import { SuccessfulApiResponseDataMapper, PreApiRequest, PrePaginationApiRequest } from '../../../../store/src/entity-request-pipeline/entity-request-pipeline.types'; import { PaginationPageIteratorConfig } from '../../../../store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-i...
<<<<<<< import { currentUserRolesReducer } from './reducers/current-user-roles-reducer/current-user-roles.reducer'; ======= import { createServiceInstanceReducer } from './reducers/create-service-instance.reducer'; >>>>>>> import { createServiceInstanceReducer } from './reducers/create-service-instance.reducer'; imp...
<<<<<<< this.appEdits = { name: '', instances: 0, memory: 0, enable_ssh: false }; this.summaryDataChanging$ = this.applicationService.isFetchingApp$ ======= this.summaryDataChanging$ = this.applicationService.app$ >>>>>>> this.summaryDataChanging$ = this.applicationServic...
<<<<<<< import { getTabsFromExtensions, StratosTabType, StratosActionMetadata, getActionsFromExtensions, StratosActionType } from '../../../../../../core/extension/extension-service'; import { IPageSideNavTab } from '../../../../../dashboard/page-side-nav/page-side-nav.component'; ======= >>>>>>> import { ...
<<<<<<< import { entityFactory, serviceSchemaKey, servicePlanVisibilitySchemaKey, serviceBrokerSchemaKey } from '../../store/helpers/entity-factory'; ======= import { entityFactory, serviceSchemaKey, servicePlanVisibilitySchemaKey, organizationSchemaKey } from '../../store/helpers/entity-factory'; >>>>>>> import { e...
<<<<<<< import { APIResource, CFResponse } from '../../frontend/app/store/types/api.types'; import { CfUser } from '../../frontend/app/store/types/user.types'; import { e2e, E2ESetup } from '../e2e'; ======= import { IOrganization, IRoute } from '../../frontend/app/core/cf-api.types'; import { APIResource } from '....
<<<<<<< ======= import { IServiceBroker, IServicePlan } from '../../../../../core/src/core/cf-api-svc.types'; >>>>>>> <<<<<<< import { IServiceBroker, IServicePlan } from '../../../cf-api-svc.types'; ======= import { cfEntityCatalog } from '../../../cf-entity-catalog'; >>>>>>> import { IServiceBroker, IServicePl...
<<<<<<< import { UsageGaugeComponent } from './components/usage-gauge/usage-gauge.component'; import { PercentagePipe } from './pipes/percentage.pipe'; import { TableCellUsageComponent } from './components/table/custom-cells/table-cell-usage/table-cell-usage.component'; ======= import { CardAppStatusComponent } from ...
<<<<<<< import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'; import { EntityInfo } from '../../../../../../../store/src/types/api.types'; ======= import { AppState } from '../../../../../../../store/src/app-state'; import { APIResource } from '../../../../../../../store/src/types/api.type...
<<<<<<< import { BaseCF } from '../cf-page.types'; ======= import { ActiveRouteCfOrgSpace } from '../cf-page.types'; import { IOrganization, ISpace, IApp } from '../../../core/cf-api.types'; >>>>>>> import { ActiveRouteCfOrgSpace } from '../cf-page.types'; <<<<<<< this.cfGuid = baseCf.guid; this.getAllO...
<<<<<<< import { XSRFModule } from './xsrf.module'; ======= import { PageNotFoundComponentComponent } from './core/page-not-found-component/page-not-found-component.component'; >>>>>>> import { PageNotFoundComponentComponent } from './core/page-not-found-component/page-not-found-component.component'; import { XSRFMo...
<<<<<<< securityGroup:{}, ======= buildpack: {}, >>>>>>> securityGroup:{}, buildpack: {}, <<<<<<< securityGroup:{}, securityRule:{}, ======= buildpack:{}, >>>>>>> securityGroup:{}, securityRule:{}, buildpack:{}, <<<<<<< securityGroup: {}, s...
<<<<<<< this.cardMenu = [{ label: 'Detach', action: this.detach, can: this.appService.waitForAppEntity$.pipe( switchMap(app => this.currentUserPermissionsService.can( CurrentUserPermissions.SERVICE_BINDING_EDIT, this.appService.cf...
<<<<<<< import { Observable , Subscription } from 'rxjs'; ======= import { Observable } from 'rxjs/Observable'; import { map, publishReplay, refCount } from 'rxjs/operators'; import { Subscription } from 'rxjs/Subscription'; >>>>>>> import { Observable, Subscription } from 'rxjs'; import { map, publishReplay, refCo...
<<<<<<< import { CfBuildpackCardComponent } from '../../list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component'; ======= import { CfStacksCardComponent } from '../../list-types/cf-stacks/cf-stacks-card/cf-stacks-card.component'; >>>>>>> import { CfBuildpackCardComponent } from '../../list-types/cf-bu...
<<<<<<< import { tag } from 'rxjs-spy/operators/tag'; import { debounceTime, distinctUntilChanged, filter, first, tap, withLatestFrom, map } from 'rxjs/operators'; import { Subscription , Observable } from 'rxjs'; ======= import { Observable } from 'rxjs/Observable'; import { map } from 'rxjs/operators'; import { Su...
<<<<<<< import { APIResource } from '../../store/types/api.types'; import { GetAppEnvVarsAction } from './../../store/actions/app-metadata.actions'; ======= import { ApplicationEnvVars, } from '../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service'; import { Env...
<<<<<<< import {SetArrays} from '../../../web/js/util/SetArrays'; import {Tag} from '../../../web/js/tags/Tags'; ======= import {Sets} from '../../../web/js/util/Sets'; import {DataObjectIndex} from './DataObjectIndex'; >>>>>>> import {SetArrays} from '../../../web/js/util/SetArrays'; import {Tag} from '../../../web...
<<<<<<< import { currentUserCfRolesRequestStateReducer, currentUserRolesRequestStateReducer, } from './current-user-request-state.reducers'; import { roleInfoFromSessionReducer } from './current-user-role-session.reducer'; ======= import { VerifiedSession, SESSION_VERIFIED } from '../../actions/auth.actions'; imp...
<<<<<<< TableCellUsageComponent, ======= TableCellRouteComponent, TableCellTCPRouteComponent, >>>>>>> TableCellUsageComponent, TableCellRouteComponent, TableCellTCPRouteComponent,
<<<<<<< import { GeneralEntityAppState, GeneralRequestDataState } from '../../store/src/app-state'; import { endpointSchemaKey } from '../../store/src/helpers/entity-factory'; ======= import { AppState } from '../../store/src/app-state'; import { applicationSchemaKey, endpointSchemaKey, organizationSchemaKey, ...
<<<<<<< import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { first, map } from 'rxjs/operators'; ======= import { Validators } from '@angular/forms'; >>>>>>> import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; import { first, map } from 'rxjs/operators'; import { Val...
<<<<<<< import { applicationEntityType, appStatsEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types'; ======= import { IAppSummary } from '../../../../../../../../core/src/core/cf-api.types'; >>>>>>> <<<<<<< import { IAppSummary } from '../../../../../../cf-api.types'; import { CF_ENDPOINT_...
<<<<<<< import { IDomain } from '../../../../cf-api.types'; import { CF_ENDPOINT_TYPE } from '../../../../cf-types'; ======= import { cfEntityCatalog } from '../../../../cf-entity-catalog'; >>>>>>> import { IDomain } from '../../../../cf-api.types'; import { cfEntityCatalog } from '../../../../cf-entity-catalog';
<<<<<<< import { EntityInlineChildAction } from '../entity-relations/entity-relations.types'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { CFStartAction, ICFAction } from '../../../store/src/types/request.types'; ======= import { CFStartAction } from './cf-action.types'; >>>>...
<<<<<<< import { createEntityRelationKey } from '../../../../../store/helpers/entity-relations.types'; const orgWithSpaceSchema = entityFactory(organisationWithSpaceKey); const spaceSchema = entityFactory(spaceSchemaKey); ======= import { AppReducersModule } from '../../../../../store/reducers.module'; import { GetA...
<<<<<<< import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material'; import { GetSystemInfo } from '../../store/actions/system.actions'; ======= >>>>>>>
<<<<<<< } export interface IStack { name: string; description: string; } export interface IBuildpack { name: string; position: number; enabled: boolean; locked: boolean; filename: string; ======= } export interface IServiceInstance { guid: string; cfGuid: string; } export interface IPrivateDomai...
<<<<<<< import { PortalModule } from '@angular/cdk/portal'; ======= import { NoContentMessageComponent } from '../shared/components/no-content-message/no-content-message.component'; >>>>>>> import { PortalModule } from '@angular/cdk/portal'; import { NoContentMessageComponent } from '../shared/components/no-content...
<<<<<<< import { CoreTestingModule } from '../../../../test-framework/core-test.modules'; import { createBasicStoreModule } from '../../../../test-framework/store-test-helper'; import { Customizations } from '../../../core/customizations.types'; import { MDAppModule } from '../../../core/md.module'; ======= import ...
<<<<<<< import { PaginationMonitorFactory } from '../../../../monitors/pagination-monitor.factory'; import { DataFunctionDefinition, ListDataSource } from '../../data-sources-controllers/list-data-source'; import { IListConfig } from '../../list.component.types'; import { EndpointDataSourceHelper } from './endpoint-dat...
<<<<<<< import { compose, Store } from '@ngrx/store'; import { combineLatest, interval, Observable } from 'rxjs'; import { filter, map, publishReplay, refCount, switchMap, tap, withLatestFrom } from 'rxjs/operators'; ======= import { Store, compose } from '@ngrx/store'; import { tag } from 'rxjs-spy/operators/tag'; i...
<<<<<<< import { AppState } from './../../../../../../store/app-state'; ======= >>>>>>> <<<<<<< import { map, first, tap } from 'rxjs/operators'; ======= import { map } from 'rxjs/operators'; >>>>>>> import { first, map, tap } from 'rxjs/operators'; import { getFavoriteFromCfEntity } from '../../../../../../c...
<<<<<<< securityGroup:{}, ======= featureFlag: {}, >>>>>>> securityGroup:{}, featureFlag: {}, <<<<<<< securityGroup:{}, securityRule:{}, ======= featureFlag: {}, >>>>>>> securityGroup:{}, securityRule:{}, featureFlag: {}, <<<<<<< securityGroup: {...
<<<<<<< }); ======= })); it('First filter hidden if only one option', async(() => { component.config.getMultiFiltersConfigs = () => { return [ { key: 'filterTestKey', label: 'filterTestLabel', list$: observableOf([ ...
<<<<<<< ======= import { CFAppState } from '../../cloud-foundry/src/cf-app-state'; import { ActiveRouteCfOrgSpace } from '../../cloud-foundry/src/features/cloud-foundry/cf-page.types'; import { CloudFoundryEndpointService, } from '../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.servic...
<<<<<<< import { combineLatest, distinct, map } from 'rxjs/operators'; ======= import { combineLatest, distinct, map, tap, startWith } from 'rxjs/operators'; >>>>>>> import { combineLatest, distinct, map, startWith } from 'rxjs/operators'; <<<<<<< const scmType = deploySource.scm as GitSCMType; ...
<<<<<<< import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import * as moment from 'moment'; import { Subscription } from 'rxjs'; import { debounceTime, takeWhile, tap } from 'rxjs/operators'; import { MetricQueryConfig, MetricQueryType, MetricsAction } from '../../../store/acti...
<<<<<<< import { PaginationAction } from '../types/pagination.types'; import { ApplicationSchema } from './application.actions'; ======= import { PaginationAction } from '../types/pagination.types'; import { RouteSchema } from '../../shared/components/list/list-types/app-route/cf-app-routes-data-source'; >>>>>>> imp...
<<<<<<< MultilineTitleComponent, StackedInputActionsComponent, StackedInputActionComponent, ======= FavoritesGlobalListComponent, FavoritesMetaCardComponent, FavoritesEntityListComponent, MultilineTitleComponent >>>>>>> StackedInputActionsComponent, StackedInputActionComponent, ...
<<<<<<< import { userFavoritesEntitySchema } from '../../../core/src/base-entity-schemas'; ======= >>>>>>> <<<<<<< import { entityCatalog } from '../entity-catalog/entity-catalog'; import { proxyAPIVersion } from '../jetstream'; ======= import { userFavoritesEntitySchema } from '../base-entity-schemas'; import { ...
<<<<<<< import { appEnvVarsSchemaKey, appStatsSchemaKey, appSummarySchemaKey, privateDomainsSchemaKey, spaceQuotaSchemaKey, serviceInstancesSchemaKey, servicePlanSchemaKey, serviceSchemaKey, serviceBindingSchemaKey, buildpackSchemaKey, securityGroupSchemaKey, featureFlagSchemaKey, domainSchema...
<<<<<<< import { appEventEntityType, cfEntityFactory } from '../cf-entity-factory'; import { PaginatedAction } from '../../../store/src/types/pagination.types'; import { CFStartAction } from '../../../store/src/types/request.types'; import { QParam } from '../../../store/src/q-param'; ======= import { PaginatedAction...
<<<<<<< import { ListView } from '../../../../../../../store/src/actions/list.actions'; import { CFAppState } from '../../../../../../../store/src/app-state'; import { APIResource } from '../../../../../../../store/src/types/api.types'; ======= >>>>>>>
<<<<<<< import { DeleteUserProvidedInstance, UpdateUserProvidedServiceInstance, } from '../../../../cloud-foundry/src/actions/user-provided-service.actions'; ======= >>>>>>> <<<<<<< import { serviceBindingEntityType, serviceInstancesEntityType, userProvidedServiceInstanceEntityType, } from '../../../../cl...
<<<<<<< // The apiResponse will be null if we're validating as part of the entity service, not during an api request const entities = apiResponse ? apiResponse.response.entities : null; return validateEntityRelations({ ======= return apiAction.skipValidation ? { sta...
<<<<<<< import { initEndpointTypes } from '../endpoint-helpers'; ======= import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component'; >>>>>>> import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component'; import { initEndpointTypes } from '../endpoint-helpers...
<<<<<<< appType: 'private', consumerKey: 'myConsumerKey', consumerSecret: 'myConsumerSecret', privateKey: 'shhhhhhh', userAgent: 'xero-node-v3-unit-test' ======= AppType: 'partner', ConsumerKey: 'myConsumerKey', ConsumerSecret: 'myConsumerSecret', PrivateKeyCert: 'shhhhhhh', Us...
<<<<<<< import { RouteEvents } from './route.actions'; ======= import { SpaceSchema, spaceSchemaKey, SpaceWithOrganisationSchema } from './action-types'; import { getActions } from './action.helper'; import { PaginationAction } from '../types/pagination.types'; import { ApplicationSchema } from './application.actions...
<<<<<<< import { trigger, transition, style, animate } from '@angular/animations'; import { map } from 'rxjs/operators'; import { AuthState } from '../../../store/reducers/auth.reducer'; ======= import { ToggleSideNav } from './../../../store/actions/dashboard-actions'; import { AppState } from './../../../store/app-...
<<<<<<< super(confirmDialog, cfUserService); ======= super(confirmDialog); this.chipsConfig$ = combineLatest( this.rowSubject.asObservable(), this.configSubject.asObservable().pipe(switchMap(config => config.org$)), this.configSubject.asObservable().pipe(switchMap(config => config.spaces...
<<<<<<< public endpointParentType: string; ======= private endpointIds = new ReplaySubject<string[]>(); public endpointIds$: Observable<string[]>; public cardStatus$: Observable<CardStatus>; private subs: Subscription[] = []; >>>>>>> public endpointParentType: string; private endpointIds = new ReplaySu...
<<<<<<< SET_STRATOS_THEME, ======= SET_HEADER_EVENT, SetHeaderEvent, >>>>>>> SET_HEADER_EVENT, SET_STRATOS_THEME, SetHeaderEvent, <<<<<<< SetThemeAction, SHOW_SIDE_HELP, ======= >>>>>>> SetThemeAction, <<<<<<< sideHelpOpen: boolean; sideHelpDocument: string; themeKey: string; ======= ...