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-servic...
<<<<<<< import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs'; ======= import { Observable, Subject } from 'rxjs'; >>>>>>> import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subject } from 'rxjs'; <<<<<<< import { cfEntityFactory, cfUserEntityT...
<<<<<<< } 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 c...
<<<<<<< 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...
<<<<<<< new GetAppRoutes(appService.appGuid, appService.cfGuid), getPaginationKey('route', appService.cfGuid, appService.appGuid), ======= new GetAppRoutes( appService.appGuid, appService.cfGuid, 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 }...
<<<<<<< ======= 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/shar...
<<<<<<< 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...
<<<<<<< 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.ty...
<<<<<<< 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.s...
<<<<<<< { 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/organizat...
<<<<<<< ======= 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,...
<<<<<<< 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 '../../.....
<<<<<<< ======= 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/act...
<<<<<<< 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 { Ser...
<<<<<<< import { ServicesService } from '../../services.service'; import { getServiceInstancesInCf } from '../../services-helper'; ======= import { CreateServiceInstanceState } from '../../../../store/types/create-service-instance.types'; import { getServiceJsonParams, isMarketplaceMode, safeUnsubscribe } from '../.....
<<<<<<< }, { path: ':cfId/:serviceInstanceId/edit', component: AddServiceInstanceComponent ======= }, { path: ':cfId/:serviceInstanceId/detach', component: DetachServiceInstanceComponent >>>>>>> }, { path: ':cfId/:serviceInstanceId/edit', component: AddServiceInstanceComponent }...
<<<<<<< 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'; <<<<<<< ...
<<<<<<< loadChildren: '../../cloud-foundry/src/features/applications/applications.module#ApplicationsModule', ======= loadChildren: () => import('../../cloud-foundry/src/features/applications/applications.module').then(m => m.ApplicationsModule), >>>>>>> loadChildren: () => import('../../clou...
<<<<<<< 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'; <<<<<<< impor...
<<<<<<< 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 { crea...
<<<<<<< import { applicationSchemaKey, entityFactory, spaceSchemaKey, routeSchemaKey, organizationSchemaKey } from '../../../../../store/helpers/entity-factory'; ======= import { applicationSchemaKey, entityFactory, routeSchemaKey, spaceSchemaKey, } from '../../../../../store/helpers/entity-factory'; import ...
<<<<<<< ======= import { BaseHttpClientFetcher, flattenPagination, IPaginationFlattener, } from '../../../../store/src/helpers/paginated-request-helpers'; import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types'; import { endpointsRegisteredCFEntitiesSelector } from '../../../../s...
<<<<<<< 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-...
<<<<<<< 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-fact...
<<<<<<< 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,...
<<<<<<< system: IRequestEntityTypeState<SystemInfo>; githubBranches: IRequestEntityTypeState<APIResource>; githubCommits: IRequestEntityTypeState<APIResource>; domain: IRequestEntityTypeState<APIResource>; user: IRequestEntityTypeState<APIResource>; buildpack: IRequestEntityTypeState<APIResource>; ======= ...
<<<<<<< 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-foundr...
<<<<<<< InverseConditionCellComponent, KubernetesNamespaceLinkComponent ======= 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 '../....
<<<<<<< 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 ...
<<<<<<< ======= 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 !== {}.con...
<<<<<<< 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 } ...
<<<<<<< ======= import { appEnvVarsSchemaKey, appEventSchemaKey, applicationSchemaKey, appStatsSchemaKey, appSummarySchemaKey, buildpackSchemaKey, cfUserSchemaKey, domainSchemaKey, endpointSchemaKey, featureFlagSchemaKey, githubBranchesSchemaKey, organizationSchemaKey, privateDomainsSchemaKe...
<<<<<<< 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 { updateOrganizationQ...
<<<<<<< ======= >>>>>>> <<<<<<< ======= const initialState = { ...getInitialTestStoreState() }; initialState.pagination = { ...initialState.pagination, cfEvent: { ['app-events:mockCfGuidmockAppGuid']: { pageCount: 1, currentPage: 1, totalResults: 0, params: {...
<<<<<<< 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 { GetUserFavoritesAc...
<<<<<<< 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>( thi...
<<<<<<< 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 '../../../../../feature...
<<<<<<< import { cfEntityFactory, organizationEntityType, spaceEntityType, spaceQuotaEntityType, } from '../../../../cloud-foundry/src/cf-entity-factory'; import { GetAllOrganizationSpaces } from '../../../../store/src/actions/organization.actions'; ======= import { spaceEntityType, organizationEntityType, cf...
<<<<<<< ======= import { GitSCMService } from './data-services/scm/scm.service'; >>>>>>> import { GitSCMService } from './data-services/scm/scm.service'; <<<<<<< MetricsRangeSelectorService, ======= GitSCMService, MetricsRangeSelectorService >>>>>>> MetricsRangeSelectorService, GitSCMService,...
<<<<<<< '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.ss...
<<<<<<< actionHistory: [], lists: {}, routing: { currentState: null } }; /* tslint:enable */ ======= system: {}, private_domains: {}, space_quota_definition: {} }, actionHistory: [], lists: {} }; /* tslint:enable */ >>>>>>> system: {} }, actionHistory: [], lists:...
<<<<<<< ======= 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: g...
<<<<<<< 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 { GetS...
<<<<<<< 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, ref...
<<<<<<< ======= 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-helper...
<<<<<<< .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); ======= .filt...
<<<<<<< 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, Sta...
<<<<<<< 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' | 'a...
<<<<<<< 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 '../...
<<<<<<< ======= 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 { ...
<<<<<<< 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...
<<<<<<< TemplateRef, ViewChild, ======= >>>>>>> TemplateRef, ViewChild, <<<<<<< asapScheduler, queueScheduler, ======= isObservable, asapScheduler, >>>>>>> queueScheduler, isObservable, asapScheduler, <<<<<<< combineLatest, throttleTime, ======= subscribeOn, >>>>>>> combineLates...
<<<<<<< export interface CFBasePipelineRequestActionMeta { includeRelations?: string[]; populateMissing?: boolean; flatten?: boolean; } // class CFBasePipelineRequestAction = BasePipelineRequestAction < { entity } > export function registerCFEntities() { generateCFEntities().forEach(entity => entityCatalogue.r...
<<<<<<< deployApplication: { cloudFoundryDetails: null, }, appMetadata: { values: { '4e4858c4-24ab-4caf-87a8-7703d1da58a0': { environmentVars: { staging_env_json: { http_proxy: '', HTTP_PROXY: '', https_proxy: '', ...
<<<<<<< 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 { TableRowCompone...
<<<<<<< ======= 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.cardOneFetching$ = this.applicationService.app$ ======= this.appEdits = { name: '', instances: 0, memory: 0, enable_ssh: false }; this.summaryDataChanging$ = this.applicationService.app$ >>>>>>> this.summaryDataChanging$ = this.applicationService.app$ <<<<<<...
<<<<<<< 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/operato...
<<<<<<< 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 { 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/compac...
<<<<<<< private authTypesForEndpoint = []; ======= private hasAttemptedConnect: boolean; >>>>>>> private hasAttemptedConnect: boolean; private authTypesForEndpoint = []; <<<<<<< const { guid, authType, authValues } = this.endpointForm.value; ======= this.hasAttemptedConnect = true; const { gui...
<<<<<<< ======= 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 { EntityCatalogEntity...
<<<<<<< ...((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).replac...
<<<<<<< * 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 parsePathTemplat...
<<<<<<< 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): Arr...
<<<<<<< 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 ...
<<<<<<< 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(targetUse...
<<<<<<< <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...
<<<<<<< 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';...
<<<<<<< /** * 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; /** *...
<<<<<<< /** * 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 WpSo...
<<<<<<< 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 ...
<<<<<<< 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 pa...
<<<<<<< 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 "@fron...
<<<<<<< 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 { Redirec...
<<<<<<< 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, De...
<<<<<<< import { UpdateProjectUserRequest } from '../domain/http'; ======= import { AddProjectUserRequest, UpdateProjectUserRequest, ListProjectUsersResponse, ProjectUserResponse } from '../domain/http'; >>>>>>> import { AddProjectUserRequest, UpdateProjectUserRequest, ListProjectUsersResponse, ProjectUserResponse }...
<<<<<<< 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 clas...
<<<<<<< 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 userExi...
<<<<<<< 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 { getInstanc...
<<<<<<< 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 getFe...
<<<<<<< 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 { XRPA...
<<<<<<< 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-xpr...
<<<<<<< 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) ...
<<<<<<< ======= 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 => { ...
<<<<<<< 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 => { ...
<<<<<<< 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...
<<<<<<< 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, ...
<<<<<<< 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 'cl...
<<<<<<< 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[] = ...