conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import {FileController} from "./Controller/FileController";
import {AdminController} from "./Controller/AdminController";
=======
import {DebugController} from "./Controller/DebugController";
import {App as uwsApp} from "./Server/sifrr.server";
>>>>>>>
import {FileController} from "./Controller/FileController";
import {DebugController} from "./Controller/DebugController";
import {App as uwsApp} from "./Server/sifrr.server"; |
<<<<<<<
private previousConstraint : MediaStreamConstraints;
private focused : boolean = true;
private lastUpdateScene : Date = new Date();
private setTimeOutlastUpdateScene? : NodeJS.Timeout;
=======
private discussionManager: DiscussionManager;
private userInputManager?: UserInputManager;
>>>>>>>
private previousConstraint : MediaStreamConstraints;
private focused : boolean = true;
private lastUpdateScene : Date = new Date();
private setTimeOutlastUpdateScene? : NodeJS.Timeout;
private discussionManager: DiscussionManager;
private userInputManager?: UserInputManager;
<<<<<<<
this.previousConstraint = JSON.parse(JSON.stringify(this.constraintsMedia));
this.pingCameraStatus();
this.checkActiveUser();
}
public setLastUpdateScene(){
this.lastUpdateScene = new Date();
}
public blurCamera() {
if(!this.focused){
return;
}
this.focused = false;
this.previousConstraint = JSON.parse(JSON.stringify(this.constraintsMedia));
this.disableCamera();
}
public focusCamera() {
if(this.focused){
return;
}
this.focused = true;
this.applyPreviousConfig();
=======
this.discussionManager = new DiscussionManager(this,'');
>>>>>>>
this.previousConstraint = JSON.parse(JSON.stringify(this.constraintsMedia));
this.pingCameraStatus();
this.checkActiveUser();
this.discussionManager = new DiscussionManager(this,'');
}
public setLastUpdateScene(){
this.lastUpdateScene = new Date();
}
public blurCamera() {
if(!this.focused){
return;
}
this.focused = false;
this.previousConstraint = JSON.parse(JSON.stringify(this.constraintsMedia));
this.disableCamera();
}
public focusCamera() {
if(this.focused){
return;
}
this.focused = true;
this.applyPreviousConfig();
<<<<<<<
private getElementByIdOrFail<T extends HTMLElement>(id: string): T {
const elem = document.getElementById(id);
if (elem === null) {
throw new Error("Cannot find HTML element with id '"+id+"'");
}
// FIXME: does not check the type of the returned type
return elem as T;
}
public showReportModal(userId: string, userName: string, reportCallBack: ReportCallback){
=======
public showReportModal(userId: string, userName: string, reportCallBack: ReportCallback){
>>>>>>>
public showReportModal(userId: string, userName: string, reportCallBack: ReportCallback){ |
<<<<<<<
private previousConstraint : MediaStreamConstraints;
private focused : boolean = true;
private lastUpdateScene : Date = new Date();
private setTimeOutlastUpdateScene? : NodeJS.Timeout;
=======
private hasCamera = true;
>>>>>>>
private previousConstraint : MediaStreamConstraints;
private focused : boolean = true;
private lastUpdateScene : Date = new Date();
private setTimeOutlastUpdateScene? : NodeJS.Timeout;
private hasCamera = true;
<<<<<<<
this.enableCameraStyle();
=======
if(!this.hasCamera){
return;
}
this.cinemaClose.style.display = "none";
this.cinemaBtn.classList.remove("disabled");
this.cinema.style.display = "block";
>>>>>>>
this.enableCameraStyle();
<<<<<<<
this.disableCameraStyle();
this.stopCamera();
=======
this.disabledCameraView();
>>>>>>>
this.disableCameraStyle(); |
<<<<<<<
import {FileController} from "./Controller/FileController";
=======
import {AdminController} from "./Controller/AdminController";
>>>>>>>
import {FileController} from "./Controller/FileController";
import {AdminController} from "./Controller/AdminController"; |
<<<<<<<
export class MapController extends BaseController{
=======
//todo: delete this
export class MapController {
App: Application;
>>>>>>>
//todo: delete this
export class MapController extends BaseController{ |
<<<<<<<
import Jwt, {JsonWebTokenError} from "jsonwebtoken";
import {
SECRET_KEY,
MINIMUM_DISTANCE,
GROUP_RADIUS,
ALLOW_ARTILLERY,
ADMIN_API_URL,
ADMIN_API_TOKEN
} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
import {World} from "../Model/World";
=======
import {MINIMUM_DISTANCE, GROUP_RADIUS} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
import {GameRoom} from "../Model/GameRoom";
>>>>>>>
import {MINIMUM_DISTANCE, GROUP_RADIUS} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
import {GameRoom} from "../Model/GameRoom";
<<<<<<<
WebRtcStartMessage, WebRtcDisconnectMessage, PlayGlobalMessage, ReportPlayerMessage, TeleportMessageMessage
=======
WebRtcStartMessage,
WebRtcDisconnectMessage,
PlayGlobalMessage,
>>>>>>>
WebRtcStartMessage,
WebRtcDisconnectMessage,
PlayGlobalMessage,
ReportPlayerMessage,
TeleportMessageMessage
<<<<<<<
import Axios from "axios";
=======
import {ViewportInterface} from "../Model/Websocket/ViewportMessage";
import {jwtTokenManager} from "../Services/JWTTokenManager";
import {adminApi} from "../Services/AdminApi";
import {RoomIdentifier} from "../Model/RoomIdentifier";
>>>>>>>
import {ViewportInterface} from "../Model/Websocket/ViewportMessage";
import {jwtTokenManager} from "../Services/JWTTokenManager";
import {adminApi} from "../Services/AdminApi";
import {RoomIdentifier} from "../Model/RoomIdentifier";
import Axios from "axios";
<<<<<<<
private isValidToken(token: object): token is TokenInterface {
if (typeof((token as TokenInterface).userUuid) !== 'string') {
return false;
}
return true;
}
private async authenticate(req: HttpRequest): Promise<{ token: string, userUuid: string }> {
//console.log(socket.handshake.query.token);
const query = parse(req.getQuery());
if (!query.token) {
throw new Error('An authentication error happened, a user tried to connect without a token.');
}
const token = query.token;
if (typeof(token) !== "string") {
throw new Error('Token is expected to be a string');
}
if(token === 'test') {
if (ALLOW_ARTILLERY) {
return {
token,
userUuid: uuidv4()
}
} else {
throw new Error("In order to perform a load-testing test on this environment, you must set the ALLOW_ARTILLERY environment variable to 'true'");
}
}
/*if(this.searchClientByToken(socket.handshake.query.token)){
console.error('An authentication error happened, a user tried to connect while its token is already connected.');
return next(new Error('Authentication error'));
}*/
const promise = new Promise<{ token: string, userUuid: string }>((resolve, reject) => {
Jwt.verify(token, SECRET_KEY, {},(err, tokenDecoded) => {
if (err) {
console.error('An authentication error happened, invalid JsonWebToken.', err);
reject(new Error('An authentication error happened, invalid JsonWebToken. '+err.message));
return;
}
if (tokenDecoded === undefined) {
console.error('Empty token found.');
reject(new Error('Empty token found.'));
return;
}
const tokenInterface = tokenDecoded as TokenInterface;
=======
>>>>>>> |
<<<<<<<
import {DEBUG_MODE, POSITION_DELAY, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
import {
ITiledMap,
ITiledMapLayer,
ITiledMapLayerProperty, ITiledMapObject,
ITiledTileSet
} from "../Map/ITiledMap";
=======
import {DEBUG_MODE, POSITION_DELAY, RESOLUTION, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
import {ITiledMap, ITiledMapLayer, ITiledMapLayerProperty, ITiledTileSet} from "../Map/ITiledMap";
>>>>>>>
import {DEBUG_MODE, POSITION_DELAY, RESOLUTION, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
import {
ITiledMap,
ITiledMapLayer,
ITiledMapLayerProperty, ITiledMapObject,
ITiledTileSet
} from "../Map/ITiledMap"; |
<<<<<<<
export var pdfPageSelection = "pdfPageSelection";
=======
export var serifGroupSet = "serifGroupSet";
>>>>>>>
export var pdfPageSelection = "pdfPageSelection";
export var serifGroupSet = "serifGroupSet"; |
<<<<<<<
* Returns the current flighting assignment for the user
*/
protected getFlightingAssignments(clipperId: string): Promise<any> {
let fetchNonLocalData = () => {
return new Promise<ResponsePackage<string>>((resolve, reject) => {
let userFlightUrl = UrlUtils.addUrlQueryValue(Constants.Urls.userFlightingEndpoint, Constants.Urls.QueryParams.clipperId, clipperId);
HttpWithRetries.get(userFlightUrl).then((request) => {
resolve({
request: request,
parsedResponse: request.responseText
});
}, (error) => {
reject(error);
});
});
};
return new Promise((resolve: (formattedFlights: string[]) => void, reject: (error: OneNoteApi.GenericError) => void) => {
this.clipperData.getFreshValue(ClipperStorageKeys.flightingInfo, fetchNonLocalData, Experiments.updateIntervalForFlights).then((successfulResponse) => {
// The response comes as a string array in the form [flight1, flight2, flight3],
// needs to be in CSV format for ODIN cooker, so we rejoin w/o spaces
let parsedResponse: string[] = successfulResponse.data.Features ? successfulResponse.data.Features : [];
resolve(parsedResponse);
}, (error: OneNoteApi.GenericError) => {
reject(error);
});
});
}
/**
=======
>>>>>>> |
<<<<<<<
guilds: new Map(),
channels: new Map(),
messages: new Map(),
unavailableGuilds: new Map(),
};
async function cleanMessageCache() {
// Find all messages for each channel and if more than 100 we need to remove the oldest messages.
const messagesPerChannel = new Map<string, Message[]>();
for (const message of cache.messages.values()) {
if (
// If the guild isn't in cache the message is useless to cache
(message.guildID && !cache.guilds.has(message.guildID)) ||
// If the channel isn't in cache the message is useless in cache
!cache.channels.has(message.channelID)
) {
cache.messages.delete(message.id);
}
const channel = messagesPerChannel.get(message.channelID);
if (!channel) {
messagesPerChannel.set(message.channelID, [message]);
} else {
channel.push(message);
}
}
messagesPerChannel.forEach((messages) => {
if (messages.length < 100) return;
// This channel has more than 100 messages in cache. Delete the oldest
const sortedMessages = messages.sort((a, b) => b.timestamp - a.timestamp);
sortedMessages.slice(100).forEach((message) =>
cache.messages.delete(message.id)
);
});
// Check once per minute
await delay(60000);
cleanMessageCache();
}
cleanMessageCache();
=======
guilds: new Collection(),
channels: new Collection(),
messages: new Collection(),
unavailableGuilds: new Collection(),
};
>>>>>>>
guilds: new Collection(),
channels: new Collection(),
messages: new Collection(),
unavailableGuilds: new Collection(),
};
async function cleanMessageCache() {
// Find all messages for each channel and if more than 100 we need to remove the oldest messages.
const messagesPerChannel = new Map<string, Message[]>();
for (const message of cache.messages.values()) {
if (
// If the guild isn't in cache the message is useless to cache
(message.guildID && !cache.guilds.has(message.guildID)) ||
// If the channel isn't in cache the message is useless in cache
!cache.channels.has(message.channelID)
) {
cache.messages.delete(message.id);
}
const channel = messagesPerChannel.get(message.channelID);
if (!channel) {
messagesPerChannel.set(message.channelID, [message]);
} else {
channel.push(message);
}
}
messagesPerChannel.forEach((messages) => {
if (messages.length < 100) return;
// This channel has more than 100 messages in cache. Delete the oldest
const sortedMessages = messages.sort((a, b) => b.timestamp - a.timestamp);
sortedMessages.slice(100).forEach((message) =>
cache.messages.delete(message.id)
);
});
// Check once per minute
await delay(60000);
cleanMessageCache();
}
cleanMessageCache(); |
<<<<<<<
export const memberHasPermission = (
memberID: string,
ownerID: string,
roleData: RoleData[],
memberRoleIDs: string[],
=======
export function memberHasPermission(
member_id: string,
owner_id: string,
role_data: RoleData[],
member_role_ids: string[],
>>>>>>>
export function memberHasPermission(
memberID: string,
ownerID: string,
roleData: RoleData[],
memberRoleIDs: string[],
<<<<<<<
) => {
if (memberID === ownerID) return true;
=======
) {
if (member_id === owner_id) return true;
>>>>>>>
) {
if (memberID === ownerID) return true;
<<<<<<<
export const calculatePermissions = (permissionBits: number) => {
=======
export function calculatePermissions(permission_bits: number) {
>>>>>>>
export function calculatePermissions(permissionBits: number) { |
<<<<<<<
return axios.post(this.searchUrl(), this.query)
=======
return axios.get(this.searchUrl(), this.query)
.then((response)=>{
this.results = response.data
this.resultsListener.onNext(this.results)
return this.results
})
>>>>>>>
return axios.post(this.searchUrl(), this.query)
.then((response)=>{
this.results = response.data
this.resultsListener.onNext(this.results)
return this.results
}) |
<<<<<<<
let current = containerElement.firstChild;
if (current) {
let parent = current.parentElement;
let nextNode;
do {
nextNode = current.nextSibling;
parent.removeChild(current);
current = nextNode;
} while (current);
}
app.renderComponent('PpmClient', containerElement, null);
=======
app.registerInitializer({
initialize(registry) {
registry.register(`component-manager:/${app.rootName}/component-managers/main`, ComponentManager);
}
});
>>>>>>>
let current = containerElement.firstChild;
if (current) {
let parent = current.parentElement;
let nextNode;
do {
nextNode = current.nextSibling;
parent.removeChild(current);
current = nextNode;
} while (current);
}
app.registerInitializer({
initialize(registry) {
registry.register(`component-manager:/${app.rootName}/component-managers/main`, ComponentManager);
}
}); |
<<<<<<<
import { ChangeType, Color, Device, KeyedTemplate, ObservableArray, profile, Property, Screen, StackLayout, View, Trace } from "@nativescript/core";
import * as types from "@nativescript/core/utils/types";
import { layout } from "@nativescript/core/utils/utils";
=======
import {ChangeType, ObservableArray} from '@nativescript/core/data/observable-array';
import {KeyedTemplate, layout, Property, View} from '@nativescript/core/ui/core/view';
import {StackLayout} from '@nativescript/core/ui/layouts/stack-layout';
import * as types from '@nativescript/core/utils/types';
import * as application from '@nativescript/core/application';
import {device, screen} from '@nativescript/core/platform';
>>>>>>>
import { ChangeType, Color, Device, KeyedTemplate, ObservableArray, profile, Property, Screen, StackLayout, View, Trace } from "@nativescript/core";
import * as types from "@nativescript/core/utils/types";
import { layout } from "@nativescript/core/utils/utils";
<<<<<<<
this.pager.registerOnPageChangeCallback(this._pageListener);
this.pager.setAdapter(this._pagerAdapter);
=======
this.pager.registerOnPageChangeCallback(
this._pageListener
);
this._pagerAdapter.owner = this;
>>>>>>>
this.pager.registerOnPageChangeCallback(
this._pageListener
);
this._pagerAdapter.owner = this;
<<<<<<<
initStaticPagerStateAdapter();
if (!(this._pagerAdapter instanceof StaticPagerStateAdapter)) {
this._pagerAdapter = new StaticPagerStateAdapter(
new WeakRef(this)
);
=======
if (this._pagerAdapter.type !== 'static') {
this._pagerAdapter = new PagerRecyclerAdapter(this, 'static');
this._pagerAdapter.type = 'static';
>>>>>>>
if (this._pagerAdapter.type !== 'static') {
this._pagerAdapter = new PagerRecyclerAdapter(this, 'static');
this._pagerAdapter.type = 'static';
<<<<<<<
this.pager.setCurrentItem(this.selectedIndex, false);
=======
this.pager.setCurrentItem(
this.selectedIndex,
false
);
if (this.indicatorView && this.showIndicator) {
this.indicatorView.setCount(this._childrenCount);
}
>>>>>>>
this.pager.setCurrentItem(
this.selectedIndex,
false
);
if (this.indicatorView && this.showIndicator) {
this.indicatorView.setCount(this._childrenCount);
}
<<<<<<<
let slideToRightSide =
selectedPosition == position && positionOffset != 0;
=======
let slideToRightSide = selectedPosition === position && positionOffset !== 0;
>>>>>>>
let slideToRightSide = selectedPosition === position && positionOffset !== 0;
<<<<<<<
@NativeClass
class PagerRecyclerAdapterImpl extends androidx.recyclerview.widget
.RecyclerView.Adapter<any> {
owner: WeakRef<Pager>;
constructor(owner: WeakRef<Pager>) {
super();
this.owner = owner;
return global.__native(this);
=======
class PagerFragmentImpl extends androidx.fragment.app.Fragment {
private owner: Pager;
private index: number;
private holder: any;
private type: string;
static newInstance(pagerId: number, index: number, type: string) {
const fragment = new PagerFragmentImpl();
const args = new android.os.Bundle();
args.putInt(PAGERID, pagerId);
args.putInt(INDEX, index);
args.putString(FRAGTYPE, type);
fragment.setArguments(args);
return fragment;
}
onCreate(param0: android.os.Bundle) {
super.onCreate(param0);
const args = this.getArguments();
this.owner = getPagerById(args.getInt(PAGERID));
this.index = args.getInt(INDEX);
this.type = args.getString(FRAGTYPE);
if (!this.owner) {
throw new Error(`Cannot find Pager`);
}
>>>>>>>
class PagerFragmentImpl extends androidx.fragment.app.Fragment {
private owner: Pager;
private index: number;
private holder: any;
private type: string;
static newInstance(pagerId: number, index: number, type: string) {
const fragment = new PagerFragmentImpl();
const args = new android.os.Bundle();
args.putInt(PAGERID, pagerId);
args.putInt(INDEX, index);
args.putString(FRAGTYPE, type);
fragment.setArguments(args);
return fragment;
}
onCreate(param0: android.os.Bundle) {
super.onCreate(param0);
const args = this.getArguments();
this.owner = getPagerById(args.getInt(PAGERID));
this.index = args.getInt(INDEX);
this.type = args.getString(FRAGTYPE);
if (!this.owner) {
throw new Error(`Cannot find Pager`);
}
<<<<<<<
let view: View = template.createView();
=======
>>>>>>>
<<<<<<<
return new PagerViewHolder(new WeakRef(sp), new WeakRef(owner));
=======
this.holder = sp;
return sp.nativeView;
>>>>>>>
this.holder = sp;
return sp.nativeView;
<<<<<<<
onBindViewHolder(holder: any, index: number): void {
const owner = this.owner ? this.owner.get() : null;
if (owner) {
if (owner.circularMode) {
if (index === 0) {
index = this.lastDummy();
} else if (index === this.firstDummy()) {
index = 0;
} else {
index = index - 1;
}
}
let args = <ItemEventData>{
eventName: ITEMLOADING,
object: owner,
android: holder,
ios: undefined,
index,
view: holder.view[PLACEHOLDER] ? null : holder.view,
};
owner.notify(args);
if (holder.view[PLACEHOLDER]) {
if (args.view) {
holder.view.addChild(args.view);
} else {
holder.view.addChild(
owner._getDefaultItemContent(index)
);
}
holder.view[PLACEHOLDER] = false;
=======
public getItem(i: number) {
if (this.owner) {
if (this.owner._childrenViews) {
return this.owner._childrenViews.get(i);
>>>>>>>
public getItem(i: number) {
if (this.owner) {
if (this.owner._childrenViews) {
return this.owner._childrenViews.get(i);
<<<<<<<
if (owner && owner.items) {
const item = (owner as any).items.getItem
? (owner as any).items.getItem(i)
: owner.items[i];
if (item) {
id = owner.itemIdGenerator(item, i, owner.items);
=======
if (this.type === 'static') {
if (this.owner) {
const item = this.getItem(i);
if (item) {
id = this.owner.itemIdGenerator(item, i, Array.from(this.owner._childrenViews));
}
}
} else {
if (this.owner && this.owner.items) {
const item = (this.owner as any).items.getItem ? (this.owner as any).items.getItem(i) : this.owner.items[i];
if (item) {
id = this.owner.itemIdGenerator(item, i, this.owner.items);
}
>>>>>>>
if (this.type === 'static') {
if (this.owner) {
const item = this.getItem(i);
if (item) {
id = this.owner.itemIdGenerator(item, i, Array.from(this.owner._childrenViews));
}
}
} else {
if (this.owner && this.owner.items) {
const item = (this.owner as any).items.getItem ? (this.owner as any).items.getItem(i) : this.owner.items[i];
if (item) {
id = this.owner.itemIdGenerator(item, i, this.owner.items);
}
<<<<<<<
return owner.circularMode
? this.getItemCount() - 3
: this.getItemCount() - 1;
=======
return this.owner.circularMode ? this.getItemCount() - 3 : this.getItemCount() - 1;
>>>>>>>
return this.owner.circularMode ? this.getItemCount() - 3 : this.getItemCount() - 1;
<<<<<<<
let StaticPagerStateAdapter;
function initStaticPagerStateAdapter() {
if (StaticPagerStateAdapter) {
return;
}
@NativeClass
class StaticPagerStateAdapterImpl extends androidx.recyclerview.widget
.RecyclerView.Adapter<any> {
owner: WeakRef<Pager>;
constructor(owner: WeakRef<Pager>) {
super();
this.owner = owner;
return global.__native(this);
}
onCreateViewHolder(param0: android.view.ViewGroup, type: number): any {
const owner = this.owner ? this.owner.get() : null;
if (!owner) {
return null;
}
const view = owner._childrenViews.get(type);
let sp = new StackLayout(); // Pager2 requires match_parent so add a parent with to fill
if (view && !view.parent) {
sp.addChild(view);
} else {
sp[PLACEHOLDER] = true;
}
owner._addView(sp);
sp.nativeView.setLayoutParams(
new android.view.ViewGroup.LayoutParams(
android.view.ViewGroup.LayoutParams.MATCH_PARENT,
android.view.ViewGroup.LayoutParams.MATCH_PARENT
)
);
initPagerViewHolder();
return new PagerViewHolder(new WeakRef(sp), new WeakRef(owner));
}
onBindViewHolder(holder: any, index: number): void {
const owner = this.owner ? this.owner.get() : null;
if (owner) {
let args = <ItemEventData>{
eventName: ITEMLOADING,
object: owner,
android: holder,
ios: undefined,
index,
view: holder.view[PLACEHOLDER] ? null : holder.view,
};
owner.notify(args);
if (holder.view[PLACEHOLDER]) {
if (args.view) {
holder.view.addChild(args.view);
}
holder.view[PLACEHOLDER] = false;
}
}
}
hasStableIds(): boolean {
return true;
}
public getItem(i: number) {
const owner = this.owner ? this.owner.get() : null;
if (owner) {
if (owner._childrenViews) {
return owner._childrenViews.get(i);
}
}
return null;
}
public getItemId(i: number) {
const owner = this.owner ? this.owner.get() : null;
let id = i;
if (owner) {
const item = this.getItem(i);
if (item) {
id = owner.itemIdGenerator(
item,
i,
Array.from(owner._childrenViews)
);
}
}
return long(id);
}
public getItemCount(): number {
const owner = this.owner ? this.owner.get() : null;
return owner && owner._childrenViews
? owner._childrenViews.size
: 0;
}
public getItemViewType(index: number) {
return index;
}
}
StaticPagerStateAdapter = StaticPagerStateAdapterImpl as any;
}
let PagerViewHolder;
function initPagerViewHolder() {
if (PagerViewHolder) {
return;
}
@NativeClass
class PagerViewHolderImpl extends androidx.recyclerview.widget.RecyclerView
.ViewHolder {
constructor(
private owner: WeakRef<View>,
private pager: WeakRef<Pager>
) {
super(owner.get().nativeViewProtected);
return global.__native(this);
}
get view(): View {
return this.owner ? this.owner.get() : null;
}
}
PagerViewHolder = PagerViewHolderImpl as any;
}
=======
>>>>>>> |
<<<<<<<
export function renderHook<P, R>(
callback: (props: P) => R,
options?: RenderHookOptions<P>
): RenderHookResult<P, R>
export const testHook: typeof renderHook
=======
>>>>>>>
export function renderHook<P, R>(
callback: (props: P) => R,
options?: RenderHookOptions<P>
): RenderHookResult<P, R> |
<<<<<<<
['screen_height_in', data.params.screen_height_in],
['screen_height_px', data.params.screen_height_px],
=======
['screen_height_in', data.params.screen_height_px],
['screen_height_px', data.params.screen_height_px],
>>>>>>>
['screen_height_in', data.params.screen_height_in],
['screen_height_in', data.params.screen_height_px],
['screen_height_px', data.params.screen_height_px], |
<<<<<<<
const parser: nearley.Parser = new nearley.Parser(nearley.Grammar.fromCompiled(EntryPointTemplate.default));
parser.feed(params);
=======
const parser: nearley.Parser = new nearley.Parser(nearley.Grammar.fromCompiled(EntryPointTemplate));
parser.feed(TezosLanguageUtil.normalizeMichelineWhiteSpace(TezosLanguageUtil.stripComments(params)));
>>>>>>>
const parser: nearley.Parser = new nearley.Parser(nearley.Grammar.fromCompiled(EntryPointTemplate.default));
parser.feed(TezosLanguageUtil.normalizeMichelineWhiteSpace(TezosLanguageUtil.stripComments(params))); |
<<<<<<<
import { percySnapshot } from 'ember-percy';
=======
import { selectChoose, selectSearch } from 'ember-power-select/test-support';
>>>>>>>
import { percySnapshot } from 'ember-percy';
import { selectChoose, selectSearch } from 'ember-power-select/test-support'; |
<<<<<<<
import { TezosConseilClient } from '../../../reporting/tezos/TezosConseilClient'
import { ConseilServerInfo } from 'types/conseil/QueryTypes';
import { ContractMapDetailsItem } from 'types/conseil/ConseilTezosTypes';
=======
import { TezosParameterFormat } from '../../../types/tezos/TezosChainTypes';
>>>>>>>
import { TezosConseilClient } from '../../../reporting/tezos/TezosConseilClient'
import { ConseilServerInfo } from 'types/conseil/QueryTypes';
import { ContractMapDetailsItem } from 'types/conseil/ConseilTezosTypes';
import { TezosParameterFormat } from '../../../types/tezos/TezosChainTypes';
<<<<<<<
// TODO(keefertaylor): Compute this checksum correctly.
core: ''
=======
// TODO(keefertaylor): Compute this checksum correctly.
core: ''
}
/**
* Property bag containing the results of opening an oven.
*/
export type OpenOvenResult = {
// The operation hash of the request to open an oven.
operationHash: string
// The address of the new oven contract.
ovenAddress: string
>>>>>>>
// TODO(keefertaylor): Compute this checksum correctly.
core: ''
}
/**
* Property bag containing the results of opening an oven.
*/
export type OpenOvenResult = {
// The operation hash of the request to open an oven.
operationHash: string
// The address of the new oven contract.
ovenAddress: string
<<<<<<<
export function verifyScript(
tokenScript: string,
ovenScript: string,
coreScript: string
): boolean {
=======
export function verifyScript(tokenScript: string, ovenScript, string, coreScript: string): boolean {
>>>>>>>
export function verifyScript(
tokenScript: string,
ovenScript: string,
coreScript: string
): boolean {
<<<<<<<
return tokenMatched && ovenMatched && coreMatched
=======
return tokenMatched && ovenMatched && coreMatched
}
/**
*
* @param server
* @param address
*/
export async function getSimpleStorage(server: string, address: string): Promise<WrappedTezosStorage> {
const storageResult = await TezosNodeReader.getContractStorage(server, address);
console.log(JSON.stringify(storageResult));
return {
balanceMap: Number(JSONPath({ path: '$.args[1].args[0].args[1].args[0].int', json: storageResult })[0]),
approvalsMap: Number(JSONPath({ path: '$.args[1].args[0].args[0].args[1].int', json: storageResult })[0]),
supply: Number(JSONPath({ path: '$.args[1].args[1].args[1].int', json: storageResult })[0]),
administrator: JSONPath({ path: '$.args[1].args[0].args[0].args[0].string', json: storageResult })[0],
paused: (JSONPath({ path: '$.args[1].args[1].args[0].prim', json: storageResult })[0]).toString().toLowerCase().startsWith('t'),
pauseGuardian: JSONPath({ path: '$.args[1].args[0].args[1].args[1].string', json: storageResult })[0],
outcomeMap: Number(JSONPath({ path: '$.args[0].args[0].int', json: storageResult })[0]),
swapMap: Number(JSONPath({ path: '$.args[0].args[1].int', json: storageResult })[0])
};
>>>>>>>
return tokenMatched && ovenMatched && coreMatched
}
/**
*
* @param server
* @param address
*/
export async function getSimpleStorage(server: string, address: string): Promise<WrappedTezosStorage> {
const storageResult = await TezosNodeReader.getContractStorage(server, address);
console.log(JSON.stringify(storageResult));
return {
balanceMap: Number(JSONPath({ path: '$.args[1].args[0].args[1].args[0].int', json: storageResult })[0]),
approvalsMap: Number(JSONPath({ path: '$.args[1].args[0].args[0].args[1].int', json: storageResult })[0]),
supply: Number(JSONPath({ path: '$.args[1].args[1].args[1].int', json: storageResult })[0]),
administrator: JSONPath({ path: '$.args[1].args[0].args[0].args[0].string', json: storageResult })[0],
paused: (JSONPath({ path: '$.args[1].args[1].args[0].prim', json: storageResult })[0]).toString().toLowerCase().startsWith('t'),
pauseGuardian: JSONPath({ path: '$.args[1].args[0].args[1].args[1].string', json: storageResult })[0],
outcomeMap: Number(JSONPath({ path: '$.args[0].args[0].int', json: storageResult })[0]),
swapMap: Number(JSONPath({ path: '$.args[0].args[1].int', json: storageResult })[0])
};
<<<<<<<
/**
* Retrieve a list of all oven addresses a user owns.
*
* @param serverInfo Connection info for Conseil.
* @param coreContractAddress The core contract address
* @param ovenOwner The oven owner to search for
* @param ovenListBigMapId The BigMap ID of the oven list.
*/
export async function listOvens(
serverInfo: ConseilServerInfo,
coreContractAddress: string,
ovenOwner: string,
ovenListBigMapId: number
): Promise<Array<string>> {
// Fetch map data.
const mapData = await TezosConseilClient.getBigMapData(serverInfo, coreContractAddress)
if (mapData === undefined) {
throw new Error("Could not fetch map data!")
}
// Find the Map that contains the oven list.
const { maps } = mapData
let ovenListMap: ContractMapDetailsItem | undefined = undefined
for (let i = 0; i < maps.length; i++) {
if (maps[i].definition.index === ovenListBigMapId) {
ovenListMap = maps[i]
break
}
}
if (ovenListMap === undefined) {
throw new Error("Could not find specified map ID!")
}
// Conseil reports addresses as quoted michelson encoded hex prefixed
// with '0x'. Normalize these to base58check encoded addresses.
const { content } = ovenListMap
const normalizedOvenList: Array<OvenMapSchema> = content.map((oven: OvenMapSchema) => {
return {
key: TezosMessageUtils.readAddress(oven.key.replace(/\"/g, '').replace(/\n/, '').replace("0x", "")),
value: TezosMessageUtils.readAddress(oven.value.replace(/\"/g, '').replace(/\n/, '').replace("0x", ""))
}
})
// Filter oven list for ovens belonging to the owner.
const ownedOvens = normalizedOvenList.filter((oven: OvenMapSchema): boolean => {
return ovenOwner === oven.value
})
// Map filtered array to only contain oven addresses.
return ownedOvens.map((oven: OvenMapSchema) => {
return oven.key
})
}
=======
/**
* Open a new oven.
*
* The oven's owner is assigned to the sender's address.
*
* @param nodeUrl The URL of the Tezos node which serves data.
* @param signer A Signer for the sourceAddress.
* @param keystore A Keystore for the sourceAddress.
* @param fee The fee to use.
* @param coreAddress The address of the core contract.
* @param gasLimit The gas limit to use.
* @param storageLimit The storage limit to use.
* @returns A property bag of data about the operation.
*/
export async function openOven(
nodeUrl: string,
signer: Signer,
keystore: KeyStore,
fee: number,
coreAddress: string,
gasLimit: number,
storageLimit: number
): Promise<OpenOvenResult> {
const entryPoint = 'runEntrypointLambda'
const lambdaName = 'createOven'
const bytes = TezosMessageUtils.writePackedData(`Pair None "${keystore.publicKeyHash}"`, 'pair (option key_hash) address', TezosParameterFormat.Michelson)
const parameters = `Pair "${lambdaName}" 0x${bytes}`
const nodeResult = await TezosNodeWriter.sendContractInvocationOperation(
nodeUrl,
signer,
keystore,
coreAddress,
0,
fee,
storageLimit,
gasLimit,
entryPoint,
parameters,
TezosTypes.TezosParameterFormat.Michelson
)
const operationHash = TezosContractUtils.clearRPCOperationGroupHash(nodeResult.operationGroupID);
const ovenAddress = TezosMessageUtils.calculateContractAddress(operationHash, 0)
return {
operationHash,
ovenAddress
}
}
>>>>>>>
/**
* Retrieve a list of all oven addresses a user owns.
*
* @param serverInfo Connection info for Conseil.
* @param coreContractAddress The core contract address
* @param ovenOwner The oven owner to search for
* @param ovenListBigMapId The BigMap ID of the oven list.
*/
export async function listOvens(
serverInfo: ConseilServerInfo,
coreContractAddress: string,
ovenOwner: string,
ovenListBigMapId: number
): Promise<Array<string>> {
// Fetch map data.
const mapData = await TezosConseilClient.getBigMapData(serverInfo, coreContractAddress)
if (mapData === undefined) {
throw new Error("Could not fetch map data!")
}
// Find the Map that contains the oven list.
const { maps } = mapData
let ovenListMap: ContractMapDetailsItem | undefined = undefined
for (let i = 0; i < maps.length; i++) {
if (maps[i].definition.index === ovenListBigMapId) {
ovenListMap = maps[i]
break
}
}
if (ovenListMap === undefined) {
throw new Error("Could not find specified map ID!")
}
// Conseil reports addresses as quoted michelson encoded hex prefixed
// with '0x'. Normalize these to base58check encoded addresses.
const { content } = ovenListMap
const normalizedOvenList: Array<OvenMapSchema> = content.map((oven: OvenMapSchema) => {
return {
key: TezosMessageUtils.readAddress(oven.key.replace(/\"/g, '').replace(/\n/, '').replace("0x", "")),
value: TezosMessageUtils.readAddress(oven.value.replace(/\"/g, '').replace(/\n/, '').replace("0x", ""))
}
})
// Filter oven list for ovens belonging to the owner.
const ownedOvens = normalizedOvenList.filter((oven: OvenMapSchema): boolean => {
return ovenOwner === oven.value
})
// Map filtered array to only contain oven addresses.
return ownedOvens.map((oven: OvenMapSchema) => {
return oven.key
})
}
/**
* Open a new oven.
*
* The oven's owner is assigned to the sender's address.
*
* @param nodeUrl The URL of the Tezos node which serves data.
* @param signer A Signer for the sourceAddress.
* @param keystore A Keystore for the sourceAddress.
* @param fee The fee to use.
* @param coreAddress The address of the core contract.
* @param gasLimit The gas limit to use.
* @param storageLimit The storage limit to use.
* @returns A property bag of data about the operation.
*/
export async function openOven(
nodeUrl: string,
signer: Signer,
keystore: KeyStore,
fee: number,
coreAddress: string,
gasLimit: number,
storageLimit: number
): Promise<OpenOvenResult> {
const entryPoint = 'runEntrypointLambda'
const lambdaName = 'createOven'
const bytes = TezosMessageUtils.writePackedData(`Pair None "${keystore.publicKeyHash}"`, 'pair (option key_hash) address', TezosParameterFormat.Michelson)
const parameters = `Pair "${lambdaName}" 0x${bytes}`
const nodeResult = await TezosNodeWriter.sendContractInvocationOperation(
nodeUrl,
signer,
keystore,
coreAddress,
0,
fee,
storageLimit,
gasLimit,
entryPoint,
parameters,
TezosTypes.TezosParameterFormat.Michelson
)
const operationHash = TezosContractUtils.clearRPCOperationGroupHash(nodeResult.operationGroupID);
const ovenAddress = TezosMessageUtils.calculateContractAddress(operationHash, 0)
return {
operationHash,
ovenAddress
}
} |
<<<<<<<
import idNormalizer, {TYPE_ID} from 'src/normalizers/id'
import {defaultTimeRange} from 'src/shared/data/timeRanges'
import {
Dashboard,
TimeRange,
Cell,
Source,
Template,
URLQueries,
} from 'src/types'
import {CellType, DashboardName} from 'src/types/dashboard'
=======
import {Dashboard, TimeRange, Cell, Source, Template} from 'src/types'
>>>>>>>
import idNormalizer, {TYPE_ID} from 'src/normalizers/id'
import {defaultTimeRange} from 'src/shared/data/timeRanges'
import {
Dashboard,
TimeRange,
Cell,
Source,
Template,
URLQueries,
} from 'src/types'
import {CellType, DashboardName} from 'src/types/dashboard'
<<<<<<<
export const loadDashboard = dashboard => ({
type: 'LOAD_DASHBOARD',
=======
interface LoadDeafaultDashTimeV1Action {
type: 'ADD_DASHBOARD_TIME_V1'
payload: {
dashboardID: number
}
}
export const loadDeafaultDashTimeV1 = (
dashboardID: number
): LoadDeafaultDashTimeV1Action => ({
type: 'ADD_DASHBOARD_TIME_V1',
payload: {
dashboardID,
},
})
interface AddDashTimeV1Action {
type: 'ADD_DASHBOARD_TIME_V1'
payload: {
dashboardID: number
timeRange: TimeRange
}
}
export const addDashTimeV1 = (
dashboardID: number,
timeRange: TimeRange
): AddDashTimeV1Action => ({
type: 'ADD_DASHBOARD_TIME_V1',
>>>>>>>
export const loadDashboard = dashboard => ({
type: 'LOAD_DASHBOARD',
<<<<<<<
interface UpdateDashboardCellsAction {
type: 'UPDATE_DASHBOARD_CELLS'
payload: {
dashboard: Dashboard
cells: Cell[]
}
}
export const updateDashboardCells = (
dashboard: Dashboard,
cells: Cell[]
): UpdateDashboardCellsAction => ({
type: 'UPDATE_DASHBOARD_CELLS',
payload: {
dashboard,
cells,
},
})
=======
>>>>>>>
<<<<<<<
interface EditDashboardCellAction {
type: 'EDIT_DASHBOARD_CELL'
payload: {
dashboard: Dashboard
x: number
y: number
isEditing: boolean
}
}
export const editDashboardCell = (
dashboard: Dashboard,
x: number,
y: number,
isEditing: boolean
): EditDashboardCellAction => ({
type: 'EDIT_DASHBOARD_CELL',
// x and y coords are used as a alternative to cell ids, which are not
// universally unique, and cannot be because React depends on a
// quasi-predictable ID for keys. Since cells cannot overlap, coordinates act
// as a suitable id
payload: {
dashboard,
x, // x-coord of the cell to be edited
y, // y-coord of the cell to be edited
isEditing,
},
})
interface CancelEditCellAction {
type: 'CANCEL_EDIT_CELL'
payload: {
dashboardID: string
cellID: string
}
}
export const cancelEditCell = (
dashboardID: string,
cellID: string
): CancelEditCellAction => ({
type: 'CANCEL_EDIT_CELL',
payload: {
dashboardID,
cellID,
},
})
interface RenameDashboardCellAction {
type: 'RENAME_DASHBOARD_CELL'
payload: {
dashboard: Dashboard
x: number
y: number
name: string
}
}
export const renameDashboardCell = (
dashboard: Dashboard,
x: number,
y: number,
name: string
): RenameDashboardCellAction => ({
type: 'RENAME_DASHBOARD_CELL',
payload: {
dashboard,
x, // x-coord of the cell to be renamed
y, // y-coord of the cell to be renamed
name,
},
})
=======
>>>>>>>
<<<<<<<
interface TemplateVariablesSelectedByNameAction {
type: 'TEMPLATE_VARIABLES_SELECTED_BY_NAME'
payload: {
dashboardID: number
queries: URLQueries
}
}
=======
// This is limited in typing as it will be changed soon
>>>>>>>
interface TemplateVariablesSelectedByNameAction {
type: 'TEMPLATE_VARIABLES_SELECTED_BY_NAME'
payload: {
dashboardID: number
queries: URLQueries
}
}
<<<<<<<
dashboardID: number,
queries: URLQueries
): TemplateVariablesSelectedByNameAction => ({
type: 'TEMPLATE_VARIABLES_SELECTED_BY_NAME',
=======
dashboardID: number,
query: any
) => ({
type: TEMPLATE_VARIABLES_SELECTED_BY_NAME,
>>>>>>>
dashboardID: number,
queries: URLQueries
): TemplateVariablesSelectedByNameAction => ({
type: 'TEMPLATE_VARIABLES_SELECTED_BY_NAME', |
<<<<<<<
onChooseValue: (item: TemplateValue) => void
=======
onUpdateDefaultTemplateValue: (v: string) => void
notify?: (message: Notification) => void
>>>>>>>
onUpdateDefaultTemplateValue: (item: TemplateValue) => void
notify?: (message: Notification) => void |
<<<<<<<
import { BattleStatusWindow } from "../windows/battle/BattleStatusWindow";
=======
import { ability_categories } from "../Ability";
>>>>>>>
import { BattleStatusWindow } from "../windows/battle/BattleStatusWindow";
import { ability_categories } from "../Ability"; |
<<<<<<<
export default class InstitutionModel extends OsfModel {
=======
export interface Assets {
logo: string;
}
/**
* Model for OSF APIv2 institutions. This model may be used with one of several API endpoints. It may be queried
* directly, or accessed via relationship fields.
*
* @class Institution
*/
export default class Institution extends OsfModel {
>>>>>>>
export interface Assets {
logo: string;
}
export default class InstitutionModel extends OsfModel { |
<<<<<<<
import { UserState } from './user/reducers/user.state';
import { CheckoutState } from './checkout/reducers/checkout.state';
=======
import { CartState } from './checkout/cart/reducers/cart-state';
import { SearchState } from './home/reducers/search.state';
>>>>>>>
import { UserState } from './user/reducers/user.state';
import { CheckoutState } from './checkout/reducers/checkout.state';
import { CartState } from './checkout/cart/reducers/cart-state';
import { SearchState } from './home/reducers/search.state';
<<<<<<<
checkout: CheckoutState;
users: UserState;
=======
cart: CartState;
search: SearchState;
>>>>>>>
checkout: CheckoutState;
users: UserState;
cart: CartState;
search: SearchState; |
<<<<<<<
private emit(result: CompilationResult, callback: ts.WriteFileCallback) {
const emitOutput = this.program.emit(
undefined,
callback,
undefined,
false,
this.finalTransformers ? this.finalTransformers(this.program) : undefined,
);
=======
private emit(result: CompilationResult, preEmitDiagnostics: ReadonlyArray<ts.DiagnosticWithLocation>, callback: ts.WriteFileCallback) {
const emitOutput = this.program.emit(undefined, callback);
>>>>>>>
private emit(result: CompilationResult, preEmitDiagnostics: ReadonlyArray<ts.DiagnosticWithLocation>, callback: ts.WriteFileCallback) {
const emitOutput = this.program.emit(
undefined,
callback,
undefined,
false,
this.finalTransformers ? this.finalTransformers(this.program) : undefined,
); |
<<<<<<<
let tsConfigContent: tsConfig.TsConfig = undefined;
let projectDirectory = process.cwd();
=======
let tsConfigContent: TsConfig = undefined;
>>>>>>>
let tsConfigContent: TsConfig = undefined;
let projectDirectory = process.cwd(); |
<<<<<<<
import {OrdersComponent} from "./orders/orders.component";
=======
import {WorkerSettingsComponent} from "./worker-settings/worker-settings.component";
import {WorkerSettingsResolverService} from "./worker-settings/services/worker-settings-resolver.service";
>>>>>>>
import {OrdersComponent} from "./orders/orders.component";
import {WorkerSettingsComponent} from "./worker-settings/worker-settings.component";
import {WorkerSettingsResolverService} from "./worker-settings/services/worker-settings-resolver.service"; |
<<<<<<<
'service:status-messages',
=======
'service:toast',
'service:ready',
>>>>>>>
'service:status-messages',
'service:toast',
'service:ready', |
<<<<<<<
'service:analytics',
=======
'service:features',
>>>>>>>
'service:features',
'service:analytics', |
<<<<<<<
frameComponent: FunctionalFrameComponent | React.Component;
=======
tabs: EmbeddedWidget[] | undefined;
frameComponent: {
forceUpdate(): void,
createNew?(oldEntity: EntityPack<ModifiableEntity>): (Promise<EntityPack<ModifiableEntity> | undefined>) | undefined
};
>>>>>>>
frameComponent: FunctionalFrameComponent | React.Component;
tabs: EmbeddedWidget[] | undefined; |
<<<<<<<
queryName: any;
parentColumn?: string;
parentValue?: any;
=======
queryName: PseudoType | QueryKey;
simpleColumnName?: string;
simpleValue?: any;
>>>>>>>
queryName: PseudoType | QueryKey;
parentColumn?: string;
parentValue?: any; |
<<<<<<<
frameComponent: {
forceUpdate(): void,
createNew?(): (Promise<EntityPack<ModifiableEntity> | undefined>) | undefined
};
entityComponent: React.Component | null | undefined;
pack: EntityPack<ModifiableEntity> | undefined;
=======
frameComponent: React.Component<any, any>;
entityComponent: React.Component<any, any> | null | undefined;
pack: EntityPack<ModifiableEntity>;
>>>>>>>
frameComponent: {
forceUpdate(): void,
createNew?(): (Promise<EntityPack<ModifiableEntity> | undefined>) | undefined
};
entityComponent: React.Component | null | undefined;
pack: EntityPack<ModifiableEntity>; |
<<<<<<<
render() {
=======
protected render() {
const classes = {
'mdc-top-app-bar--fixed':
this.type === 'fixed' || this.type === 'prominentFixed',
'mdc-top-app-bar--short':
this.type === 'shortCollapsed' || this.type === 'short',
'mdc-top-app-bar--short-collapsed': this.type === 'shortCollapsed',
'mdc-top-app-bar--prominent':
this.type === 'prominent' || this.type === 'prominentFixed',
'mdc-top-app-bar--dense': this.dense,
'mwc-top-app-bar--center-title': this.centerTitle,
};
const alignStartTitle = !this.centerTitle ? html`
<span class="mdc-top-app-bar__title"><slot name="title"></slot></span>
` :
'';
const centerSection = this.centerTitle ? html`
<section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-center">
<span class="mdc-top-app-bar__title"><slot name="title"></slot></span>
</section>` :
'';
>>>>>>>
protected render() {
<<<<<<<
=======
// override that prevents `super.firstUpdated` since we are controlling when
// `createFoundation` is called.
protected firstUpdated() {
}
protected updated(changedProperties: PropertyValues) {
// update foundation if `type` or `scrollTarget` changes
if (changedProperties.has('type') ||
changedProperties.has('scrollTarget')) {
this.createFoundation();
}
}
>>>>>>>
<<<<<<<
firstUpdated() {
super.firstUpdated();
this.updateRootPosition();
=======
protected createFoundation() {
super.createFoundation();
const windowScroller = this.scrollTarget === window;
// we add support for top-app-bar's tied to an element scroller.
this.mdcRoot.style.position = windowScroller ? '' : 'absolute';
// TODO(sorvell): not sure why this is necessary but the MDC demo does it.
this.mdcRoot.style.top = windowScroller ? '0px' : '';
this.unregisterListeners();
>>>>>>>
firstUpdated() {
super.firstUpdated();
this.updateRootPosition(); |
<<<<<<<
protected resetFoundation() {
if (this.mdcFoundation) {
this.mdcFoundation.destroy();
this.mdcFoundation.init();
}
}
=======
/**
* Layout is called on mousedown / touchstart as the dragging animations of
* slider are calculated based off of the bounding rect which can change
* between interactions with this component, and this is the only location
* in the foundation that udpates the rects. e.g. scrolling horizontally
* causes adverse effects on the bounding rect vs mouse drag / touchmove
* location.
*/
@eventOptions({capture: true, passive: true})
>>>>>>>
protected resetFoundation() {
if (this.mdcFoundation) {
this.mdcFoundation.destroy();
this.mdcFoundation.init();
}
}
/**
* Layout is called on mousedown / touchstart as the dragging animations of
* slider are calculated based off of the bounding rect which can change
* between interactions with this component, and this is the only location
* in the foundation that udpates the rects. e.g. scrolling horizontally
* causes adverse effects on the bounding rect vs mouse drag / touchmove
* location.
*/
@eventOptions({capture: true, passive: true}) |
<<<<<<<
(reason: string, matchingIdentities: ReadonlyArray<Identity>): Promise<ReadonlyArray<Identity>>;
=======
(reason: string, matchingIdentities: ReadonlyArray<PublicIdentity>, meta?: any): Promise<
ReadonlyArray<PublicIdentity>
>;
>>>>>>>
(reason: string, matchingIdentities: ReadonlyArray<Identity>, meta?: any): Promise<ReadonlyArray<Identity>>;
<<<<<<<
): Promise<ReadonlyArray<Identity>> {
=======
meta?: any,
): Promise<ReadonlyArray<PublicIdentity>> {
>>>>>>>
meta?: any,
): Promise<ReadonlyArray<Identity>> {
<<<<<<<
public async signAndPost(reason: string, transaction: UnsignedTransaction): Promise<TransactionId | null> {
=======
public async signAndPost(
reason: string,
transaction: UnsignedTransaction,
meta?: any,
): Promise<TransactionId | undefined> {
>>>>>>>
public async signAndPost(
reason: string,
transaction: UnsignedTransaction,
meta?: any,
): Promise<TransactionId | null> { |
<<<<<<<
options: Ed25519Keypair | ReadonlyArray<Slip10RawIndex> | number,
): Promise<Identity> {
=======
options: Ed25519Keypair | readonly Slip10RawIndex[] | number,
): Promise<PublicIdentity> {
>>>>>>>
options: Ed25519Keypair | readonly Slip10RawIndex[] | number,
): Promise<Identity> {
<<<<<<<
public getAllIdentities(): ReadonlyArray<Identity> {
=======
public getAllIdentities(): readonly PublicIdentity[] {
>>>>>>>
public getAllIdentities(): readonly Identity[] {
<<<<<<<
private ensureNoIdentityCollision(newIdentities: ReadonlyArray<Identity>): void {
=======
private ensureNoIdentityCollision(newIdentities: readonly PublicIdentity[]): void {
>>>>>>>
private ensureNoIdentityCollision(newIdentities: readonly Identity[]): void { |
<<<<<<<
options: 'Options',
=======
required: 'Required',
optional: 'Optional',
>>>>>>>
required: 'Required',
options: 'Options',
optional: 'Optional', |
<<<<<<<
import { SubscriptionEvent } from "../rpcclients";
/*** adaptor ***/
=======
>>>>>>>
import { SubscriptionEvent } from "../rpcclients"; |
<<<<<<<
Participant,
// Governance
ElectorProperties,
Electors,
Electorate,
Fraction,
ElectionRule,
VersionedId,
ProposalExecutorResult,
ProposalResult,
ProposalStatus,
Proposal,
// NFTs
BnsUsernamesByOwnerQuery,
=======
BnsBlockchainNft,
BnsBlockchainsByChainIdQuery,
BnsBlockchainsQuery,
BnsUsernamesByChainAndAddressQuery,
BnsUsernamesByOwnerAddressQuery,
>>>>>>>
BnsUsernamesByOwnerQuery,
<<<<<<<
// transactions
BnsTx,
AddAddressToUsernameTx,
CreateMultisignatureTx,
=======
>>>>>>>
<<<<<<<
UpdateMultisignatureTx,
=======
isRemoveAddressFromUsernameTx,
// transactions
BnsTx,
isBnsTx,
>>>>>>>
isRemoveAddressFromUsernameTx,
// Multisignature contracts
Participant,
CreateMultisignatureTx,
UpdateMultisignatureTx,
// Governance
ElectorProperties,
Electors,
Electorate,
Fraction,
ElectionRule,
VersionedId,
ProposalExecutorResult,
ProposalResult,
ProposalStatus,
Proposal,
// transactions
BnsTx,
isBnsTx, |
<<<<<<<
import { ChainId, Nonce, PublicIdentity, SignedTransaction, TxCodec, UnsignedTransaction } from "@iov/bcp-types";
import { Slip10RawIndex } from "@iov/crypto";
=======
import { Nonce, SignedTransaction, TxCodec, UnsignedTransaction } from "@iov/bcp-types";
import { Ed25519Keypair, Slip10RawIndex } from "@iov/crypto";
>>>>>>>
import { ChainId, Nonce, PublicIdentity, SignedTransaction, TxCodec, UnsignedTransaction } from "@iov/bcp-types";
import { Ed25519Keypair, Slip10RawIndex } from "@iov/crypto";
<<<<<<<
import { Wallet, WalletId } from "./wallet";
import { Ed25519Wallet } from "./wallets";
=======
import { LocalIdentity, PublicIdentity, Wallet, WalletId } from "./wallet";
>>>>>>>
import { Wallet, WalletId } from "./wallet";
<<<<<<<
/**
* Creates an identitiy in the wallet with the given ID in the primary keyring
*
* The identity is bound to one chain ID to encourage using different
* keypairs on different chains.
*/
createIdentity(id: WalletId, chainId: ChainId, options: Ed25519Wallet | ReadonlyArray<Slip10RawIndex> | number): Promise<PublicIdentity>;
=======
/** Creates an identitiy in the wallet with the given ID in the primary keyring */
createIdentity(id: WalletId, options: Ed25519Keypair | ReadonlyArray<Slip10RawIndex> | number): Promise<LocalIdentity>;
>>>>>>>
/**
* Creates an identitiy in the wallet with the given ID in the primary keyring
*
* The identity is bound to one chain ID to encourage using different
* keypairs on different chains.
*/
createIdentity(id: WalletId, chainId: ChainId, options: Ed25519Keypair | ReadonlyArray<Slip10RawIndex> | number): Promise<PublicIdentity>; |
<<<<<<<
import { ChainId, PrehashType, PublicIdentity, SignableBytes, SignatureBytes } from "@iov/bcp-types";
import { Slip10RawIndex } from "@iov/crypto";
=======
import { ChainId, PublicKeyBundle, SignatureBytes } from "@iov/base-types";
import { PrehashType, SignableBytes } from "@iov/bcp-types";
import { Ed25519Keypair, Slip10RawIndex } from "@iov/crypto";
>>>>>>>
import { ChainId, PrehashType, PublicIdentity, SignableBytes, SignatureBytes } from "@iov/bcp-types";
import { Ed25519Keypair, Slip10RawIndex } from "@iov/crypto";
<<<<<<<
import { Ed25519Wallet } from "./wallets";
=======
export declare type LocalIdentityId = string & As<"local-identity-id">;
/** a public key we can identify with on a blockchain */
export interface PublicIdentity {
readonly pubkey: PublicKeyBundle;
}
/**
* a local version of a PublicIdentity that contains
* additional local information
*/
export interface LocalIdentity extends PublicIdentity {
readonly id: LocalIdentityId;
readonly label?: string;
}
>>>>>>>
<<<<<<<
/**
* Creates a new identity in the wallet.
*
* The identity is bound to one chain ID to encourage using different
* keypairs on different chains.
*/
readonly createIdentity: (chainId: ChainId, options: Ed25519Wallet | ReadonlyArray<Slip10RawIndex> | number) => Promise<PublicIdentity>;
/**
* Sets a local label associated with the public identity to be displayed in the UI.
* To clear a label, set it to undefined
*/
=======
readonly createIdentity: (options: Ed25519Keypair | ReadonlyArray<Slip10RawIndex> | number) => Promise<LocalIdentity>;
>>>>>>>
/**
* Creates a new identity in the wallet.
*
* The identity is bound to one chain ID to encourage using different
* keypairs on different chains.
*/
readonly createIdentity: (chainId: ChainId, options: Ed25519Keypair | ReadonlyArray<Slip10RawIndex> | number) => Promise<PublicIdentity>;
/**
* Sets a local label associated with the public identity to be displayed in the UI.
* To clear a label, set it to undefined
*/ |
<<<<<<<
ChainId,
=======
ConfirmedTransaction,
>>>>>>>
ChainId,
ConfirmedTransaction, |
<<<<<<<
export { ChainAddressPair, Participant, ElectorProperties, Electors, Electorate, Fraction, ElectionRule, VersionedId, ProposalExecutorResult, ProposalResult, ProposalStatus, Proposal, BnsUsernamesByOwnerQuery, BnsUsernamesByUsernameQuery, BnsUsernamesQuery, BnsUsernameNft, BnsTx, AddAddressToUsernameTx, CreateMultisignatureTx, RegisterUsernameTx, RemoveAddressFromUsernameTx, UpdateMultisignatureTx, } from "./types";
=======
export { ChainAddressPair, BnsBlockchainNft, BnsBlockchainsByChainIdQuery, BnsBlockchainsQuery, BnsUsernamesByChainAndAddressQuery, BnsUsernamesByOwnerAddressQuery, BnsUsernamesByUsernameQuery, BnsUsernamesQuery, BnsUsernameNft, RegisterUsernameTx, isRegisterUsernameTx, AddAddressToUsernameTx, isAddAddressToUsernameTx, RemoveAddressFromUsernameTx, isRemoveAddressFromUsernameTx, BnsTx, isBnsTx, } from "./types";
>>>>>>>
export { ChainAddressPair, BnsUsernamesByOwnerQuery, BnsUsernamesByUsernameQuery, BnsUsernamesQuery, BnsUsernameNft, RegisterUsernameTx, isRegisterUsernameTx, AddAddressToUsernameTx, isAddAddressToUsernameTx, RemoveAddressFromUsernameTx, isRemoveAddressFromUsernameTx, Participant, CreateMultisignatureTx, UpdateMultisignatureTx, ElectorProperties, Electors, Electorate, Fraction, ElectionRule, VersionedId, ProposalExecutorResult, ProposalResult, ProposalStatus, Proposal, BnsTx, isBnsTx, } from "./types"; |
<<<<<<<
console.log(colors.yellow(" * from @iov/bns"));
console.log(colors.yellow(" - bnsCodec"));
console.log(colors.yellow(" - BnsConnection"));
console.log(colors.yellow(" - bnsConnector"));
console.log(colors.yellow(" - RegisterUsernameTx"));
console.log(colors.yellow(" * from @iov/core"));
console.log(colors.yellow(" - Address"));
console.log(colors.yellow(" - ChainId"));
console.log(colors.yellow(" - Ed25519HdWallet"));
console.log(colors.yellow(" - HdPaths"));
console.log(colors.yellow(" - Keyring"));
console.log(colors.yellow(" - MultiChainSigner"));
console.log(colors.yellow(" - Nonce"));
console.log(colors.yellow(" - UserProfile"));
console.log(colors.yellow(" - Secp256k1HdWallet"));
console.log(colors.yellow(" - SendTransaction"));
console.log(colors.yellow(" - TokenTicker"));
console.log(colors.yellow(" - Wallet"));
console.log(colors.yellow(" - WalletId"));
console.log(colors.yellow(" - WalletImplementationIdString"));
console.log(colors.yellow(" - WalletSerializationString"));
console.log(colors.yellow(" * from @iov/crypto"));
console.log(colors.yellow(" - Bip39"));
console.log(colors.yellow(" - Ed25519"));
console.log(colors.yellow(" - Ed25519Keypair"));
console.log(colors.yellow(" - Random"));
console.log(colors.yellow(" - Sha256"));
console.log(colors.yellow(" - Sha512"));
console.log(colors.yellow(" * from @iov/encoding"));
console.log(colors.yellow(" - Bech32"));
console.log(colors.yellow(" - Encoding"));
console.log(colors.yellow(" * from @iov/faucets"));
console.log(colors.yellow(" - IovFaucet"));
=======
for (const moduleName of imports.keys()) {
console.log(colors.yellow(` * from ${moduleName}`));
for (const symbol of imports.get(moduleName)!) {
console.log(colors.yellow(` - ${symbol}`));
}
}
>>>>>>>
for (const moduleName of imports.keys()) {
console.log(colors.yellow(` * from ${moduleName}`));
for (const symbol of imports.get(moduleName)!) {
console.log(colors.yellow(` - ${symbol}`));
}
}
<<<<<<<
import {
bnsCodec,
BnsConnection,
bnsConnector,
RegisterUsernameTx,
} from '@iov/bns';
import {
Address,
ChainId,
Ed25519HdWallet,
HdPaths,
Keyring,
MultiChainSigner,
Nonce,
Secp256k1HdWallet,
SendTransaction,
TokenTicker,
UserProfile,
Wallet,
WalletId,
WalletImplementationIdString,
WalletSerializationString,
} from "@iov/core";
import { Bip39, Ed25519, Ed25519Keypair, Random, Sha256, Sha512 } from '@iov/crypto';
import { Bech32, Encoding } from '@iov/encoding';
import { IovFaucet } from '@iov/faucets';
const { toAscii, fromHex, toHex } = Encoding;
=======
>>>>>>> |
<<<<<<<
private readonly identities: Identity[];
private readonly privkeyPaths: Map<IdentityId, ReadonlyArray<Slip10RawIndex>>;
=======
private readonly identities: PublicIdentity[];
private readonly privkeyPaths: Map<IdentityId, readonly Slip10RawIndex[]>;
>>>>>>>
private readonly identities: Identity[];
private readonly privkeyPaths: Map<IdentityId, readonly Slip10RawIndex[]>;
<<<<<<<
const identities: Identity[] = [];
const privkeyPaths = new Map<IdentityId, ReadonlyArray<Slip10RawIndex>>();
=======
const identities: PublicIdentity[] = [];
const privkeyPaths = new Map<IdentityId, readonly Slip10RawIndex[]>();
>>>>>>>
const identities: Identity[] = [];
const privkeyPaths = new Map<IdentityId, readonly Slip10RawIndex[]>();
<<<<<<<
public getIdentities(): ReadonlyArray<Identity> {
=======
public getIdentities(): readonly PublicIdentity[] {
>>>>>>>
public getIdentities(): readonly Identity[] {
<<<<<<<
private privkeyPathForIdentity(identity: Identity): ReadonlyArray<Slip10RawIndex> {
=======
private privkeyPathForIdentity(identity: PublicIdentity): readonly Slip10RawIndex[] {
>>>>>>>
private privkeyPathForIdentity(identity: Identity): readonly Slip10RawIndex[] { |
<<<<<<<
const ganacheMnemonic: string =
"oxygen fall sure lava energy veteran enroll frown question detail include maximum";
const atomicSwapErc20ContractAddress = "0x9768ae2339B48643d710B11dDbDb8A7eDBEa15BC" as Address;
const ethereumBaseUrl: string = "http://localhost:8545";
=======
const ganacheMnemonic = "oxygen fall sure lava energy veteran enroll frown question detail include maximum";
const ethereumBaseUrl = "http://localhost:8545";
>>>>>>>
const ganacheMnemonic = "oxygen fall sure lava energy veteran enroll frown question detail include maximum";
const atomicSwapErc20ContractAddress = "0x9768ae2339B48643d710B11dDbDb8A7eDBEa15BC" as Address;
const ethereumBaseUrl = "http://localhost:8545"; |
<<<<<<<
import { generateMask, resolveResult, makeAuthorData } from "./util";
=======
>>>>>>>
import { generateMask, resolveResult, makeAuthorData } from "./util";
<<<<<<<
export interface Options {
results?: number;
mask?: number[];
excludeMask?: number[];
// getRatings?: boolean;
testMode?: boolean;
db?: number;
}
export interface SagiriResult {
url: string;
site: string;
index: number;
similarity: number;
thumbnail: string;
authorName: string | null;
authorUrl: string | null;
raw: Result;
}
=======
>>>>>>>
export interface Options {
results?: number;
mask?: number[];
excludeMask?: number[];
// getRatings?: boolean;
testMode?: boolean;
db?: number;
}
export interface SagiriResult {
url: string;
site: string;
index: number;
similarity: number;
thumbnail: string;
authorName: string | null;
authorUrl: string | null;
raw: Result;
} |
<<<<<<<
}
catch (e) {
this.showToast('Invalid username or password');
=======
} catch (e) {
const toast = this.toastCtrl.create({
message : 'Invalid username or password',
duration : 5000,
showCloseButton: true,
});
toast.present();
} finally {
this.loading = false;
>>>>>>>
}
catch (e) {
this.showToast('Invalid username or password');
}
finally {
this.loading = false; |
<<<<<<<
if (this.channel.direct){
this.router.navigate(['direct', channelId], { relativeTo: this.route });
}else {
this.router.navigate(['channel', channelId], { relativeTo: this.route });
}
=======
this.router.navigate(['channel', channelId]);
>>>>>>>
if (this.channel.direct){
this.router.navigate(['direct', channelId]);
}else {
this.router.navigate(['channel', channelId]);
} |
<<<<<<<
server: '',
subscriptionServer: '?' // TODO set subscription server on production
=======
server: 'http://localhost:3000',
>>>>>>>
server: 'http://localhost:3000',
subscriptionServer: '?' // TODO set subscription server on production |
<<<<<<<
import { UnixTimeToStringPipe } from '../../pipes/unix-time-to-string';
=======
import { ServiceWorkerModule } from '@angular/service-worker';
import { PushNotificationsService } from './services/push-notifications.service';
import { UserDataService } from './services/user-data/user-data.service';
>>>>>>>
import { UnixTimeToStringPipe } from '../../pipes/unix-time-to-string';
import { ServiceWorkerModule } from '@angular/service-worker';
import { PushNotificationsService } from './services/push-notifications.service';
import { UserDataService } from './services/user-data/user-data.service';
<<<<<<<
IonicModule.forRoot(AppComponent, { mode: 'md' }),
=======
ServiceWorkerModule,
IonicModule.forRoot(AppComponent),
>>>>>>>
ServiceWorkerModule,
IonicModule.forRoot(AppComponent, { mode: 'md' }),
<<<<<<<
declarations: [UnixTimeToStringPipe]
=======
declarations: [],
providers: [PushNotificationsService, UserDataService]
>>>>>>>
declarations: [UnixTimeToStringPipe],
providers: [PushNotificationsService, UserDataService], |
<<<<<<<
verifyEmail: {
merge: {
header: 'Merge account?',
body: 'Would you like to merge <strong>{{email}}</strong> into your account? This action is irreversible.',
verifyButton: 'Merge account',
denyButton: 'Do not merge account',
verifySuccess: '<strong>{{email}}</strong> has been merged into your account.',
denySuccess: '<strong>{{email}}</strong> has not been merged into your account.',
verifyError: 'There was a problem merging <strong>{{email}}</strong> into your account.',
denyError: 'There was a problem canceling the request to merge <strong>{{email}}</strong> into your account.',
},
add: {
header: 'Add alternate email?',
body: 'Would you like to add <strong>{{email}}</strong> to your account?',
verifyButton: 'Add email',
denyButton: 'Do not add email',
verifySuccess: '<strong>{{email}}</strong> has been added to your account.',
denySuccess: '<strong>{{email}}</strong> has not been added to your account.',
verifyError: 'There was a problem adding <strong>{{email}}</strong> to your account.',
denyError: 'There was a problem canceling the request to add <strong>{{email}}</strong> to your account.',
},
},
=======
ipsum: {
title: 'tempor nec feugiat nisl pretium',
sentence: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
paragraph: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id velit ut tortor pretium. Nisi porta lorem mollis aliquam ut porttitor leo a. Cras fermentum odio eu feugiat. Eget mi proin sed libero enim. Quam adipiscing vitae proin sagittis. Volutpat consequat mauris nunc congue nisi vitae suscipit tellus. At varius vel pharetra vel turpis nunc eget. Purus ut faucibus pulvinar elementum integer enim neque volutpat. Turpis nunc eget lorem dolor. Mattis pellentesque id nibh tortor id aliquet lectus proin nibh. Arcu felis bibendum ut tristique et egestas quis. Nisl tincidunt eget nullam non nisi est sit amet. Fringilla urna porttitor rhoncus dolor purus non enim.',
},
>>>>>>>
verifyEmail: {
merge: {
header: 'Merge account?',
body: 'Would you like to merge <strong>{{email}}</strong> into your account? This action is irreversible.',
verifyButton: 'Merge account',
denyButton: 'Do not merge account',
verifySuccess: '<strong>{{email}}</strong> has been merged into your account.',
denySuccess: '<strong>{{email}}</strong> has not been merged into your account.',
verifyError: 'There was a problem merging <strong>{{email}}</strong> into your account.',
denyError: 'There was a problem canceling the request to merge <strong>{{email}}</strong> into your account.',
},
add: {
header: 'Add alternate email?',
body: 'Would you like to add <strong>{{email}}</strong> to your account?',
verifyButton: 'Add email',
denyButton: 'Do not add email',
verifySuccess: '<strong>{{email}}</strong> has been added to your account.',
denySuccess: '<strong>{{email}}</strong> has not been added to your account.',
verifyError: 'There was a problem adding <strong>{{email}}</strong> to your account.',
denyError: 'There was a problem canceling the request to add <strong>{{email}}</strong> to your account.',
},
},
ipsum: {
title: 'tempor nec feugiat nisl pretium',
sentence: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
paragraph: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id velit ut tortor pretium. Nisi porta lorem mollis aliquam ut porttitor leo a. Cras fermentum odio eu feugiat. Eget mi proin sed libero enim. Quam adipiscing vitae proin sagittis. Volutpat consequat mauris nunc congue nisi vitae suscipit tellus. At varius vel pharetra vel turpis nunc eget. Purus ut faucibus pulvinar elementum integer enim neque volutpat. Turpis nunc eget lorem dolor. Mattis pellentesque id nibh tortor id aliquet lectus proin nibh. Arcu felis bibendum ut tristique et egestas quis. Nisl tincidunt eget nullam non nisi est sit amet. Fringilla urna porttitor rhoncus dolor purus non enim.',
}, |
<<<<<<<
const metricsPublishingEnabledFunc = glue42gd?.getMetricsPublishingEnabled;
const canUpdateMetric = metricsPublishingEnabledFunc ? metricsPublishingEnabledFunc : () => true;
=======
const identity = internalConfig.connection.identity;
>>>>>>>
const metricsPublishingEnabledFunc = glue42gd?.getMetricsPublishingEnabled;
const identity = internalConfig.connection.identity;
const canUpdateMetric = metricsPublishingEnabledFunc ? metricsPublishingEnabledFunc : () => true;
<<<<<<<
logger: _logger.subLogger("metrics"),
canUpdateMetric
=======
logger: _logger.subLogger("metrics"),
system: identity?.application ?? "metrics-system",
service: identity?.service ?? "metrics-service",
instance: identity?.instance ?? identity?.windowId ?? shortid(),
>>>>>>>
logger: _logger.subLogger("metrics"),
canUpdateMetric
system: identity?.application ?? "metrics-system",
service: identity?.service ?? "metrics-service",
instance: identity?.instance ?? identity?.windowId ?? shortid(), |
<<<<<<<
canUpdateMetric: () => boolean;
=======
system: string;
service: string;
instance: string;
>>>>>>>
canUpdateMetric: () => boolean;
system: string;
service: string;
instance: string; |
<<<<<<<
//export * from './colorpicker/index';
export * from './data-table/index';
=======
export * from './colorpicker/index';
>>>>>>>
export * from './colorpicker/index';
export * from './data-table/index'; |
<<<<<<<
node_blurb: {
fork: {
title: 'Forked:',
manage_contributors: 'Manage Contributors',
},
private_tooltip: 'This project is private',
},
forks: {
fork: 'Fork',
title: 'Forks',
back: 'Back to Analytics',
new: 'New fork',
new_fork_info_title: 'Fork status',
new_fork_info: 'Your fork is being created. You\'ll receive an email when it is complete.',
create_fork_modal: 'Are you sure you want to fork this project?',
unable_to_delete_fork: 'Any child components must be deleted prior to deleting this component.',
page_title: '{{nodeTitle}} Forks',
no_forks: 'This project has no forks. A fork is a copy of a project that you can change without affecting the original project.',
new_fork_failed: 'Failed to create a new fork. Please try again later.',
delete_fork_failed: 'Failed to delete the project. Please try again later.',
},
delete_modal: {
title: 'Are you sure you want to delete this {{nodeType}}?',
body: 'It will no longer be available to other contributors on the {{nodeType}}.',
type_this: 'Type the following to continue:',
input_label: 'Scientist name verification',
},
paginator: {
next: 'Next page',
previous: 'Previous page',
},
=======
social: {
twitter: 'Twitter',
facebook: 'Facebook',
google_group: 'Google Group',
github: 'GitHub',
google_plus: 'Google Plus',
linkedin: 'LinkedIn',
},
>>>>>>>
node_blurb: {
fork: {
title: 'Forked:',
manage_contributors: 'Manage Contributors',
},
private_tooltip: 'This project is private',
},
forks: {
fork: 'Fork',
title: 'Forks',
back: 'Back to Analytics',
new: 'New fork',
new_fork_info_title: 'Fork status',
new_fork_info: 'Your fork is being created. You\'ll receive an email when it is complete.',
create_fork_modal: 'Are you sure you want to fork this project?',
unable_to_delete_fork: 'Any child components must be deleted prior to deleting this component.',
page_title: '{{nodeTitle}} Forks',
no_forks: 'This project has no forks. A fork is a copy of a project that you can change without affecting the original project.',
new_fork_failed: 'Failed to create a new fork. Please try again later.',
delete_fork_failed: 'Failed to delete the project. Please try again later.',
},
delete_modal: {
title: 'Are you sure you want to delete this {{nodeType}}?',
body: 'It will no longer be available to other contributors on the {{nodeType}}.',
type_this: 'Type the following to continue:',
input_label: 'Scientist name verification',
},
paginator: {
next: 'Next page',
previous: 'Previous page',
},
social: {
twitter: 'Twitter',
facebook: 'Facebook',
google_group: 'Google Group',
github: 'GitHub',
google_plus: 'Google Plus',
linkedin: 'LinkedIn',
}, |
<<<<<<<
switch (longheader.getPacketType()) {
=======
var packetOffset: PacketOffset;
switch (header.getPacketType()) {
>>>>>>>
var packetOffset: PacketOffset;
switch (longheader.getPacketType()) {
<<<<<<<
return this.parseClientInitialPacket(connection, headerOffset, buffer, endpoint);
=======
>>>>>>>
<<<<<<<
return this.parseProtected0RTTPacket(connection, headerOffset, buffer, endpoint);
=======
>>>>>>>
<<<<<<<
return this.parseHandshakePacket(connection, headerOffset, buffer, endpoint);
=======
// Handshake packet
packetOffset = this.parseHandshakePacket(connection, header, buffer, offset, endpoint);
break;
>>>>>>>
// Handshake packet
packetOffset = this.parseHandshakePacket(connection, headerOffset, buffer, endpoint);
break; |
<<<<<<<
import {AntiMemLeak} from '../../core/anti-mem-leak';
=======
import {AwsSsoAccount} from '../../models/aws-sso-account';
>>>>>>>
import {AntiMemLeak} from '../../core/anti-mem-leak';
import {AwsSsoAccount} from '../../models/aws-sso-account'; |
<<<<<<<
import {AwsSsoAccount} from '../../models/aws-sso-account';
=======
import {environment} from '../../../environments/environment';
import {KeychainService} from '../../services-system/keychain.service';
>>>>>>>
import {environment} from '../../../environments/environment';
import {KeychainService} from '../../services-system/keychain.service';
import {AwsSsoAccount} from '../../models/aws-sso-account'; |
<<<<<<<
this.workspaceService.credentialEmit.emit({status: err.stack, accountName: session.account.accountName});
});
=======
this.appService.logger('Error in Aws Credential process', LoggerLevel.ERROR, this, err.stack);
throw new Error(err);
});
>>>>>>>
this.appService.logger('Error in Aws Credential process', LoggerLevel.ERROR, this, err.stack);
throw new Error(err);
});
<<<<<<<
// Second jump
const sts = new AWS.STS();
const params = {
RoleArn: `arn:aws:iam::${session.account.accountNumber}:role/${session.account.role.name}`,
RoleSessionName: `truster-on-${session.account.role.name}`
};
if (parentSession.account.mfaDevice !== undefined && parentSession.account.mfaDevice !== null && parentSession.account.mfaDevice !== '') {
this.appService.inputDialog('MFA Code insert', 'Insert MFA Code', 'please insert MFA code from your app or device', (value) => {
params['SerialNumber'] = parentSession.account.mfaDevice;
params['TokenCode'] = value;
processData();
});
} else {
processData();
}
=======
// Finished double jump
this.configurationService.disableLoadingWhenReady(workspace, session);
this.appService.logger('Made it through Double jump from plain', LoggerLevel.INFO, this);
}
});
>>>>>>>
const params = {
RoleArn: `arn:aws:iam::${session.account.accountNumber}:role/${session.account.role.name}`,
RoleSessionName: `truster-on-${session.account.role.name}`
};
if (parentSession.account.mfaDevice !== undefined && parentSession.account.mfaDevice !== null && parentSession.account.mfaDevice !== '') {
this.appService.inputDialog('MFA Code insert', 'Insert MFA Code', 'please insert MFA code from your app or device', (value) => {
params['SerialNumber'] = parentSession.account.mfaDevice;
params['TokenCode'] = value;
processData();
});
} else {
processData();
} |
<<<<<<<
import { Injectable } from '@angular/core';
import { NativeService } from './native-service';
=======
import {Injectable} from '@angular/core';
import {NativeService} from './native-service';
import {AppService, LoggerLevel} from './app.service';
>>>>>>>
import {Injectable} from '@angular/core';
import {NativeService} from './native-service';
import {AppService, LoggerLevel} from './app.service';
<<<<<<<
// Save secret
saveSecret(service: string, account: string, password: string) {
=======
constructor(private appService: AppService) {
super();
}
/**
* Save your secret in the keychain
* @param service - environment.appName
* @param account - unique identifier
* @param password - secret
*/
saveSecret(service: string, account: string, password: string): boolean {
>>>>>>>
constructor(private appService: AppService) {
super();
}
/**
* Save your secret in the keychain
* @param service - environment.appName
* @param account - unique identifier
* @param password - secret
*/
saveSecret(service: string, account: string, password: string) {
<<<<<<<
// Delete the secret
deletePassword(service: string, account: string) {
=======
/**
* Delete a secret from the keychain
* @param service - environment.appName
* @param account - unique identifier
*/
deletePassword(service: string, account: string): boolean {
>>>>>>>
/**
* Delete a secret from the keychain
* @param service - environment.appName
* @param account - unique identifier
*/
deletePassword(service: string, account: string) { |
<<<<<<<
import { InternalAddress } from '../address';
import { InternalCheckoutSelectors } from '../checkout';
=======
import { Address } from '../address';
>>>>>>>
import { Address } from '../address';
import { InternalCheckoutSelectors } from '../checkout';
<<<<<<<
updateAddress(address: InternalAddress, options?: ShippingRequestOptions): ThunkAction<ShippingStrategyUpdateAddressAction, InternalCheckoutSelectors> {
=======
updateAddress(address: Address, options?: ShippingRequestOptions): ThunkAction<ShippingStrategyUpdateAddressAction> {
>>>>>>>
updateAddress(address: Address, options?: ShippingRequestOptions): ThunkAction<ShippingStrategyUpdateAddressAction, InternalCheckoutSelectors> {
<<<<<<<
selectOption(addressId: string, shippingOptionId: string, options?: ShippingRequestOptions): ThunkAction<ShippingStrategySelectOptionAction, InternalCheckoutSelectors> {
=======
selectOption(shippingOptionId: string, options?: ShippingRequestOptions): ThunkAction<ShippingStrategySelectOptionAction> {
>>>>>>>
selectOption(shippingOptionId: string, options?: ShippingRequestOptions): ThunkAction<ShippingStrategySelectOptionAction, InternalCheckoutSelectors> { |
<<<<<<<
const action = this._quoteActionCreator.loadQuote(options);
return this._store.dispatch(action);
}
loadConfig(options?: RequestOptions): Promise<CheckoutSelectors> {
const action = this._configActionCreator.loadConfig(options);
return this._store.dispatch(action, { queueId: 'config' });
=======
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._checkoutActionCreator.loadCheckout(options)),
this._store.dispatch(this._configActionCreator.loadConfig(options), { queueId: 'config' }),
]).then(() => this._store.getState());
>>>>>>>
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._checkoutActionCreator.loadCheckout(options)),
]).then(() => this._store.getState());
}
loadConfig(options?: RequestOptions): Promise<CheckoutSelectors> {
const action = this._configActionCreator.loadConfig(options);
return this._store.dispatch(action, { queueId: 'config' }); |
<<<<<<<
updateAddressAction = Observable.of(createAction(UPDATE_BILLING_ADDRESS_REQUESTED));
submitOrderAction = Observable.of(createAction(OrderActionType.SubmitOrderRequested));
=======
updateAddressAction = Observable.of(createAction(BillingAddressActionTypes.UpdateBillingAddressRequested));
submitOrderAction = Observable.of(createAction(SUBMIT_ORDER_REQUESTED));
>>>>>>>
updateAddressAction = Observable.of(createAction(BillingAddressActionTypes.UpdateBillingAddressRequested));
submitOrderAction = Observable.of(createAction(OrderActionType.SubmitOrderRequested)); |
<<<<<<<
import { CheckoutActionType } from './checkout-actions';
import CheckoutRequestSender from './checkout-request-sender';
import { getCheckout } from './checkouts.mock';
=======
import createCheckoutClient from './create-checkout-client';
import 'rxjs/add/operator/toArray';
import 'rxjs/add/operator/toPromise';
>>>>>>>
import { CheckoutActionType } from './checkout-actions';
import { getCheckout } from './checkouts.mock';
import createCheckoutClient from './create-checkout-client'; |
<<<<<<<
import { InternalAddress } from '../../address';
import { CheckoutStore, InternalCheckoutSelectors } from '../../checkout';
=======
import { Address } from '../../address';
import { CheckoutSelectors, CheckoutStore } from '../../checkout';
>>>>>>>
import { Address } from '../../address';
import { CheckoutStore, InternalCheckoutSelectors } from '../../checkout'; |
<<<<<<<
import { CartActionCreator } from '../cart';
import { getDefaultLogger } from '../common/log';
import { getEnvironment } from '../common/utility';
=======
>>>>>>>
import { getDefaultLogger } from '../common/log';
import { getEnvironment } from '../common/utility';
<<<<<<<
new GiftCertificateActionCreator(client),
new InstrumentActionCreator(new InstrumentRequestSender(paymentClient, createRequestSender())),
new OrderActionCreator(client),
=======
new GiftCertificateActionCreator(giftCertificateRequestSender),
new InstrumentActionCreator(new InstrumentRequestSender(paymentClient, requestSender)),
orderActionCreator,
>>>>>>>
new GiftCertificateActionCreator(new GiftCertificateRequestSender(requestSender)),
new InstrumentActionCreator(new InstrumentRequestSender(paymentClient, requestSender)),
orderActionCreator, |
<<<<<<<
import { CountryRequestSender, CountryResponseBody } from '../geography';
import { InternalOrderResponseBody, OrderRequestBody, OrderRequestSender } from '../order';
import { PaymentMethodsResponseBody, PaymentMethodRequestSender, PaymentMethodResponseBody } from '../payment';
=======
import { CountryRequestSender } from '../geography';
import { OrderParams, OrderRequestBody, OrderRequestSender } from '../order';
import { PaymentMethodRequestSender } from '../payment';
>>>>>>>
import { CountryRequestSender, CountryResponseBody } from '../geography';
import { InternalOrderResponseBody, Order, OrderParams, OrderRequestBody, OrderRequestSender } from '../order';
import { PaymentMethodsResponseBody, PaymentMethodRequestSender, PaymentMethodResponseBody } from '../payment';
<<<<<<<
loadOrder(orderId: number, options?: RequestOptions): Promise<Response<InternalOrderResponseBody>> {
=======
loadOrder(orderId: number, options?: RequestOptions<OrderParams>): Promise<Response> {
>>>>>>>
loadOrder(orderId: number, options?: RequestOptions<OrderParams>): Promise<Response<Order>> {
<<<<<<<
submitOrder(body: OrderRequestBody, options?: RequestOptions): Promise<Response<InternalOrderResponseBody>> {
=======
/**
* @deprecated
* Remove once we fully transition to Storefront API
*/
loadInternalOrder(orderId: number, options?: RequestOptions): Promise<Response> {
return this._orderRequestSender.loadInternalOrder(orderId, options);
}
submitOrder(body: OrderRequestBody, options?: RequestOptions): Promise<Response> {
>>>>>>>
/**
* @deprecated
* Remove once we fully transition to Storefront API
*/
loadInternalOrder(orderId: number, options?: RequestOptions): Promise<Response> {
return this._orderRequestSender.loadInternalOrder(orderId, options);
}
submitOrder(body: OrderRequestBody, options?: RequestOptions): Promise<Response<InternalOrderResponseBody>> { |
<<<<<<<
import { InternalAddress } from '../../address';
import { CheckoutStore, InternalCheckoutSelectors } from '../../checkout';
import ShippingAddressActionCreator from '../shipping-address-action-creator';
import ShippingOptionActionCreator from '../shipping-option-action-creator';
=======
import { Address } from '../../address';
import { CheckoutSelectors, CheckoutStore } from '../../checkout';
import ConsignmentActionCreator from '../consignment-action-creator';
>>>>>>>
import { Address } from '../../address';
import { CheckoutStore, InternalCheckoutSelectors } from '../../checkout';
import ConsignmentActionCreator from '../consignment-action-creator';
<<<<<<<
updateAddress(address: InternalAddress, options?: ShippingRequestOptions): Promise<InternalCheckoutSelectors> {
=======
updateAddress(address: Address, options?: ShippingRequestOptions): Promise<CheckoutSelectors> {
>>>>>>>
updateAddress(address: Address, options?: ShippingRequestOptions): Promise<InternalCheckoutSelectors> {
<<<<<<<
selectOption(addressId: string, optionId: string, options?: ShippingRequestOptions): Promise<InternalCheckoutSelectors> {
=======
selectOption(optionId: string, options?: ShippingRequestOptions): Promise<CheckoutSelectors> {
>>>>>>>
selectOption(optionId: string, options?: ShippingRequestOptions): Promise<InternalCheckoutSelectors> { |
<<<<<<<
remote: {
customerMessage: string;
provider: string;
useStoreCredit: boolean;
};
phoneNumber: string;
=======
>>>>>>> |
<<<<<<<
=======
import { Coupon } from '../coupon';
import { Currency } from '../currency';
>>>>>>> |
<<<<<<<
loadCheckout(options?: RequestOptions): Promise<CheckoutSelectors> {
const action = this._quoteActionCreator.loadQuote(options);
return this._store.dispatch(action)
.then(() => this.getState());
=======
loadCheckout(id: string, options?: RequestOptions): Promise<CheckoutSelectors> {
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._checkoutActionCreator.loadCheckout(id, options)),
]).then(() => this._store.getState());
>>>>>>>
loadCheckout(id: string, options?: RequestOptions): Promise<CheckoutSelectors> {
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._checkoutActionCreator.loadCheckout(id, options)),
]).then(() => this.getState());
<<<<<<<
const action = this._orderActionCreator.loadOrder(orderId, options);
return this._store.dispatch(action)
.then(() => this.getState());
=======
return Promise.all([
this._store.dispatch(this._orderActionCreator.loadInternalOrder(orderId, options)),
this._store.dispatch(this._orderActionCreator.loadOrder(orderId, options)),
]).then(() => this._store.getState());
>>>>>>>
return Promise.all([
this._store.dispatch(this._orderActionCreator.loadInternalOrder(orderId, options)),
this._store.dispatch(this._orderActionCreator.loadOrder(orderId, options)),
]).then(() => this.getState());
<<<<<<<
const action = this._couponActionCreator.applyCoupon(code, options);
return this._store.dispatch(action)
.then(() => this.getState());
=======
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._couponActionCreator.applyCoupon(code, options)),
]).then(() => this._store.getState());
>>>>>>>
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._couponActionCreator.applyCoupon(code, options)),
]).then(() => this.getState());
<<<<<<<
const action = this._couponActionCreator.removeCoupon(code, options);
return this._store.dispatch(action)
.then(() => this.getState());
=======
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._couponActionCreator.removeCoupon(code, options)),
]).then(() => this._store.getState());
>>>>>>>
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._couponActionCreator.removeCoupon(code, options)),
]).then(() => this.getState());
<<<<<<<
const action = this._giftCertificateActionCreator.applyGiftCertificate(code, options);
return this._store.dispatch(action)
.then(() => this.getState());
=======
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._giftCertificateActionCreator.applyGiftCertificate(code, options)),
]).then(() => this._store.getState());
>>>>>>>
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._giftCertificateActionCreator.applyGiftCertificate(code, options)),
]).then(() => this.getState());
<<<<<<<
const action = this._giftCertificateActionCreator.removeGiftCertificate(code, options);
return this._store.dispatch(action)
.then(() => this.getState());
=======
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._giftCertificateActionCreator.removeGiftCertificate(code, options)),
]).then(() => this._store.getState());
>>>>>>>
return Promise.all([
this._store.dispatch(this._quoteActionCreator.loadQuote(options)),
this._store.dispatch(this._giftCertificateActionCreator.removeGiftCertificate(code, options)),
]).then(() => this.getState()); |
<<<<<<<
return store => Observable.create((observer: Observer<PaymentStrategyExecuteAction>) => {
const state = store.getState();
const { payment = {} as Payment, useStoreCredit } = payload;
const meta = { methodId: payment.methodId };
=======
return store => {
const executeAction = Observable.create((observer: Observer<PaymentStrategyExecuteAction>) => {
const state = store.getState();
const { payment = {} as Payment, useStoreCredit } = payload;
const meta = { methodId: payment.name };
>>>>>>>
return store => {
const executeAction = Observable.create((observer: Observer<PaymentStrategyExecuteAction>) => {
const state = store.getState();
const { payment = {} as Payment, useStoreCredit } = payload;
const meta = { methodId: payment.methodId };
<<<<<<<
strategy
.execute(payload, { ...options, methodId: payment.methodId, gatewayId: payment.gatewayId })
.then(() => {
observer.next(createAction(PaymentStrategyActionType.ExecuteSucceeded, undefined, meta));
observer.complete();
})
.catch(error => {
observer.error(createErrorAction(PaymentStrategyActionType.ExecuteFailed, error, meta));
});
});
=======
observer.next(createAction(PaymentStrategyActionType.ExecuteRequested, undefined, meta));
strategy
.execute(payload, { ...options, methodId: payment.name, gatewayId: payment.gateway })
.then(() => {
observer.next(createAction(PaymentStrategyActionType.ExecuteSucceeded, undefined, meta));
observer.complete();
})
.catch(error => {
observer.error(createErrorAction(PaymentStrategyActionType.ExecuteFailed, error, meta));
});
});
return concat(
this._loadOrder(store, options),
executeAction
);
};
>>>>>>>
observer.next(createAction(PaymentStrategyActionType.ExecuteRequested, undefined, meta));
strategy
.execute(payload, { ...options, methodId: payment.methodId, gatewayId: payment.gatewayId })
.then(() => {
observer.next(createAction(PaymentStrategyActionType.ExecuteSucceeded, undefined, meta));
observer.complete();
})
.catch(error => {
observer.error(createErrorAction(PaymentStrategyActionType.ExecuteFailed, error, meta));
});
});
return concat(
this._loadOrder(store, options),
executeAction
);
};
<<<<<<<
widgetInteraction(method: () => Promise<any>, options?: PaymentRequestOptions): ThunkAction<PaymentStrategyWidgetAction> {
return store => Observable.create((observer: Observer<PaymentStrategyWidgetAction>) => {
const methodId = options && options.methodId;
const meta = { methodId };
observer.next(createAction(PaymentStrategyActionType.WidgetInteractionStarted, undefined, meta));
method().then(() => {
observer.next(createAction(PaymentStrategyActionType.WidgetInteractionFinished, undefined, meta));
observer.complete();
})
.catch(error => {
observer.error(createErrorAction(PaymentStrategyActionType.WidgetInteractionFailed, error, meta));
});
});
}}
=======
private _loadOrder(store: ReadableCheckoutStore, options?: RequestOptions): Observable<Action> {
const state = store.getState();
const checkout = state.checkout.getCheckout();
if (!checkout) {
throw new MissingDataError('Unable to load order because "checkout" is missing.');
}
if (!checkout.orderId) {
return empty();
}
return this._orderActionCreator.loadOrder(checkout.orderId, options);
}
}
>>>>>>>
widgetInteraction(method: () => Promise<any>, options?: PaymentRequestOptions): ThunkAction<PaymentStrategyWidgetAction> {
return store => Observable.create((observer: Observer<PaymentStrategyWidgetAction>) => {
const methodId = options && options.methodId;
const meta = { methodId };
observer.next(createAction(PaymentStrategyActionType.WidgetInteractionStarted, undefined, meta));
method().then(() => {
observer.next(createAction(PaymentStrategyActionType.WidgetInteractionFinished, undefined, meta));
observer.complete();
})
.catch(error => {
observer.error(createErrorAction(PaymentStrategyActionType.WidgetInteractionFailed, error, meta));
});
});
}
private _loadOrder(store: ReadableCheckoutStore, options?: RequestOptions): Observable<Action> {
const state = store.getState();
const checkout = state.checkout.getCheckout();
if (!checkout) {
throw new MissingDataError('Unable to load order because "checkout" is missing.');
}
if (!checkout.orderId) {
return empty();
}
return this._orderActionCreator.loadOrder(checkout.orderId, options);
}
} |
<<<<<<<
if (!cart) {
throw new MissingDataError();
}
this._verifyCart(cart, options)
.then(() => this._checkoutClient.submitOrder(this._mapToOrderRequestBody(payload), options))
=======
this._checkoutValidator.validate(cart, options)
.then(() => this._checkoutClient.submitOrder(payload, options))
>>>>>>>
this._checkoutValidator.validate(cart, options)
.then(() => this._checkoutClient.submitOrder(this._mapToOrderRequestBody(payload), options))
<<<<<<<
private _verifyCart(existingCart: InternalCart, options?: RequestOptions): Promise<boolean> {
return this._checkoutClient.loadCart(options)
.then(({ body = {} }) =>
this._cartComparator.isEqual(existingCart, body.data.cart) ? Promise.resolve(true) : Promise.reject(false)
)
.catch(() => Promise.reject(new CartChangedError()));
}
private _mapToOrderRequestBody(payload: OrderRequestBody): InternalOrderRequestBody {
const { payment, ...order } = payload;
if (!payment) {
return order;
}
return {
...payload,
payment: {
paymentData: payment.paymentData,
name: payment.methodId,
gateway: payment.gatewayId,
},
};
}
=======
>>>>>>>
private _mapToOrderRequestBody(payload: OrderRequestBody): InternalOrderRequestBody {
const { payment, ...order } = payload;
if (!payment) {
return order;
}
return {
...payload,
payment: {
paymentData: payment.paymentData,
name: payment.methodId,
gateway: payment.gatewayId,
},
};
} |
<<<<<<<
customerGroupId: number;
customerGroupName: string;
=======
>>>>>>>
<<<<<<<
phoneNumber: string;
=======
>>>>>>>
<<<<<<<
remote?: {
customerMessage?: string;
provider: string;
useStoreCredit?: boolean;
};
=======
remote?: {
billing: string;
billingMessage: string;
customer: string;
customerMessage: string;
payment: string;
provider: string;
shipping: string;
useStoreCredit: boolean;
};
customerGroupId?: number;
customerGroupName?: string;
phoneNumber?: string;
>>>>>>>
remote?: {
provider: string;
customerMessage?: string;
useStoreCredit?: boolean;
};
customerGroupId?: number;
customerGroupName?: string;
phoneNumber?: string; |
<<<<<<<
updateAddress(address: InternalAddress, options?: ShippingRequestOptions): ThunkAction<ShippingStrategyUpdateAddressAction> {
=======
updateAddress(address: Address, options: ShippingActionOptions = {}): ThunkAction<ShippingStrategyUpdateAddressAction> {
>>>>>>>
updateAddress(address: Address, options?: ShippingRequestOptions): ThunkAction<ShippingStrategyUpdateAddressAction> {
<<<<<<<
selectOption(addressId: string, shippingOptionId: string, options?: ShippingRequestOptions): ThunkAction<ShippingStrategySelectOptionAction> {
=======
selectOption(shippingOptionId: string, options: ShippingActionOptions = {}): ThunkAction<ShippingStrategySelectOptionAction> {
>>>>>>>
selectOption(shippingOptionId: string, options?: ShippingRequestOptions): ThunkAction<ShippingStrategySelectOptionAction> { |
<<<<<<<
import CheckoutErrorSelector from './checkout-error-selector';
import CheckoutSelector from './checkout-selector';
import CheckoutStatusSelector from './checkout-status-selector';
=======
import CheckoutStoreSelector from './checkout-store-selector';
import CheckoutStoreStatusSelector from './checkout-store-status-selector';
import CheckoutStoreErrorSelector from './checkout-store-error-selector';
>>>>>>>
import CheckoutStoreErrorSelector from './checkout-store-error-selector';
import CheckoutStoreSelector from './checkout-store-selector';
import CheckoutStoreStatusSelector from './checkout-store-status-selector'; |
<<<<<<<
import { DEFAULT_PARTITION } from '../shared/regions/regionUtilities'
=======
import { SsmDocumentNode } from '../ssmDocument/explorer/ssmDocumentNode'
>>>>>>>
import { DEFAULT_PARTITION } from '../shared/regions/regionUtilities'
import { SsmDocumentNode } from '../ssmDocument/explorer/ssmDocumentNode' |
<<<<<<<
s3Client: S3Client
=======
ssmDocumentClient: SsmDocumentClient
>>>>>>>
s3Client: S3Client
ssmDocumentClient: SsmDocumentClient
<<<<<<<
s3Client: new MockS3Client({}),
=======
ssmDocumentClient: new MockSsmDocumentClient(),
>>>>>>>
s3Client: new MockS3Client({}),
ssmDocumentClient: new MockSsmDocumentClient(),
<<<<<<<
public createS3Client(regionCode: string): S3Client {
return this.clients.s3Client
}
=======
public createSsmClient(regionCode: string): SsmDocumentClient {
return this.clients.ssmDocumentClient
}
>>>>>>>
public createS3Client(regionCode: string): S3Client {
return this.clients.s3Client
}
public createSsmClient(regionCode: string): SsmDocumentClient {
return this.clients.ssmDocumentClient
}
<<<<<<<
}
export class MockS3Client implements S3Client {
public readonly regionCode: string
public readonly createBucket: (request: CreateBucketRequest) => Promise<CreateBucketResponse>
public readonly listBuckets: () => Promise<ListBucketsResponse>
public readonly listFiles: (request: ListFilesRequest) => Promise<ListFilesResponse>
public readonly createFolder: (request: CreateFolderRequest) => Promise<CreateFolderResponse>
public readonly downloadFile: (request: DownloadFileRequest) => Promise<void>
public readonly uploadFile: (request: UploadFileRequest) => Promise<void>
public readonly listObjectVersions: (request: ListObjectVersionsRequest) => Promise<ListObjectVersionsResponse>
public readonly listObjectVersionsIterable: (
request: ListObjectVersionsRequest
) => AsyncIterableIterator<ListObjectVersionsResponse>
public readonly deleteObject: (request: DeleteObjectRequest) => Promise<void>
public readonly deleteObjects: (request: DeleteObjectsRequest) => Promise<DeleteObjectsResponse>
public readonly deleteBucket: (request: DeleteBucketRequest) => Promise<void>
public constructor({
regionCode = '',
createBucket = async (request: CreateBucketRequest) => ({ bucket: { name: '', region: '', arn: '' } }),
listBuckets = async () => ({ buckets: [] }),
listFiles = async (request: ListFilesRequest) => ({ files: [], folders: [] }),
createFolder = async (request: CreateFolderRequest) => ({ folder: { name: '', path: '', arn: '' } }),
downloadFile = async (request: DownloadFileRequest) => {},
uploadFile = async (request: UploadFileRequest) => {},
listObjectVersions = async (request: ListObjectVersionsRequest) => ({ objects: [] }),
listObjectVersionsIterable = (request: ListObjectVersionsRequest) => asyncGenerator([]),
deleteObject = async (request: DeleteObjectRequest) => {},
deleteObjects = async (request: DeleteObjectsRequest) => ({ errors: [] }),
deleteBucket = async (request: DeleteBucketRequest) => {},
}: {
regionCode?: string
createBucket?(request: CreateBucketRequest): Promise<CreateBucketResponse>
listBuckets?(): Promise<ListBucketsResponse>
listFiles?(request: ListFilesRequest): Promise<ListFilesResponse>
createFolder?(request: CreateFolderRequest): Promise<CreateFolderResponse>
downloadFile?(request: DownloadFileRequest): Promise<void>
uploadFile?(request: UploadFileRequest): Promise<void>
listObjectVersions?(request: ListObjectVersionsRequest): Promise<ListObjectVersionsResponse>
listObjectVersionsIterable?(
request: ListObjectVersionsRequest
): AsyncIterableIterator<ListObjectVersionsResponse>
deleteObject?(request: DeleteObjectRequest): Promise<void>
deleteObjects?(request: DeleteObjectsRequest): Promise<DeleteObjectsResponse>
deleteBucket?(request: DeleteBucketRequest): Promise<void>
}) {
this.regionCode = regionCode
this.createBucket = createBucket
this.listBuckets = listBuckets
this.listFiles = listFiles
this.createFolder = createFolder
this.downloadFile = downloadFile
this.uploadFile = uploadFile
this.listObjectVersions = listObjectVersions
this.listObjectVersionsIterable = listObjectVersionsIterable
this.deleteObject = deleteObject
this.deleteObjects = deleteObjects
this.deleteBucket = deleteBucket
}
=======
}
export class MockSsmDocumentClient implements SsmDocumentClient {
public constructor(
public readonly regionCode: string = '',
public readonly listDocuments: () => AsyncIterableIterator<SSM.DocumentIdentifier> = () => asyncGenerator([]),
public readonly listDocumentVersions: (
documentName: string
) => AsyncIterableIterator<SSM.Types.DocumentVersionInfo> = (documentName: string) => asyncGenerator([]),
public readonly getDocument: (
documentName: string,
documentVersion?: string
) => Promise<SSM.Types.GetDocumentResult> = async (documentName: string, documentVersion?: string) =>
({
Name: '',
DocumentType: '',
Content: '',
DocumentFormat: '',
} as SSM.Types.GetDocumentResult),
public readonly createDocument: (
request: SSM.Types.CreateDocumentRequest
) => Promise<SSM.Types.CreateDocumentResult> = async (request: SSM.Types.CreateDocumentRequest) => ({}),
public readonly updateDocument: (
request: SSM.Types.UpdateDocumentRequest
) => Promise<SSM.Types.UpdateDocumentResult> = async (request: SSM.Types.UpdateDocumentRequest) => ({})
) {}
>>>>>>>
}
export class MockS3Client implements S3Client {
public readonly regionCode: string
public readonly createBucket: (request: CreateBucketRequest) => Promise<CreateBucketResponse>
public readonly listBuckets: () => Promise<ListBucketsResponse>
public readonly listFiles: (request: ListFilesRequest) => Promise<ListFilesResponse>
public readonly createFolder: (request: CreateFolderRequest) => Promise<CreateFolderResponse>
public readonly downloadFile: (request: DownloadFileRequest) => Promise<void>
public readonly uploadFile: (request: UploadFileRequest) => Promise<void>
public readonly listObjectVersions: (request: ListObjectVersionsRequest) => Promise<ListObjectVersionsResponse>
public readonly listObjectVersionsIterable: (
request: ListObjectVersionsRequest
) => AsyncIterableIterator<ListObjectVersionsResponse>
public readonly deleteObject: (request: DeleteObjectRequest) => Promise<void>
public readonly deleteObjects: (request: DeleteObjectsRequest) => Promise<DeleteObjectsResponse>
public readonly deleteBucket: (request: DeleteBucketRequest) => Promise<void>
public constructor({
regionCode = '',
createBucket = async (request: CreateBucketRequest) => ({ bucket: { name: '', region: '', arn: '' } }),
listBuckets = async () => ({ buckets: [] }),
listFiles = async (request: ListFilesRequest) => ({ files: [], folders: [] }),
createFolder = async (request: CreateFolderRequest) => ({ folder: { name: '', path: '', arn: '' } }),
downloadFile = async (request: DownloadFileRequest) => {},
uploadFile = async (request: UploadFileRequest) => {},
listObjectVersions = async (request: ListObjectVersionsRequest) => ({ objects: [] }),
listObjectVersionsIterable = (request: ListObjectVersionsRequest) => asyncGenerator([]),
deleteObject = async (request: DeleteObjectRequest) => {},
deleteObjects = async (request: DeleteObjectsRequest) => ({ errors: [] }),
deleteBucket = async (request: DeleteBucketRequest) => {},
}: {
regionCode?: string
createBucket?(request: CreateBucketRequest): Promise<CreateBucketResponse>
listBuckets?(): Promise<ListBucketsResponse>
listFiles?(request: ListFilesRequest): Promise<ListFilesResponse>
createFolder?(request: CreateFolderRequest): Promise<CreateFolderResponse>
downloadFile?(request: DownloadFileRequest): Promise<void>
uploadFile?(request: UploadFileRequest): Promise<void>
listObjectVersions?(request: ListObjectVersionsRequest): Promise<ListObjectVersionsResponse>
listObjectVersionsIterable?(
request: ListObjectVersionsRequest
): AsyncIterableIterator<ListObjectVersionsResponse>
deleteObject?(request: DeleteObjectRequest): Promise<void>
deleteObjects?(request: DeleteObjectsRequest): Promise<DeleteObjectsResponse>
deleteBucket?(request: DeleteBucketRequest): Promise<void>
}) {
this.regionCode = regionCode
this.createBucket = createBucket
this.listBuckets = listBuckets
this.listFiles = listFiles
this.createFolder = createFolder
this.downloadFile = downloadFile
this.uploadFile = uploadFile
this.listObjectVersions = listObjectVersions
this.listObjectVersionsIterable = listObjectVersionsIterable
this.deleteObject = deleteObject
this.deleteObjects = deleteObjects
this.deleteBucket = deleteBucket
}
}
export class MockSsmDocumentClient implements SsmDocumentClient {
public constructor(
public readonly regionCode: string = '',
public readonly listDocuments: () => AsyncIterableIterator<SSM.DocumentIdentifier> = () => asyncGenerator([]),
public readonly listDocumentVersions: (
documentName: string
) => AsyncIterableIterator<SSM.Types.DocumentVersionInfo> = (documentName: string) => asyncGenerator([]),
public readonly getDocument: (
documentName: string,
documentVersion?: string
) => Promise<SSM.Types.GetDocumentResult> = async (documentName: string, documentVersion?: string) =>
({
Name: '',
DocumentType: '',
Content: '',
DocumentFormat: '',
} as SSM.Types.GetDocumentResult),
public readonly createDocument: (
request: SSM.Types.CreateDocumentRequest
) => Promise<SSM.Types.CreateDocumentResult> = async (request: SSM.Types.CreateDocumentRequest) => ({}),
public readonly updateDocument: (
request: SSM.Types.UpdateDocumentRequest
) => Promise<SSM.Types.UpdateDocumentResult> = async (request: SSM.Types.UpdateDocumentRequest) => ({})
) {} |
<<<<<<<
public constructor(private readonly args: SamCliLocalInvokeInvocationArguments) {
this.args.skipPullImage = !!this.args.skipPullImage
=======
private readonly templateResourceName: string
private readonly templatePath: string
private readonly eventPath: string
private readonly environmentVariablePath: string
private readonly debugPort?: string
private readonly invoker: SamLocalInvokeCommand
private readonly dockerNetwork?: string
private readonly skipPullImage: boolean
private readonly debuggerPath?: string
private readonly invokerContext: SamCliProcessInvokerContext
/**
* @see SamCliLocalInvokeInvocationArguments for parameter info
* skipPullImage - Defaults to false (the latest Docker image will be pulled down if necessary)
*/
public constructor({ skipPullImage = false, ...params }: SamCliLocalInvokeInvocationArguments) {
this.templateResourceName = params.templateResourceName
this.templatePath = params.templatePath
this.eventPath = params.eventPath
this.environmentVariablePath = params.environmentVariablePath
this.debugPort = params.debugPort
this.invoker = params.invoker
this.dockerNetwork = params.dockerNetwork
this.skipPullImage = skipPullImage
this.debuggerPath = params.debuggerPath
// Enterprise!
this.invokerContext = new DefaultSamCliProcessInvokerContext()
>>>>>>>
private readonly invokerContext: SamCliProcessInvokerContext
public constructor(private readonly args: SamCliLocalInvokeInvocationArguments) {
this.args.skipPullImage = !!this.args.skipPullImage
// Enterprise!
this.invokerContext = new DefaultSamCliProcessInvokerContext()
<<<<<<<
const invokeArgs = [
=======
const samCommand = this.invokerContext.cliConfig.getSamCliLocation() ?? 'sam'
const args = [
>>>>>>>
const samCommand = this.invokerContext.cliConfig.getSamCliLocation() ?? 'sam'
const invokeArgs = [
<<<<<<<
await this.args.invoker.invoke({
options: {
env: {
...process.env,
...this.args.environmentVariables,
},
},
command: 'sam',
args: invokeArgs,
isDebug: !!this.args.debugPort,
=======
await this.invoker.invoke({
command: samCommand,
args,
isDebug: !!this.debugPort,
>>>>>>>
await this.args.invoker.invoke({
options: {
env: {
...process.env,
...this.args.environmentVariables,
},
},
command: samCommand,
args: invokeArgs,
isDebug: !!this.args.debugPort, |
<<<<<<<
/**
* Validates debug configuration properties.
*/
function validateConfig(
folder: vscode.WorkspaceFolder | undefined,
config: AwsSamDebuggerConfiguration,
): boolean {
const cftRegistry = CloudFormationTemplateRegistry.getRegistry()
let rv: { isValid: boolean; message?: string } = { isValid: false, message: undefined, }
if (!config.request) {
rv.message = localize(
'AWS.sam.debugger.missingField',
'Missing required field "{0}" in debug config',
'request'
)
} else if (!AWS_SAM_DEBUG_REQUEST_TYPES.includes(config.request)) {
rv.message = localize(
'AWS.sam.debugger.invalidRequest',
'Debug Configuration has an unsupported request type. Supported types: {0}',
AWS_SAM_DEBUG_REQUEST_TYPES.join(', '))
} else if (!AWS_SAM_DEBUG_TARGET_TYPES.includes(config.invokeTarget.target)) {
rv.message = localize(
'AWS.sam.debugger.invalidTarget',
'Debug Configuration has an unsupported target type. Supported types: {0}',
AWS_SAM_DEBUG_TARGET_TYPES.join(', '))
} else if (config.invokeTarget.target === TEMPLATE_TARGET_TYPE) {
let cfnTemplate
if (config.invokeTarget.samTemplatePath) {
const fullpath = tryGetAbsolutePath(folder, config.invokeTarget.samTemplatePath)
// Normalize to absolute path for use in the runner.
config.invokeTarget.samTemplatePath = fullpath
cfnTemplate = cftRegistry.getRegisteredTemplate(fullpath)?.template
}
rv = validateTemplateConfig(config, config.invokeTarget.samTemplatePath, cfnTemplate)
} else if (config.invokeTarget.target === CODE_TARGET_TYPE) {
rv = validateCodeConfig(config)
}
if (!rv.isValid) {
vscode.window.showErrorMessage(rv.message ?? 'invalid debug-config')
} else if (rv.message) {
vscode.window.showInformationMessage(rv.message)
=======
function createDirectInvokeSamDebugConfigurationFromTemplate(
resourceName: string,
templatePath: string
): AwsSamDebuggerConfiguration {
return {
type: AWS_SAM_DEBUG_TYPE,
request: DIRECT_INVOKE_TYPE,
name: resourceName,
invokeTarget: {
target: TEMPLATE_TARGET_TYPE,
samTemplatePath: templatePath,
samTemplateResource: resourceName,
},
>>>>>>>
/**
* Validates debug configuration properties.
*/
function validateConfig(folder: vscode.WorkspaceFolder | undefined, config: AwsSamDebuggerConfiguration): boolean {
const cftRegistry = CloudFormationTemplateRegistry.getRegistry()
let rv: { isValid: boolean; message?: string } = { isValid: false, message: undefined }
if (!config.request) {
rv.message = localize(
'AWS.sam.debugger.missingField',
'Missing required field "{0}" in debug config',
'request'
)
} else if (!AWS_SAM_DEBUG_REQUEST_TYPES.includes(config.request)) {
rv.message = localize(
'AWS.sam.debugger.invalidRequest',
'Debug Configuration has an unsupported request type. Supported types: {0}',
AWS_SAM_DEBUG_REQUEST_TYPES.join(', ')
)
} else if (!AWS_SAM_DEBUG_TARGET_TYPES.includes(config.invokeTarget.target)) {
rv.message = localize(
'AWS.sam.debugger.invalidTarget',
'Debug Configuration has an unsupported target type. Supported types: {0}',
AWS_SAM_DEBUG_TARGET_TYPES.join(', ')
)
} else if (config.invokeTarget.target === TEMPLATE_TARGET_TYPE) {
let cfnTemplate
if (config.invokeTarget.samTemplatePath) {
const fullpath = tryGetAbsolutePath(folder, config.invokeTarget.samTemplatePath)
// Normalize to absolute path for use in the runner.
config.invokeTarget.samTemplatePath = fullpath
cfnTemplate = cftRegistry.getRegisteredTemplate(fullpath)?.template
}
rv = validateTemplateConfig(config, config.invokeTarget.samTemplatePath, cfnTemplate)
} else if (config.invokeTarget.target === CODE_TARGET_TYPE) {
rv = validateCodeConfig(config)
}
if (!rv.isValid) {
vscode.window.showErrorMessage(rv.message ?? 'invalid debug-config')
} else if (rv.message) {
vscode.window.showInformationMessage(rv.message)
<<<<<<<
'AWS.sam.debugger.missingField',
'Missing required field "{0}" in debug config',
'samTemplatePath'
)
=======
'AWS.sam.debugger.invalidRequest',
'Debug Configuration has an unsupported request type. Supported types: {0}',
AWS_SAM_DEBUG_REQUEST_TYPES.join(', ')
),
>>>>>>>
'AWS.sam.debugger.missingField',
'Missing required field "{0}" in debug config',
'samTemplatePath'
),
<<<<<<<
'AWS.sam.debugger.missingTemplate',
'Invalid (or missing) template file (path must be workspace-relative, or absolute): {0}',
templateTarget.samTemplatePath
)
=======
'AWS.sam.debugger.invalidTarget',
'Debug Configuration has an unsupported target type. Supported types: {0}',
AWS_SAM_DEBUG_TARGET_TYPES.join(', ')
),
>>>>>>>
'AWS.sam.debugger.missingTemplate',
'Invalid (or missing) template file (path must be workspace-relative, or absolute): {0}',
templateTarget.samTemplatePath
),
<<<<<<<
'AWS.sam.debugger.missingField',
'Missing required field "{0}" in debug config',
'samTemplateResource'
)
=======
'AWS.sam.debugger.missingTemplate',
'Unable to find the Template file {0}',
templateTarget.samTemplatePath
),
>>>>>>>
'AWS.sam.debugger.missingField',
'Missing required field "{0}" in debug config',
'samTemplateResource'
), |
<<<<<<<
import { ExtContext } from './shared/extensions'
=======
import { activate as activateStepFunctions } from './stepFunctions/activation'
>>>>>>>
import { ExtContext } from './shared/extensions'
import { activate as activateStepFunctions } from './stepFunctions/activation'
<<<<<<<
extensionContext: extContext
=======
extensionContext: context,
>>>>>>>
extensionContext: extContext,
<<<<<<<
context: extContext
=======
context: context,
>>>>>>>
context: extContext,
<<<<<<<
await activateSam(extContext)
=======
await activateServerless({
awsContext,
extensionContext: context,
outputChannel: toolkitOutputChannel,
regionProvider,
telemetryService: ext.telemetry,
toolkitSettings,
})
setImmediate(async () => {
await activateStepFunctions(context, awsContext, toolkitOutputChannel)
})
>>>>>>>
await activateSam(extContext)
setImmediate(async () => {
await activateStepFunctions(context, awsContext, toolkitOutputChannel)
}) |
<<<<<<<
const CLOUD9_APPNAME = 'AWS Cloud9'
export enum IDE {
vscode,
cloud9,
}
export function getIdeType(): IDE {
if (vscode.env.appName === CLOUD9_APPNAME) {
return IDE.cloud9
}
return IDE.vscode
}
interface IdeProperties {
shortName: string
longName: string
commandPalette: string
}
export function getIdeProperties(): IdeProperties {
switch (getIdeType()) {
case IDE.cloud9:
return {
shortName: 'Cloud9',
longName: 'AWS Cloud9',
commandPalette: 'Go to Anything Panel',
}
// default is IDE.vscode
default:
return {
shortName: 'VS Code',
longName: 'Visual Studio Code',
commandPalette: 'Command Palette',
}
}
}
/**
* Returns whether or not this is Cloud9
*/
export function isCloud9(): boolean {
return getIdeType() === IDE.cloud9
}
/**
* Returns the compute region (e.g. Cloud9 region) or 'not-regional' if used in a non-regional setting.
* TODO: Implement this function!!!
*/
export function getComputeRegion(): string | undefined {
if (isCloud9()) {
return 'not-implemented'
}
return undefined
}
=======
const VSCODE_APPNAME = 'Visual Studio Code'
export enum IDE {
vscode,
unknown,
}
export function getIdeType(): IDE {
// Theia doesn't necessarily have all env propertie
// so we should be defensive and assume appName is nullable.
if (vscode.env.appName?.startsWith(VSCODE_APPNAME)) {
return IDE.vscode
}
return IDE.unknown
}
>>>>>>>
const VSCODE_APPNAME = 'Visual Studio Code'
const CLOUD9_APPNAME = 'AWS Cloud9'
export enum IDE {
vscode,
cloud9,
unknown,
}
export function getIdeType(): IDE {
if (vscode.env.appName === CLOUD9_APPNAME) {
return IDE.cloud9
}
// Theia doesn't necessarily have all env propertie
// so we should be defensive and assume appName is nullable.
if (vscode.env.appName?.startsWith(VSCODE_APPNAME)) {
return IDE.vscode
}
return IDE.unknown
}
interface IdeProperties {
shortName: string
longName: string
commandPalette: string
}
export function getIdeProperties(): IdeProperties {
switch (getIdeType()) {
case IDE.cloud9:
return {
shortName: 'Cloud9',
longName: 'AWS Cloud9',
commandPalette: 'Go to Anything Panel',
}
// default is IDE.vscode
default:
return {
shortName: 'VS Code',
longName: 'Visual Studio Code',
commandPalette: 'Command Palette',
}
}
}
/**
* Returns whether or not this is Cloud9
*/
export function isCloud9(): boolean {
return getIdeType() === IDE.cloud9
}
/**
* Returns the compute region (e.g. Cloud9 region) or 'not-regional' if used in a non-regional setting.
* TODO: Implement this function!!!
*/
export function getComputeRegion(): string | undefined {
if (isCloud9()) {
return 'not-implemented'
}
return undefined
} |
<<<<<<<
localResourceRoots: [
ext.visualizationResourcePaths.localScriptsPath,
ext.visualizationResourcePaths.visualizationCache
],
=======
localResourceRoots: [
ext.visualizationResourcePaths.localScriptsPath,
ext.visualizationResourcePaths.stateMachineThemePath
],
>>>>>>>
localResourceRoots: [
ext.visualizationResourcePaths.localScriptsPath,
ext.visualizationResourcePaths.visualizationCache,
ext.visualizationResourcePaths.stateMachineThemePath
],
<<<<<<<
ext.visualizationResourcePaths.webviewScript.with({ scheme: 'vscode-resource' }),
ext.visualizationResourcePaths.visualizationScript.with({ scheme: 'vscode-resource' }),
ext.visualizationResourcePaths.visualizationCSS.with({ scheme: 'vscode-resource' })
=======
ext.visualizationResourcePaths.webviewScript.with({ scheme: 'vscode-resource' }),
ext.visualizationResourcePaths.stateMachineThemeCSS.with({ scheme: 'vscode-resource' })
>>>>>>>
ext.visualizationResourcePaths.webviewScript.with({ scheme: 'vscode-resource' }),
ext.visualizationResourcePaths.visualizationScript.with({ scheme: 'vscode-resource' }),
ext.visualizationResourcePaths.visualizationCSS.with({ scheme: 'vscode-resource' }),
ext.visualizationResourcePaths.stateMachineThemeCSS.with({ scheme: 'vscode-resource' })
<<<<<<<
graphStateMachineScriptPath: vscode.Uri,
graphStateMachineScriptPath2: vscode.Uri,
graphStateMachineCSS: vscode.Uri
=======
graphStateMachineScriptPath: vscode.Uri,
stateMachineThemeCSS: vscode.Uri
>>>>>>>
graphStateMachineScriptPath: vscode.Uri,
graphStateMachineScriptPath2: vscode.Uri,
stateMachineThemeCSS: vscode.Uri,
graphStateMachineCSS: vscode.Uri
<<<<<<<
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href='${graphStateMachineCSS}'>
<script src='${graphStateMachineScriptPath2}'></script>
</head>
<body>
<div id="svgcontainer" class="workflowgraph" style="background-color: white;">
<svg></svg>
</div>
<script src='${graphStateMachineScriptPath}'></script>
</body>
</html>`
=======
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="https://d19z89qxwgm7w9.cloudfront.net/graph-0.0.1.css">
<link rel="stylesheet" href='${stateMachineThemeCSS}'>
<script src="https://d19z89qxwgm7w9.cloudfront.net/sfn-0.0.3.js"></script>
</head>
<body>
<div id="svgcontainer" class="workflowgraph">
<svg></svg>
</div>
<script src='${graphStateMachineScriptPath}'></script>
</body>
</html>`
>>>>>>>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href='${graphStateMachineCSS}'>
<link rel="stylesheet" href='${stateMachineThemeCSS}'>
<script src='${graphStateMachineScriptPath2}'></script>
</head>
<body>
<div id="svgcontainer" class="workflowgraph">
<svg></svg>
</div>
<script src='${graphStateMachineScriptPath}'></script>
</body>
</html>` |
<<<<<<<
import { getLambdaFileNameFromHandler } from '../utils'
import { addCodiconToString } from '../../shared/utilities/textUtilities'
=======
import { getLambdaDetails } from '../utils'
>>>>>>>
import { addCodiconToString } from '../../shared/utilities/textUtilities'
import { getLambdaDetails } from '../utils' |
<<<<<<<
python: 'ms-python.python'
}
/**
* Long-lived, extension-scoped, shared globals.
*/
export interface ExtContext extends vscode.ExtensionContext {
//extensionContext: vscode.ExtensionContext
awsContext: AwsContext
regionProvider: RegionProvider
settings: SettingsConfiguration
outputChannel: vscode.OutputChannel
telemetryService: TelemetryService
chanLogger: ChannelLogger
=======
python: 'ms-python.python',
>>>>>>>
python: 'ms-python.python',
}
/**
* Long-lived, extension-scoped, shared globals.
*/
export interface ExtContext extends vscode.ExtensionContext {
//extensionContext: vscode.ExtensionContext
awsContext: AwsContext
regionProvider: RegionProvider
settings: SettingsConfiguration
outputChannel: vscode.OutputChannel
telemetryService: TelemetryService
chanLogger: ChannelLogger |
<<<<<<<
import { APIGateway, CloudFormation, CloudWatchLogs, IAM, Lambda, Schemas, StepFunctions, STS } from 'aws-sdk'
import { ApiGatewayClient } from '../../../shared/clients/apiGatewayClient'
=======
import { CloudFormation, CloudWatchLogs, IAM, Lambda, Schemas, StepFunctions, STS, SSM } from 'aws-sdk'
>>>>>>>
import { APIGateway, CloudFormation, CloudWatchLogs, IAM, Lambda, Schemas, StepFunctions, STS, SSM } from 'aws-sdk'
import { ApiGatewayClient } from '../../../shared/clients/apiGatewayClient' |
<<<<<<<
import * as telemetry from '../telemetry/telemetry'
import { TelemetryService } from '../telemetry/telemetryService'
=======
import { recordLambdaInvokeLocal, recordSamAttachDebugger, Result, Runtime } from '../telemetry/telemetry'
>>>>>>>
import * as telemetry from '../telemetry/telemetry'
<<<<<<<
const recordApigwTelemetry = (result: telemetry.Result) => {
telemetry.recordApigatewayInvokeLocal({
result: result,
runtime: config.runtime as telemetry.Runtime,
debug: !config.noDebug,
httpMethod: config.api?.httpMethod,
})
}
=======
const localInvokeArgs: SamCliLocalInvokeInvocationArguments = {
templateResourceName: makeResourceName(config),
templatePath: config.templatePath,
eventPath: config.eventPayloadFile,
environmentVariablePath: config.envFile,
environmentVariables: envVars,
invoker: config.samLocalInvokeCommand!,
dockerNetwork: config.sam?.dockerNetwork,
debugPort: !config.noDebug ? config.debugPort?.toString() : undefined,
debuggerPath: config.debuggerPath,
debugArgs: config.debugArgs,
containerEnvFile: config.containerEnvFile,
extraArgs: config.sam?.localArguments,
parameterOverrides: config.parameterOverrides,
skipPullImage: config.sam?.skipNewImageCheck,
}
const command = new SamCliLocalInvokeInvocation(localInvokeArgs)
>>>>>>>
const recordApigwTelemetry = (result: telemetry.Result) => {
telemetry.recordApigatewayInvokeLocal({
result: result,
runtime: config.runtime as telemetry.Runtime,
debug: !config.noDebug,
httpMethod: config.api?.httpMethod,
})
}
<<<<<<<
// sam local invoke ...
const command = new SamCliLocalInvokeInvocation(localInvokeArgs)
let invokeResult: telemetry.Result = 'Failed'
try {
await command.execute(timer)
invokeResult = 'Succeeded'
} catch (err) {
ctx.chanLogger.error(
'AWS.error.during.sam.local',
'Failed to run SAM application locally: {0}',
err as Error
)
} finally {
telemetry.recordLambdaInvokeLocal({
result: invokeResult,
runtime: config.runtime as telemetry.Runtime,
debug: !config.noDebug,
})
}
=======
const lambdaPackageType = isImageLambdaConfig(config) ? 'Image' : 'Zip'
let invokeResult: Result = 'Failed'
try {
await command.execute(timer)
invokeResult = 'Succeeded'
} catch (err) {
ctx.chanLogger.error('AWS.error.during.sam.local', 'Failed to run SAM Application locally: {0}', err as Error)
} finally {
recordLambdaInvokeLocal({
lambdaPackageType: lambdaPackageType,
result: invokeResult,
runtime: config.runtime as Runtime,
debug: !config.noDebug,
})
>>>>>>>
// sam local invoke ...
const command = new SamCliLocalInvokeInvocation(localInvokeArgs)
let invokeResult: telemetry.Result = 'Failed'
try {
await command.execute(timer)
invokeResult = 'Succeeded'
} catch (err) {
ctx.chanLogger.error(
'AWS.error.during.sam.local',
'Failed to run SAM application locally: {0}',
err as Error
)
} finally {
telemetry.recordLambdaInvokeLocal({
lambdaPackageType: lambdaPackageType,
result: invokeResult,
runtime: config.runtime as telemetry.Runtime,
debug: !config.noDebug,
})
}
<<<<<<<
export interface RecordAttachDebuggerMetricContext {
telemetryService: Pick<TelemetryService, 'record'>
runtime: string
result: boolean | undefined
attempts: number
durationMillis: number
}
function recordAttachDebuggerMetric(params: RecordAttachDebuggerMetricContext) {
telemetry.recordSamAttachDebugger({
runtime: params.runtime as telemetry.Runtime,
result: params.result ? 'Succeeded' : 'Failed',
attempts: params.attempts,
duration: params.durationMillis,
})
}
=======
>>>>>>> |
<<<<<<<
import { Runtime } from 'aws-sdk/clients/lambda'
=======
import { getIdeProperties } from '../../shared/extensionUtilities'
>>>>>>>
import { Runtime } from 'aws-sdk/clients/lambda'
import { getIdeProperties } from '../../shared/extensionUtilities' |
<<<<<<<
public schedule: Function;
public scheduleIterable: Function;
public scheduleOnce: Function;
public later: Function;
=======
>>>>>>>
public scheduleIterable: Function;
<<<<<<<
/*
Alias of Backburner.prototype.schedule()
Defer the passed function to run inside the specified queue.
@method defer
@param {String} queueName
@param {Object} target
@param {Function|String} method The method or method name to be executed
@param {any} args The method arguments
@return method result
TODO: fix stack as optional argument
*/
=======
/**
* @deprecated please use schedule instead.
*/
>>>>>>>
/**
* @deprecated please use schedule instead.
*/
<<<<<<<
/*
Defer the passed iterable of functions to run inside the specified queue.
@method deferIterable
@param {String} queueName
@param {Iterable} an iterable of functions to execute
@return method result
*/
public deferIterable(queueName: string, iterable: Function) {
let stack = this.DEBUG ? new Error() : undefined;
let _iteratorDrain = iteratorDrain;
return this._ensureInstance().schedule(queueName, null, _iteratorDrain, [iterable], false, stack);
}
=======
/**
* @deprecated please use scheduleOnce instead.
*/
>>>>>>>
/*
Defer the passed iterable of functions to run inside the specified queue.
@method deferIterable
@param {String} queueName
@param {Iterable} an iterable of functions to execute
@return method result
*/
public deferIterable(queueName: string, iterable: Function) {
let stack = this.DEBUG ? new Error() : undefined;
let _iteratorDrain = iteratorDrain;
return this._ensureInstance().schedule(queueName, null, _iteratorDrain, [iterable], false, stack);
}
/**
* @deprecated please use scheduleOnce instead.
*/
<<<<<<<
}
Backburner.prototype.schedule = Backburner.prototype.defer;
Backburner.prototype.scheduleOnce = Backburner.prototype.deferOnce;
Backburner.prototype.scheduleIterable = Backburner.prototype.deferIterable;
Backburner.prototype.later = Backburner.prototype.setTimeout;
=======
}
>>>>>>>
}
Backburner.prototype.scheduleIterable = Backburner.prototype.deferIterable; |
<<<<<<<
if (name.startsWith(`--`) && !name.startsWith(`--no-`)) {
registerDynamic(machine, node, [`isNegatedOption`, name, option.hidden || name !== longestName], node, [`pushFalse`, name]);
=======
if (name.startsWith(`--`)) {
registerDynamic(machine, node, [`isNegatedOption`, name], node, [`pushFalse`, name]);
>>>>>>>
if (name.startsWith(`--`) && !name.startsWith(`--no-`)) {
registerDynamic(machine, node, [`isNegatedOption`, name], node, [`pushFalse`, name]); |
<<<<<<<
/**
* The schema used to validate the Command instance.
*
* The easiest way to validate it is by using the [Yup](https://github.com/jquense/yup) library.
*
* @example
* yup.object().shape({
* a: yup.number().integer(),
* b: yup.number().integer(),
* })
*/
export type Schema<C extends Command<any> = Command<any>> = {
/**
* A function that takes the `Command` instance as a parameter and validates it, throwing an Error if the validation fails.
*/
validate: (object: C) => void;
};
=======
/**
* The definition of a Command.
*/
export type Definition = Usage & {
/**
* The path of the command, starting with `cli.binaryName`.
*/
path: string;
/**
* The detailed usage of the command.
*/
usage: string;
};
>>>>>>>
/**
* The definition of a Command.
*/
export type Definition = Usage & {
/**
* The path of the command, starting with `cli.binaryName`.
*/
path: string;
/**
* The detailed usage of the command.
*/
usage: string;
};
/**
* The schema used to validate the Command instance.
*
* The easiest way to validate it is by using the [Yup](https://github.com/jquense/yup) library.
*
* @example
* yup.object().shape({
* a: yup.number().integer(),
* b: yup.number().integer(),
* })
*/
export type Schema<C extends Command<any> = Command<any>> = {
/**
* A function that takes the `Command` instance as a parameter and validates it, throwing an Error if the validation fails.
*/
validate: (object: C) => void;
}; |
<<<<<<<
const sessionId = (
Date.now().toString(36) +
Math.random()
.toString(36)
.substr(2, 5)
).toUpperCase();
=======
const extractXsrfTokenFromJwt = (jwt: string) => {
const parts = jwt.split(".");
if (parts.length === 3) {
return JSON.parse(atob(parts[1])).xsrf;
}
};
// @VisibleForTesting
export const extractXsrfTokenFromCookie = (cookieString?: string) => {
if (cookieString) {
const cookies = cookieString.split(";");
for (const c of cookies) {
const parts = c.trim().split("=");
if (parts[0] === "X-Bearer-Token") {
return extractXsrfTokenFromJwt(parts[1]);
}
}
}
};
const extractXsrfToken = () => {
return extractXsrfTokenFromCookie(document.cookie);
};
>>>>>>>
const sessionId = (
Date.now().toString(36) +
Math.random()
.toString(36)
.substr(2, 5)
).toUpperCase();
const extractXsrfTokenFromJwt = (jwt: string) => {
const parts = jwt.split(".");
if (parts.length === 3) {
return JSON.parse(atob(parts[1])).xsrf;
}
};
// @VisibleForTesting
export const extractXsrfTokenFromCookie = (cookieString?: string) => {
if (cookieString) {
const cookies = cookieString.split(";");
for (const c of cookies) {
const parts = c.trim().split("=");
if (parts[0] === "X-Bearer-Token") {
return extractXsrfTokenFromJwt(parts[1]);
}
}
}
};
const extractXsrfToken = () => {
return extractXsrfTokenFromCookie(document.cookie);
};
<<<<<<<
o.headers = {
Cache: "no-cache",
// identify the request as ajax request
"X-Requested-With": "XMLHttpRequest",
"X-SCM-Session-ID": sessionId
};
=======
o.headers = headers;
>>>>>>>
o.headers = headers; |
<<<<<<<
import { Router, NavigationStart, ActivatedRouteSnapshot, NavigationExtras, UrlSegment } from '@angular/router';
import { Subject } from 'rxjs';
import { pairwise, filter } from 'rxjs/operators';
=======
import {
Router,
NavigationStart,
ActivatedRouteSnapshot,
UrlSegment,
PRIMARY_OUTLET,
NavigationExtras
} from '@angular/router';
import { Subject } from 'rxjs/Subject';
import 'rxjs/add/observable/forkJoin';
import 'rxjs/add/operator/toPromise';
import 'rxjs/add/operator/filter';
import 'rxjs/add/operator/pairwise';
>>>>>>>
import {
Router,
NavigationStart,
ActivatedRouteSnapshot,
UrlSegment,
PRIMARY_OUTLET,
NavigationExtras
} from '@angular/router';
import { Subject } from 'rxjs';
import { pairwise, filter } from 'rxjs/operators'; |
<<<<<<<
export interface RemoteCallGetSchemaTreeParams {
types:string[];
}
export interface RemoteCallGetSchemaTreeResult extends RemoteCallResultBase {
schemas:SchemaTreeNode[];
total:number;
}
=======
export interface RemoteCallMixinDeleteParams {
qualifiedMixinNames:string[];
}
export interface RemoteCallMixinDeleteResult extends RemoteCallResultBase {
successes: {
qualifiedMixinName:string;
}[];
failures: {
qualifiedMixinName:string;
reason:string;
}[];
}
export interface RemoteCallMixinCreateOrUpdateParams {
mixin:string;
iconReference:string;
}
export interface RemoteCallMixinCreateOrUpdateResult extends RemoteCallResultBase {
created:bool;
updated:bool;
}
export interface RemoteCallGetContentTreeParams {
contentIds?:string[];
}
export interface RemoteCallGetContentTreeResult extends RemoteCallResultBase {
total:number;
contents:ContentTreeNode[];
}
export interface RemoteCallDeleteRelationshipTypeParams {
qualifiedRelationshipTypeNames:string[];
}
export interface DeleteRelationshipTypeSuccess {
qualifiedRelationshipTypeName:string;
}
export interface DeleteRelationshipTypeFailure {
qualifiedRelationshipTypeName:string;
reason:string;
}
export interface RemoteCallDeleteRelationshipTypeResult extends RemoteCallResultBase {
successes:DeleteRelationshipTypeSuccess[];
failures:DeleteRelationshipTypeFailure[];
}
export interface RemoteCallGetRelationshipTypeParams {
qualifiedRelationshipTypeName:string;
format:string;
}
export interface RemoteCallGetRelationshipTypeResult extends RemoteCallResultBase {
iconUrl:string;
relationshipType:RelationshipType;
}
export interface RemoteCallCreateOrUpdateRelationshipTypeParams {
relationshipType:string;
iconReference:string;
}
export interface RemoteCallCreateOrUpdateRelationshipTypeResult extends RemoteCallResultBase {
created:bool;
updated:bool;
}
>>>>>>>
export interface RemoteCallGetSchemaTreeParams {
types:string[];
}
export interface RemoteCallGetSchemaTreeResult extends RemoteCallResultBase {
schemas:SchemaTreeNode[];
total:number;
}
export interface RemoteCallMixinDeleteParams {
qualifiedMixinNames:string[];
}
export interface RemoteCallMixinDeleteResult extends RemoteCallResultBase {
successes: {
qualifiedMixinName:string;
}[];
failures: {
qualifiedMixinName:string;
reason:string;
}[];
}
export interface RemoteCallMixinCreateOrUpdateParams {
mixin:string;
iconReference:string;
}
export interface RemoteCallMixinCreateOrUpdateResult extends RemoteCallResultBase {
created:bool;
updated:bool;
}
export interface RemoteCallGetContentTreeParams {
contentIds?:string[];
}
export interface RemoteCallGetContentTreeResult extends RemoteCallResultBase {
total:number;
contents:ContentTreeNode[];
}
export interface RemoteCallDeleteRelationshipTypeParams {
qualifiedRelationshipTypeNames:string[];
}
export interface DeleteRelationshipTypeSuccess {
qualifiedRelationshipTypeName:string;
}
export interface DeleteRelationshipTypeFailure {
qualifiedRelationshipTypeName:string;
reason:string;
}
export interface RemoteCallDeleteRelationshipTypeResult extends RemoteCallResultBase {
successes:DeleteRelationshipTypeSuccess[];
failures:DeleteRelationshipTypeFailure[];
}
export interface RemoteCallGetRelationshipTypeParams {
qualifiedRelationshipTypeName:string;
format:string;
}
export interface RemoteCallGetRelationshipTypeResult extends RemoteCallResultBase {
iconUrl:string;
relationshipType:RelationshipType;
}
export interface RemoteCallCreateOrUpdateRelationshipTypeParams {
relationshipType:string;
iconReference:string;
}
export interface RemoteCallCreateOrUpdateRelationshipTypeResult extends RemoteCallResultBase {
created:bool;
updated:bool;
}
<<<<<<<
schema_tree (params:RemoteCallGetSchemaTreeParams, callback:(result:RemoteCallGetSchemaTreeResult)=>void):void;
schema_list (params, callback):void;
system_getSystemInfo (params, callback):void;
mixin_get (params, callback):void;
mixin_createOrUpdate (params, callback):void;
mixin_delete (params, callback):void;
relationshipType_get (params, callback):void;
relationshipType_createOrUpdate (params, callback):void;
relationshipType_delete (params, callback):void;
=======
schema_tree (params, callback):void;
schema_list (params:RemoteCallSchemaListParams, callback:(result:RemoteCallSchemaListResult)=>void):void;
system_getSystemInfo (params:RemoteCallSystemGetSystemInfoParams, callback:(result:RemoteCallSystemGetSystemInfoResult)=>void):void;
mixin_get (params:RemoteCallMixinGetParams, callback:(result:RemoteCallMixinGetResult)=>void):void;
mixin_createOrUpdate (params:RemoteCallMixinCreateOrUpdateParams, callback:(result:RemoteCallMixinCreateOrUpdateResult)=>void):void;
mixin_delete (params:RemoteCallMixinDeleteParams, callback:(result:RemoteCallMixinDeleteResult)=>void):void;
relationshipType_delete (params:RemoteCallDeleteRelationshipTypeParams,
callback:(result:RemoteCallDeleteRelationshipTypeResult)=>void):void;
relationshipType_get (params:RemoteCallGetRelationshipTypeParams, callback:(result:RemoteCallGetRelationshipTypeResult)=>void):void;
relationshipType_createOrUpdate (params:RemoteCallCreateOrUpdateRelationshipTypeParams,
callback:(result:RemoteCallCreateOrUpdateRelationshipTypeResult)=>void):void;
>>>>>>>
schema_tree (params:RemoteCallGetSchemaTreeParams, callback:(result:RemoteCallGetSchemaTreeResult)=>void):void;
schema_list (params:RemoteCallSchemaListParams, callback:(result:RemoteCallSchemaListResult)=>void):void;
system_getSystemInfo (params:RemoteCallSystemGetSystemInfoParams, callback:(result:RemoteCallSystemGetSystemInfoResult)=>void):void;
mixin_get (params:RemoteCallMixinGetParams, callback:(result:RemoteCallMixinGetResult)=>void):void;
mixin_createOrUpdate (params:RemoteCallMixinCreateOrUpdateParams, callback:(result:RemoteCallMixinCreateOrUpdateResult)=>void):void;
mixin_delete (params:RemoteCallMixinDeleteParams, callback:(result:RemoteCallMixinDeleteResult)=>void):void;
relationshipType_delete (params:RemoteCallDeleteRelationshipTypeParams,
callback:(result:RemoteCallDeleteRelationshipTypeResult)=>void):void;
relationshipType_get (params:RemoteCallGetRelationshipTypeParams, callback:(result:RemoteCallGetRelationshipTypeResult)=>void):void;
relationshipType_createOrUpdate (params:RemoteCallCreateOrUpdateRelationshipTypeParams,
callback:(result:RemoteCallCreateOrUpdateRelationshipTypeResult)=>void):void; |
<<<<<<<
private makeDisplayName(item: ViewItem<ContentSummaryAndCompareStatus>): string {
return StringHelper.isEmpty(item.getDisplayName()) ? StringHelper.escapeHtml("<Unnamed " +
this.convertName(item.getModel().getContentSummary().getType().getLocalName() +
"") + ">") : item.getDisplayName();
}
private convertName(name: string): string {
return StringHelper.capitalize(name.replace(/-/g, " ").trim());
=======
private makeDisplayName(item: ViewItem<ContentSummary>): string {
let localName = item.getModel().getType().getLocalName() || "";
return StringHelper.isEmpty(item.getDisplayName())
? api.content.ContentUnnamed.prettifyUnnamed(localName)
: item.getDisplayName();
>>>>>>>
private makeDisplayName(item: ViewItem<ContentSummaryAndCompareStatus>): string {
let localName = item.getModel().getType().getLocalName() || "";
return StringHelper.isEmpty(item.getDisplayName())
? api.content.ContentUnnamed.prettifyUnnamed(localName)
: item.getDisplayName(); |
<<<<<<<
drawTicks: true,
=======
visible: false,
>>>>>>>
drawTicks: true,
visible: false, |
<<<<<<<
this.reset();
this.notifySucceed(issue);
=======
>>>>>>>
this.reset(); |
<<<<<<<
=======
// page shader catches mouse events
// so bind listener to it to highlight underlying views
>>>>>>>
<<<<<<<
this.highlightSelected();
//this.shade();
=======
this.shade();
>>>>>>>
//this.shade(); |
<<<<<<<
///<reference path='FormOccurrenceDraggableLabel.ts' />
=======
///<reference path='HelpTextContainer.ts' />
///<reference path='FormItemSetLabel.ts' />
>>>>>>>
///<reference path='HelpTextContainer.ts' />
///<reference path='FormOccurrenceDraggableLabel.ts' /> |