conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
export const getLoginFormMessage = compose(fromNotificationReducer.getLoginMessage, getNotificationState);
// ===================Instagram list states and compose methods ================================================
function getInstagramState(state: State): fromInstagramReducer.State {
return state.insta... |
<<<<<<<
if (options.legacyProof) {
=======
if (options && options.legacyProof) {
>>>>>>>
if (options && options.legacyProof) {
<<<<<<<
} else {
return this.posRootChainManager.exitERC20Hermoine(txHash, options)
=======
} else {
return this.posRootChainManager.exitERC20Hermoine(txHa... |
<<<<<<<
import { Component, OnInit } from '@angular/core';
=======
import { Component } from '@angular/core';
import { UserProfile } from '../../../models/user-profile';
import { LikeTripAction } from '../../../actions/trips.action';
>>>>>>>
import { Component, OnInit } from '@angular/core';
<<<<<<<
export class Tri... |
<<<<<<<
import { Observable } from 'rxjs/Observable';
=======
import { LikeTripAction } from './../../../../actions/trips.action';
>>>>>>>
import { Observable } from 'rxjs/Observable';
import { LikeTripAction } from './../../../../actions/trips.action';
<<<<<<<
=======
constructor(
private router: Router,
... |
<<<<<<<
updateHeader(evt) {
this.currPos = (window.pageYOffset || evt.target.scrollTop) - (evt.target.clientTop || 0);
if(this.currPos >= this.changePos ) {
this.isScrolled = true;
} else {
this.isScrolled = false;
}
}
login() {
// Firebase authentication
// th... |
<<<<<<<
import { OtherDetailsComponent } from './user-settings/other-details/other-details.component';
=======
import { ChangePasswordComponent } from './user-settings/change-password/change-password.component';
>>>>>>>
import { OtherDetailsComponent } from './user-settings/other-details/other-details.component';
im... |
<<<<<<<
import { TripsService } from './../../../services/trips.service';
=======
import { environment } from './../../../../environments/environment';
import { TripsService } from './../../../services/trips.service';
>>>>>>>
import { environment } from './../../../../environments/environment';
<<<<<<<
constructo... |
<<<<<<<
private $scope: any;
private $modal: any;
private $http: any; //ng.IHttpProvider causes errors
private template: ArmTemplate;
private graph: Graph;
private loadUrl: string; //Url from the address bar
private loadedUrl: string;
toolboxItems: ToolboxResource[];
=======
priva... |
<<<<<<<
['✅', '%s', styles.emoji],
[parameters, '%o', 'padding-left: 4px;'],
=======
['done ✅', '%s', styles.emoji],
[name, '%s', 'padding-left: 4px;'],
[parameters, '(%o)', 'padding: 0;'],
>>>>>>>
['✅', '%s', styles.emoji],
[parameters, '(%o)', 'padding-left: 4px;'],
<<<<<... |
<<<<<<<
// compute the file offset for position
var range = new vscode.Range(0, 0, position.line, position.character);
var offset = document.getTextInRange(range).length;
var gocode = getBinPath("gocode");
=======
var offset = document.offsetAt(position);
var gocode = path.join(process.env["GOPATH"... |
<<<<<<<
import { setupGoPathAndOfferToInstallTools } from './goInstallTools';
import { GO_MODE } from './goMode';
import { showHideStatus } from './goStatus';
import { testAtCursor, testCurrentPackage, testCurrentFile } from './goTest';
import { addImport } from './goImport';
=======
import { setupGoPathAndOfferToIns... |
<<<<<<<
type Options = readonly [ignore.IgnorePatternOptions];
=======
type Options = [ignore.IgnorePatternOption];
>>>>>>>
type Options = readonly [ignore.IgnorePatternOption];
<<<<<<<
const schema: JSONSchema4 = [ignore.ignorePatternOptionsSchema];
=======
const schema = [ignore.ignorePatternOptionSchema];
>>>... |
<<<<<<<
type Options = readonly [
ignore.IgnoreLocalOption & ignore.IgnorePatternOptions
];
=======
type Options = [ignore.IgnoreLocalOption & ignore.IgnorePatternOption];
>>>>>>>
type Options = readonly [ignore.IgnoreLocalOption & ignore.IgnorePatternOption];
<<<<<<<
const schema: JSONSchema4 = [
deepMerge([ig... |
<<<<<<<
refField?: string;
snapshotListenOptions?: firestore.SnapshotListenOptions;
=======
snapshotListenOptions?: firebase.firestore.SnapshotListenOptions;
>>>>>>>
refField?: string;
snapshotListenOptions?: firebase.firestore.SnapshotListenOptions; |
<<<<<<<
import { auth, User } from 'firebase';
import { useEffect, useMemo } from 'react';
=======
import firebase from 'firebase/app';
import { useEffect } from 'react';
>>>>>>>
import firebase from 'firebase/app';
import { useEffect, useMemo } from 'react'; |
<<<<<<<
Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,
it replaces the entry for the current route.
When the user clicks the "back" button in the browser, there will be fewer steps.
This is most commonly used to manage redirects in a way that does not ... |
<<<<<<<
Invocation,
NamedArguments,
PositionalArguments,
=======
>>>>>>>
Invocation,
NamedArguments,
PositionalArguments,
<<<<<<<
export const CURLY_CAPABILITIES: ComponentCapabilities = {
dynamicLayout: true,
dynamicTag: true,
prepareArgs: false,
createArgs: true,
attributeHook: true,
eleme... |
<<<<<<<
import { CompilableBlock, Macros, OpcodeBuilder } from '@glimmer/opcode-compiler';
import { Option } from '@glimmer/util';
import { Core } from '@glimmer/wire-format';
import { OwnedTemplateMeta } from 'ember-views';
=======
import { assert } from 'ember-debug';
import { ENV } from 'ember-environment';
>>>>>... |
<<<<<<<
=======
const DEBUG = true;
>>>>>>>
<<<<<<<
=======
// EAVNs
//------------------------------------------------------------------------
export type EAVNField = "e"|"a"|"v"|"n";
/**
* An EAVN is a single Attribute:Value pair of an Entity (a record),
* produced by a given Node.
* E.g., the record `[#p... |
<<<<<<<
// EMBER_GLIMMER_TEMPLATE_ONLY_COMPONENTS,
// GLIMMER_CUSTOM_COMPONENT_MANAGER,
=======
GLIMMER_CUSTOM_COMPONENT_MANAGER,
>>>>>>>
// GLIMMER_CUSTOM_COMPONENT_MANAGER,
<<<<<<<
// this._definitionCache = new Cache(2000, ({ name, source, owner }) => {
// let { component: componentFactory, lay... |
<<<<<<<
=======
Cookies,
FabPluginRuntime,
>>>>>>>
<<<<<<<
FABServerContext,
RuntimeImports,
=======
>>>>>>>
RuntimeImports, |
<<<<<<<
Directive,
=======
FabResponderMutableContext,
>>>>>>>
Directive,
FabResponderMutableContext,
<<<<<<<
[
...(runtimes as RuntimeImports),
{
plugin: final_responder,
args: {},
},
],
=======
[...runtimes, final_responder],
>>>>>>>
[
...(runtime... |
<<<<<<<
context.tracker.blockTimeEnd("PresolveCheck");
debug(" Join combo valid:", valid, remainingToSolve, countOfSolved, this.registerLength);
=======
//debug(" Join combo valid:", valid, remainingToSolve, countOfSolved, this.registerLength);
>>>>>>>
//debug(" Join combo valid:... |
<<<<<<<
export { ViewWidth, ViewHeight, SizeType } from './components/AdaptivityProvider/AdaptivityContext';
export const v = process.env.VKUI_VERSION;
=======
export { ViewWidth, SizeType } from './components/AdaptivityProvider/AdaptivityContext';
>>>>>>>
export { ViewWidth, ViewHeight, SizeType } from './component... |
<<<<<<<
}
export function setRef<T>(element: T, ref: Ref<T>): void {
if (ref) {
if (typeof ref === 'function') {
ref(element);
} else {
ref.current = element;
}
}
}
// eslint-disable-next-line
export const noop = () => {};
export function createCustomEvent(window: any, type: string, event... |
<<<<<<<
case AppMode.Date:
return getDateState();
=======
case AppMode.FixedTooltips:
return getFixedTooltipsState();
>>>>>>>
case AppMode.Date:
return getDateState();
case AppMode.FixedTooltips:
return getFixedTooltipsState(); |
<<<<<<<
const metaExports: StylableExports = {
classes: {},
vars: {},
stVars: {},
keyframes: {}
};
const ast = meta.outputAst = meta.ast.clone();
=======
const metaExports: Pojo<string> = {};
const ast = this.resetTransformPropert... |
<<<<<<<
=======
import { generateStylableResult, generateStylableRoot } from '../utils/generate-test-util';
>>>>>>> |
<<<<<<<
// private _cssLanguageService?: LanguageService;
=======
public updateCached(
context: TemplateContext,
position: ts.LineAndCharacter,
completions: vscode.CompletionList
) {
this._cachedCompletionsFile = context.fileName;
this._cachedCompletionsPosition = p... |
<<<<<<<
import {ProjectTemplate, ProjectTemplateType} from './Models/Interfaces/ProjectTemplate';
=======
import * as fs from 'fs-plus';
>>>>>>>
<<<<<<<
const result: ProjectTemplate =
templateJson.templates.find((template: ProjectTemplate) => {
return template.label ==... |
<<<<<<<
=======
private templateFiles: TemplateFileInfo[] = [];
>>>>>>>
private templateFiles: TemplateFileInfo[] = [];
<<<<<<<
devicePath: string, private sketchContent = '') {
=======
devicePath: string, templateFiles?: TemplateFileInfo[]) {
>>>>>>>
devicePath: string, templateFiles?: Tem... |
<<<<<<<
device =
new AZ3166Device(this.extensionContext, deviceDir, sketchContent);
=======
device = new AZ3166Device(
this.extensionContext, this.channel, deviceDir,
projectTemplateItem.sketch);
>>>>>>>
device = new AZ3166Device(
this.extensionContext, this.... |
<<<<<<<
context: vscode.ExtensionContext, devicePath: string,
channel: vscode.OutputChannel, private sketchContent = '') {
=======
context: vscode.ExtensionContext, projectPath: string,
channel: vscode.OutputChannel, projectTemplateType: ProjectTemplateType,
telemetryContext: TelemetryCo... |
<<<<<<<
}
export function generateInterfaceFileNameFromUrnId(
urnId: string, targetPath: string) {
const suffix = '.interface.json';
const names: string[] = urnId.split(':');
// at least the path should contain urn, namespace, name & version
if (names.length < 4) {
throw new Error(`The id of the file i... |
<<<<<<<
// analyzer.analyze(results.blocks);
console.log(blocks);
=======
>>>>>>>
// analyzer.analyze(results.blocks); |
<<<<<<<
import {AZ3166Device} from './Models/AZ3166Device';
import {IoTButtonDevice} from './Models/IoTButtonDevice';
import {RaspberryPiDevice} from './Models/RaspberryPiDevice';
import {Esp32Device} from './Models/Esp32Device';
import {CodeGenerateCore} from './pnp/CodeGenerateCore';
import {PnPMetaModelUtility, PnPM... |
<<<<<<<
generateRegistration: (reg, callback) => {
const config = cli.getConfig();
=======
generateRegistration(reg, callback) {
const config = cli.getConfig() as IConfig|null;
if (!config) {
throw Error('Config not ready');
}
>>>>>>>
generateRegistration: (reg... |
<<<<<<<
import { SlackRTMHandler } from "./SlackRTMHandler";
=======
import { TeamInfoResponse, ConversationsInfoResponse } from "./SlackResponses";
>>>>>>>
import { SlackRTMHandler } from "./SlackRTMHandler";
import { TeamInfoResponse, ConversationsInfoResponse } from "./SlackResponses";
<<<<<<<
co... |
<<<<<<<
import { Bridge, PrometheusMetrics, StateLookup,
Logging, Intent, UserMembership } from "matrix-appservice-bridge";
=======
import { Bridge, PrometheusMetrics, StateLookup, StateLookupEvent,
Logging, Intent } from "matrix-appservice-bridge";
>>>>>>>
import {
Bridge, PrometheusMetrics, StateLookup... |
<<<<<<<
await Promise.all(userIds.map((userId) => this.main.getIntent(userId).leave(roomId)));
=======
await Promise.all(userIds.map(async (userId) => {
return this.main.getIntent(userId).leave(roomId);
}));
>>>>>>>
await Promise.all... |
<<<<<<<
// transform travis config
await transformTravisConfig(options.inDir, options.outDir);
// Delete files that were explicitly requested to be deleted.
if (options.deleteFiles !== undefined) {
await deleteGlobsSafe(options.deleteFiles, outDir);
}
=======
>>>>>>>
// transform travis config
aw... |
<<<<<<<
import {
ExtensionMessage,
ExtensionMessageSender
} from '../common/extensionMessaging';
=======
import {settingsHome} from './settingsHelper'
// for poking around at internal applicationinsights options
var sender = require ('applicationinsights/Library/Sender');
var telemetryLogger = require ('appl... |
<<<<<<<
// doIt();
// import "./programs/flappy";
import "./programs/compiler";
=======
doIt();
// import "./programs/flappy";
// import "./programs/hover";
>>>>>>>
// doIt();
// import "./programs/flappy";
import "./programs/compiler";
// import "./programs/hover"; |
<<<<<<<
await Promise.all(options.sources.map(async apiSource => {
const source = await apiSource.handler.getMeshSource({
=======
for (const apiSource of options.sources) {
const source = await apiSource.handlerLibrary.getMeshSource({
>>>>>>>
for (const apiSource of options.sources) {
const source ... |
<<<<<<<
export { deferred } from "https://deno.land/std@0.74.0/async/deferred.ts";
export { Drash } from "https://deno.land/x/drash@v1.2.5/mod.ts";
=======
export { deferred } from "https://deno.land/std@0.79.0/async/deferred.ts";
>>>>>>>
export { deferred } from "https://deno.land/std@0.79.0/async/deferred.ts";
e... |
<<<<<<<
const tasks = block.getUserTransactionAndProofs(this.wallet.address, this.predicatesManager).map(async tx => {
tx.getSignedTx().getStateUpdates().forEach(stateUpdate => {
if(this._spend(tx, stateUpdate)) {
this.storage.addUserAction(tx.blkNum.toNumber(), UserActionUtil.createSend(tx)... |
<<<<<<<
import {HttpErrorResponse} from '@angular/common/http';
import {KeycloakService} from 'keycloak-angular';
=======
import {BookmarkStore} from '../../public/bookmark/store/BookmarkStore';
>>>>>>>
import {HttpErrorResponse} from '@angular/common/http';
import {KeycloakService} from 'keycloak-angular';
<<<<<<<... |
<<<<<<<
private _session: IDebugger.ISession | null;
private _sessionChanged = new Signal<this, void>(this);
private _service = new DebugService(null, this);
private _currentLineChanged = new Signal<this, number>(this);
=======
>>>>>>>
private _currentLineChanged = new Signal<this, number>(this); |
<<<<<<<
// doIt();
// import "./programs/flappy";
import "./programs/editor";
=======
doIt();
// import "./programs/flappy";
// import "./programs/hover";
>>>>>>>
// doIt();
// import "./programs/flappy";
// import "./programs/hover";
import "./programs/editor"; |
<<<<<<<
editor.setGutterMarker(
lineNumber,
'breakpoints',
isRemoveGutter ? null : Private.createMarkerNode()
);
setTimeout(this.setHover);
=======
>>>>>>>
<<<<<<<
export function createHoverNode() {
let hoverGutterElement = document.createElement('div');
hoverGutterElement.... |
<<<<<<<
// Start service immediately (before mount) if specified in options
if (immediate) {
service.start();
}
useEffect(() => {
=======
useLayoutEffect(() => {
>>>>>>>
useEffect(() => { |
<<<<<<<
describe.skip('issue#20 - getOwnPropertyDescriptor', () => {
it('readonly proxy prevents mutation when value accessed via accessor descriptor', () => {
const target = new ReactiveMembrane();
const todos = {};
Object.defineProperty(todos, 'entry', {
... |
<<<<<<<
const data = await makePromise<Result>(
=======
const { data } = await makePromise(
>>>>>>>
const { data } = await makePromise<Result>(
<<<<<<<
const data = await makePromise<Result>(
=======
const { data } = await makePromise(
>>>>>>>
const { data } = await makePromise<Resu... |
<<<<<<<
relayHub = await RelayHub.new(
stakeManager.address,
penalizer.address,
relayHubConfiguration.MAX_WORKER_COUNT,
relayHubConfiguration.GAS_RESERVE,
relayHubConfiguration.POST_OVERHEAD,
relayHubConfiguration.GAS_OVERHEAD,
relayHubConfiguration.MAXIMUM_RECIPIENT_DEPOSI... |
<<<<<<<
export { default as AtSteps } from './steps'
=======
export { default as AtCurtain } from './curtain'
>>>>>>>
export { default as AtSteps } from './steps'
export { default as AtCurtain } from './curtain' |
<<<<<<<
pretty = await run_prettier_string(input, options);
=======
switch (options.parser) {
case "latex":
pretty = await latex_format(input, options);
break;
case "python":
pretty = await python_format(input, options, logger);
break;
case "r":
pretty... |
<<<<<<<
// for X11, we just want to communicate the %-value
set_status_font_size(font_size: number, default_font_size) {
const percent = Math.round((font_size * 100) / default_font_size);
this.set_status(`Set zoom to ${percent}%`, 1500);
}
=======
help(): void {
open_new_tab(HELP_URL);
}
>>>>... |
<<<<<<<
=======
strategies?: immutable.List<string>;
keyboard_variant_options?: immutable.List<any>;
>>>>>>>
keyboard_variant_options?: immutable.List<any>; |
<<<<<<<
}
export const VERSION_COOKIE_NAME = "cocalc_version";
=======
}
// helps with converting an array of strings to a union type of strings.
// usage: 1. const foo : string[] = tuple(["bar", "baz"]);
// 2. type Foo = typeof foo[number]; // bar | baz;
export function tuple<T extends string[]>(o: T) {
r... |
<<<<<<<
for (let cmd in keybindings) {
const keys = keybindings[cmd];
for (key of keys.split(" ")) {
f(key, cmd);
}
=======
// use a closure to bind cmd.
const f = (key, cmd) =>
(extraKeys[key] = cm => {
cm.edit_selection({ cmd });
return actions.s... |
<<<<<<<
export { default as AtTabsPane } from './tabs-pane'
export { default as AtSwipeAction } from './swipe-action'
export { default as AtAccordion } from './accordion'
=======
export { default as AtTabsPane } from './tabs-pane'
export declare const AtModalHeader: ComponentClass
export declare const AtModalAction:... |
<<<<<<<
export * from "./misc";
export * from "./sanitize";
export * from "./language";
export * from "./iframe";
export * from "./cookies";
export * from "./tracking";
=======
export { sagews_canonical_mode } from "./sagews-canonical-mode";
>>>>>>>
export * from "./misc";
export * from "./sanitize";
export * from "... |
<<<<<<<
"Set if there is an error computing the directory listing, e.g., if there is no directory this may happen. This will be cleared once the listing is successfully computed."
},
deleted: {
type: "array",
pg_type: "TEXT[]",
desc:
"Paths within this directory that have been... |
<<<<<<<
import { ConfirmDialogOptions } from "./confirm-dialog";
import { callback2 } from "smc-util/async-utils";
import { JUPYTER_CLASSIC_MODERN } from "smc-util/theme";
const { instantiate_assistant } = require("../assistant/main");
=======
const { instantiate_snippets } = require("../assistant/main");
const { com... |
<<<<<<<
getContributorsForProject(projectId: number) : Promise<HttpResponse<Contributor[]>> {
return this.httpClient.get<Contributor[]>(this.apiURL + 'projects/' + projectId + '/contributors', {observe: 'response'}).toPromise();
}
=======
/**
* Get the dependencyTree for to build a levelized structure ... |
<<<<<<<
templateUrl: './lib/swiper.component.html',
styleUrls: [ './lib/swiper.component.css' ],
=======
exportAs: 'ngxSwiper',
templateUrl: './swiper.component.html',
styleUrls: ['./swiper.component.css'],
>>>>>>>
exportAs: 'ngxSwiper',
templateUrl: './lib/swiper.component.html',
styleUrls: [ './lib... |
<<<<<<<
tagPrefix?: string;
tagSeparator?: string;
=======
udsGracefulErrorHandling?: boolean;
udsGracefulRestartRateLimit?: number;
>>>>>>>
tagPrefix?: string;
tagSeparator?: string;
udsGracefulErrorHandling?: boolean;
udsGracefulRestartRateLimit?: number; |
<<<<<<<
/** position of elements */
translate: 0.0,
=======
/** use button role for items */
useButtonRole: true,
>>>>>>>
/** position of elements */
translate: 0.0,
/** use button role for items */
useButtonRole: true, |
<<<<<<<
if (isValidElement(vnode)) {
const vtype = vnode.vtype
if (vtype & (VType.Composite | VType.Stateless)) {
domNode = (vnode as any).init(parentComponent)
} else if (vtype & VType.Text) {
domNode = doc.createTextNode((vnode as any).text);
(vnode as any).dom = domNode
} else if ... |
<<<<<<<
throw new Error(`Cannot find test-cloud.exe, the exe was not found in the path specified by "--uitest-tools-dir".${os.EOL}` +
`Please check that ${testCloudPath} points to a test-cloud.exe.${os.EOL}` +
`Minimum required version is "${UITestPreparer.getMinimumVersionString()}".`);
=======
... |
<<<<<<<
=======
hasTags() {
return this.branches !== undefined && this.branches.filter(b => b.isTag).length > 0;
}
}
@Component({
selector: 'app-dialog-overview-example-dialog',
templateUrl: 'app-merge-dialog.html',
})
export class MergeDialogComponent {
constructor(
public dialogRef: MatDialogRe... |
<<<<<<<
try {
const xml = new DOMParser().parseFromString(fs.readFileSync(fullPath, "utf-8"), "text/xml");
let name: string = "unknown";
const matches = entry.path.match("^(.*)[_-]nunit[_-]report");
if (matches && matches.length > 1) {
... |
<<<<<<<
import { CommandArgs } from "../../../util/commandline/command";
import { MobileCenterClient, models, clientRequest } from "../../../util/apis";
=======
import { AppCenterClient, models, clientRequest } from "../../../util/apis";
>>>>>>>
import { CommandArgs } from "../../../util/commandline/command";
import... |
<<<<<<<
/// <reference path="globals/temp/index.d.ts" />
/// <reference path="modules/async/index.d.ts" />
=======
/// <reference path="globals/rx/index.d.ts" />
/// <reference path="globals/temp/index.d.ts" />
>>>>>>>
/// <reference path="globals/temp/index.d.ts" />
/// <reference path="modules/async/index.d.ts" />... |
<<<<<<<
import { FeatureManagementModule } from '@abp/ng.feature-management';
=======
import { NgxValidateCoreModule } from '@ngx-validate/core';
>>>>>>>
import { FeatureManagementModule } from '@abp/ng.feature-management';
import { NgxValidateCoreModule } from '@ngx-validate/core'; |
<<<<<<<
import { ConfigPlugin, NGXS_CONFIG_PLUGIN_OPTIONS } from './plugins/config/config.plugin';
=======
import { ConfigPlugin, NGXS_CONFIG_PLUGIN_OPTIONS } from './plugins/config.plugin';
import { LocaleProvider } from './providers/locale.provider';
>>>>>>>
import { LocaleProvider } from './providers/locale.provi... |
<<<<<<<
import {Contributor} from '../../model/contributor'
=======
import {Branch} from '../../model/branch';
>>>>>>>
import {Contributor} from '../../model/contributor'
import {Branch} from '../../model/branch';
<<<<<<<
contributors: Contributor[];
=======
branches: Branch[];
>>>>>>>
contributors: Contri... |
<<<<<<<
=======
providers: [MessageService],
mocks: [OAuthService],
>>>>>>>
mocks: [OAuthService],
<<<<<<<
=======
it('should display an error toast', () => {
service.error('test', 'title');
spectator.detectChanges();
expect(spectator.query('p-toast')).toBeTruthy();
expect(spectat... |
<<<<<<<
import { StoreModule } from '@ngrx/store';
import { EffectsModule } from '@ngrx/effects';
import * as fromAuth from '../../../auth/store';
import { ComponentWrapperDirective } from '../../../cms/components';
import * as fromCmsReducer from '../../../cms/store/reducers';
import { SiteContextModule } from '../../... |
<<<<<<<
=======
private userStore: Store<fromUserStore.UserState>,
private cartStore: Store<fromCartStore.CartState>,
>>>>>>>
private userStore: Store<fromUserStore.UserState>, |
<<<<<<<
import { SpinnerModule } from './spinner/spinner.module';
=======
import { GenericLinkModule } from './generic-link/generic-link.module';
>>>>>>>
import { SpinnerModule } from './spinner/spinner.module';
import { GenericLinkModule } from './generic-link/generic-link.module';
<<<<<<<
import { SpinnerComponen... |
<<<<<<<
import { PageType } from '../../routing/models/page-context.model';
import { RoutingService } from '../../routing/facade/routing.service';
import { CmsService } from '../facade/cms.service';
=======
import { DefaultPageService } from '../services/default-page.service';
import { CmsModuleConfig } from '../cms-... |
<<<<<<<
import {
browser,
element,
by,
ElementArrayFinder,
ElementFinder
} from 'protractor';
import { print } from 'util';
=======
import { element, by } from 'protractor';
>>>>>>>
import { element, by, ElementArrayFinder, ElementFinder } from 'protractor'; |
<<<<<<<
export * from './lib/my-account/order/order.module';
export * from './lib/my-account/my-account.module';
=======
export * from './lib/services/services.module';
>>>>>>>
export * from './lib/my-account/order/order.module';
export * from './lib/my-account/my-account.module';
export * from './lib/services/servi... |
<<<<<<<
import { ActivatedRoute } from '@angular/router';
import { OnInit } from '@angular/core/src/metadata/lifecycle_hooks';
=======
import { Component, OnDestroy, OnInit } from '@angular/core';
>>>>>>>
import { ActivatedRoute } from '@angular/router';
import { Component, OnDestroy, OnInit } from '@angular/core'; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
import { GlobalMessageService } from '../../../../global-message/facade/global-message.service';
import { RoutingService } from '../../../../routing/facade/routing.service';
import { checkoutNavBar } from './checkout-navigation-bar';
=======
import { RoutingService } from '@sparta... |
<<<<<<<
import { StoreFinderGridComponent } from './components/store-finder-grid/store-finder-grid.component';
=======
import { PaginationAndSortingModule } from '../ui/components/pagination-and-sorting/pagination-and-sorting.module';
import { BootstrapModule } from '../bootstrap.module';
>>>>>>>
import { StoreFinde... |
<<<<<<<
refreshToken(refreshToken: string) {
const url = this.getOAuthEndpoint();
let creds = '';
creds +=
'client_id=' +
encodeURIComponent(this.configService.authentication.client_id);
creds +=
'&client_secret=' +
encodeURIComponent(this.configService.authentication.client_se... |
<<<<<<<
import {DependencyRootComponent} from './levelized-structure-map/dependency-root/dependency-root.component';
import {DependencyCompareComponent} from './levelized-structure-map/dependency-compare/dependency-compare.component';
import {TreeNodeComponent} from './levelized-structure-map/tree-node/tree-node.compon... |
<<<<<<<
import { AuthService } from '../facade/auth.service';
import { RoutingService } from '../../routing/facade/routing.service';
=======
import { Store, select } from '@ngrx/store';
import * as fromStore from './../store';
import { RoutingService } from '@spartacus/core';
>>>>>>>
import { AuthService } from '../... |
<<<<<<<
import { StoreListPageModule } from './store-list-page/store-list-page.module';
=======
import { ContactPageModule } from './contact-page/contact-page.module';
import { SalePageModule } from './sale-page/sale-page.module';
import { HelpPageModule } from './help-page/help-page.module';
import { ResetNewPasswo... |
<<<<<<<
SpinnerModule,
StoreModule.forRoot({
...fromRoot.getReducers(),
stores: combineReducers(fromReducers.reducers)
}),
=======
StoreModule.forRoot({}),
StoreModule.forFeature('stores', fromReducers.reducers),
>>>>>>>
SpinnerModule,
Store... |
<<<<<<<
),
map((action: any) => action.payload),
mergeMap(payload => {
if (payload === undefined || payload.userId === undefined) {
payload = {
userId: this.cartData.userId,
cartId: this.cartData.cartId,
details: this.cartData.getDetails ? true : undefined
... |
<<<<<<<
this.store.dispatch(
new fromGlobalMessage.AddMessage({
text: 'Logged In Successfully',
type: GlobalMessageType.MSG_TYPE_CONFIRMATION
})
);
this.store.dispatch(
new fromGlobalMessage.RemoveMessagesByTyp... |
<<<<<<<
readonly tabs: ElementArrayFinder = this.page
.element(by.tagName('ngb-tabset'))
.all(by.css('li'));
=======
readonly productPrice: ElementFinder = this.productSummaryComponent.element(
by.css('.y-product-summary__price')
);
>>>>>>>
readonly tabs: ElementArrayFinder = this.page
.eleme... |
<<<<<<<
import { AuthModuleConfig, OccConfig, RoutingModuleConfig } from '@spartacus/core';
=======
import {
OccConfig,
RoutingModuleConfig,
ConfigurableRoutesConfig
} from '@spartacus/core';
>>>>>>>
import { AuthModuleConfig, OccConfig,
RoutingModuleConfig,
ConfigurableRoutesConfig
} from '@spartacus/core... |
<<<<<<<
import {
PWAModuleConfig,
defaultPWAModuleConfig
} from '../../../pwa/pwa.module-config';
import { PwaModule } from '../../../pwa/pwa.module';
=======
import { SiteContextConfig } from '@spartacus/core';
>>>>>>>
import {
PWAModuleConfig,
defaultPWAModuleConfig
} from '../../../pwa/pwa.module-config';... |
<<<<<<<
it('should display empty cart if no items added and when items are removed', async () => {
// Go to cart
await cart.navigateTo();
let cartPageText = await cart.page.getText();
expect(cartPageText).toContain('Your shopping cart is empty');
expect(cartPageText).toContain('Suggestions');
... |
<<<<<<<
=======
import { LoginComponent } from './login.component';
>>>>>>>
<<<<<<<
import { AuthService } from '../../../auth/facade/auth.service';
import { UserToken } from './../../../auth/models/token-types.model';
import { LoginComponent } from './login.component';
class MockAuthService {
login = createS... |
<<<<<<<
=======
import { AuthService, Cart, OrderEntry, UserToken } from '@spartacus/core';
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.