conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
export const EMPTY_OBJECT = {}
Object.freeze(EMPTY_OBJECT)
declare var window: any
=======
declare var window, global, Symbol
>>>>>>>
export const EMPTY_OBJECT = {}
Object.freeze(EMPTY_OBJECT)
declare var window: any
<<<<<<<
import { isObservableMap, ObservableMap, IKeyValueMap } from "../types/observablemap"
=======
import { isObservableMap, ObservableMap, IKeyValueMap } from "../types/observablemap"
import { observable } from "../api/observable"
import { Iterator } from "./iterable"
>>>>>>>
import { isObservableMap, ObservableMap, IKeyValueMap } from "../types/observablemap"
import { Iterator } from "./iterable" |
<<<<<<<
import { fail, isPlainObject, isES6Map, deepEqual } from "../utils/utils"
=======
import { fail, isPlainObject, invariant, isES6Map } from "../utils/utils"
>>>>>>>
import { fail, isPlainObject, isES6Map } from "../utils/utils" |
<<<<<<<
/**
* Warn if computed values are accessed outside a reactive context
*/
warnOnUnsafeComputationReads = false
=======
/**
* Don't catch and rethrow exceptions. This is useful for inspecting the state of
* the stack when an exception occurs while debugging.
*/
disableErrorBoundaries = false
>>>>>>>
/**
* Warn if computed values are accessed outside a reactive context
*/
warnOnUnsafeComputationReads = false
/*
* Don't catch and rethrow exceptions. This is useful for inspecting the state of
* the stack when an exception occurs while debugging.
*/
disableErrorBoundaries = false
<<<<<<<
globalState.allowStateChanges = !globalState.enforceActions
=======
globalState.allowStateChanges = !globalState.strictMode
}
/**
* Don't catch and rethrow exceptions. This is useful for inspecting the state of
* the stack when an exception occurs while debugging.
*/
export function disableErrorBoundaries() {
console.warn("WARNING: Debug feature only. MobX will NOT recover from errors if this is on.")
globalState.disableErrorBoundaries = true
}
/**
* Opposite of disableErrorBoundaries
*/
export function enableErrorBoundaries() {
globalState.disableErrorBoundaries = false
>>>>>>>
globalState.allowStateChanges = !globalState.enforceActions
}
/**
* Don't catch and rethrow exceptions. This is useful for inspecting the state of
* the stack when an exception occurs while debugging.
*/
export function disableErrorBoundaries() {
console.warn("WARNING: Debug feature only. MobX will NOT recover from errors if this is on.")
globalState.disableErrorBoundaries = true
}
/**
* Opposite of disableErrorBoundaries
*/
export function enableErrorBoundaries() {
globalState.disableErrorBoundaries = false |
<<<<<<<
import Interactive from '../../elements/interactive.js';
import { getScriptName } from '../../util/file.js';
import DependencyGraph from "../../model/dependency-graph.js"
=======
import {Interactive, getScriptName} from '../../index.js';
>>>>>>>
import {Interactive, getScriptName} from '../../index.js';
import DependencyGraph from "../../model/dependency-graph.js" |
<<<<<<<
isComputing: boolean = false; // to check for cycles
=======
setter: (value: T) => void;
>>>>>>>
isComputing: boolean = false; // to check for cycles
setter: (value: T) => void; |
<<<<<<<
export class Atom implements IAtom {
isPendingUnobservation: boolean; // for effective unobserving
isObserved = false;
observers = new DerivationsSets();
=======
export class BaseAtom implements IAtom {
isDirty = false;
staleObservers = [];
observers = new SimpleSet<IDerivation>();
>>>>>>>
export class BaseAtom implements IAtom {
isPendingUnobservation: boolean; // for effective unobserving
isObserved = false;
observers = new DerivationsSets();
<<<<<<<
import {IObservable, propagateChanged, reportObserved, DerivationsSets} from "./observable";
import {transactionStart, transactionEnd} from "../core/transaction";
import {noop, getNextId} from "../utils/utils";
=======
export class Atom extends BaseAtom implements IAtom {
public isBeingTracked = false;
/**
* Create a new atom. For debugging purposes it is recommended to give it a name.
* The onBecomeObserved and onBecomeUnobserved callbacks can be used for resource management.
*/
constructor(public name = "Atom@" + getNextId(), public onBecomeObservedHandler: () => void = noop, public onBecomeUnobservedHandler: () => void = noop) {
super(name);
}
public reportObserved(): boolean {
super.reportObserved();
const tracking = globalState.isTracking;
if (tracking && !this.isBeingTracked) {
this.isBeingTracked = true;
this.onBecomeObservedHandler();
}
return tracking;
}
public onBecomeUnobserved() {
this.isBeingTracked = false;
this.onBecomeUnobservedHandler();
}
}
import {globalState} from "./globalstate";
import {IObservable, propagateReadiness, propagateStaleness, reportObserved} from "./observable";
import {IDerivation} from "./derivation";
import {runReactions} from "./reaction";
import {invariant, noop, getNextId} from "../utils/utils";
import {SimpleSet} from "../utils/set";
>>>>>>>
export class Atom extends BaseAtom implements IAtom {
public isBeingTracked = false;
/**
* Create a new atom. For debugging purposes it is recommended to give it a name.
* The onBecomeObserved and onBecomeUnobserved callbacks can be used for resource management.
*/
constructor(public name = "Atom@" + getNextId(), public onBecomeObservedHandler: () => void = noop, public onBecomeUnobservedHandler: () => void = noop) {
super(name);
}
public reportObserved(): boolean {
super.reportObserved();
const tracking = globalState.isTracking;
if (tracking && !this.isBeingTracked) {
this.isBeingTracked = true;
this.onBecomeObservedHandler();
}
return tracking;
}
public onBecomeUnobserved() {
this.isBeingTracked = false;
this.onBecomeUnobservedHandler();
}
}
import {globalState} from "./globalstate";
import {IObservable, propagateChanged, reportObserved, DerivationsSets} from "./observable";
import {transactionStart, transactionEnd} from "../core/transaction";
import {noop, getNextId} from "../utils/utils"; |
<<<<<<<
})
test("505, don't throw when accessing subclass fields in super constructor (typescript)", t => {
const values: any = { }
class A {
@observable a = 1
constructor() {
values.b = (this as any)['b']
values.a = this.a
}
}
class B extends A {
@observable b = 2
}
new B()
t.deepEqual(values, { a: 1, b: undefined}) // undefined, as A constructor runs before B constructor
t.end()
})
test('computed getter / setter for plan objects should succeed (typescript)', function(t) {
const b = observable({
a: 3,
get propX() { return this.a * 2 },
set propX(v) { this.a = v }
})
const values: number[] = []
mobx.autorun(() => values.push(b.propX))
t.equal(b.propX, 6);
b.propX = 4;
t.equal(b.propX, 8);
t.deepEqual(values, [6, 8])
t.end();
});
=======
})
test("484 - observable objects are IObservableObject", t => {
const needs_observable_object = (o: IObservableObject): any => null;
const o = observable({stuff: "things"});
needs_observable_object(o);
t.pass();
t.end();
});
test("484 - observable objects are still type T", t => {
const o = observable({stuff: "things"});
o.stuff = "new things";
t.pass();
t.end();
});
test("484 - isObservableObject type guard includes type T", t => {
const o = observable({stuff: "things"});
if(isObservableObject(o)) {
o.stuff = "new things";
t.pass();
} else {
t.fail("object should have been observable");
}
t.end();
});
test("484 - isObservableObject type guard includes type IObservableObject", t => {
const requires_observable_object = (o: IObservableObject): void => null;
const o = observable({stuff: "things"});
if(isObservableObject(o)) {
requires_observable_object(o);
t.pass();
} else {
t.fail("object should have been IObservableObject");
}
t.end();
});
>>>>>>>
})
test("505, don't throw when accessing subclass fields in super constructor (typescript)", t => {
const values: any = { }
class A {
@observable a = 1
constructor() {
values.b = (this as any)['b']
values.a = this.a
}
}
class B extends A {
@observable b = 2
}
new B()
t.deepEqual(values, { a: 1, b: undefined}) // undefined, as A constructor runs before B constructor
t.end()
})
test('computed getter / setter for plan objects should succeed (typescript)', function(t) {
const b = observable({
a: 3,
get propX() { return this.a * 2 },
set propX(v) { this.a = v }
})
const values: number[] = []
mobx.autorun(() => values.push(b.propX))
t.equal(b.propX, 6);
b.propX = 4;
t.equal(b.propX, 8);
t.deepEqual(values, [6, 8])
t.end()
})
test("484 - observable objects are IObservableObject", t => {
const needs_observable_object = (o: IObservableObject): any => null;
const o = observable({stuff: "things"});
needs_observable_object(o);
t.pass();
t.end();
});
test("484 - observable objects are still type T", t => {
const o = observable({stuff: "things"});
o.stuff = "new things";
t.pass();
t.end();
});
test("484 - isObservableObject type guard includes type T", t => {
const o = observable({stuff: "things"});
if(isObservableObject(o)) {
o.stuff = "new things";
t.pass();
} else {
t.fail("object should have been observable");
}
t.end();
});
test("484 - isObservableObject type guard includes type IObservableObject", t => {
const requires_observable_object = (o: IObservableObject): void => null;
const o = observable({stuff: "things"});
if(isObservableObject(o)) {
requires_observable_object(o);
t.pass();
} else {
t.fail("object should have been IObservableObject");
}
t.end();
}); |
<<<<<<<
// TODO: kill these shallow and other deprecated stuff
shallowBox<T>(value?: T, name?: string): IObservableValue<T> {
=======
shallowBox<T = any>(value?: T, name?: string): IObservableValue<T> {
>>>>>>>
// TODO: kill these shallow and other deprecated stuff
shallowBox<T = any>(value?: T, name?: string): IObservableValue<T> {
<<<<<<<
array<T>(initialValues?: T[], options?: CreateObservableOptions): IObservableArray<T> {
// TODO: invariant, not already observable (also for the other apis)
=======
array<T = any>(initialValues?: T[], options?: CreateObservableOptions): IObservableArray<T> {
>>>>>>>
array<T = any>(initialValues?: T[], options?: CreateObservableOptions): IObservableArray<T> {
// TODO: invariant, not already observable (also for the other apis)
<<<<<<<
// TODO: record?
// TODO: separate between object and record
// TODO: record should be frozen
// only record supports computed props
object<T>(
=======
object<T = any>(
>>>>>>>
// TODO: record?
// TODO: separate between object and record
// TODO: record should be frozen
// only record supports computed props
object<T = any>( |
<<<<<<<
tokensMetadata(symbols: string[]): TokenMetadata[] | Promise<TokenMetadata[]>;
tokenTransfersByContractAddress(contractAddress: string, limit?: number, page?: number): TransferPage | Promise<TransferPage>;
tokenTransfersByContractAddressForHolder(contractAddress: string, holderAddress: string, filter?: FilterEnum, limit?: number, page?: number): TransferPage | Promise<TransferPage>;
internalTransactionsByAddress(address: string, offset?: number, limit?: number): TransferPage | Promise<TransferPage>;
=======
tokensMetadata(symbols?: string[]): TokenMetadata[] | Promise<TokenMetadata[]>;
tokenTransfersByContractAddress(contractAddress: string, limit?: number, page?: number): TransfersPage | Promise<TransfersPage>;
tokenTransfersByContractAddressForHolder(contractAddress: string, holderAddress: string, filter?: FilterEnum, limit?: number, page?: number): TransfersPage | Promise<TransfersPage>;
tokenTransfersByContractAddressesForHolder(contractAddresses: string[], holderAddress: string, filter?: FilterEnum, limit?: number, page?: number, timestampFrom?: number, timestampTo?: number): TransfersPage | Promise<TransfersPage>;
internalTransactionsByAddress(address: string, limit?: number, page?: number): TransfersPage | Promise<TransfersPage>;
>>>>>>>
tokensMetadata(symbols?: string[]): TokenMetadata[] | Promise<TokenMetadata[]>;
tokenTransfersByContractAddress(contractAddress: string, limit?: number, page?: number): TransferPage | Promise<TransferPage>;
tokenTransfersByContractAddressForHolder(contractAddress: string, holderAddress: string, filter?: FilterEnum, limit?: number, page?: number): TransferPage | Promise<TransferPage>;
internalTransactionsByAddress(address: string, offset?: number, limit?: number): TransferPage | Promise<TransferPage>;
tokenTransfersByContractAddressesForHolder(contractAddresses: string[], holderAddress: string, filter?: FilterEnum, limit?: number, page?: number, timestampFrom?: number, timestampTo?: number): TransferPage | Promise<TransferPage>; |
<<<<<<<
import PageDetailsToken from '@app/modules/tokens/pages/PageDetailsToken.vue'
=======
import PageKnowledgeBase from '@app/modules/other/pages/PageKnowledgeBase.vue'
import PagePrivacyPolicy from '@app/modules/other/pages/PagePrivacyPolicy.vue'
>>>>>>>
import PageDetailsToken from '@app/modules/tokens/pages/PageDetailsToken.vue'
import PageKnowledgeBase from '@app/modules/other/pages/PageKnowledgeBase.vue'
import PagePrivacyPolicy from '@app/modules/other/pages/PagePrivacyPolicy.vue' |
<<<<<<<
import { BlocksServiceImpl, MockBlockRepository } from '@app/server/modules/blocks'
import { ChartsServiceImpl, MockChartsRepository } from '@app/server/modules/charts'
import { MockExchangeServiceImpl } from '@app/server/modules/exchanges'
import { MockTxsRepository, TxsServiceImpl } from '@app/server/modules/txs'
=======
import { BlocksServiceImpl, RethinkBlockRepository } from '@app/server/modules/blocks'
import { ChartsServiceImpl, RethinkChartsRepository } from '@app/server/modules/charts'
import { CoinMarketCapRepository, ExchangeServiceImpl } from '@app/server/modules/exchanges'
import { RethinkTxsRepository, TxsServiceImpl } from '@app/server/modules/txs'
>>>>>>>
import { BlocksServiceImpl, MockBlockRepository } from '@app/server/modules/blocks'
import { ChartsServiceImpl, MockChartsRepository } from '@app/server/modules/charts'
import { CoinMarketCapRepository, ExchangeServiceImpl } from '@app/server/modules/exchanges'
import { MockTxsRepository, TxsServiceImpl } from '@app/server/modules/txs'
<<<<<<<
=======
import * as Redis from 'ioredis'
import * as r from 'rethinkdb'
>>>>>>>
import * as Redis from 'ioredis' |
<<<<<<<
let projectRoot: string, sumanConfig, main: string,
usingRunner: boolean, testDebugLogPath: string, sumanPaths: Array<string>,
sumanObj: Object, integrantPreFn: Function;
=======
let projectRoot: string, sumanConfig, main: string,
usingRunner: boolean, testDebugLogPath: string, sumanPaths: Array<string>,
sumanObj: Object, integrantPreFn: Function;
>>>>>>>
let projectRoot: string, sumanConfig, main: string,
usingRunner: boolean, testDebugLogPath: string, sumanPaths: Array<string>,
sumanObj: Object, integrantPreFn: Function;
<<<<<<<
const initMap = new Map() as Map<Object, Object>;
=======
>>>>>>>
const initMap = new Map() as Map<Object, Object>; |
<<<<<<<
const API_VERSION = 28;
=======
const API_VERSION = 22;
>>>>>>>
const API_VERSION = 28;
<<<<<<<
=======
if (msg.name != "setPluginMenuData") console.log("onWebMessage, msg: ", msg.name, msg.args);
>>>>>>>
<<<<<<<
postMessage: function(name, args, transferList): void {
console.log("postMessage, name, args, transferList: ", name, args, transferList);
=======
postMessage: function(name, args, transferList) {
// console.log("postMessage, name, args, transferList: ", name, args, transferList);
>>>>>>>
postMessage: function(name, args, transferList): void {
console.log("postMessage, name, args, transferList: ", name, args, transferList);
<<<<<<<
return (): void => {
=======
return () => {
registeredCallbacks.delete(id); // TODO: is it okay to delete this? will it ever be needed after cancelled?
>>>>>>>
return (): void => {
registeredCallbacks.delete(id); // TODO: is it okay to delete this? will it ever be needed after cancelled?
<<<<<<<
promiseMessage: function(name, args, transferList): Promise<any> {
=======
promiseMessage: function(name, args, transferList) {
>>>>>>>
promiseMessage: function(name, args, transferList) {
<<<<<<<
setMessageHandler: function(handler): void {
=======
setMessageHandler: function(handler) {
>>>>>>>
setMessageHandler: function(handler): void {
<<<<<<<
=======
console.log("webBinding channel.port1.onmessage, event.data: ", event.data);
>>>>>>>
<<<<<<<
sendMsgToMain("openFile", "/file/" + args.fileKey, args.title, undefined, args.target);
},
openPrototype(args: any) {
sendMsgToMain("openFile", "/proto/" + args.fileKey, args.title, "?node-id=" + args.pageId, args.target);
=======
sendMsgToMain("openTab", "/file/" + args.fileKey, args.title, undefined, args.target);
>>>>>>>
sendMsgToMain("openFile", "/file/" + args.fileKey, args.title, undefined, args.target);
},
openPrototype(args: any) {
sendMsgToMain("openFile", "/proto/" + args.fileKey, args.title, "?node-id=" + args.pageId, args.target);
<<<<<<<
setFeatureFlags(args: any) {
sendMsgToMain("setFeatureFlags", args);
},
startAppAuth(args: any) {
sendMsgToMain("startAppAuth", args);
},
finishAppAuth(args: any) {
sendMsgToMain("finishAppAuth", args);
},
createMultipleNewLocalFileExtensions(args: any) {
console.log("log", { name: "createMultipleNewLocalFileExtensions", args });
return async () => {
const result = await postPromiseMessageToMainProcess(
"createMultipleNewLocalFileExtensions",
args.options,
args.depth,
);
console.log("await createMultipleNewLocalFileExtensions, result: ", result);
return { data: result };
};
=======
async createMultipleNewLocalFileExtensions(args: any) {
const result = await postPromiseMessageToMainProcess(
"createMultipleNewLocalFileExtensions",
args.options,
args.depth,
);
return { data: result };
>>>>>>>
setFeatureFlags(args: any) {
sendMsgToMain("setFeatureFlags", args);
},
startAppAuth(args: any) {
sendMsgToMain("startAppAuth", args);
},
finishAppAuth(args: any) {
sendMsgToMain("finishAppAuth", args);
},
async createMultipleNewLocalFileExtensions(args: any) {
const result = await postPromiseMessageToMainProcess(
"createMultipleNewLocalFileExtensions",
args.options,
args.depth,
);
return { data: result }; |
<<<<<<<
=======
export { ElMessage } from './message'
export { ElAvatar } from './avatar'
>>>>>>>
export { ElAvatar } from './avatar'
<<<<<<<
/** Avatar Component */
export class Avatar extends ElAvatar {}
=======
>>>>>>> |
<<<<<<<
// eslint-disable-next-line no-unused-vars
import { Middleware, MiddlewareAPI } from 'redux';
=======
import { compose, Middleware, MiddlewareAPI } from 'redux';
import partial from 'lodash/fp/partial';
import partialRight from 'lodash/fp/partialRight';
>>>>>>>
import { Middleware, MiddlewareAPI } from 'redux';
<<<<<<<
// eslint-disable-next-line no-unused-vars
import { Config } from './types';
=======
import { Config, ReduxWebSocket } from './types';
>>>>>>>
import { Config } from './types'; |
<<<<<<<
import { Apollo } from 'apollo-angular';
=======
>>>>>>> |
<<<<<<<
import { IdeaPageComponent } from './components/idea/idea-page/idea-page.component';
import { IdeaCardComponent } from './components/idea/idea-card/idea-card.component';
import { IdeaModalComponent } from './components/idea/idea-modal/idea-modal.component';
=======
import { ErrorHandlerComponent } from './components/error-handler/error-handler.component';
>>>>>>>
import { IdeaPageComponent } from './components/idea/idea-page/idea-page.component';
import { IdeaCardComponent } from './components/idea/idea-card/idea-card.component';
import { IdeaModalComponent } from './components/idea/idea-modal/idea-modal.component';
import { ErrorHandlerComponent } from './components/error-handler/error-handler.component';
<<<<<<<
AddIdeaComponent,
IdeaPageComponent,
IdeaCardComponent,
IdeaModalComponent
=======
AddIdeaComponent,
ErrorHandlerComponent
>>>>>>>
AddIdeaComponent,
IdeaPageComponent,
IdeaCardComponent,
IdeaModalComponent,
ErrorHandlerComponent |
<<<<<<<
},
{
path: 'login',
component: LoginComponent
=======
},
{
path: 'board/login',
component: BoardLoginComponent
},
{
path: 'board/dashboard',
canActivate: [BoardAuthGuard],
component: BoardDashboardComponent
>>>>>>>
},
{
path: 'login',
component: LoginComponent
},
{
path: 'board/login',
component: BoardLoginComponent
},
{
path: 'board/dashboard',
canActivate: [BoardAuthGuard],
component: BoardDashboardComponent |
<<<<<<<
if (owner &&
this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection &&
this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection(previousTraitCollection)) {
owner.notify({ eventName: iosView.traitCollectionColorAppearanceChangedEvent, object: owner });
=======
if (owner && this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection(previousTraitCollection)) {
owner.notify({ eventName: iosViewHelper.traitCollectionColorAppearanceChangedEvent, object: owner });
>>>>>>>
if (owner &&
this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection &&
this.traitCollection.hasDifferentColorAppearanceComparedToTraitCollection(previousTraitCollection)) {
owner.notify({ eventName: iosViewHelper.traitCollectionColorAppearanceChangedEvent, object: owner }); |
<<<<<<<
// << article-push-to-observablearray
TKUnit.wait(ASYNC);
=======
// ```
// </snippet>
TKUnit.waitUntilReady(() => repeater.isLayoutValid);
>>>>>>>
// << article-push-to-observablearray
TKUnit.wait(ASYNC);
TKUnit.waitUntilReady(() => repeater.isLayoutValid); |
<<<<<<<
import { ref, watch, computed } from 'vue'
=======
import { ref, watch, computed, reactive, Ref } from '@vue/composition-api'
>>>>>>>
import { ref, watch, computed, reactive, Ref } from 'vue'
<<<<<<<
buildState: () => S,
getters: G = {} as G
// methods: Record<string | symbol, StoreMethod>
): CombinedStore<Id, S, G> {
const state = ref<S>(buildState())
=======
buildState = () => ({} as S),
getters: G = {} as G,
actions: A = {} as A,
initialState?: S | undefined
): Store<Id, S, G, A> {
const state: Ref<S> = ref(initialState || buildState())
const _r = getActiveReq()
>>>>>>>
buildState: () => S = () => ({} as S),
getters: G = {} as G,
actions: A = {} as A,
initialState?: S | undefined
): Store<Id, S, G, A> {
const state: Ref<S> = ref(initialState || buildState())
// TODO: remove req part?
const _r = getActiveReq()
<<<<<<<
const method = getters[getterName]
// @ts-ignore
computedGetters[getterName] = computed<ReturnType<typeof method>>(() =>
// @ts-ignore FIXME: why is this even failing on TS
getters[getterName](state.value)
)
=======
computedGetters[getterName] = computed(() => {
setActiveReq(_r)
// eslint-disable-next-line @typescript-eslint/no-use-before-define
return getters[getterName](state.value, computedGetters)
}) as StoreWithGetters<S, G>[typeof getterName]
}
// const reactiveGetters = reactive(computedGetters)
const wrappedActions: StoreWithActions<A> = {} as StoreWithActions<A>
for (const actionName in actions) {
wrappedActions[actionName] = function() {
setActiveReq(_r)
// eslint-disable-next-line
return actions[actionName].apply(store, arguments as unknown as any[])
} as StoreWithActions<A>[typeof actionName]
>>>>>>>
computedGetters[getterName] = computed(() => {
setActiveReq(_r)
// eslint-disable-next-line @typescript-eslint/no-use-before-define
return getters[getterName](state.value as S, computedGetters)
}) as any
}
// const reactiveGetters = reactive(computedGetters)
const wrappedActions: StoreWithActions<A> = {} as StoreWithActions<A>
for (const actionName in actions) {
wrappedActions[actionName] = function() {
setActiveReq(_r)
// eslint-disable-next-line
return actions[actionName].apply(store, arguments as unknown as any[])
} as StoreWithActions<A>[typeof actionName] |
<<<<<<<
=======
private map: Map & IMapboxInstance;
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
>>>>>>>
<<<<<<<
private markerContainer: HTMLElement;
=======
>>>>>>>
private markerContainer: HTMLElement;
<<<<<<<
// init
public addMarkerContainer(): void {
const container = this.map.getCanvasContainer();
this.markerContainer = DOM.create('div', 'l7_marker', container);
}
public getMarkerContainer(): HTMLElement {
return this.markerContainer;
}
// map event
public on(type: string, handle: (...args: any[]) => void): void {
this.map.on(EventMap[type] || type, handle);
}
public off(type: string, handle: (...args: any[]) => void): void {
this.map.off(EventMap[type] || type, handle);
}
public getContainer(): HTMLElement | null {
return this.map.getContainer();
}
public getSize(): [number, number] {
const size = this.map.transform;
return [size.width, size.height];
}
// get mapStatus method
=======
public getType() {
return MapType.mapbox;
}
>>>>>>>
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
// init
public addMarkerContainer(): void {
const container = this.map.getCanvasContainer();
this.markerContainer = DOM.create('div', 'l7_marker', container);
}
public getMarkerContainer(): HTMLElement {
return this.markerContainer;
}
// map event
public on(type: string, handle: (...args: any[]) => void): void {
this.map.on(EventMap[type] || type, handle);
}
public off(type: string, handle: (...args: any[]) => void): void {
this.map.off(EventMap[type] || type, handle);
}
public getContainer(): HTMLElement | null {
return this.map.getContainer();
}
public getSize(): [number, number] {
const size = this.map.transform;
return [size.width, size.height];
}
// get mapStatus method
public getType() {
return MapType.mapbox;
}
<<<<<<<
const { id, attributionControl = false, ...rest } = mapConfig;
=======
const { id, ...rest } = mapConfig;
this.$mapContainer = document.getElementById(id);
this.$mapContainer!.classList.add(`${counter++}`);
>>>>>>>
const { id, attributionControl = false, ...rest } = mapConfig;
this.$mapContainer = document.getElementById(id);
this.$mapContainer!.classList.add(`${counter++}`);
<<<<<<<
$link.rel = 'stylesheet';
document.head.appendChild($link);
this.removeLogoControl();
=======
this.$link.rel = 'stylesheet';
document.head.appendChild(this.$link);
}
public destroy() {
document.head.removeChild(this.$link);
this.$mapContainer = null;
this.map.remove();
}
public getMapContainer() {
return this.$mapContainer;
>>>>>>>
this.removeLogoControl();
this.$link.rel = 'stylesheet';
document.head.appendChild(this.$link);
}
public destroy() {
document.head.removeChild(this.$link);
this.$mapContainer = null;
this.map.remove();
}
public getMapContainer() {
return this.$mapContainer; |
<<<<<<<
IIconService: Symbol.for('IIconService'),
=======
IInteractionService: Symbol.for('IInteractionService'),
>>>>>>>
IIconService: Symbol.for('IIconService'),
IInteractionService: Symbol.for('IInteractionService'), |
<<<<<<<
IconService,
IControl,
IControlService,
=======
>>>>>>>
IControl,
IControlService,
<<<<<<<
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
=======
>>>>>>>
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
<<<<<<<
public map: AMap.Map | Map;
protected readonly iconService: IIconService;
=======
private iconService: IIconService;
>>>>>>>
public map: AMap.Map | Map;
<<<<<<<
private controlService: IControlService;
=======
private mapType: MapType;
>>>>>>>
private controlService: IControlService;
private iconService: IIconService;
// private mapType: MapType;
<<<<<<<
// this.mapService = mapService;
=======
>>>>>>>
<<<<<<<
this.controlService = container.get<IControlService>(TYPES.IControlService);
this.map = this.mapService.map; // 暴露原生map方法
}
public getMapService(): IMapService {
return this.mapService;
=======
mapType = this.mapService.getType();
>>>>>>>
this.controlService = container.get<IControlService>(TYPES.IControlService);
this.map = this.mapService.map; // 暴露原生map方法
}
public getMapService(): IMapService {
return this.mapService;
// mapType = this.mapService.getType(); |
<<<<<<<
=======
private map: Map & IMapboxInstance;
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
>>>>>>>
<<<<<<<
private markerContainer: HTMLElement;
=======
>>>>>>>
private markerContainer: HTMLElement;
<<<<<<<
// init
public addMarkerContainer(): void {
const container = this.map.getCanvasContainer();
this.markerContainer = DOM.create('div', 'l7_marker', container);
}
public getMarkerContainer(): HTMLElement {
return this.markerContainer;
}
// map event
public on(type: string, handle: (...args: any[]) => void): void {
this.map.on(EventMap[type] || type, handle);
}
public off(type: string, handle: (...args: any[]) => void): void {
this.map.off(EventMap[type] || type, handle);
}
public getContainer(): HTMLElement | null {
return this.map.getContainer();
}
public getSize(): [number, number] {
const size = this.map.transform;
return [size.width, size.height];
}
// get mapStatus method
=======
public getType() {
return MapType.mapbox;
}
>>>>>>>
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
// init
public addMarkerContainer(): void {
const container = this.map.getCanvasContainer();
this.markerContainer = DOM.create('div', 'l7_marker', container);
}
public getMarkerContainer(): HTMLElement {
return this.markerContainer;
}
// map event
public on(type: string, handle: (...args: any[]) => void): void {
this.map.on(EventMap[type] || type, handle);
}
public off(type: string, handle: (...args: any[]) => void): void {
this.map.off(EventMap[type] || type, handle);
}
public getContainer(): HTMLElement | null {
return this.map.getContainer();
}
public getSize(): [number, number] {
const size = this.map.transform;
return [size.width, size.height];
}
// get mapStatus method
public getType() {
return MapType.mapbox;
}
<<<<<<<
const { id, attributionControl = false, ...rest } = mapConfig;
=======
const { id, ...rest } = mapConfig;
this.$mapContainer = document.getElementById(id);
this.$mapContainer!.classList.add(`${counter++}`);
>>>>>>>
const { id, attributionControl = false, ...rest } = mapConfig;
this.$mapContainer = document.getElementById(id);
this.$mapContainer!.classList.add(`${counter++}`);
<<<<<<<
$link.rel = 'stylesheet';
document.head.appendChild($link);
this.removeLogoControl();
=======
this.$link.rel = 'stylesheet';
document.head.appendChild(this.$link);
}
public destroy() {
document.head.removeChild(this.$link);
this.$mapContainer = null;
this.map.remove();
}
public getMapContainer() {
return this.$mapContainer;
>>>>>>>
this.removeLogoControl();
this.$link.rel = 'stylesheet';
document.head.appendChild(this.$link);
}
public destroy() {
document.head.removeChild(this.$link);
this.$mapContainer = null;
this.map.remove();
}
public getMapContainer() {
return this.$mapContainer; |
<<<<<<<
import {
IScale,
IScaleOptions,
ISourceCFG,
ScaleAttributeType,
} from '@antv/l7';
=======
import { IActiveOption, IScale, IScaleOptions, ISourceCFG } from '@antv/l7';
import Active from './Active';
>>>>>>>
import { IActiveOption, IScale, IScaleOptions, ISourceCFG } from '@antv/l7';
import Active from './Active';
<<<<<<<
import Scale from './Scale';
=======
import Filter from './Filter';
import Scales from './Scales';
>>>>>>>
import Filter from './Filter';
import Scale from './Scale';
<<<<<<<
value: string | number;
values: string[] | number[] | string;
scale?: string;
=======
value: string | number | CallBack;
values: string[] | number[] | string | CallBack;
>>>>>>>
value: string | number;
values: string[] | number[] | string;
scale?: string; |
<<<<<<<
export * from './services/asset/IFontService';
export * from './services/component/IControlService';
export * from './services/component/IMarkerService';
export * from './services/component/IPopUpService';
=======
export * from './services/log/ILogService';
>>>>>>>
export * from './services/asset/IFontService';
export * from './services/component/IControlService';
export * from './services/component/IMarkerService';
export * from './services/component/IPopUpService';
export * from './services/log/ILogService'; |
<<<<<<<
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
// get map status method
getMinZoom(): number;
getMaxZoom(): number;
=======
// get map params
getType(): MapType;
>>>>>>>
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
// get map status method
getMinZoom(): number;
getMaxZoom(): number;
// get map params
getType(): MapType; |
<<<<<<<
IconService,
IControl,
IControlService,
=======
>>>>>>>
IControl,
IControlService,
<<<<<<<
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
=======
>>>>>>>
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
<<<<<<<
public map: AMap.Map | Map;
protected readonly iconService: IIconService;
=======
private iconService: IIconService;
>>>>>>>
public map: AMap.Map | Map;
<<<<<<<
private controlService: IControlService;
=======
private mapType: MapType;
>>>>>>>
private controlService: IControlService;
private iconService: IIconService;
// private mapType: MapType;
<<<<<<<
// this.mapService = mapService;
=======
>>>>>>>
<<<<<<<
this.controlService = container.get<IControlService>(TYPES.IControlService);
this.map = this.mapService.map; // 暴露原生map方法
}
public getMapService(): IMapService {
return this.mapService;
=======
mapType = this.mapService.getType();
>>>>>>>
this.controlService = container.get<IControlService>(TYPES.IControlService);
this.map = this.mapService.map; // 暴露原生map方法
}
public getMapService(): IMapService {
return this.mapService;
// mapType = this.mapService.getType(); |
<<<<<<<
IconService,
IControl,
IControlService,
=======
>>>>>>>
IControl,
IControlService,
<<<<<<<
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
=======
>>>>>>>
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
<<<<<<<
public map: AMap.Map | Map;
protected readonly iconService: IIconService;
=======
private iconService: IIconService;
>>>>>>>
public map: AMap.Map | Map;
<<<<<<<
private controlService: IControlService;
=======
private mapType: MapType;
>>>>>>>
private controlService: IControlService;
private iconService: IIconService;
// private mapType: MapType;
<<<<<<<
// this.mapService = mapService;
=======
>>>>>>>
<<<<<<<
this.controlService = container.get<IControlService>(TYPES.IControlService);
this.map = this.mapService.map; // 暴露原生map方法
}
public getMapService(): IMapService {
return this.mapService;
=======
mapType = this.mapService.getType();
>>>>>>>
this.controlService = container.get<IControlService>(TYPES.IControlService);
this.map = this.mapService.map; // 暴露原生map方法
mapType = this.mapService.getType();
}
public getMapService(): IMapService {
return this.mapService;
// |
<<<<<<<
IFontService,
=======
IEncodeFeature,
>>>>>>>
IEncodeFeature,
IFontService,
<<<<<<<
ILayerStyleAttribute,
ILayerStyleOptions,
IMapService,
=======
>>>>>>>
IMapService,
<<<<<<<
public styleOption: ILayerStyleOptions = {
opacity: 1.0,
};
// 样式属性
public styleAttributes: {
[key: string]: Required<ILayerStyleAttribute>;
} = {};
=======
@lazyInject(TYPES.IStyleAttributeService)
public styleAttributeService: IStyleAttributeService;
>>>>>>>
@lazyInject(TYPES.IStyleAttributeService)
public styleAttributeService: IStyleAttributeService;
<<<<<<<
@lazyInject(TYPES.IMapService)
private readonly map: IMapService;
constructor(initializationOptions: Partial<ILayerInitializationOptions>) {
this.initializationOptions = initializationOptions;
=======
constructor(
styleOptions: Partial<ILayerInitializationOptions & ChildLayerStyleOptions>,
) {
this.styleOptions = {
...defaultLayerInitializationOptions,
...styleOptions,
};
>>>>>>>
@lazyInject(TYPES.IMapService)
private readonly map: IMapService;
constructor(
styleOptions: Partial<ILayerInitializationOptions & ChildLayerStyleOptions>,
) {
this.styleOptions = {
...defaultLayerInitializationOptions,
...styleOptions,
}; |
<<<<<<<
IFontService,
=======
IEncodeFeature,
>>>>>>>
IEncodeFeature,
IFontService,
<<<<<<<
ILayerStyleAttribute,
ILayerStyleOptions,
IMapService,
=======
>>>>>>>
IMapService,
<<<<<<<
public styleOption: ILayerStyleOptions = {
opacity: 1.0,
};
// 样式属性
public styleAttributes: {
[key: string]: Required<ILayerStyleAttribute>;
} = {};
=======
@lazyInject(TYPES.IStyleAttributeService)
public styleAttributeService: IStyleAttributeService;
>>>>>>>
@lazyInject(TYPES.IStyleAttributeService)
public styleAttributeService: IStyleAttributeService;
<<<<<<<
@lazyInject(TYPES.IMapService)
private readonly map: IMapService;
constructor(initializationOptions: Partial<ILayerInitializationOptions>) {
this.initializationOptions = initializationOptions;
=======
constructor(
styleOptions: Partial<ILayerInitializationOptions & ChildLayerStyleOptions>,
) {
this.styleOptions = {
...defaultLayerInitializationOptions,
...styleOptions,
};
>>>>>>>
@lazyInject(TYPES.IMapService)
private readonly map: IMapService;
constructor(
styleOptions: Partial<ILayerInitializationOptions & ChildLayerStyleOptions>,
) {
this.styleOptions = {
...defaultLayerInitializationOptions,
...styleOptions,
}; |
<<<<<<<
this.controlService.destroy();
this.removeAllListeners();
=======
this.rendererService.destroy();
this.map.destroy();
>>>>>>>
this.controlService.destroy();
this.removeAllListeners();
this.rendererService.destroy();
this.map.destroy(); |
<<<<<<<
IControlService: Symbol.for('IControlService'),
=======
IStyleAttributeService: Symbol.for('IStyleAttributeService'),
>>>>>>>
IControlService: Symbol.for('IControlService'),
IStyleAttributeService: Symbol.for('IStyleAttributeService'), |
<<<<<<<
IconService,
IControl,
IControlService,
=======
>>>>>>>
IControl,
IControlService,
<<<<<<<
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
=======
>>>>>>>
import { inject, injectable } from 'inversify';
import { Map } from 'mapbox-gl';
<<<<<<<
public map: AMap.Map | Map;
protected readonly iconService: IIconService;
=======
private iconService: IIconService;
>>>>>>>
public map: AMap.Map | Map;
<<<<<<<
private controlService: IControlService;
=======
private mapType: MapType;
>>>>>>>
private controlService: IControlService;
private iconService: IIconService;
// private mapType: MapType;
<<<<<<<
// this.mapService = mapService;
=======
>>>>>>>
<<<<<<<
this.controlService = container.get<IControlService>(TYPES.IControlService);
this.map = this.mapService.map; // 暴露原生map方法
}
public getMapService(): IMapService {
return this.mapService;
=======
mapType = this.mapService.getType();
>>>>>>>
this.controlService = container.get<IControlService>(TYPES.IControlService);
this.map = this.mapService.map; // 暴露原生map方法
}
public getMapService(): IMapService {
return this.mapService;
// mapType = this.mapService.getType(); |
<<<<<<<
this.controlService.destroy();
this.removeAllListeners();
=======
this.rendererService.destroy();
this.map.destroy();
>>>>>>>
this.controlService.destroy();
this.removeAllListeners();
this.rendererService.destroy();
this.map.destroy(); |
<<<<<<<
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
// get map status method
getMinZoom(): number;
getMaxZoom(): number;
=======
// get map params
getType(): MapType;
>>>>>>>
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
// get map status method
getMinZoom(): number;
getMaxZoom(): number;
// get map params
getType(): MapType; |
<<<<<<<
=======
private map: Map & IMapboxInstance;
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
>>>>>>>
<<<<<<<
private markerContainer: HTMLElement;
=======
>>>>>>>
private markerContainer: HTMLElement;
<<<<<<<
// init
public addMarkerContainer(): void {
const container = this.map.getCanvasContainer();
this.markerContainer = DOM.create('div', 'l7_marker', container);
}
public getMarkerContainer(): HTMLElement {
return this.markerContainer;
}
// map event
public on(type: string, handle: (...args: any[]) => void): void {
this.map.on(EventMap[type] || type, handle);
}
public off(type: string, handle: (...args: any[]) => void): void {
this.map.off(EventMap[type] || type, handle);
}
public getContainer(): HTMLElement | null {
return this.map.getContainer();
}
public getSize(): [number, number] {
const size = this.map.transform;
return [size.width, size.height];
}
// get mapStatus method
=======
public getType() {
return MapType.mapbox;
}
>>>>>>>
private $mapContainer: HTMLElement | null;
private $link: HTMLLinkElement;
// init
public addMarkerContainer(): void {
const container = this.map.getCanvasContainer();
this.markerContainer = DOM.create('div', 'l7_marker', container);
}
public getMarkerContainer(): HTMLElement {
return this.markerContainer;
}
// map event
public on(type: string, handle: (...args: any[]) => void): void {
this.map.on(EventMap[type] || type, handle);
}
public off(type: string, handle: (...args: any[]) => void): void {
this.map.off(EventMap[type] || type, handle);
}
public getContainer(): HTMLElement | null {
return this.map.getContainer();
}
public getSize(): [number, number] {
const size = this.map.transform;
return [size.width, size.height];
}
// get mapStatus method
public getType() {
return MapType.mapbox;
}
<<<<<<<
const { id, attributionControl = false, ...rest } = mapConfig;
=======
const { id, ...rest } = mapConfig;
this.$mapContainer = document.getElementById(id);
this.$mapContainer!.classList.add(`${counter++}`);
>>>>>>>
const { id, attributionControl = false, ...rest } = mapConfig;
this.$mapContainer = document.getElementById(id);
this.$mapContainer!.classList.add(`${counter++}`);
<<<<<<<
$link.rel = 'stylesheet';
document.head.appendChild($link);
this.removeLogoControl();
=======
this.$link.rel = 'stylesheet';
document.head.appendChild(this.$link);
}
public destroy() {
document.head.removeChild(this.$link);
this.$mapContainer = null;
this.map.remove();
}
public getMapContainer() {
return this.$mapContainer;
>>>>>>>
this.removeLogoControl();
this.$link.rel = 'stylesheet';
document.head.appendChild(this.$link);
}
public destroy() {
document.head.removeChild(this.$link);
this.$mapContainer = null;
this.map.remove();
}
public getMapContainer() {
return this.$mapContainer; |
<<<<<<<
this.controlService.destroy();
this.removeAllListeners();
=======
this.rendererService.destroy();
this.map.destroy();
>>>>>>>
this.controlService.destroy();
this.removeAllListeners();
this.rendererService.destroy();
this.map.destroy(); |
<<<<<<<
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
// get map status method
getMinZoom(): number;
getMaxZoom(): number;
=======
// get map params
getType(): MapType;
>>>>>>>
// init map
addMarkerContainer(): void;
getMarkerContainer(): HTMLElement;
// MapEvent // 定义事件类型
on(type: string, hander: (...args: any[]) => void): void;
off(type: string, hander: (...args: any[]) => void): void;
// get dom
getContainer(): HTMLElement | null;
getSize(): [number, number];
// get map status method
getMinZoom(): number;
getMaxZoom(): number;
// get map params
getType(): MapType; |
<<<<<<<
this.controlService.destroy();
this.removeAllListeners();
=======
this.rendererService.destroy();
this.map.destroy();
>>>>>>>
this.controlService.destroy();
this.removeAllListeners();
this.rendererService.destroy();
this.map.destroy(); |
<<<<<<<
const docStyle = window.document.documentElement.style;
type ELType = HTMLElement | SVGElement;
export function createRendererContainer(
domId: string | HTMLDivElement,
): HTMLDivElement | null {
let $wrapper = domId as HTMLDivElement;
if (typeof domId === 'string') {
$wrapper = document.getElementById(domId) as HTMLDivElement;
}
=======
let containerCounter = 0;
export function createRendererContainer(domId: string): HTMLDivElement | null {
const $wrapper = document.getElementById(domId);
>>>>>>>
const docStyle = window.document.documentElement.style;
type ELType = HTMLElement | SVGElement;
let containerCounter = 0;
export function createRendererContainer(
domId: string | HTMLDivElement,
): HTMLDivElement | null {
let $wrapper = domId as HTMLDivElement;
if (typeof domId === 'string') {
$wrapper = document.getElementById(domId) as HTMLDivElement;
} |
<<<<<<<
IFontService,
=======
IEncodeFeature,
>>>>>>>
IEncodeFeature,
IFontService,
<<<<<<<
ILayerStyleAttribute,
ILayerStyleOptions,
IMapService,
=======
>>>>>>>
IMapService,
<<<<<<<
public styleOption: ILayerStyleOptions = {
opacity: 1.0,
};
// 样式属性
public styleAttributes: {
[key: string]: Required<ILayerStyleAttribute>;
} = {};
=======
@lazyInject(TYPES.IStyleAttributeService)
public styleAttributeService: IStyleAttributeService;
>>>>>>>
@lazyInject(TYPES.IStyleAttributeService)
public styleAttributeService: IStyleAttributeService;
<<<<<<<
@lazyInject(TYPES.IMapService)
private readonly map: IMapService;
constructor(initializationOptions: Partial<ILayerInitializationOptions>) {
this.initializationOptions = initializationOptions;
=======
constructor(
styleOptions: Partial<ILayerInitializationOptions & ChildLayerStyleOptions>,
) {
this.styleOptions = {
...defaultLayerInitializationOptions,
...styleOptions,
};
>>>>>>>
@lazyInject(TYPES.IMapService)
private readonly map: IMapService;
constructor(
styleOptions: Partial<ILayerInitializationOptions & ChildLayerStyleOptions>,
) {
this.styleOptions = {
...defaultLayerInitializationOptions,
...styleOptions,
}; |
<<<<<<<
import { error, info, success, warn } from '@betterer/logger';
import * as Diff from 'diff';
import * as jsonpatch from 'fast-json-patch';
=======
import { error, header, info, success, warn } from '@betterer/logger';
>>>>>>>
import { error, header, info, success, warn } from '@betterer/logger';
import * as Diff from 'diff';
import * as jsonpatch from 'fast-json-patch'; |
<<<<<<<
// Extract GraphQL no-nullable types
type GetRequiredFieldsType = ReadonlyArray<
IntrospectionInputValue | IntrospectionField
>
export const getRequiredFields = (fields: GetRequiredFieldsType) =>
map(
=======
type GetRequiredFieldsType = ReadonlyArray<IntrospectionInputValue | IntrospectionField>;
// Extract GraphQL no-nullable types
export const getRequiredFields = (fields: GetRequiredFieldsType) => map(
>>>>>>>
type GetRequiredFieldsType = ReadonlyArray<
IntrospectionInputValue | IntrospectionField
>
// Extract GraphQL no-nullable types
export const getRequiredFields = (fields: GetRequiredFieldsType) =>
map(
<<<<<<<
export const propertiesIntrospectionFieldReducer: MemoListIterator<
IntrospectionFieldReducerItem,
JSONSchema6Acc,
ReadonlyArray<IntrospectionFieldReducerItem>
> = (acc, curr: IntrospectionFieldReducerItem): JSONSchema6Acc => {
if (isIntrospectionField(curr)) {
const returnType = isNonNullIntrospectionType(curr.type)
? graphqlToJSONType(curr.type.ofType)
: graphqlToJSONType(curr.type)
acc[curr.name] = {
type: 'object',
properties: {
return: returnType,
arguments: {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.args as IntrospectionFieldReducerItem[],
propertiesIntrospectionFieldReducer,
{}
),
required: getRequiredFields(curr.args),
},
},
required: [],
}
} else if (isIntrospectionInputValue(curr)) {
const returnType = isNonNullIntrospectionType(curr.type)
? graphqlToJSONType(curr.type.ofType)
: graphqlToJSONType(curr.type)
acc[curr.name] = returnType
}
acc[curr.name].description = curr.description || undefined
return acc
}
=======
export const propertiesIntrospectionFieldReducer:
MemoListIterator<IntrospectionFieldReducerItem, JSONSchema6Acc, ReadonlyArray<IntrospectionFieldReducerItem>> =
(acc, curr: IntrospectionFieldReducerItem): JSONSchema6Acc => {
if (isIntrospectionField(curr)) {
const returnType = isNonNullIntrospectionType(curr.type) ?
graphqlToJSONType(curr.type.ofType) :
graphqlToJSONType(curr.type);
acc[curr.name] = {
type: 'object',
properties: {
'return': returnType,
'arguments': {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.args as IntrospectionFieldReducerItem[], propertiesIntrospectionFieldReducer, {}
),
required: getRequiredFields(curr.args)
},
},
required: []
};
} else if (isIntrospectionInputValue(curr)) {
const returnType = isNonNullIntrospectionType(curr.type) ?
graphqlToJSONType(curr.type.ofType) :
graphqlToJSONType(curr.type);
acc[curr.name] = returnType;
if (curr.defaultValue) {
acc[curr.name].default = resolveDefaultValue(curr)
}
}
acc[curr.name].description = curr.description || undefined;
return acc;
};
>>>>>>>
export const propertiesIntrospectionFieldReducer: MemoListIterator<
IntrospectionFieldReducerItem,
JSONSchema6Acc,
ReadonlyArray<IntrospectionFieldReducerItem>
> = (acc, curr: IntrospectionFieldReducerItem): JSONSchema6Acc => {
if (isIntrospectionField(curr)) {
const returnType = isNonNullIntrospectionType(curr.type)
? graphqlToJSONType(curr.type.ofType)
: graphqlToJSONType(curr.type)
acc[curr.name] = {
type: 'object',
properties: {
return: returnType,
arguments: {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.args as IntrospectionFieldReducerItem[],
propertiesIntrospectionFieldReducer,
{}
),
required: getRequiredFields(curr.args),
},
},
required: [],
}
} else if (isIntrospectionInputValue(curr)) {
const returnType = isNonNullIntrospectionType(curr.type)
? graphqlToJSONType(curr.type.ofType)
: graphqlToJSONType(curr.type)
acc[curr.name] = returnType
if (curr.defaultValue) {
acc[curr.name].default = resolveDefaultValue(curr)
}
}
acc[curr.name].description = curr.description || undefined
return acc
}
<<<<<<<
export const definitionsIntrospectionFieldReducer: MemoListIterator<
IntrospectionFieldReducerItem,
JSONSchema6Acc,
ReadonlyArray<IntrospectionFieldReducerItem>
> = (acc, curr: IntrospectionFieldReducerItem): JSONSchema6Acc => {
if (isIntrospectionField(curr)) {
const returnType = isNonNullIntrospectionType(curr.type)
? graphqlToJSONType(curr.type.ofType)
: graphqlToJSONType(curr.type)
acc[curr.name] = returnType
} else if (isIntrospectionInputValue(curr)) {
const returnType = isNonNullIntrospectionType(curr.type)
? graphqlToJSONType(curr.type.ofType)
: graphqlToJSONType(curr.type)
acc[curr.name] = returnType
}
acc[curr.name].description = curr.description || undefined
return acc
}
=======
export const definitionsIntrospectionFieldReducer:
MemoListIterator<IntrospectionFieldReducerItem, JSONSchema6Acc, ReadonlyArray<IntrospectionFieldReducerItem>> =
(acc, curr: IntrospectionFieldReducerItem): JSONSchema6Acc => {
if (isIntrospectionField(curr)) {
const returnType = isNonNullIntrospectionType(curr.type) ?
graphqlToJSONType(curr.type.ofType) :
graphqlToJSONType(curr.type);
acc[curr.name] = returnType;
} else if (isIntrospectionInputValue(curr)) {
const returnType = isNonNullIntrospectionType(curr.type) ?
graphqlToJSONType(curr.type.ofType) :
graphqlToJSONType(curr.type);
acc[curr.name] = returnType;
if (curr.defaultValue) {
acc[curr.name].default = resolveDefaultValue(curr)
}
}
acc[curr.name].description = curr.description || undefined;
return acc;
};
>>>>>>>
export const definitionsIntrospectionFieldReducer: MemoListIterator<
IntrospectionFieldReducerItem,
JSONSchema6Acc,
ReadonlyArray<IntrospectionFieldReducerItem>
> = (acc, curr: IntrospectionFieldReducerItem): JSONSchema6Acc => {
if (isIntrospectionField(curr)) {
const returnType = isNonNullIntrospectionType(curr.type)
? graphqlToJSONType(curr.type.ofType)
: graphqlToJSONType(curr.type)
acc[curr.name] = returnType
} else if (isIntrospectionInputValue(curr)) {
const returnType = isNonNullIntrospectionType(curr.type)
? graphqlToJSONType(curr.type.ofType)
: graphqlToJSONType(curr.type)
acc[curr.name] = returnType
if (curr.defaultValue) {
acc[curr.name].default = resolveDefaultValue(curr)
}
}
acc[curr.name].description = curr.description || undefined
return acc
}
<<<<<<<
if (isIntrospectionObjectType(curr)) {
acc[curr.name] = {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.fields as IntrospectionFieldReducerItem[],
fieldReducer,
{}
),
// ignore required for Mutations/Queries
required: type === 'definitions' ? getRequiredFields(curr.fields) : [],
}
} else if (isIntrospectionInputObjectType(curr)) {
acc[curr.name] = {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.inputFields as IntrospectionFieldReducerItem[],
fieldReducer,
{}
),
required: getRequiredFields(curr.inputFields),
}
} else if (isIntrospectionEnumType(curr)) {
acc[curr.name] = {
type: 'string',
anyOf: curr.enumValues.map((item) => {
return {
enum: [item.name],
title: item.description || item.name,
description: item.description || undefined,
=======
if (isIntrospectionObjectType(curr)) {
acc[curr.name] = {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.fields as IntrospectionFieldReducerItem[], fieldReducer, {}
),
// ignore required for Mutations/Queries
required: type === 'definitions' ? getRequiredFields(curr.fields) : []
};
} else if (isIntrospectionInputObjectType(curr)) {
acc[curr.name] = {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.inputFields as IntrospectionFieldReducerItem[], fieldReducer, {}
),
required: getRequiredFields(curr.inputFields)
};
} else if (isIntrospectionEnumType(curr)) {
acc[curr.name] = {
type: 'string',
anyOf: curr.enumValues.map((item) => {
return {
enum: [
item.name,
],
title: item.description || item.name,
description: item.description || undefined
};
}),
};
} else if(isIntrospectionDefaultScalarType(curr)){
acc[curr.name] = {
type: (typesMapping as any)[curr.name],
title: curr.name
}
}
else if (isIntrospectionScalarType(curr)){
acc[(curr as IntrospectionScalarType).name] = {
type: 'object',
title: (curr as IntrospectionScalarType).name
};
>>>>>>>
if (isIntrospectionObjectType(curr)) {
acc[curr.name] = {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.fields as IntrospectionFieldReducerItem[],
fieldReducer,
{}
),
// ignore required for Mutations/Queries
required: type === 'definitions' ? getRequiredFields(curr.fields) : [],
}
} else if (isIntrospectionInputObjectType(curr)) {
acc[curr.name] = {
type: 'object',
properties: reduce<IntrospectionFieldReducerItem, JSONSchema6Acc>(
curr.inputFields as IntrospectionFieldReducerItem[],
fieldReducer,
{}
),
required: getRequiredFields(curr.inputFields),
}
} else if (isIntrospectionEnumType(curr)) {
acc[curr.name] = {
type: 'string',
anyOf: curr.enumValues.map((item) => {
return {
enum: [item.name],
title: item.description || item.name,
description: item.description || undefined, |
<<<<<<<
player.on(player.exports.Event.SourceUnloaded, updateVideoQualities);
=======
player.on(player.exports.PlayerEvent.SourceUnloaded, updateVideoQualities);
// Update qualities when a new source is loaded
player.on(player.exports.PlayerEvent.SourceLoaded, updateVideoQualities);
>>>>>>>
player.on(player.exports.PlayerEvent.SourceUnloaded, updateVideoQualities);
<<<<<<<
player.on(player.exports.Event.VideoQualityChanged, selectCurrentVideoQuality);
uimanager.getConfig().events.onUpdated.subscribe(updateVideoQualities);
=======
player.on(player.exports.PlayerEvent.VideoQualityChanged, selectCurrentVideoQuality);
>>>>>>>
player.on(player.exports.PlayerEvent.VideoQualityChanged, selectCurrentVideoQuality);
uimanager.getConfig().events.onUpdated.subscribe(updateVideoQualities); |
<<<<<<<
import { InternalUIConfig, UIInstanceManager } from '../uimanager';
=======
import {UIInstanceManager} from '../uimanager';
import { PlayerAPI } from 'bitmovin-player';
>>>>>>>
import { UIInstanceManager } from '../uimanager';
import { PlayerAPI } from 'bitmovin-player';
<<<<<<<
player.on(player.exports.Event.Muted, muteStateHandler);
player.on(player.exports.Event.Unmuted, muteStateHandler);
player.on(player.exports.Event.VolumeChanged, volumeLevelHandler);
uimanager.getConfig().events.onUpdated.subscribe(() => {
muteStateHandler();
volumeLevelHandler();
});
=======
player.on(player.exports.PlayerEvent.Muted, muteStateHandler);
player.on(player.exports.PlayerEvent.Unmuted, muteStateHandler);
player.on(player.exports.PlayerEvent.VolumeChanged, volumeLevelHandler);
>>>>>>>
player.on(player.exports.PlayerEvent.Muted, muteStateHandler);
player.on(player.exports.PlayerEvent.Unmuted, muteStateHandler);
player.on(player.exports.PlayerEvent.VolumeChanged, volumeLevelHandler);
uimanager.getConfig().events.onUpdated.subscribe(() => {
muteStateHandler();
volumeLevelHandler();
}); |
<<<<<<<
player.addEventHandler(player.EVENT.ON_PLAY, (e) => {
this.isPlayInitiated = true;
playbackStateHandler(e);
});
player.addEventHandler(player.EVENT.ON_PAUSED, (e) => {
this.isPlayInitiated = false;
playbackStateHandler(e);
});
if (player.EVENT.ON_PLAYING) {
// Since player 7.3
player.addEventHandler(player.EVENT.ON_PLAYING, (e) => {
this.isPlayInitiated = false;
playbackStateHandler(e);
});
=======
player.addEventHandler(player.Event.Play, playbackStateHandler);
player.addEventHandler(player.Event.Paused, playbackStateHandler);
if (player.Event.Playing) {
// Since player 7.3. Not really necessary but just in case we ever miss the Play event.
player.addEventHandler(player.Event.Playing, playbackStateHandler);
>>>>>>>
player.addEventHandler(player.Event.Play, (e) => {
this.isPlayInitiated = true;
playbackStateHandler(e);
});
player.addEventHandler(player.Event.Paused, (e) => {
this.isPlayInitiated = false;
playbackStateHandler(e);
});
if (player.Event.Playing) {
// Since player 7.3
player.addEventHandler(player.Event.Playing, (e) => {
this.isPlayInitiated = false;
playbackStateHandler(e);
}); |
<<<<<<<
player.on(player.exports.Event.SourceUnloaded, updateAudioQualities);
=======
player.on(player.exports.PlayerEvent.SourceUnloaded, updateAudioQualities);
// Update qualities when a new source is loaded
player.on(player.exports.PlayerEvent.SourceLoaded, updateAudioQualities);
>>>>>>>
player.on(player.exports.PlayerEvent.SourceUnloaded, updateAudioQualities);
<<<<<<<
player.on(player.exports.Event.AudioQualityChanged, selectCurrentAudioQuality);
uimanager.getConfig().events.onUpdated.subscribe(updateAudioQualities);
=======
player.on(player.exports.PlayerEvent.AudioQualityChanged, selectCurrentAudioQuality);
>>>>>>>
player.on(player.exports.PlayerEvent.AudioQualityChanged, selectCurrentAudioQuality);
uimanager.getConfig().events.onUpdated.subscribe(updateAudioQualities); |
<<<<<<<
import {SettingsToggleButton} from './components/settingstogglebutton';
import {SettingsPanel} from './components/settingspanel';
import {SubtitleSettingsLabel} from './components/subtitlesettings/subtitlesettingslabel';
import {VideoQualitySelectBox} from './components/videoqualityselectbox';
import {Watermark} from './components/watermark';
import {AudioQualitySelectBox} from './components/audioqualityselectbox';
import {AudioTrackSelectBox} from './components/audiotrackselectbox';
import {SeekBarLabel} from './components/seekbarlabel';
import {VolumeSlider} from './components/volumeslider';
import {SubtitleSelectBox} from './components/subtitleselectbox';
import {SubtitleOverlay} from './components/subtitleoverlay';
import {VolumeControlButton} from './components/volumecontrolbutton';
import {CastToggleButton} from './components/casttogglebutton';
import {CastStatusOverlay} from './components/caststatusoverlay';
import {ErrorMessageMap, ErrorMessageOverlay, ErrorMessageTranslator} from './components/errormessageoverlay';
import {TitleBar} from './components/titlebar';
import {RecommendationOverlay} from './components/recommendationoverlay';
import {AdMessageLabel} from './components/admessagelabel';
import {AdSkipButton} from './components/adskipbutton';
import {AdClickOverlay} from './components/adclickoverlay';
import {PlaybackSpeedSelectBox} from './components/playbackspeedselectbox';
import {BufferingOverlay} from './components/bufferingoverlay';
import {CastUIContainer} from './components/castuicontainer';
import {PlaybackToggleOverlay} from './components/playbacktoggleoverlay';
import {CloseButton} from './components/closebutton';
import {MetadataLabel, MetadataLabelContent} from './components/metadatalabel';
import {Label} from './components/label';
import {AirPlayToggleButton} from './components/airplaytogglebutton';
import {PictureInPictureToggleButton} from './components/pictureinpicturetogglebutton';
import {Spacer} from './components/spacer';
=======
import PlayerAPI = bitmovin.PlayerAPI;
import Event = bitmovin.PlayerAPI.Event;
import PlayerEventCallback = bitmovin.PlayerAPI.PlayerEventCallback;
import AdStartedEvent = bitmovin.PlayerAPI.AdStartedEvent;
import PlayerEvent = bitmovin.PlayerAPI.PlayerEvent;
>>>>>>>
<<<<<<<
import { PlayerUtils } from './playerutils';
import {SettingsPanelPage} from './components/settingspanelpage';
import {SubtitleSettingsPanelPage} from './components/subtitlesettings/subtitlesettingspanelpage';
import {SettingsPanelPageOpenButton} from './components/settingspanelpageopenbutton';
import {SettingsPanelItem} from './components/settingspanelitem';
import { PlayerAPI, Event, Events, PlayerEventCallback } from 'bitmovin-player';
export interface UIRecommendationConfig {
title: string;
url: string;
thumbnail?: string;
duration?: number;
}
/**
* Marks a position on the playback timeline, e.g. a chapter or an ad break.
*/
export interface TimelineMarker {
/**
* The time in the playback timeline (e.g. {@link SeekBar}) that should be marked.
*/
time: number;
/**
* Optional duration that makes the marker mark an interval instead of a single moment in time.
*/
duration?: number;
/**
* Optional title text of the marked position, e.g. a chapter name.
* Will be rendered in the {@link SeekBarLabel} attached to a {@link SeekBar}.
*/
title?: string;
/**
* Optional CSS classes that are applied to the marker on a {@link SeekBar} and can be used to
* differentiate different types of markers by their style (e.g. different color of chapter markers
* and ad break markers).
* The CSS classes are also propagated to a connected {@link SeekBarLabel}.
*
* Multiple classes can be added to allow grouping of markers into types (e.g. chapter markers,
* ad break markers) by a shared class and still identify and style each marker with distinct
* classes (e.g. `['marker-type-chapter', 'chapter-number-1']`).
*/
cssClasses?: string[];
}
export interface UIConfig {
/**
* Specifies the container in the DOM into which the UI will be added. Can be a CSS selector string or a
* HTMLElement object. By default, the player figure will be used ({@link PlayerAPI#getFigure}).
*/
container?: string | HTMLElement;
metadata?: {
title?: string;
description?: string;
markers?: TimelineMarker[];
};
// TODO move recommendations into metadata in next major release
recommendations?: UIRecommendationConfig[];
/**
* Specifies if the UI variants should be resolved and switched automatically upon certain player events. The default
* is `true`. Should be set to `false` if purely manual switching through {@link UIManager.resolveUiVariant} is
* desired. A hybrid approach can be used by setting this to `true` (or leaving the default) and overriding
* automatic switches through a {@link UIManager.onUiVariantResolve} event handler.
*/
autoUiVariantResolve?: boolean;
/**
* Specifies if the `PlaybackSpeedSelectBox` should be displayed within the `SettingsPanel`
* Default: false
*/
playbackSpeedSelectionEnabled?: boolean;
/**
* Provide customized errorMessages
* For an example have a look at {@link ErrorMessageOverlayConfig.messages}
*/
errorMessages?: ErrorMessageMap | ErrorMessageTranslator;
}
=======
import { UIFactory } from './uifactory';
import { TimelineMarker, UIConfig } from './uiconfig';
>>>>>>>
import { UIFactory } from './uifactory';
import { TimelineMarker, UIConfig } from './uiconfig';
import { PlayerAPI, Event, Events, PlayerEventCallback } from 'bitmovin-player'; |
<<<<<<<
import {UIManager, UIInstanceManager} from './uimanager';
import {Button} from './components/button';
import {ControlBar} from './components/controlbar';
import {FullscreenToggleButton} from './components/fullscreentogglebutton';
import {HugePlaybackToggleButton} from './components/hugeplaybacktogglebutton';
import {PlaybackTimeLabel, PlaybackTimeLabelMode} from './components/playbacktimelabel';
import {PlaybackToggleButton} from './components/playbacktogglebutton';
import {SeekBar} from './components/seekbar';
import {SelectBox} from './components/selectbox';
import {ItemSelectionList} from './components/itemselectionlist';
import {SettingsPanel} from './components/settingspanel';
import {SettingsToggleButton} from './components/settingstogglebutton';
import {ToggleButton} from './components/togglebutton';
import {VideoQualitySelectBox} from './components/videoqualityselectbox';
import {VolumeToggleButton} from './components/volumetogglebutton';
import {VRToggleButton} from './components/vrtogglebutton';
import {Watermark} from './components/watermark';
import {UIContainer} from './components/uicontainer';
import {Container} from './components/container';
import {Label} from './components/label';
import {AudioQualitySelectBox} from './components/audioqualityselectbox';
import {AudioTrackSelectBox} from './components/audiotrackselectbox';
import {CastStatusOverlay} from './components/caststatusoverlay';
import {CastToggleButton} from './components/casttogglebutton';
import {Component} from './components/component';
import {ErrorMessageOverlay} from './components/errormessageoverlay';
import {RecommendationOverlay} from './components/recommendationoverlay';
import {SeekBarLabel} from './components/seekbarlabel';
import {SubtitleOverlay} from './components/subtitleoverlay';
import {SubtitleSelectBox} from './components/subtitleselectbox';
import {TitleBar} from './components/titlebar';
import {VolumeControlButton} from './components/volumecontrolbutton';
import {ClickOverlay} from './components/clickoverlay';
import {AdSkipButton} from './components/adskipbutton';
import {AdMessageLabel} from './components/admessagelabel';
import {AdClickOverlay} from './components/adclickoverlay';
import {PlaybackSpeedSelectBox} from './components/playbackspeedselectbox';
import {HugeReplayButton} from './components/hugereplaybutton';
import {BufferingOverlay} from './components/bufferingoverlay';
import {CastUIContainer} from './components/castuicontainer';
import {PlaybackToggleOverlay} from './components/playbacktoggleoverlay';
import {CloseButton} from './components/closebutton';
import {MetadataLabel, MetadataLabelContent} from './components/metadatalabel';
import {AirPlayToggleButton} from './components/airplaytogglebutton';
import {VolumeSlider} from './components/volumeslider';
import {PictureInPictureToggleButton} from './components/pictureinpicturetogglebutton';
import {Spacer} from './components/spacer';
import {BackgroundColorSelectBox} from './components/subtitlesettings/backgroundcolorselectbox';
import {BackgroundOpacitySelectBox} from './components/subtitlesettings/backgroundopacityselectbox';
import {CharacterEdgeSelectBox} from './components/subtitlesettings/characteredgeselectbox';
import {FontColorSelectBox} from './components/subtitlesettings/fontcolorselectbox';
import {FontFamilySelectBox} from './components/subtitlesettings/fontfamilyselectbox';
import {FontOpacitySelectBox} from './components/subtitlesettings/fontopacityselectbox';
import {FontSizeSelectBox} from './components/subtitlesettings/fontsizeselectbox';
import {SubtitleSettingSelectBox} from './components/subtitlesettings/subtitlesettingselectbox';
import {SubtitleSettingsLabel} from './components/subtitlesettings/subtitlesettingslabel';
import {WindowColorSelectBox} from './components/subtitlesettings/windowcolorselectbox';
import {WindowOpacitySelectBox} from './components/subtitlesettings/windowopacityselectbox';
import {ArrayUtils} from './arrayutils';
import {StringUtils} from './stringutils';
import {PlayerUtils} from './playerutils';
import {UIUtils} from './uiutils';
import {BrowserUtils} from './browserutils';
import {StorageUtils} from './storageutils';
import {SubtitleSettingsResetButton} from './components/subtitlesettings/subtitlesettingsresetbutton';
import {ListBox} from './components/listbox';
import {DemoFactory} from './demofactory';
import {SubtitleListBox} from './components/subtitlelistbox';
import {AudioTrackListBox} from './components/audiotracklistbox';
import {SettingsPanelPage} from './components/settingspanelpage';
import {SettingsPanelPageBackButton} from './components/settingspanelpagebackbutton';
import {SettingsPanelPageOpenButton} from './components/settingspanelpageopenbutton';
import {SubtitleSettingsPanelPage} from './components/subtitlesettings/subtitlesettingspanelpage';
import {SettingsPanelItem} from './components/settingspanelitem';
import {ErrorUtils} from './errorutils';
import { UIFactory } from './uifactory';
=======
/// <reference path='player.d.ts' />
export const version: string = '{{VERSION}}';
// Management
export { UIManager, UIInstanceManager } from './uimanager';
// Factories
export { UIFactory } from './uifactory';
export { DemoFactory } from './demofactory';
// Utils
export { ArrayUtils } from './arrayutils';
export { StringUtils } from './stringutils';
export { PlayerUtils } from './playerutils';
export { UIUtils } from './uiutils';
export { BrowserUtils } from './browserutils';
export { StorageUtils } from './storageutils';
export { ErrorUtils } from './errorutils';
// Components
export { Button } from './components/button';
export { ControlBar } from './components/controlbar';
export { FullscreenToggleButton } from './components/fullscreentogglebutton';
export { HugePlaybackToggleButton } from './components/hugeplaybacktogglebutton';
export { PlaybackTimeLabel, PlaybackTimeLabelMode } from './components/playbacktimelabel';
export { PlaybackToggleButton } from './components/playbacktogglebutton';
export { SeekBar } from './components/seekbar';
export { SelectBox } from './components/selectbox';
export { ItemSelectionList } from './components/itemselectionlist';
export { SettingsPanel } from './components/settingspanel';
export { SettingsToggleButton } from './components/settingstogglebutton';
export { ToggleButton } from './components/togglebutton';
export { VideoQualitySelectBox } from './components/videoqualityselectbox';
export { VolumeToggleButton } from './components/volumetogglebutton';
export { VRToggleButton } from './components/vrtogglebutton';
export { Watermark } from './components/watermark';
export { UIContainer } from './components/uicontainer';
export { Container } from './components/container';
export { Label } from './components/label';
export { AudioQualitySelectBox } from './components/audioqualityselectbox';
export { AudioTrackSelectBox } from './components/audiotrackselectbox';
export { CastStatusOverlay } from './components/caststatusoverlay';
export { CastToggleButton } from './components/casttogglebutton';
export { Component } from './components/component';
export { ErrorMessageOverlay } from './components/errormessageoverlay';
export { RecommendationOverlay } from './components/recommendationoverlay';
export { SeekBarLabel } from './components/seekbarlabel';
export { SubtitleOverlay } from './components/subtitleoverlay';
export { SubtitleSelectBox } from './components/subtitleselectbox';
export { TitleBar } from './components/titlebar';
export { VolumeControlButton } from './components/volumecontrolbutton';
export { ClickOverlay } from './components/clickoverlay';
export { AdSkipButton } from './components/adskipbutton';
export { AdMessageLabel } from './components/admessagelabel';
export { AdClickOverlay } from './components/adclickoverlay';
export { PlaybackSpeedSelectBox } from './components/playbackspeedselectbox';
export { HugeReplayButton } from './components/hugereplaybutton';
export { BufferingOverlay } from './components/bufferingoverlay';
export { CastUIContainer } from './components/castuicontainer';
export { PlaybackToggleOverlay } from './components/playbacktoggleoverlay';
export { CloseButton } from './components/closebutton';
export { MetadataLabel, MetadataLabelContent } from './components/metadatalabel';
export { AirPlayToggleButton } from './components/airplaytogglebutton';
export { VolumeSlider } from './components/volumeslider';
export { PictureInPictureToggleButton } from './components/pictureinpicturetogglebutton';
export { Spacer } from './components/spacer';
export { BackgroundColorSelectBox } from './components/subtitlesettings/backgroundcolorselectbox';
export { BackgroundOpacitySelectBox } from './components/subtitlesettings/backgroundopacityselectbox';
export { CharacterEdgeSelectBox } from './components/subtitlesettings/characteredgeselectbox';
export { FontColorSelectBox } from './components/subtitlesettings/fontcolorselectbox';
export { FontFamilySelectBox } from './components/subtitlesettings/fontfamilyselectbox';
export { FontOpacitySelectBox } from './components/subtitlesettings/fontopacityselectbox';
export { FontSizeSelectBox } from './components/subtitlesettings/fontsizeselectbox';
export { SubtitleSettingSelectBox } from './components/subtitlesettings/subtitlesettingselectbox';
export { SubtitleSettingsLabel } from './components/subtitlesettings/subtitlesettingslabel';
export { WindowColorSelectBox } from './components/subtitlesettings/windowcolorselectbox';
export { WindowOpacitySelectBox } from './components/subtitlesettings/windowopacityselectbox';
export { SubtitleSettingsResetButton } from './components/subtitlesettings/subtitlesettingsresetbutton';
export { ListBox } from './components/listbox';
export { SubtitleListBox } from './components/subtitlelistbox';
export { AudioTrackListBox } from './components/audiotracklistbox';
export { SettingsPanelPage } from './components/settingspanelpage';
export { SettingsPanelPageBackButton } from './components/settingspanelpagebackbutton';
export { SettingsPanelPageOpenButton } from './components/settingspanelpageopenbutton';
export { SubtitleSettingsPanelPage } from './components/subtitlesettings/subtitlesettingspanelpage';
export { SettingsPanelItem } from './components/settingspanelitem';
>>>>>>>
export const version: string = '{{VERSION}}';
// Management
export { UIManager, UIInstanceManager } from './uimanager';
// Factories
export { UIFactory } from './uifactory';
export { DemoFactory } from './demofactory';
// Utils
export { ArrayUtils } from './arrayutils';
export { StringUtils } from './stringutils';
export { PlayerUtils } from './playerutils';
export { UIUtils } from './uiutils';
export { BrowserUtils } from './browserutils';
export { StorageUtils } from './storageutils';
export { ErrorUtils } from './errorutils';
// Components
export { Button } from './components/button';
export { ControlBar } from './components/controlbar';
export { FullscreenToggleButton } from './components/fullscreentogglebutton';
export { HugePlaybackToggleButton } from './components/hugeplaybacktogglebutton';
export { PlaybackTimeLabel, PlaybackTimeLabelMode } from './components/playbacktimelabel';
export { PlaybackToggleButton } from './components/playbacktogglebutton';
export { SeekBar } from './components/seekbar';
export { SelectBox } from './components/selectbox';
export { ItemSelectionList } from './components/itemselectionlist';
export { SettingsPanel } from './components/settingspanel';
export { SettingsToggleButton } from './components/settingstogglebutton';
export { ToggleButton } from './components/togglebutton';
export { VideoQualitySelectBox } from './components/videoqualityselectbox';
export { VolumeToggleButton } from './components/volumetogglebutton';
export { VRToggleButton } from './components/vrtogglebutton';
export { Watermark } from './components/watermark';
export { UIContainer } from './components/uicontainer';
export { Container } from './components/container';
export { Label } from './components/label';
export { AudioQualitySelectBox } from './components/audioqualityselectbox';
export { AudioTrackSelectBox } from './components/audiotrackselectbox';
export { CastStatusOverlay } from './components/caststatusoverlay';
export { CastToggleButton } from './components/casttogglebutton';
export { Component } from './components/component';
export { ErrorMessageOverlay } from './components/errormessageoverlay';
export { RecommendationOverlay } from './components/recommendationoverlay';
export { SeekBarLabel } from './components/seekbarlabel';
export { SubtitleOverlay } from './components/subtitleoverlay';
export { SubtitleSelectBox } from './components/subtitleselectbox';
export { TitleBar } from './components/titlebar';
export { VolumeControlButton } from './components/volumecontrolbutton';
export { ClickOverlay } from './components/clickoverlay';
export { AdSkipButton } from './components/adskipbutton';
export { AdMessageLabel } from './components/admessagelabel';
export { AdClickOverlay } from './components/adclickoverlay';
export { PlaybackSpeedSelectBox } from './components/playbackspeedselectbox';
export { HugeReplayButton } from './components/hugereplaybutton';
export { BufferingOverlay } from './components/bufferingoverlay';
export { CastUIContainer } from './components/castuicontainer';
export { PlaybackToggleOverlay } from './components/playbacktoggleoverlay';
export { CloseButton } from './components/closebutton';
export { MetadataLabel, MetadataLabelContent } from './components/metadatalabel';
export { AirPlayToggleButton } from './components/airplaytogglebutton';
export { VolumeSlider } from './components/volumeslider';
export { PictureInPictureToggleButton } from './components/pictureinpicturetogglebutton';
export { Spacer } from './components/spacer';
export { BackgroundColorSelectBox } from './components/subtitlesettings/backgroundcolorselectbox';
export { BackgroundOpacitySelectBox } from './components/subtitlesettings/backgroundopacityselectbox';
export { CharacterEdgeSelectBox } from './components/subtitlesettings/characteredgeselectbox';
export { FontColorSelectBox } from './components/subtitlesettings/fontcolorselectbox';
export { FontFamilySelectBox } from './components/subtitlesettings/fontfamilyselectbox';
export { FontOpacitySelectBox } from './components/subtitlesettings/fontopacityselectbox';
export { FontSizeSelectBox } from './components/subtitlesettings/fontsizeselectbox';
export { SubtitleSettingSelectBox } from './components/subtitlesettings/subtitlesettingselectbox';
export { SubtitleSettingsLabel } from './components/subtitlesettings/subtitlesettingslabel';
export { WindowColorSelectBox } from './components/subtitlesettings/windowcolorselectbox';
export { WindowOpacitySelectBox } from './components/subtitlesettings/windowopacityselectbox';
export { SubtitleSettingsResetButton } from './components/subtitlesettings/subtitlesettingsresetbutton';
export { ListBox } from './components/listbox';
export { SubtitleListBox } from './components/subtitlelistbox';
export { AudioTrackListBox } from './components/audiotracklistbox';
export { SettingsPanelPage } from './components/settingspanelpage';
export { SettingsPanelPageBackButton } from './components/settingspanelpagebackbutton';
export { SettingsPanelPageOpenButton } from './components/settingspanelpageopenbutton';
export { SubtitleSettingsPanelPage } from './components/subtitlesettings/subtitlesettingspanelpage';
export { SettingsPanelItem } from './components/settingspanelitem'; |
<<<<<<<
import {SettingsPanelPage} from './components/settingspanelpage';
import {SettingsPanelPageBackButton} from './components/settingspanelpagebackbutton';
import {SettingsPanelPageOpenButton} from './components/settingspanelpageopenbutton';
import {SubtitleSettingsPanelPage} from './components/subtitlesettings/subtitlesettingspanelpage';
import {SettingsPanelItem} from './components/settingspanelitem';
=======
import {ErrorUtils} from './errorutils';
>>>>>>>
import {SettingsPanelPage} from './components/settingspanelpage';
import {SettingsPanelPageBackButton} from './components/settingspanelpagebackbutton';
import {SettingsPanelPageOpenButton} from './components/settingspanelpageopenbutton';
import {SubtitleSettingsPanelPage} from './components/subtitlesettings/subtitlesettingspanelpage';
import {SettingsPanelItem} from './components/settingspanelitem';
import {ErrorUtils} from './errorutils'; |
<<<<<<<
// of the ad playback by checking isAd() in ON_READY, because ON_READY always arrives when the source
// changes.
case player.exports.Event.Ready:
if (adStartedEvent && !player.ads.isLinearAdActive()) {
=======
// of the ad playback by checking isAd().
case player.exports.Event.SourceLoaded:
if (adStartedEvent && !player.isAd()) {
>>>>>>>
// of the ad playback by checking isAd().
case player.exports.Event.SourceLoaded:
if (adStartedEvent && !player.ads.isLinearAdActive()) { |
<<<<<<<
websockets: websockets,
logger: logger,
=======
websockets: websockets,
>>>>>>>
websockets: websockets,
logger: logger,
<<<<<<<
websockets: websockets,
logger: logger,
=======
websockets: websockets,
});
cron(configuration, {
graphql: graphqlAppInstance,
restApi: restApiInstance,
websockets: websockets,
dbTables: dbTables,
models: models,
emailTemplates: emailTemplates,
sendEmail: sendEmail,
database: database,
seeds: seeds,
logger: logger,
runEvent: runEvent,
multerInstance: multerInstance,
mailerInstance: mailerInstance,
>>>>>>>
websockets: websockets,
logger: logger,
});
cron(configuration, {
graphql: graphqlAppInstance,
restApi: restApiInstance,
websockets: websockets,
dbTables: dbTables,
models: models,
emailTemplates: emailTemplates,
sendEmail: sendEmail,
database: database,
seeds: seeds,
logger: logger,
runEvent: runEvent,
multerInstance: multerInstance,
mailerInstance: mailerInstance, |
<<<<<<<
as: 'নমস্কাৰ বিশ্ব',
=======
av: 'Ворчӏами дуниял',
>>>>>>>
as: 'নমস্কাৰ বিশ্ব',
av: 'Ворчӏами дуниял', |
<<<<<<<
ko: '여보세요 세계',
ln: 'Mbote Mokili',
=======
ja: 'こんにちは世界',
ko: '안녕 세상아',
>>>>>>>
ja: 'こんにちは世界',
ko: '안녕 세상아',
ln: 'Mbote Mokili', |
<<<<<<<
ja: 'こんにちは世界',
ko: '여보세요 세계',
=======
ko: '안녕 세상아',
>>>>>>>
ja: 'こんにちは世界',
ko: '안녕 세상아', |
<<<<<<<
tl: 'Kamusta Mundo',
=======
tr: 'Merhaba Dünya',
>>>>>>>
tl: 'Kamusta Mundo',
tr: 'Merhaba Dünya', |
<<<<<<<
ms: 'Hai Dunia',
=======
ml: 'ഹലോ വേൾഡ്',
mr: 'नमस्कार जग',
nd: 'Yebo Mhlaba',
ne: 'नमस्कार संसार',
>>>>>>>
ml: 'ഹലോ വേൾഡ്',
mr: 'नमस्कार जग',
ms: 'Hai Dunia',
nd: 'Yebo Mhlaba',
ne: 'नमस्कार संसार', |
<<<<<<<
const divider = document.createElement('div');
divider.className = 'mui-divider';
control.appendChild(divider);
=======
(<HTMLElement>content.querySelector('#conversationcontrol')).style.display = 'block';
>>>>>>>
const divider = document.createElement('div');
divider.className = 'mui-divider';
control.appendChild(divider);
(<HTMLElement>content.querySelector('#conversationcontrol')).style.display = 'block';
<<<<<<<
if (newValue === 'Connected' || newValue == 'Conferenced') {
=======
if (newValue === 'Connected' || newValue === 'Conferenced') {
>>>>>>>
if (newValue === 'Connected' || newValue === 'Conferenced') { |
<<<<<<<
const confirmationRegistry: number[] = [];
const getConfs = (id: number) => {
return confirmationRegistry[id];
};
function buildMockLockChain(conf = { targetConfirmations: 500 }) {
const id = confirmationRegistry.length;
confirmationRegistry[id] = 0;
const transactionConfidence = () => {
return {
current: getConfs(id),
target: conf.targetConfirmations,
};
};
const mockLockChain: LockChain = {
name: "mockLockChain",
assetDecimals: () => 1,
addressIsValid: () => true,
transactionID: () =>
"0xb5252f4b08fda457234a6da6fd77c3b23adf8b3f4e020615b876b28aa7ee6299",
transactionConfidence,
initialize: () => {
return mockLockChain;
},
getDeposits: async (_a, _b, _c, onDeposit) => {
onDeposit({ transaction: {}, amount: "1" });
},
addressStringToBytes: (i) => Buffer.from(i),
getGatewayAddress: () => "gatewayaddr",
getPubKeyScript: () => Buffer.from("pubkey"),
depositV1HashString: () => "v1hashstring",
legacyName: "Btc",
assetIsNative: () => true,
transactionRPCFormat: () => ({
txid: fromHex(
"0xb5252f4b08fda457234a6da6fd77c3b23adf8b3f4e020615b876b28aa7ee6299",
),
txindex: "0",
}),
};
return {
mockLockChain,
setConfirmations: (n: number) => {
confirmationRegistry[id] = n;
},
};
}
function buildMockMintChain() {
const state = {
currentLockConfs: 0,
};
const mockMintChain: MintChain = {
name: "mockMintChain",
assetDecimals: () => 1,
addressIsValid: () => true,
transactionID: () =>
"0xb5252f4b08fda457234a6da6fd77c3b23adf8b3f4e020615b876b28aa7ee6299",
transactionConfidence: () => ({ current: 0, target: 1 }),
initialize: () => {
return mockMintChain;
},
transactionRPCFormat: () => ({
txid: fromHex(
"0xb5252f4b08fda457234a6da6fd77c3b23adf8b3f4e020615b876b28aa7ee6299",
),
txindex: "0",
}),
legacyName: "Eth",
resolveTokenGatewayContract: async () =>
"0x0000000000000000000000000000000000000000",
submitMint: (_asset, _calls, _tx, emitter) => {
setTimeout(() => {
emitter.emit(
"transactionHash",
"0xb5252f4b08fda457234a6da6fd77c3b23adf8b3f4e020615b876b28aa7ee6299",
);
}, 100);
},
findBurnTransaction: (_p, _d, emitter) => {
setTimeout(() => {
emitter.emit(
"transactionHash",
"0xb5252f4b08fda457234a6da6fd77c3b23adf8b3f4e020615b876b28aa7ee6299",
);
}, 1000);
return {
transaction: {
hash:
"0xb5252f4b08fda457234a6da6fd77c3b23adf8b3f4e020615b876b28aa7ee6299",
},
amount: new BigNumber(0),
to: "toAddress",
nonce: new BigNumber(0),
};
},
findTransaction: () => "mintTxHash",
contractCalls: async () => [
{
sendTo: "0x0000000000000000000000000000000000000000",
contractFn: "nop",
},
],
};
return { mockMintChain, state };
}
=======
>>>>>>>
<<<<<<<
const renVMProvider = (new RenVMProvider(
"testnet",
) as any) as AbstractRenVMProvider;
=======
const renVMProvider: AbstractRenVMProvider = new RenVMProvider(
"testnet",
);
>>>>>>>
const renVMProvider: AbstractRenVMProvider = new RenVMProvider(
"testnet",
);
<<<<<<<
const renVMProvider = (new RenVMProvider(
"testnet",
) as any) as AbstractRenVMProvider;
=======
const renVMProvider: AbstractRenVMProvider = new RenVMProvider(
"testnet",
);
>>>>>>>
const renVMProvider: AbstractRenVMProvider = new RenVMProvider(
"testnet",
);
<<<<<<<
const renVMProvider = (new RenVMProvider(
"testnet",
) as any) as AbstractRenVMProvider;
=======
const renVMProvider: AbstractRenVMProvider = new RenVMProvider(
"testnet",
);
>>>>>>>
const renVMProvider: AbstractRenVMProvider = new RenVMProvider(
"testnet",
); |
<<<<<<<
import { createNewComposerPlugin } from './plugins/new-composer';
=======
import { createComponentCleanerPlugin } from './plugins/component-cleaner';
>>>>>>>
import { createNewComposerPlugin } from './plugins/new-composer';
import { createComponentCleanerPlugin } from './plugins/component-cleaner'; |
<<<<<<<
type NotPresentWhenInsideJob = 'job_id' | 'status';
interface JobTask extends Omit<Task, NotPresentWhenInsideJob> {
=======
type NotPresentWhenInsideJob = 'job_id' | 'status'
export interface JobTask extends Omit<Task, NotPresentWhenInsideJob> {
>>>>>>>
type NotPresentWhenInsideJob = 'job_id' | 'status';
export interface JobTask extends Omit<Task, NotPresentWhenInsideJob> { |
<<<<<<<
// Addresses of value txs must have last trit == 0.
if (bundle.some(tx => tx.value !== 0 && trits(tx.address)[HASH_TRITS_SIZE - 1] !== 0)) {
return false
}
=======
// currentIndex has to be equal to the index in the array
if (bundle.some((tx, index) => tx.currentIndex !== index)) {
return false
}
// Txs must have correct lastIndex
if (bundle.some(tx => tx.lastIndex !== bundle.length - 1)) {
return false
}
>>>>>>>
// Addresses of value txs must have last trit == 0.
if (bundle.some(tx => tx.value !== 0 && trits(tx.address)[HASH_TRITS_SIZE - 1] !== 0)) {
return false
}
// currentIndex has to be equal to the index in the array
if (bundle.some((tx, index) => tx.currentIndex !== index)) {
return false
}
// Txs must have correct lastIndex
if (bundle.some(tx => tx.lastIndex !== bundle.length - 1)) {
return false
} |
<<<<<<<
import { add, normalizedBundleHash } from '@iota/signing'
import { INVALID_ADDRESS_LAST_TRIT } from '../../errors'
=======
import { add, normalizedBundle } from '@iota/signing'
>>>>>>>
import { add, normalizedBundle } from '@iota/signing'
import { INVALID_ADDRESS_LAST_TRIT } from '../../errors' |
<<<<<<<
import * as moment from 'moment';
=======
import { StepType } from '../../models/step.model';
>>>>>>>
import * as moment from 'moment';
import { StepType } from '../../models/step.model'; |
<<<<<<<
this.dialogService.confirm('Uninstall the hub from MarkLogic?', 'Cancel', 'Uninstall').subscribe(() => {
this.uninstallStatus = '';
this.isUninstalling = true;
let emitter = this.install.messageEmitter.subscribe((payload: any) => {
this.percentComplete = payload.percentComplete;
this.uninstallStatus += '\n' + payload.message;
if (this.percentComplete === 100) {
emitter.unsubscribe();
setTimeout(() => {
this.router.navigate(['login']);
}, 1000);
}
});
this.install.uninstall(this.projectService.projectId, this.projectService.environment);
},
// cancel.. do nothing
() => {});
=======
this.uninstallStatus = '';
this.isUninstalling = true;
let emitter = this.install.messageEmitter.subscribe((payload: any) => {
this.percentComplete = payload.percentComplete;
this.uninstallStatus += '\n' + payload.message;
if (this.percentComplete === 100) {
emitter.unsubscribe();
setTimeout(() => {
this.router.navigate(['login']);
}, 1000);
}
});
this.install.uninstall();
>>>>>>>
this.dialogService.confirm('Uninstall the hub from MarkLogic?', 'Cancel', 'Uninstall').subscribe(() => {
this.uninstallStatus = '';
this.isUninstalling = true;
let emitter = this.install.messageEmitter.subscribe((payload: any) => {
this.percentComplete = payload.percentComplete;
this.uninstallStatus += '\n' + payload.message;
if (this.percentComplete === 100) {
emitter.unsubscribe();
setTimeout(() => {
this.router.navigate(['login']);
}, 1000);
}
});
this.install.uninstall();
},
// cancel.. do nothing
() => {}); |
<<<<<<<
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
import {EditFlowUiComponent} from './edit-flow-ui.component';
import {Step} from '../../models/step.model';
import {Options} from '../../models/step-options.model';
import {Matching} from '../mastering/matching/matching.model';
import {Merging} from '../mastering/merging/merging.model';
import {
ExistingStepNameValidator
} from "../../../common/form-validators/existing-step-name-validator";
import {Flow} from "../../models/flow.model";
=======
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { EditFlowUiComponent } from './edit-flow-ui.component';
import { Step } from '../../models/step.model';
import { Options } from '../../models/step-options.model';
import { Matching } from '../mastering/matching/matching.model';
import { Merging } from '../mastering/merging/merging.model';
import { NewStepDialogValidator } from '../../validators/new-step-dialog.validator';
>>>>>>>
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {MatDialogRef, MAT_DIALOG_DATA} from '@angular/material';
import {EditFlowUiComponent} from './edit-flow-ui.component';
import {Step} from '../../models/step.model';
import {Options} from '../../models/step-options.model';
import {Matching} from '../mastering/matching/matching.model';
import {Merging} from '../mastering/merging/merging.model';
import {NewStepDialogValidator} from '../../validators/new-step-dialog.validator';
import {
ExistingStepNameValidator
} from "../../../common/form-validators/existing-step-name-validator";
import {Flow} from "../../models/flow.model";
<<<<<<<
name: [this.data.step ? this.data.step.name : '', [
Validators.required,
Validators.pattern('[a-zA-Z][a-zA-Z0-9\_\-]*'),
ExistingStepNameValidator.forbiddenName(this.data.flow)
]],
=======
>>>>>>>
name: [this.data.step ? this.data.step.name : '', [
Validators.required,
Validators.pattern('[a-zA-Z][a-zA-Z0-9\_\-]*'),
ExistingStepNameValidator.forbiddenName(this.data.flow)
]],
<<<<<<<
// targetEntityChange(entity) {
// this.newStep.options['targetEntity'] = entity;
// }
=======
>>>>>>> |
<<<<<<<
@Input() collections: any;
@Input() selectedStepId: any;
=======
@Input() projectDirectory: any;
>>>>>>>
@Input() collections: any;
@Input() selectedStepId: any;
@Input() projectDirectory: any; |
<<<<<<<
import { ICustomEditorService, IWorkspaceService } from '../../client/common/application/types';
import { IAsyncDisposableRegistry, IConfigurationService, IDisposableRegistry } from '../../client/common/types';
=======
import { ICommandManager, IDocumentManager, IWorkspaceService } from '../../client/common/application/types';
import { IFileSystem } from '../../client/common/platform/types';
import {
IAsyncDisposableRegistry,
IConfigurationService,
IDisposableRegistry,
Resource
} from '../../client/common/types';
>>>>>>>
import { ICustomEditorService, IWorkspaceService } from '../../client/common/application/types';
import {
IAsyncDisposableRegistry,
IConfigurationService,
IDisposableRegistry,
Resource
} from '../../client/common/types';
<<<<<<<
import { INotebookEditor, INotebookEditorProvider, INotebookServerOptions } from '../../client/datascience/types';
=======
import {
IDataScienceErrorHandler,
INotebookEditor,
INotebookEditorProvider,
INotebookServerOptions
} from '../../client/datascience/types';
>>>>>>>
import { INotebookEditor, INotebookEditorProvider, INotebookServerOptions } from '../../client/datascience/types'; |
<<<<<<<
}
export interface INotebookModel {
readonly file: Uri;
readonly isDirty: boolean;
readonly isUntitled: boolean;
readonly changed: Event<NotebookModelChange>;
readonly cells: ICell[];
getJson(): Promise<Partial<nbformat.INotebookContent>>;
getContent(cells?: ICell[]): Promise<string>;
update(change: NotebookModelChange): void;
}
export const INotebookStorage = Symbol('INotebookStorage');
export interface INotebookStorage {
load(file: Uri, contents?: string): Promise<INotebookModel>;
save(): Promise<INotebookModel>;
saveAs(file: Uri): Promise<INotebookModel>;
}
=======
}
type WebViewViewState = {
readonly visible: boolean;
readonly active: boolean;
};
export type WebViewViewChangeEventArgs = { current: WebViewViewState; previous: WebViewViewState };
>>>>>>>
}
export interface INotebookModel {
readonly file: Uri;
readonly isDirty: boolean;
readonly isUntitled: boolean;
readonly changed: Event<NotebookModelChange>;
readonly cells: ICell[];
getJson(): Promise<Partial<nbformat.INotebookContent>>;
getContent(cells?: ICell[]): Promise<string>;
update(change: NotebookModelChange): void;
}
export const INotebookStorage = Symbol('INotebookStorage');
export interface INotebookStorage {
load(file: Uri, contents?: string): Promise<INotebookModel>;
save(): Promise<INotebookModel>;
saveAs(file: Uri): Promise<INotebookModel>;
}
type WebViewViewState = {
readonly visible: boolean;
readonly active: boolean;
};
export type WebViewViewChangeEventArgs = { current: WebViewViewState; previous: WebViewViewState }; |
<<<<<<<
import * as uuid from 'uuid/v4';
import { Disposable, Event, EventEmitter, Uri, WebviewPanel } from 'vscode';
import { arePathsSame } from '../../../datascience-ui/react-common/arePathsSame';
import {
ICustomEditorService,
IWorkspaceService,
WebviewCustomEditorEditingDelegate,
WebviewCustomEditorProvider
} from '../../common/application/types';
import { traceInfo } from '../../common/logger';
import {
IAsyncDisposable,
IAsyncDisposableRegistry,
IConfigurationService,
IDisposableRegistry
} from '../../common/types';
import { createDeferred } from '../../common/utils/async';
=======
import * as path from 'path';
import { Event, EventEmitter, TextDocument, TextEditor, Uri } from 'vscode';
import { ICommandManager, IDocumentManager, IWorkspaceService } from '../../common/application/types';
import { JUPYTER_LANGUAGE } from '../../common/constants';
import { IFileSystem } from '../../common/platform/types';
import {
IAsyncDisposable,
IAsyncDisposableRegistry,
IConfigurationService,
IDisposableRegistry,
Resource
} from '../../common/types';
>>>>>>>
import * as uuid from 'uuid/v4';
import { Disposable, Event, EventEmitter, Uri, WebviewPanel } from 'vscode';
import { arePathsSame } from '../../../datascience-ui/react-common/arePathsSame';
import {
ICustomEditorService,
IWorkspaceService,
WebviewCustomEditorEditingDelegate,
WebviewCustomEditorProvider
} from '../../common/application/types';
import { traceInfo } from '../../common/logger';
import {
IAsyncDisposable,
IAsyncDisposableRegistry,
IConfigurationService,
IDisposableRegistry,
Resource
} from '../../common/types';
import { createDeferred } from '../../common/utils/async';
<<<<<<<
// Register for the custom editor service.
customEditorService.registerWebviewCustomEditorProvider(NativeEditorProvider.customEditorViewType, this, {
enableFindWidget: true,
retainContextWhenHidden: true
});
}
=======
this.disposables.push(
this.documentManager.onDidChangeActiveTextEditor(this.onDidChangeActiveTextEditorHandler.bind(this))
);
>>>>>>>
// Register for the custom editor service.
customEditorService.registerWebviewCustomEditorProvider(NativeEditorProvider.customEditorViewType, this, {
enableFindWidget: true,
retainContextWhenHidden: true
});
}
<<<<<<<
private async modelChanged(file: Uri, change: NotebookModelChange): Promise<void> {
// If the cells change because of a UI event, tell VS code about it
if (change.source === 'user') {
// Skip version and file changes. They can't be undone
switch (change.kind) {
case 'version':
break;
case 'file':
// Update our storage
const promise = this.models.get(change.oldFile.toString());
this.models.delete(change.oldFile.toString());
this.models.set(change.newFile.toString(), promise!);
break;
default:
this._editEventEmitter.fire({ resource: file, edit: change });
break;
=======
private async getNextNewNotebookUri(): Promise<Uri> {
// Start in the root and look for files starting with untitled
let number = 1;
const dir = this.workspace.rootPath;
if (dir) {
const existing = await this.fileSystem.search(
path.join(dir, `${localize.DataScience.untitledNotebookFileName()}-*.ipynb`)
);
// Sort by number
existing.sort();
// Add one onto the end of the last one
if (existing.length > 0) {
const match = /(\w+)-(\d+)\.ipynb/.exec(path.basename(existing[existing.length - 1]));
if (match && match.length > 1) {
number = parseInt(match[2], 10);
}
return Uri.file(path.join(dir, `${localize.DataScience.untitledNotebookFileName()}-${number + 1}`));
>>>>>>>
private async modelChanged(file: Uri, change: NotebookModelChange): Promise<void> {
// If the cells change because of a UI event, tell VS code about it
if (change.source === 'user') {
// Skip version and file changes. They can't be undone
switch (change.kind) {
case 'version':
break;
case 'file':
// Update our storage
const promise = this.models.get(change.oldFile.toString());
this.models.delete(change.oldFile.toString());
this.models.set(change.newFile.toString(), promise!);
break;
default:
this._editEventEmitter.fire({ resource: file, edit: change });
break;
<<<<<<<
private async loadModel(file: Uri, contents?: string): Promise<INotebookModel> {
const modelAndStorage = await this.loadModelAndStorage(file, contents);
return modelAndStorage.model;
}
=======
private openNotebookAndCloseEditor = async (
document: TextDocument,
closeDocumentBeforeOpeningNotebook: boolean
) => {
// See if this is an ipynb file
if (this.isNotebook(document) && this.configuration.getSettings(document.uri).datascience.useNotebookEditor) {
const closeActiveEditorCommand = 'workbench.action.closeActiveEditor';
try {
const contents = document.getText();
const uri = document.uri;
if (closeDocumentBeforeOpeningNotebook) {
if (
!this.documentManager.activeTextEditor ||
this.documentManager.activeTextEditor.document !== document
) {
await this.documentManager.showTextDocument(document);
}
await this.cmdManager.executeCommand(closeActiveEditorCommand);
}
>>>>>>>
private async loadModel(file: Uri, contents?: string): Promise<INotebookModel> {
const modelAndStorage = await this.loadModelAndStorage(file, contents);
return modelAndStorage.model;
}
<<<<<<<
this.models.set(key, modelPromise);
=======
// If we have both `git` & `file` schemes for the same file, then we're most likely looking at a diff view.
// Also ensure both editors are in the same view column.
// Possible we have a git diff view (with two editors git and file scheme), and we open the file view
// on the side (different view column).
const gitSchemeEditor = this.documentManager.visibleTextEditors.find(
editorUri =>
editorUri.document.uri.scheme === 'git' &&
this.fileSystem.arePathsSame(editorUri.document.uri.fsPath, editor.document.uri.fsPath)
);
if (!gitSchemeEditor) {
return false;
>>>>>>>
this.models.set(key, modelPromise);
<<<<<<<
// Just use the length (don't bother trying to fill in holes). We never remove storage objects from
// our map, so we'll keep creating new untitled notebooks.
const fileName = `${localize.DataScience.untitledNotebookFileName()}-${untitledStorage.length + 1}.ipynb`;
const fileUri = Uri.file(fileName);
// Turn this back into an untitled
return fileUri.with({ scheme: 'untitled', path: fileName });
=======
// Also confirm the document we have passed in, belongs to one of the editors.
// If its not, then its another document (that is not in the diff view).
return gitSchemeEditor === editor || fileSchemeEditor === editor;
}
private isNotebook(document: TextDocument) {
// Only support file uris (we don't want to automatically open any other ipynb file from another resource as a notebook).
// E.g. when opening a document for comparison, the scheme is `git`, in live share the scheme is `vsls`.
const validUriScheme = document.uri.scheme === 'file' || document.uri.scheme === 'vsls';
return (
validUriScheme &&
(document.languageId === JUPYTER_LANGUAGE ||
path.extname(document.fileName).toLocaleLowerCase() === '.ipynb')
);
>>>>>>>
// Just use the length (don't bother trying to fill in holes). We never remove storage objects from
// our map, so we'll keep creating new untitled notebooks.
const fileName = `${localize.DataScience.untitledNotebookFileName()}-${untitledStorage.length + 1}.ipynb`;
const fileUri = Uri.file(fileName);
// Turn this back into an untitled
return fileUri.with({ scheme: 'untitled', path: fileName }); |
<<<<<<<
=======
const rewireConsole = false;
>>>>>>>
<<<<<<<
// rewireConsole = true;
=======
//rewireConsole = true;
>>>>>>> |
<<<<<<<
import extractWithTranslationHOC from './withTranslationHOC';
import extractUseTranslationHook from './useTranslationHook';
import extractCustomUseTranslationHook from './customUseTranslationHook';
=======
>>>>>>>
import extractCustomUseTranslationHook from './customUseTranslationHook'; |
<<<<<<<
storage = typemoq.Mock.ofType<INotebookStorage & INotebookModel>();
when(configService.getSettings()).thenReturn({ datascience: { useNotebookEditor: true } } as any);
=======
when(configService.getSettings(anything())).thenReturn({ datascience: { useNotebookEditor: true } } as any);
when(docManager.onDidChangeActiveTextEditor).thenReturn(changeActiveTextEditorEventEmitter.event);
when(docManager.visibleTextEditors).thenReturn([]);
>>>>>>>
when(configService.getSettings(anything())).thenReturn({ datascience: { useNotebookEditor: true } } as any);
when(docManager.onDidChangeActiveTextEditor).thenReturn(changeActiveTextEditorEventEmitter.event);
when(docManager.visibleTextEditors).thenReturn([]);
<<<<<<<
=======
// Verify we didn't open another native editor.
expect(notebookEditor.editors).to.be.lengthOf(1);
}
// Re-display the old ipynb file(open it again)'
changeActiveTextEditorEventEmitter.fire(textEditor);
// wait for callbacks to get executed.
await sleep(1);
// At this point the notebook should be shown (focused).
editor.verify(e => e.show(), typemoq.Times.exactly(2));
// Verify we didn't open another native editor (display existing file).
expect(notebookEditor.editors).to.be.lengthOf(1);
}
test('Show the notebook editor when an opening the same ipynb file', async () => openSameIPynbFile(false));
test('Show the notebook editor when an opening the same ipynb file (after opening some other random file)', async () =>
openSameIPynbFile(true));
test('Do not open the notebook editor when a txt file is opened', async () => {
await testAutomaticallyOpeningNotebookEditorWhenOpeningFiles(Uri.file('some text file.txt'), false);
});
test('Open the notebook editor when an ipynb file is opened with a file scheme', async () => {
await testAutomaticallyOpeningNotebookEditorWhenOpeningFiles(Uri.parse('file:///some file.ipynb'), true);
});
test('Open the notebook editor when an ipynb file is opened with a vsls scheme (live share)', async () => {
await testAutomaticallyOpeningNotebookEditorWhenOpeningFiles(Uri.parse('vsls:///some file.ipynb'), true);
});
test('Do not open the notebook editor when an ipynb file is opened with a git scheme (comparing staged/modified files)', async () => {
await testAutomaticallyOpeningNotebookEditorWhenOpeningFiles(Uri.parse('git://some//text file.txt'), false);
});
>>>>>>> |
<<<<<<<
=======
private contentsLoadedPromise: Deferred<void> = createDeferred<void>();
private _file: Uri = Uri.file('');
private _dirty: boolean = false;
private isPromptingToSaveToDisc: boolean = false;
private visibleCells: ICell[] = [];
>>>>>>>
<<<<<<<
const options = await this.editorProvider.getNotebookOptions();
if (this._model) {
const metadata = (await this._model.getJson()).metadata;
return {
...options,
metadata
};
} else {
return options;
}
=======
const options = await this.ipynbProvider.getNotebookOptions();
await this.contentsLoadedPromise.promise;
const metadata = this.notebookJson.metadata;
return {
...options,
metadata
};
>>>>>>>
const options = await this.editorProvider.getNotebookOptions();
await this.loadedPromise.promise;
if (this._model) {
const metadata = (await this._model.getJson()).metadata;
return {
...options,
metadata
};
} else {
return options;
}
<<<<<<<
=======
// Then save the contents. We'll stick our cells back into this format when we save
if (json) {
this.notebookJson = json;
}
this.contentsLoadedPromise.resolve();
// Extract cells from the json
const cells = contents ? (json.cells as (nbformat.ICodeCell | nbformat.IRawCell | nbformat.IMarkdownCell)[]) : [];
// Then parse the cells
return this.loadCells(
cells.map((c, index) => {
return {
id: `NotebookImport#${index}`,
file: Identifiers.EmptyFileName,
line: 0,
state: CellState.finished,
data: c
};
}),
forceDirty
);
>>>>>>> |
<<<<<<<
{
avatar: require('../assets/graphics/contributors/maira.png'),
bio:
"Maira is a software engineer at VTEX, currently working with GraphQL every day. She loves web development and learning new technologies that make it even more enjoyable.",
job: 'Developer @ VTEX',
link: 'https://github.com/mairatma',
name: 'Maira Bello',
},
=======
{
avatar: require('../assets/graphics/contributors/ben.jpg'),
bio:
"A full time Elixir developer at CargoSense, Ben is a co-author of the Absinthe GraphQL implementation for Elixir.",
job: 'Developer @ Cargosense',
link: 'https://twitter.com/benwilson512',
name: 'Ben Wilson',
},
{
avatar: require('../assets/graphics/contributors/bruce.jpg'),
bio:
"Bruce is a polyglot technologist, speaker, and Pragmatic Bookshelf author. He's the CTO of CargoSense, a logistics intelligence company built on Elixir and committed to its open source community.",
job: 'CTO @ Cargosense',
link: 'https://twitter.com/wbruce',
name: 'Bruce Williams',
},
>>>>>>>
{
avatar: require('../assets/graphics/contributors/maira.png'),
bio:
"Maira is a software engineer at VTEX, currently working with GraphQL every day. She loves web development and learning new technologies that make it even more enjoyable.",
job: 'Developer @ VTEX',
link: 'https://github.com/mairatma',
name: 'Maira Bello',
},
avatar: require('../assets/graphics/contributors/ben.jpg'),
bio:
"A full time Elixir developer at CargoSense, Ben is a co-author of the Absinthe GraphQL implementation for Elixir.",
job: 'Developer @ Cargosense',
link: 'https://twitter.com/benwilson512',
name: 'Ben Wilson',
},
{
avatar: require('../assets/graphics/contributors/bruce.jpg'),
bio:
"Bruce is a polyglot technologist, speaker, and Pragmatic Bookshelf author. He's the CTO of CargoSense, a logistics intelligence company built on Elixir and committed to its open source community.",
job: 'CTO @ Cargosense',
link: 'https://twitter.com/wbruce',
name: 'Bruce Williams',
}, |
<<<<<<<
features: Features;
=======
enableSiteSettingsShortcut: boolean;
>>>>>>>
features: Features;
enableSiteSettingsShortcut: boolean;
<<<<<<<
this.features = data.features || {};
=======
this.enableSiteSettingsShortcut = data.enableSiteSettingsShortcut != undefined ?
data.enableSiteSettingsShortcut : true;
>>>>>>>
this.features = data.features || {};
this.enableSiteSettingsShortcut = data.enableSiteSettingsShortcut != undefined ?
data.enableSiteSettingsShortcut : true;
<<<<<<<
features?: {
appsFlyer?: AppsFlyerConfig;
};
=======
enableSiteSettingsShortcut?: boolean;
>>>>>>>
features?: {
appsFlyer?: AppsFlyerConfig;
};
enableSiteSettingsShortcut?: boolean; |
<<<<<<<
/* Internal Imports */
import { rootPath } from '../index'
const should = chai.should()
const testArtifactsDir = path.join(rootPath, 'test', 'artifacts.test.tmp')
const testRootPath = path.join(testArtifactsDir, (+new Date()).toString())
const dbRootPath = path.join(testRootPath, 'db')
// If these directories don't exist, create them.
fs.mkdirSync(testArtifactsDir, { recursive: true })
fs.mkdirSync(testRootPath, { recursive: true })
fs.mkdirSync(dbRootPath, { recursive: true })
export { should, dbRootPath }
export { testRootPath as rootPath }
=======
chai.use(chaiAsPromised)
const should = chai.should()
export { should }
>>>>>>>
/* Internal Imports */
import { rootPath } from '../index'
chai.use(chaiAsPromised)
const should = chai.should()
const testArtifactsDir = path.join(rootPath, 'test', 'artifacts.test.tmp')
const testRootPath = path.join(testArtifactsDir, (+new Date()).toString())
const dbRootPath = path.join(testRootPath, 'db')
// If these directories don't exist, create them.
fs.mkdirSync(testArtifactsDir, { recursive: true })
fs.mkdirSync(testRootPath, { recursive: true })
fs.mkdirSync(dbRootPath, { recursive: true })
export { should, dbRootPath }
export { testRootPath as rootPath } |
<<<<<<<
/* External Imports */
import path = require('path')
const rootPath = __dirname
const dbRootPath = path.join(__dirname, 'db')
export * from './src/interfaces'
export { rootPath, dbRootPath }
=======
export * from './src/interfaces'
export * from './src/app'
>>>>>>>
/* External Imports */
import path = require('path')
const rootPath = __dirname
const dbRootPath = path.join(__dirname, 'db')
export { rootPath, dbRootPath }
export * from './src/app'
export * from './src/interfaces' |
<<<<<<<
export { parse } from "https://deno.land/[email protected]/flags/mod.ts";
=======
export { parse } from "https://deno.land/[email protected]/flags/mod.ts";
>>>>>>>
export { parse } from "https://deno.land/[email protected]/flags/mod.ts";
<<<<<<<
} from "https://deno.land/[email protected]/fmt/colors.ts";
=======
green,
red,
yellow,
} from "https://deno.land/[email protected]/fmt/colors.ts";
>>>>>>>
green,
red,
yellow,
} from "https://deno.land/[email protected]/fmt/colors.ts";
<<<<<<<
} from "https://deno.land/[email protected]/testing/asserts.ts";
=======
} from "https://deno.land/[email protected]/testing/asserts.ts";
>>>>>>>
} from "https://deno.land/[email protected]/testing/asserts.ts"; |
<<<<<<<
describe("Renaming Data Sets", () => {
it("Should rename the node", async () => {
showInputBox.mockReset();
renameDataSet.mockReset();
const child = new ZoweNode("HLQ.TEST.DELETE.NODE", vscode.TreeItemCollapsibleState.None, sessNode, null);
showInputBox.mockResolvedValueOnce("HLQ.TEST.DELETE.NODE.NEW");
await extension.renameDataSet(child, testTree);
expect(renameDataSet.mock.calls.length).toBe(1);
expect(renameDataSet).toHaveBeenLastCalledWith(child.getSession(), "HLQ.TEST.DELETE.NODE", "HLQ.TEST.DELETE.NODE.NEW");
});
it("Should rename a favorited node", async () => {
showInputBox.mockReset();
renameDataSet.mockReset();
const child = new ZoweNode("[sessNode]: HLQ.TEST.DELETE.NODE", vscode.TreeItemCollapsibleState.None, sessNode, null);
child.contextValue = "ds_fav";
showInputBox.mockResolvedValueOnce("HLQ.TEST.DELETE.NODE.NEW");
await extension.renameDataSet(child, testTree);
expect(renameDataSet.mock.calls.length).toBe(1);
expect(renameDataSet).toHaveBeenLastCalledWith(child.getSession(), "HLQ.TEST.DELETE.NODE", "HLQ.TEST.DELETE.NODE.NEW");
});
it("Should throw an error if zowe.Rename.dataSet throws", async () => {
let error;
const defaultError = new Error("Default error message");
showInputBox.mockReset();
renameDataSet.mockReset();
renameDataSet.mockImplementation(() => { throw defaultError; });
const child = new ZoweNode("[sessNode]: HLQ.TEST.DELETE.NODE", vscode.TreeItemCollapsibleState.None, sessNode, null);
child.contextValue = "ds_fav";
showInputBox.mockResolvedValueOnce("HLQ.TEST.DELETE.NODE.NEW");
try {
await extension.renameDataSet(child, testTree);
} catch (err) {
error = err;
}
expect(renameDataSet.mock.calls.length).toBe(1);
expect(renameDataSet).toHaveBeenLastCalledWith(child.getSession(), "HLQ.TEST.DELETE.NODE", "HLQ.TEST.DELETE.NODE.NEW");
expect(error).toBe(defaultError);
});
});
=======
it("tests the issueTsoCommand function", async () => {
showQuickPick.mockReset();
showInputBox.mockReset();
Object.defineProperty(profileLoader.Profiles, "getInstance", {
value: jest.fn(() => {
return {
allProfiles: [],
defaultProfile: undefined,
};
})
});
await extension.issueTsoCommand(outputChannel);
expect(expect(showInformationMessage.mock.calls[0][0]).toEqual("No profiles available"));
});
it("tests the issueTsoCommand error function", async () => {
showQuickPick.mockReset();
showInputBox.mockReset();
showQuickPick.mockReturnValueOnce("firstName");
showInputBox.mockReturnValueOnce("/d iplinfo");
issueSimple.mockReturnValueOnce({commandResponse: "fake response"});
await extension.issueTsoCommand(undefined);
expect(showErrorMessage.mock.calls.length).toBe(1);
});
>>>>>>>
describe("Renaming Data Sets", () => {
it("Should rename the node", async () => {
showInputBox.mockReset();
renameDataSet.mockReset();
const child = new ZoweNode("HLQ.TEST.DELETE.NODE", vscode.TreeItemCollapsibleState.None, sessNode, null);
showInputBox.mockResolvedValueOnce("HLQ.TEST.DELETE.NODE.NEW");
await extension.renameDataSet(child, testTree);
expect(renameDataSet.mock.calls.length).toBe(1);
expect(renameDataSet).toHaveBeenLastCalledWith(child.getSession(), "HLQ.TEST.DELETE.NODE", "HLQ.TEST.DELETE.NODE.NEW");
});
it("Should rename a favorited node", async () => {
showInputBox.mockReset();
renameDataSet.mockReset();
const child = new ZoweNode("[sessNode]: HLQ.TEST.DELETE.NODE", vscode.TreeItemCollapsibleState.None, sessNode, null);
child.contextValue = "ds_fav";
showInputBox.mockResolvedValueOnce("HLQ.TEST.DELETE.NODE.NEW");
await extension.renameDataSet(child, testTree);
expect(renameDataSet.mock.calls.length).toBe(1);
expect(renameDataSet).toHaveBeenLastCalledWith(child.getSession(), "HLQ.TEST.DELETE.NODE", "HLQ.TEST.DELETE.NODE.NEW");
});
it("Should throw an error if zowe.Rename.dataSet throws", async () => {
let error;
const defaultError = new Error("Default error message");
showInputBox.mockReset();
renameDataSet.mockReset();
renameDataSet.mockImplementation(() => { throw defaultError; });
const child = new ZoweNode("[sessNode]: HLQ.TEST.DELETE.NODE", vscode.TreeItemCollapsibleState.None, sessNode, null);
child.contextValue = "ds_fav";
showInputBox.mockResolvedValueOnce("HLQ.TEST.DELETE.NODE.NEW");
try {
await extension.renameDataSet(child, testTree);
} catch (err) {
error = err;
}
expect(renameDataSet.mock.calls.length).toBe(1);
expect(renameDataSet).toHaveBeenLastCalledWith(child.getSession(), "HLQ.TEST.DELETE.NODE", "HLQ.TEST.DELETE.NODE.NEW");
expect(error).toBe(defaultError);
});
it("tests the issueTsoCommand function", async () => {
showQuickPick.mockReset();
showInputBox.mockReset();
Object.defineProperty(profileLoader.Profiles, "getInstance", {
value: jest.fn(() => {
return {
allProfiles: [],
defaultProfile: undefined,
};
})
});
await extension.issueTsoCommand(outputChannel);
expect(expect(showInformationMessage.mock.calls[0][0]).toEqual("No profiles available"));
});
it("tests the issueTsoCommand error function", async () => {
showQuickPick.mockReset();
showInputBox.mockReset();
showQuickPick.mockReturnValueOnce("firstName");
showInputBox.mockReturnValueOnce("/d iplinfo");
issueSimple.mockReturnValueOnce({commandResponse: "fake response"});
await extension.issueTsoCommand(undefined);
expect(showErrorMessage.mock.calls.length).toBe(1);
}); |
<<<<<<<
=======
import { ISession } from "@zowe/imperative";
import { Profiles } from "./Profiles";
import * as extension from "../src/extension";
>>>>>>>
import { ISession } from "@zowe/imperative";
import { Profiles } from "./Profiles"; |
<<<<<<<
BumpMap = "bumpMap",
RoughnessMap = "roughnessMap",
=======
AlphaMap = "alphaMap",
AOMap = "aoMap",
BumpMap = "bumpMap",
NormalMap = "normalMap",
SpecularMap = "specularMap",
GradientMap = "gradientMap",
RoughnessMap = "roughnessMap",
MetalnessMap = "metalnessMap",
DisplacementMap = "displacementMap",
>>>>>>>
AlphaMap = "alphaMap",
AOMap = "aoMap",
BumpMap = "bumpMap",
NormalMap = "normalMap",
SpecularMap = "specularMap",
GradientMap = "gradientMap",
RoughnessMap = "roughnessMap",
MetalnessMap = "metalnessMap",
DisplacementMap = "displacementMap",
<<<<<<<
=======
name?: string;
type: DefineLocation;
>>>>>>>
name?: string;
<<<<<<<
/**
*
*/
=======
removeDefineByName(name: string): Define | null;
findDefineByName(name: string): Define | null;
>>>>>>>
removeDefineByName(name: string): Define | null;
<<<<<<<
private _setTexelDecodingFunction(key, add, encoding?);
private _addOrRemoveTexturesDecodingDefine(add);
=======
private _setTexelDefine(key, add, encoding?);
private _addOrRemoveTexturesDefine(add);
>>>>>>>
private _setTexelDefine(key, add, encoding?);
private _addOrRemoveTexturesDefine(add); |
<<<<<<<
import { ZoweExplorerApiRegister } from "./api/ZoweExplorerApiRegister";
=======
import * as nls from "vscode-nls";
const localize = nls.config({ messageFormat: nls.MessageFormat.file })();
>>>>>>>
import { ZoweExplorerApiRegister } from "./api/ZoweExplorerApiRegister";
import * as nls from "vscode-nls";
const localize = nls.config({ messageFormat: nls.MessageFormat.file })();
<<<<<<<
spools = await ZoweExplorerApiRegister.getJesApi(this.profile).getSpoolFiles(this.job.jobname, this.job.jobid);
=======
spools = await vscode.window.withProgress({
location: vscode.ProgressLocation.Notification,
title: localize("ZoweJobNode.getJobs.spoolfiles", "Get Job Spool files command submitted.")
}, () => {
return zowe.GetJobs.getSpoolFiles(this.session, this.job.jobname, this.job.jobid);
});
>>>>>>>
spools = await vscode.window.withProgress({
location: vscode.ProgressLocation.Notification,
title: localize("ZoweJobNode.getJobs.spoolfiles", "Get Job Spool files command submitted.")
}, () => {
return ZoweExplorerApiRegister.getJesApi(this.profile).getSpoolFiles(this.job.jobname, this.job.jobid);
});
<<<<<<<
let jobs: zowe.IJob[] = [];
if (this.searchId.length > 0 ) {
jobs.push(await ZoweExplorerApiRegister.getJesApi(this.profile).getJob(this._searchId));
} else {
jobs = await ZoweExplorerApiRegister.getJesApi(this.profile).getJobsByOwnerAndPrefix(this._owner, this._prefix);
}
=======
const jobs = await vscode.window.withProgress({
location: vscode.ProgressLocation.Notification,
title: localize("ZoweJobNode.getJobs.jobs", "Get Jobs command submitted.")
}, () => {
return this.getJobs(this.session, this._owner, this._prefix, this._searchId);
});
>>>>>>>
const jobs = await vscode.window.withProgress({
location: vscode.ProgressLocation.Notification,
title: localize("ZoweJobNode.getJobs.jobs", "Get Jobs command submitted.")
}, () => {
return this.getJobs(this._owner, this._prefix, this._searchId);
}); |
<<<<<<<
const writeText = jest.fn();
=======
const existsSync = jest.fn();
>>>>>>>
const writeText = jest.fn();
const existsSync = jest.fn();
<<<<<<<
Object.defineProperty(vscode.env.clipboard, "writeText", {value: writeText});
=======
Object.defineProperty(fs, "existsSync", {value: existsSync});
>>>>>>>
Object.defineProperty(vscode.env.clipboard, "writeText", {value: writeText});
Object.defineProperty(fs, "existsSync", {value: existsSync}); |
<<<<<<<
public save(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
public update(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
=======
public delete(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
public get configurations() {
return [{
type: "zosmf",
schema: {
type: "object",
title: "test profile",
description: "test profile",
properties: {
sum: {
type: "number"
}
},
required: ["sum"]
},
},
{
type: "banana",
schema: {
type: "object",
title: "test banana",
description: "test banana",
properties: {
sum: {
type: "number"
}
},
required: ["sum"]
},
}];
}
>>>>>>>
public save(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
public update(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
public delete(){
return { name: "profile1", profile: {}, type: "zosmf" };
}
public get configurations() {
return [{
type: "zosmf",
schema: {
type: "object",
title: "test profile",
description: "test profile",
properties: {
sum: {
type: "number"
}
},
required: ["sum"]
},
},
{
type: "banana",
schema: {
type: "object",
title: "test banana",
description: "test banana",
properties: {
sum: {
type: "number"
}
},
required: ["sum"]
},
}];
} |
<<<<<<<
import { ZoweExplorerApiRegister } from "./api/ZoweExplorerApiRegister";
import { sortTreeItems, applyIcons, FilterDescriptor, FilterItem, getAppName, resolveQuickPickHelper } from "./utils";
=======
import { sortTreeItems, applyIcons, FilterDescriptor, FilterItem, getAppName, resolveQuickPickHelper, errorHandling } from "./utils";
>>>>>>>
import { ZoweExplorerApiRegister } from "./api/ZoweExplorerApiRegister";
import { sortTreeItems, applyIcons, FilterDescriptor, FilterItem, getAppName, resolveQuickPickHelper, errorHandling } from "./utils"; |
<<<<<<<
const writeText = jest.fn();
=======
const createBasicZosmfSession = jest.fn();
>>>>>>>
const writeText = jest.fn();
const createBasicZosmfSession = jest.fn();
<<<<<<<
Object.defineProperty(vscode.env.clipboard, "writeText", {value: writeText});
=======
Object.defineProperty(zowe.ZosmfSession, "createBasicZosmfSession", { value: createBasicZosmfSession});
>>>>>>>
Object.defineProperty(vscode.env.clipboard, "writeText", {value: writeText});
Object.defineProperty(zowe.ZosmfSession, "createBasicZosmfSession", { value: createBasicZosmfSession}); |
<<<<<<<
import * as application from "tns-core-modules/application";
import * as frame from "tns-core-modules/ui/frame";
import { Label } from "tns-core-modules/ui/label/";
import { Page } from "tns-core-modules/ui/page";
import { Color } from "tns-core-modules/ui/frame";
=======
>>>>>>>
import * as application from "tns-core-modules/application";
import * as frame from "tns-core-modules/ui/frame";
import { Label } from "tns-core-modules/ui/label/";
import { Page } from "tns-core-modules/ui/page";
import { Color } from "tns-core-modules/ui/frame"; |
<<<<<<<
zowe.DownloadJobs.downloadAllSpoolContentCommon(job.getSession(), {
=======
ZoweExplorerApiRegister.getJesApi(job.profile).downloadSpoolContent({
>>>>>>>
ZoweExplorerApiRegister.getJesApi(job.getProfile()).downloadSpoolContent({
<<<<<<<
const jobJcl = await zowe.GetJobs.getJclForJob(job.getSession(), job.job);
=======
const jobJcl = await ZoweExplorerApiRegister.getJesApi(job.profile).getJclForJob(job.job);
>>>>>>>
const jobJcl = await ZoweExplorerApiRegister.getJesApi(job.getProfile()).getJclForJob(job.job);
<<<<<<<
switch (node.getParent().contextValue) {
=======
let sessProfile;
const profiles = await Profiles.getInstance();
switch (node.mParent.contextValue) {
>>>>>>>
let sessProfile;
const profiles = await Profiles.getInstance();
switch (node.getParent().contextValue) {
<<<<<<<
sesName = node.getParent().getParent().getLabel();
label = node.getParent().getLabel() + "(" + node.label.trim()+ ")";
=======
sesName = node.mParent.mParent.label;
label = node.mParent.label.trim()+ "(" + node.label.trim()+ ")";
sessProfile = node.mParent.mParent.profile;
>>>>>>>
sesName = node.getParent().getParent().getLabel();
label = node.getParent().getLabel() + "(" + node.label.trim()+ ")";
sessProfile = node.getParent().getParent().getProfile();
<<<<<<<
openPS(new ZoweDatasetNode(name, vscode.TreeItemCollapsibleState.None, parent, null), true, datasetProvider);
=======
openPS(
new ZoweNode(name, vscode.TreeItemCollapsibleState.None, parent, null, undefined, undefined, parent.profile),
true, datasetProvider);
>>>>>>>
openPS(
new ZoweDatasetNode(name, vscode.TreeItemCollapsibleState.None, parent, null, undefined, undefined, parent.getProfile()),
true, datasetProvider); |
<<<<<<<
vscode.commands.registerCommand("zowe.uss.renameNode", async (node) => ussActions.renameUSSNode(node, ussFileProvider, getUSSDocumentFilePath(node)));
let jobsProvider: ZosJobsProvider;
=======
vscode.workspace.onDidChangeConfiguration(async (e) => {
if (e.affectsConfiguration("Zowe-USS-Persistent-Favorites")) {
const ussSetting: any = { ...vscode.workspace.getConfiguration().get("Zowe-USS-Persistent-Favorites") };
if (!ussSetting.persistence) {
ussSetting.favorites = [];
await vscode.workspace.getConfiguration().update("Zowe-USS-Persistent-Favorites", ussSetting, vscode.ConfigurationTarget.Global);
}
}
});
// JES
>>>>>>>
vscode.commands.registerCommand("zowe.uss.renameNode", async (node) => ussActions.renameUSSNode(node, ussFileProvider, getUSSDocumentFilePath(node)));
vscode.workspace.onDidChangeConfiguration(async (e) => {
if (e.affectsConfiguration("Zowe-USS-Persistent-Favorites")) {
const ussSetting: any = { ...vscode.workspace.getConfiguration().get("Zowe-USS-Persistent-Favorites") };
if (!ussSetting.persistence) {
ussSetting.favorites = [];
await vscode.workspace.getConfiguration().update("Zowe-USS-Persistent-Favorites", ussSetting, vscode.ConfigurationTarget.Global);
}
}
});
// JES |
<<<<<<<
import { ZoweNode } from "../../src/ZoweNode";
import * as imperative from "@zowe/imperative";
=======
import { ZoweDatasetNode } from "../../src/ZoweDatasetNode";
import * as brtimperative from "@brightside/imperative";
>>>>>>>
import { ZoweDatasetNode } from "../../src/ZoweDatasetNode";
import * as imperative from "@zowe/imperative";
<<<<<<<
Object.defineProperty(imperative, "ImperativeError", {value: ImperativeError});
Object.defineProperty(imperative, "CliProfileManager", {value: CliProfileManager});
=======
Object.defineProperty(brtimperative, "CliProfileManager", {value: CliProfileManager});
>>>>>>>
Object.defineProperty(imperative, "CliProfileManager", {value: CliProfileManager});
<<<<<<<
Object.defineProperty(ZoweNode, "getProfileName", { value: getProfileName });
Object.defineProperty(imperative, "ImperativeConfig", { value: ImperativeConfig });
Object.defineProperty(ImperativeConfig, "instance", { value: icInstance });
Object.defineProperty(icInstance, "cliHome", { value: cliHome });
=======
>>>>>>> |
<<<<<<<
createFilterString: mockCreateFilterString,
=======
setItem: jest.fn(),
>>>>>>>
createFilterString: mockCreateFilterString,
setItem: jest.fn(),
<<<<<<<
addRecall: mockAddRecall,
getRecall: mockUSSGetRecall,
removeRecall: mockRemoveUSSRecall,
openItemFromPath: mockUSSOpenItemFromPath,
=======
searchInLoadedItems: jest.fn(),
setItem: jest.fn(),
>>>>>>>
addRecall: mockAddRecall,
getRecall: mockUSSGetRecall,
removeRecall: mockRemoveUSSRecall,
openItemFromPath: mockUSSOpenItemFromPath,
searchInLoadedItems: jest.fn(),
setItem: jest.fn(),
<<<<<<<
"zowe.jobs.removeSearchFavorite",
"zowe.openRecentMember",
=======
"zowe.jobs.removeSearchFavorite",
"zowe.searchInAllLoadedItems",
>>>>>>>
"zowe.jobs.removeSearchFavorite",
"zowe.openRecentMember",
"zowe.searchInAllLoadedItems", |
<<<<<<<
import { getIconByNode } from "./generators/icons";
import { getMessageByNode, MessageContentType } from "./generators/messages";
import * as contextually from "./utils/context";
import { linkProfileDialog } from "./utils/Profilelink";
=======
>>>>>>>
import { linkProfileDialog } from "./utils/profileLink";
<<<<<<<
// Globals
export let ZOWETEMPFOLDER;
export let ZOWE_TMP_FOLDER;
export let USS_DIR;
export let DS_DIR;
export let ISTHEIA: boolean = false; // set during activate
export const CONTEXT_PREFIX = "_";
export const FAV_SUFFIX = CONTEXT_PREFIX + "fav";
export const RC_SUFFIX = CONTEXT_PREFIX + "rc=";
export const INFORMATION_CONTEXT = "information";
export const FAVORITE_CONTEXT = "favorite";
export const DS_FAV_CONTEXT = "ds_fav";
export const PDS_FAV_CONTEXT = "pds_fav";
export const DS_SESSION_CONTEXT = "session";
export const DS_PDS_CONTEXT = "pds";
export const DS_DS_CONTEXT = "ds";
export const DS_MEMBER_CONTEXT = "member";
export const DS_TEXT_FILE_CONTEXT = "textFile";
export const DS_FAV_TEXT_FILE_CONTEXT = "textFile_fav";
export const DS_BINARY_FILE_CONTEXT = "binaryFile";
export const DS_MIGRATED_FILE_CONTEXT = "migr";
export const USS_SESSION_CONTEXT = "ussSession";
export const USS_DIR_CONTEXT = "directory";
export const USS_FAV_DIR_CONTEXT = "directory_fav";
export const JOBS_SESSION_CONTEXT = "server";
export const JOBS_JOB_CONTEXT = "job";
export const JOBS_SPOOL_CONTEXT = "spool";
export const ICON_STATE_OPEN = "open";
export const ICON_STATE_CLOSED = "closed";
export const VSAM_CONTEXT = "vsam";
let usrNme: string;
let passWrd: string;
let baseEncd: string;
let validProfile: number = -1;
let log: Logger;
=======
>>>>>>>
<<<<<<<
vscode.commands.registerCommand("zowe.createDataset", (node) => createFile(node, datasetProvider));
vscode.commands.registerCommand("zowe.all.profilelink", (node) => linkProfileDialog(node.getProfile()));
vscode.commands.registerCommand("zowe.createMember", (node) => createMember(node, datasetProvider));
vscode.commands.registerCommand("zowe.deleteDataset", (node) => deleteDataset(node, datasetProvider));
vscode.commands.registerCommand("zowe.deletePDS", (node) => deleteDataset(node, datasetProvider));
vscode.commands.registerCommand("zowe.uploadDialog", (node) => mvsActions.uploadDialog(node, datasetProvider));
vscode.commands.registerCommand("zowe.deleteMember", (node) => deleteDataset(node, datasetProvider));
vscode.commands.registerCommand("zowe.editMember", (node) => openPS(node, false, datasetProvider));
vscode.commands.registerCommand("zowe.removeSession", async (node) => datasetProvider.deleteSession(node));
vscode.commands.registerCommand("zowe.removeFavorite", async (node) => datasetProvider.removeFavorite(node));
vscode.commands.registerCommand("zowe.saveSearch", async (node) => datasetProvider.addFavorite(node));
vscode.commands.registerCommand("zowe.removeSavedSearch", async (node) => datasetProvider.removeFavorite(node));
vscode.commands.registerCommand("zowe.submitJcl", async () => submitJcl(datasetProvider));
vscode.commands.registerCommand("zowe.submitMember", async (node) => submitMember(node));
vscode.commands.registerCommand("zowe.showDSAttributes", (node) => showDSAttributes(node, datasetProvider));
vscode.commands.registerCommand("zowe.renameDataSet", (node) => datasetProvider.rename(node));
vscode.commands.registerCommand("zowe.copyDataSet", (node) => copyDataSet(node));
vscode.commands.registerCommand("zowe.pasteDataSet", (node) => pasteDataSet(node, datasetProvider));
vscode.commands.registerCommand("zowe.renameDataSetMember", (node) => datasetProvider.rename(node));
vscode.commands.registerCommand("zowe.hMigrateDataSet", (node) => hMigrateDataSet(node));
vscode.workspace.onDidChangeConfiguration(async (e) => {
datasetProvider.onDidChangeConfiguration(e);
});
vscode.workspace.onDidChangeConfiguration((e) => {
if (e.affectsConfiguration("Zowe-Temp-Folder-Location")) {
const updatedPreferencesTempPath: string =
vscode.workspace.getConfiguration()
/* tslint:disable:no-string-literal */
.get("Zowe-Temp-Folder-Location")["folderPath"];
moveTempFolder(preferencesTempPath, updatedPreferencesTempPath);
// Update current temp folder preference
preferencesTempPath = updatedPreferencesTempPath;
}
});
// Attaches the TreeView as a subscriber to the refresh event of datasetProvider
const theTreeView = datasetProvider.getTreeView();
context.subscriptions.push(theTreeView);
if (!ISTHEIA) {
theTreeView.onDidCollapseElement(async (e) => {
datasetProvider.flipState(e.element, false);
});
theTreeView.onDidExpandElement(async (e) => {
datasetProvider.flipState(e.element, true);
});
}
}
if (ussFileProvider) {
vscode.commands.registerCommand("zowe.uss.addFavorite", async (node: IZoweUSSTreeNode) => ussFileProvider.addFavorite(node));
vscode.commands.registerCommand("zowe.uss.removeFavorite", async (node: IZoweUSSTreeNode) => ussFileProvider.removeFavorite(node));
vscode.commands.registerCommand("zowe.uss.addSession", async () => addZoweSession(ussFileProvider));
vscode.commands.registerCommand("zowe.uss.refreshAll", () => ussActions.refreshAllUSS(ussFileProvider));
vscode.commands.registerCommand("zowe.uss.refreshUSS", (node: IZoweUSSTreeNode) => node.refreshUSS());
vscode.commands.registerCommand("zowe.uss.refreshUSSInTree", (node: IZoweUSSTreeNode) => refreshUSSInTree(node, ussFileProvider));
vscode.commands.registerCommand("zowe.uss.fullPath", (node: IZoweUSSTreeNode) => ussFileProvider.filterPrompt(node));
vscode.commands.registerCommand("zowe.uss.ZoweUSSNode.open", (node: IZoweUSSTreeNode) => node.openUSS(false, true, ussFileProvider));
vscode.commands.registerCommand("zowe.uss.removeSession", async (node: IZoweUSSTreeNode) => ussFileProvider.deleteSession(node));
vscode.commands.registerCommand("zowe.uss.createFile", async (node: IZoweUSSTreeNode) =>
ussActions.createUSSNode(node, ussFileProvider, "file"));
vscode.commands.registerCommand("zowe.uss.createFolder", async (node: IZoweUSSTreeNode) =>
ussActions.createUSSNode(node, ussFileProvider, "directory"));
vscode.commands.registerCommand("zowe.uss.deleteNode", async (node: IZoweUSSTreeNode) =>
node.deleteUSSNode(ussFileProvider, node.getUSSDocumentFilePath()));
vscode.commands.registerCommand("zowe.uss.binary", async (node: IZoweUSSTreeNode) => changeFileType(node, true, ussFileProvider));
vscode.commands.registerCommand("zowe.uss.text", async (node: IZoweUSSTreeNode) => changeFileType(node, false, ussFileProvider));
vscode.commands.registerCommand("zowe.uss.renameNode", async (node: IZoweUSSTreeNode) => ussFileProvider.rename(node));
vscode.commands.registerCommand("zowe.uss.uploadDialog", async (node: IZoweUSSTreeNode) => ussActions.uploadDialog(node, ussFileProvider));
vscode.commands.registerCommand("zowe.uss.createNode", async (node: IZoweUSSTreeNode) =>
ussActions.createUSSNodeDialog(node, ussFileProvider));
vscode.commands.registerCommand("zowe.uss.copyPath", async (node: IZoweUSSTreeNode) => ussActions.copyPath(node));
vscode.commands.registerCommand("zowe.uss.editFile", (node: IZoweUSSTreeNode) => node.openUSS(false, false, ussFileProvider));
vscode.commands.registerCommand("zowe.uss.saveSearch", async (node: IZoweUSSTreeNode) => ussFileProvider.saveSearch(node));
vscode.commands.registerCommand("zowe.uss.removeSavedSearch", async (node: IZoweUSSTreeNode) => ussFileProvider.removeFavorite(node));
vscode.workspace.onDidChangeConfiguration(async (e) => {
ussFileProvider.onDidChangeConfiguration(e);
});
const theTreeView = ussFileProvider.getTreeView();
context.subscriptions.push(theTreeView);
if (!ISTHEIA) {
theTreeView.onDidCollapseElement(async (e) => {
ussFileProvider.flipState(e.element, false);
});
theTreeView.onDidExpandElement(async (e) => {
ussFileProvider.flipState(e.element, true);
});
}
}
if (jobsProvider) {
vscode.commands.registerCommand("zowe.zosJobsOpenspool", (session, spool) => {
getSpoolContent(session, spool);
});
vscode.commands.registerCommand("zowe.deleteJob", (job) => jobsProvider.delete(job));
vscode.commands.registerCommand("zowe.runModifyCommand", (job) => {
modifyCommand(job);
});
vscode.commands.registerCommand("zowe.runStopCommand", (job) => {
stopCommand(job);
});
vscode.commands.registerCommand("zowe.refreshJobsServer", async (node) => refreshJobsServer(node, jobsProvider));
vscode.commands.registerCommand("zowe.refreshAllJobs", async () => jobActions.refreshAllJobs(jobsProvider));
vscode.commands.registerCommand("zowe.addJobsSession", () => addZoweSession(jobsProvider));
vscode.commands.registerCommand("zowe.setOwner", (node) => {
setOwner(node, jobsProvider);
});
vscode.commands.registerCommand("zowe.setPrefix", (node) => {
setPrefix(node, jobsProvider);
});
vscode.commands.registerCommand("zowe.removeJobsSession", (node) => jobsProvider.deleteSession(node));
vscode.commands.registerCommand("zowe.downloadSpool", (job) => downloadSpool(job));
vscode.commands.registerCommand("zowe.getJobJcl", (job) => {
downloadJcl(job);
});
vscode.commands.registerCommand("zowe.setJobSpool", async (session, jobid) => {
const sessionNode = jobsProvider.mSessionNodes.find((jobNode) => {
return jobNode.label.trim() === session.trim();
});
sessionNode.dirty = true;
jobsProvider.refresh();
const jobs: IZoweJobTreeNode[] = await sessionNode.getChildren();
const job: IZoweJobTreeNode = jobs.find((jobNode) => {
return jobNode.job.jobid === jobid;
});
jobsProvider.setItem(theTreeView, job);
});
vscode.commands.registerCommand("zowe.jobs.search", (node) => jobsProvider.filterPrompt(node));
vscode.commands.registerCommand("zowe.issueTsoCmd", async () => MvsCommandHandler.getInstance().issueMvsCommand());
vscode.commands.registerCommand("zowe.issueMvsCmd", async (node, command) =>
MvsCommandHandler.getInstance().issueMvsCommand(node.session, command));
vscode.workspace.onDidChangeConfiguration(async (e) => {
jobsProvider.onDidChangeConfiguration(e);
});
vscode.commands.registerCommand("zowe.jobs.addFavorite", async (node) => jobsProvider.addFavorite(node));
vscode.commands.registerCommand("zowe.jobs.removeFavorite", async (node) => jobsProvider.removeFavorite(node));
vscode.commands.registerCommand("zowe.jobs.saveSearch", async (node) => jobsProvider.saveSearch(node));
vscode.commands.registerCommand("zowe.jobs.removeSearchFavorite", async (node) => jobsProvider.removeFavorite(node));
const theTreeView = jobsProvider.getTreeView();
context.subscriptions.push(theTreeView);
if (!ISTHEIA) {
theTreeView.onDidCollapseElement( async (e: { element: IZoweJobTreeNode; }) => {
jobsProvider.flipState(e.element, false);
});
theTreeView.onDidExpandElement( async (e: { element: IZoweJobTreeNode; }) => {
jobsProvider.flipState(e.element, true);
});
}
}
if (datasetProvider || ussFileProvider) {
vscode.commands.registerCommand("zowe.openRecentMember", () => openRecentMemberPrompt(datasetProvider, ussFileProvider));
vscode.commands.registerCommand("zowe.searchInAllLoadedItems", async () => searchInAllLoadedItems(datasetProvider, ussFileProvider));
=======
>>>>>>> |
<<<<<<<
import { IZoweTree, IZoweTreeNode } from "./ZoweTree";
import { ZoweNode } from "./ZoweNode";
import { Logger, TextUtils, IProfileLoaded, ImperativeConfig, Session, CredentialManagerFactory,
ImperativeError, DefaultCredentialManager } from "@zowe/imperative";
=======
import { IZoweTreeNode, IZoweJobTreeNode, IZoweUSSTreeNode, IZoweDatasetTreeNode } from "./api/IZoweTreeNode";
import { ZoweDatasetNode } from "./ZoweDatasetNode";
import { IZoweTree } from "./api/IZoweTree";
import { Logger, TextUtils, IProfileLoaded, ImperativeConfig, Session, CredentialManagerFactory, ImperativeError, DefaultCredentialManager } from "@brightside/imperative";
>>>>>>>
import { IZoweTreeNode, IZoweJobTreeNode, IZoweUSSTreeNode, IZoweDatasetTreeNode } from "./api/IZoweTreeNode";
import { ZoweDatasetNode } from "./ZoweDatasetNode";
import { IZoweTree } from "./api/IZoweTree";
import { Logger, TextUtils, IProfileLoaded, ImperativeConfig, Session, CredentialManagerFactory,
ImperativeError, DefaultCredentialManager } from "@zowe/imperative";
<<<<<<<
if(previousTemp === ZOWETEMPFOLDER) {
=======
if (previousTemp === BRIGHTTEMPFOLDER) {
>>>>>>>
if (previousTemp === ZOWETEMPFOLDER) {
<<<<<<<
moveSync(previousTemp, ZOWETEMPFOLDER, { overwrite: true });
=======
moveSync(previousTemp, BRIGHTTEMPFOLDER, {overwrite: true});
>>>>>>>
moveSync(previousTemp, ZOWETEMPFOLDER, { overwrite: true });
<<<<<<<
* @param {ZoweNode} node - Desired Zowe session
=======
* @param {ZoweDatasetNode} node - Desired Brightside session
>>>>>>>
* @param {ZoweDatasetNode} node - Desired Zowe session
<<<<<<<
await zowe.Copy.dataSet(
node.getSession(),
=======
await ZoweExplorerApiRegister.getMvsApi(node.getProfile()).copyDataSetMember(
{ dataSetName: beforeDataSetName, memberName: beforeMemberName },
>>>>>>>
await ZoweExplorerApiRegister.getMvsApi(node.getProfile()).copyDataSetMember(
{ dataSetName: beforeDataSetName, memberName: beforeMemberName },
<<<<<<<
node.setEtag(uploadResponse.apiResponse[0].etag);
} else if (!uploadResponse.success && uploadResponse.commandResponse.includes(localize("saveFile.error.ZosmfEtagMismatchError",
"Rest API failure with HTTP(S) status 412"))) {
const downloadResponse = await zowe.Download.dataSet(documentSession, label, {
=======
if (node) {
node.setEtag(uploadResponse.apiResponse[0].etag);
}
} else if (!uploadResponse.success && uploadResponse.commandResponse.includes(localize("saveFile.error.ZosmfEtagMismatchError", "Rest API failure with HTTP(S) status 412"))) {
const downloadResponse = await ZoweExplorerApiRegister.getMvsApi(node ? node.getProfile(): profile).getContents(label, {
>>>>>>>
if (node) {
node.setEtag(uploadResponse.apiResponse[0].etag);
}
} else if (!uploadResponse.success && uploadResponse.commandResponse.includes(localize("saveFile.error.ZosmfEtagMismatchError", "Rest API failure with HTTP(S) status 412"))) {
const downloadResponse = await ZoweExplorerApiRegister.getMvsApi(node ? node.getProfile(): profile).getContents(label, {
<<<<<<<
vscode.window.showWarningMessage(localize("saveFile.error.etagMismatch",
"Remote file has been modified in the meantime.\nSelect 'Compare' to resolve the conflict."));
=======
vscode.window.showWarningMessage(localize("saveFile.error.etagMismatch", "Remote file has been modified in the meantime.\nSelect 'Compare' to resolve the conflict."));
>>>>>>>
vscode.window.showWarningMessage(localize("saveFile.error.etagMismatch",
"Remote file has been modified in the meantime.\nSelect 'Compare' to resolve the conflict."));
<<<<<<<
return zowe.Upload.fileToUSSFile(documentSession, doc.fileName, remote, binary, null, null, etagToUpload, returnEtag); // TODO TESTING
=======
return ZoweExplorerApiRegister.getUssApi(sesNode.getProfile()).putContents(
doc.fileName, remote, binary, null, etagToUpload, returnEtag); // TODO MISSED TESTING
>>>>>>>
return ZoweExplorerApiRegister.getUssApi(sesNode.getProfile()).putContents(
doc.fileName, remote, binary, null, etagToUpload, returnEtag); // TODO MISSED TESTING
<<<<<<<
vscode.window.showWarningMessage(localize("saveFile.error.etagMismatch",
"Remote file has been modified in the meantime.\nSelect 'Compare' to resolve the conflict."));
// Store document in a separate variable, to be used on merge conflict
const oldDoc = doc;
const oldDocText = oldDoc.getText();
const startPosition = new vscode.Position(0,0);
const endPosition = new vscode.Position(oldDoc.lineCount,0);
=======
this.downloaded = true;
vscode.window.showWarningMessage(localize("saveFile.error.etagMismatch", "Remote file has been modified in the meantime.\nSelect 'Compare' to resolve the conflict."));
const startPosition = new vscode.Position(0, 0);
const endPosition = new vscode.Position(oldDocLineCount, 0);
>>>>>>>
this.downloaded = true;
vscode.window.showWarningMessage(localize("saveFile.error.etagMismatch",
"Remote file has been modified in the meantime.\nSelect 'Compare' to resolve the conflict."));
const startPosition = new vscode.Position(0, 0);
const endPosition = new vscode.Position(oldDocLineCount, 0); |
<<<<<<<
expect(existsSync.mock.calls.length).toBe(3);
expect(existsSync.mock.calls[0][0]).toBe(extension.ZOWETEMPFOLDER);
=======
expect(existsSync.mock.calls.length).toBe(4);
expect(existsSync.mock.calls[0][0]).toBe(extension.BRIGHTTEMPFOLDER);
>>>>>>>
expect(existsSync.mock.calls.length).toBe(4);
expect(existsSync.mock.calls[0][0]).toBe(extension.ZOWETEMPFOLDER);
<<<<<<<
expect(rmdirSync.mock.calls[0][0]).toBe(extension.ZOWETEMPFOLDER);
=======
expect(rmdirSync.mock.calls[0][0]).toBe(extension.BRIGHTTEMPFOLDER);
expect(initialize.mock.calls.length).toBe(1);
expect(initialize.mock.calls[0][0]).toStrictEqual({
configuration: [],
profileRootDirectory: path.join(cliHome(), "profiles")
});
>>>>>>>
expect(rmdirSync.mock.calls[0][0]).toBe(extension.ZOWETEMPFOLDER);
expect(initialize.mock.calls.length).toBe(1);
expect(initialize.mock.calls[0][0]).toStrictEqual({
configuration: [],
profileRootDirectory: path.join(cliHome(), "profiles")
}); |
<<<<<<<
node = new ZoweNode("AUSER.TEST.SPFLOG1", vscode.TreeItemCollapsibleState.None, sessNode, null);
expect(extension.getDocumentFilePath(node.mLabel, node)).toEqual("/test/path/temp/_D_/sestest/AUSER.TEST.SPFLOG1.log");
=======
>>>>>>>
node = new ZoweNode("AUSER.TEST.SPFLOG1", vscode.TreeItemCollapsibleState.None, sessNode, null);
expect(extension.getDocumentFilePath(node.mLabel, node)).toEqual("/test/path/temp/_D_/sestest/AUSER.TEST.SPFLOG1.log"); |
<<<<<<<
});
/*************************************************************************************************************
* Testing openItemFromPath
*************************************************************************************************************/
describe("openItemFromPath tests", () => {
const session = new Session({
user: "fake",
password: "fake",
hostname: "fake",
port: 443,
protocol: "https",
type: "basic",
});
const profileOne: IProfileLoaded = {
name: "aProfile",
profile: {
user:undefined,
password: undefined
},
type: "zosmf",
message: "",
failNotFound: false
};
const testTree = new USSTree();
const sessionNode = new ZoweUSSNode("ussTestSess", vscode.TreeItemCollapsibleState.Collapsed, null, session,
null, false, profileOne.name, undefined);
const file = new ZoweUSSNode("c.txt", vscode.TreeItemCollapsibleState.Collapsed, sessionNode, null, "/a/b");
beforeEach(async () => {
sessionNode.children = [file];
testTree.mSessionNodes = [sessionNode];
});
it("Should open a USS file in the tree", async () => {
spyOn(sessionNode, "getChildren").and.returnValue(Promise.resolve([file]));
await testTree.openItemFromPath("/a/b/c.txt", sessionNode);
expect(testTree.getHistory().includes("[aProfile]: /a/b/c.txt")).toBe(true);
});
it("Should fail because the child no longer exists", async () => {
spyOn(sessionNode, "getChildren").and.returnValue(Promise.resolve([]));
const recallSpy = jest.spyOn(testTree, "removeRecall");
await testTree.openItemFromPath("/d.txt", sessionNode);
expect(recallSpy).toBeCalledWith("[aProfile]: /d.txt");
});
=======
describe("renameUSSNode", () => {
const executeCommand = jest.fn();
Object.defineProperty(vscode.commands, "executeCommand", {value: executeCommand});
const testTree = new USSTree();
const refreshSpy = jest.spyOn(testTree, "refreshElement");
const removeFavorite = jest.spyOn(testTree, "removeFavorite");
const addFavorite = jest.spyOn(testTree, "addFavorite");
const resetMocks = () => {
executeCommand.mockReset();
showErrorMessage.mockReset();
showInputBox.mockReset();
renameUSSFile.mockReset();
};
const resetNode = (node: ZoweUSSNode) => {
node.label = "";
node.shortLabel = "";
};
const ussNode = getUSSNode();
const ussFavNode = getFavoriteUSSNode();
it("should exit if blank input is provided", async () => {
resetMocks();
resetNode(ussNode);
showInputBox.mockReturnValueOnce("");
await testTree.rename(ussNode);
expect(showErrorMessage.mock.calls.length).toBe(0);
expect(renameUSSFile.mock.calls.length).toBe(0);
expect(refreshSpy).not.toHaveBeenCalled();
});
it("should execute rename USS file and and refresh the tree", async () => {
resetMocks();
resetNode(ussNode);
showInputBox.mockReturnValueOnce("new name");
await testTree.rename(ussNode);
expect(showErrorMessage.mock.calls.length).toBe(0);
expect(renameUSSFile.mock.calls.length).toBe(1);
});
it("should attempt rename USS file but abort with no name", async () => {
resetMocks();
resetNode(ussNode);
showInputBox.mockReturnValueOnce(undefined);
await testTree.rename(ussNode);
expect(refreshSpy).not.toHaveBeenCalled();
});
it("should attempt to rename USS file but throw an error", async () => {
resetMocks();
resetNode(ussNode);
showInputBox.mockReturnValueOnce("new name");
renameUSSFile.mockRejectedValueOnce(Error("testError"));
try {
await testTree.rename(ussNode);
// tslint:disable-next-line:no-empty
} catch (err) {
}
expect(showErrorMessage.mock.calls.length).toBe(1);
});
it("should execute rename favorite USS file", async () => {
resetMocks();
showInputBox.mockReturnValueOnce("new name");
await testTree.rename(ussFavNode);
expect(showErrorMessage.mock.calls.length).toBe(0);
expect(renameUSSFile.mock.calls.length).toBe(1);
expect(removeFavorite.mock.calls.length).toBe(1);
expect(addFavorite.mock.calls.length).toBe(1);
});
});
>>>>>>>
describe("renameUSSNode", () => {
const executeCommand = jest.fn();
Object.defineProperty(vscode.commands, "executeCommand", {value: executeCommand});
const testTree = new USSTree();
const refreshSpy = jest.spyOn(testTree, "refreshElement");
const removeFavorite = jest.spyOn(testTree, "removeFavorite");
const addFavorite = jest.spyOn(testTree, "addFavorite");
const resetMocks = () => {
executeCommand.mockReset();
showErrorMessage.mockReset();
showInputBox.mockReset();
renameUSSFile.mockReset();
};
const resetNode = (node: ZoweUSSNode) => {
node.label = "";
node.shortLabel = "";
};
const ussNode = getUSSNode();
const ussFavNode = getFavoriteUSSNode();
it("should exit if blank input is provided", async () => {
resetMocks();
resetNode(ussNode);
showInputBox.mockReturnValueOnce("");
await testTree.rename(ussNode);
expect(showErrorMessage.mock.calls.length).toBe(0);
expect(renameUSSFile.mock.calls.length).toBe(0);
expect(refreshSpy).not.toHaveBeenCalled();
});
it("should execute rename USS file and and refresh the tree", async () => {
resetMocks();
resetNode(ussNode);
showInputBox.mockReturnValueOnce("new name");
await testTree.rename(ussNode);
expect(showErrorMessage.mock.calls.length).toBe(0);
expect(renameUSSFile.mock.calls.length).toBe(1);
});
it("should attempt rename USS file but abort with no name", async () => {
resetMocks();
resetNode(ussNode);
showInputBox.mockReturnValueOnce(undefined);
await testTree.rename(ussNode);
expect(refreshSpy).not.toHaveBeenCalled();
});
it("should attempt to rename USS file but throw an error", async () => {
resetMocks();
resetNode(ussNode);
showInputBox.mockReturnValueOnce("new name");
renameUSSFile.mockRejectedValueOnce(Error("testError"));
try {
await testTree.rename(ussNode);
// tslint:disable-next-line:no-empty
} catch (err) {
}
expect(showErrorMessage.mock.calls.length).toBe(1);
});
it("should execute rename favorite USS file", async () => {
resetMocks();
showInputBox.mockReturnValueOnce("new name");
await testTree.rename(ussFavNode);
expect(showErrorMessage.mock.calls.length).toBe(0);
expect(renameUSSFile.mock.calls.length).toBe(1);
expect(removeFavorite.mock.calls.length).toBe(1);
expect(addFavorite.mock.calls.length).toBe(1);
});
});
});
/*************************************************************************************************************
* Testing openItemFromPath
*************************************************************************************************************/
describe("openItemFromPath tests", () => {
const session = new Session({
user: "fake",
password: "fake",
hostname: "fake",
port: 443,
protocol: "https",
type: "basic",
});
const profileOne: IProfileLoaded = {
name: "aProfile",
profile: {
user:undefined,
password: undefined
},
type: "zosmf",
message: "",
failNotFound: false
};
const testTree = new USSTree();
const sessionNode = new ZoweUSSNode("ussTestSess", vscode.TreeItemCollapsibleState.Collapsed, null, session,
null, false, profileOne.name, undefined);
const file = new ZoweUSSNode("c.txt", vscode.TreeItemCollapsibleState.Collapsed, sessionNode, null, "/a/b");
beforeEach(async () => {
sessionNode.children = [file];
testTree.mSessionNodes = [sessionNode];
});
it("Should open a USS file in the tree", async () => {
spyOn(sessionNode, "getChildren").and.returnValue(Promise.resolve([file]));
await testTree.openItemFromPath("/a/b/c.txt", sessionNode);
expect(testTree.getHistory().includes("[aProfile]: /a/b/c.txt")).toBe(true);
});
it("Should fail because the child no longer exists", async () => {
spyOn(sessionNode, "getChildren").and.returnValue(Promise.resolve([]));
const recallSpy = jest.spyOn(testTree, "removeRecall");
await testTree.openItemFromPath("/d.txt", sessionNode);
expect(recallSpy).toBeCalledWith("[aProfile]: /d.txt");
}); |
<<<<<<<
=======
import * as ajv from 'ajv';
>>>>>>> |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.