conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
return ParserHelpers.addParsedVariableToModule(parser, id, req);
};
if (this.options.worker !== false) {
parser.hooks.new.for('Worker').tap(NAME, handleWorker('Worker'));
}
if (this.options.sharedWorker) {
parser.hooks.new.for('SharedWorker').tap(NAME, handleWorker('SharedWorker'));
=======
>>>>>>> |
<<<<<<<
var hide = __webpack_require__(7);
=======
var createNonEnumerableProperty = __webpack_require__(7);
>>>>>>>
var createNonEnumerableProperty = __webpack_require__(8);
<<<<<<<
/* 5 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
function addEvent(event, details) {
if (typeof event !== 'string') {
throw new Error('Event name must be a string');
}
return new CustomEvent(event, {
detail: details
});
}
exports.addEvent = addEvent;
exports.events = ['loadstart', 'durationchange', 'loadedmetadata', 'loadeddata', 'progress', 'canplay', 'canplaythrough', 'suspend', 'abort', 'error', 'emptied', 'stalled', 'play', 'playing', 'pause', 'waiting', 'seeking', 'seeked', 'timeupdate', 'ended', 'ratechange', 'volumechange'];
/***/ }),
/* 6 */
=======
/* 6 */
>>>>>>>
/* 6 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
function addEvent(event, details) {
if (typeof event !== 'string') {
throw new Error('Event name must be a string');
}
return new CustomEvent(event, {
detail: details
});
}
exports.addEvent = addEvent;
exports.events = ['loadstart', 'durationchange', 'loadedmetadata', 'loadeddata', 'progress', 'canplay', 'canplaythrough', 'suspend', 'abort', 'error', 'emptied', 'stalled', 'play', 'playing', 'pause', 'waiting', 'seeking', 'seeked', 'timeupdate', 'ended', 'ratechange', 'volumechange'];
/***/ }),
/* 7 */
<<<<<<<
/* 8 */
/***/ (function(module, exports, __webpack_require__) {
var isObject = __webpack_require__(9);
module.exports = function (it) {
if (!isObject(it)) {
throw TypeError(String(it) + ' is not an object');
} return it;
};
/***/ }),
=======
/* 8 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
function addEvent(event, details) {
if (typeof event !== 'string') {
throw new Error('Event name must be a string');
}
return new CustomEvent(event, {
detail: details
});
}
exports.addEvent = addEvent;
exports.events = ['loadstart', 'durationchange', 'loadedmetadata', 'loadeddata', 'progress', 'canplay', 'canplaythrough', 'suspend', 'abort', 'error', 'emptied', 'stalled', 'play', 'playing', 'pause', 'waiting', 'seeking', 'seeked', 'timeupdate', 'ended', 'ratechange', 'volumechange'];
/***/ }),
>>>>>>>
<<<<<<<
/***/ (function(module, exports, __webpack_require__) {
var fails = __webpack_require__(6);
// Thank's IE8 for his funny defineProperty
module.exports = !fails(function () {
return Object.defineProperty({}, 'a', { get: function () { return 7; } }).a != 7;
});
/***/ }),
/* 12 */
=======
>>>>>>>
<<<<<<<
var DESCRIPTORS = __webpack_require__(11);
var IE8_DOM_DEFINE = __webpack_require__(49);
var anObject = __webpack_require__(8);
=======
var DESCRIPTORS = __webpack_require__(9);
var IE8_DOM_DEFINE = __webpack_require__(50);
var anObject = __webpack_require__(4);
>>>>>>>
var DESCRIPTORS = __webpack_require__(9);
var IE8_DOM_DEFINE = __webpack_require__(50);
var anObject = __webpack_require__(4);
<<<<<<<
var shared = __webpack_require__(25);
var hide = __webpack_require__(7);
var has = __webpack_require__(10);
=======
var shared = __webpack_require__(26);
var createNonEnumerableProperty = __webpack_require__(7);
var has = __webpack_require__(11);
>>>>>>>
var shared = __webpack_require__(26);
var createNonEnumerableProperty = __webpack_require__(8);
var has = __webpack_require__(11);
<<<<<<<
/* 26 */
/***/ (function(module, exports, __webpack_require__) {
var NATIVE_WEAK_MAP = __webpack_require__(76);
var global = __webpack_require__(0);
var isObject = __webpack_require__(9);
var hide = __webpack_require__(7);
var objectHas = __webpack_require__(10);
var sharedKey = __webpack_require__(37);
var hiddenKeys = __webpack_require__(38);
var WeakMap = global.WeakMap;
var set, get, has;
var enforce = function (it) {
return has(it) ? get(it) : set(it, {});
};
var getterFor = function (TYPE) {
return function (it) {
var state;
if (!isObject(it) || (state = get(it)).type !== TYPE) {
throw TypeError('Incompatible receiver, ' + TYPE + ' required');
} return state;
};
};
if (NATIVE_WEAK_MAP) {
var store = new WeakMap();
var wmget = store.get;
var wmhas = store.has;
var wmset = store.set;
set = function (it, metadata) {
wmset.call(store, it, metadata);
return metadata;
};
get = function (it) {
return wmget.call(store, it) || {};
};
has = function (it) {
return wmhas.call(store, it);
};
} else {
var STATE = sharedKey('state');
hiddenKeys[STATE] = true;
set = function (it, metadata) {
hide(it, STATE, metadata);
return metadata;
};
get = function (it) {
return objectHas(it, STATE) ? it[STATE] : {};
};
has = function (it) {
return objectHas(it, STATE);
};
}
module.exports = {
set: set,
get: get,
has: has,
enforce: enforce,
getterFor: getterFor
};
/***/ }),
=======
>>>>>>>
<<<<<<<
var anObject = __webpack_require__(8);
var isArrayIteratorMethod = __webpack_require__(62);
=======
var anObject = __webpack_require__(4);
var isArrayIteratorMethod = __webpack_require__(63);
>>>>>>>
var anObject = __webpack_require__(4);
var isArrayIteratorMethod = __webpack_require__(63);
<<<<<<<
var fails = __webpack_require__(6);
var classof = __webpack_require__(12);
=======
var fails = __webpack_require__(6);
var classof = __webpack_require__(13);
>>>>>>>
var fails = __webpack_require__(7);
var classof = __webpack_require__(13);
<<<<<<<
var hide = __webpack_require__(7);
=======
var createNonEnumerableProperty = __webpack_require__(7);
>>>>>>>
var createNonEnumerableProperty = __webpack_require__(8);
<<<<<<<
var anObject = __webpack_require__(8);
var defineProperties = __webpack_require__(86);
=======
var anObject = __webpack_require__(4);
var defineProperties = __webpack_require__(87);
>>>>>>>
var anObject = __webpack_require__(4);
var defineProperties = __webpack_require__(87);
<<<<<<<
var DESCRIPTORS = __webpack_require__(11);
var fails = __webpack_require__(6);
=======
var DESCRIPTORS = __webpack_require__(9);
var fails = __webpack_require__(6);
>>>>>>>
var DESCRIPTORS = __webpack_require__(9);
var fails = __webpack_require__(7);
<<<<<<<
var hide = __webpack_require__(7);
=======
var createNonEnumerableProperty = __webpack_require__(7);
>>>>>>>
var createNonEnumerableProperty = __webpack_require__(8);
<<<<<<<
var hide = __webpack_require__(7);
=======
var createNonEnumerableProperty = __webpack_require__(7);
>>>>>>>
var createNonEnumerableProperty = __webpack_require__(8);
<<<<<<<
var hide = __webpack_require__(7);
var has = __webpack_require__(10);
=======
var createNonEnumerableProperty = __webpack_require__(7);
var has = __webpack_require__(11);
>>>>>>>
var createNonEnumerableProperty = __webpack_require__(8);
var has = __webpack_require__(11);
<<<<<<<
var anObject = __webpack_require__(8);
var aPossiblePrototype = __webpack_require__(93);
=======
var anObject = __webpack_require__(4);
var aPossiblePrototype = __webpack_require__(94);
>>>>>>>
var anObject = __webpack_require__(4);
var aPossiblePrototype = __webpack_require__(94);
<<<<<<<
var anObject = __webpack_require__(8);
=======
var anObject = __webpack_require__(4);
>>>>>>>
var anObject = __webpack_require__(4);
<<<<<<<
var anObject = __webpack_require__(8);
=======
var anObject = __webpack_require__(4);
>>>>>>>
var anObject = __webpack_require__(4);
<<<<<<<
var fails = __webpack_require__(6);
var classof = __webpack_require__(12);
var bind = __webpack_require__(20);
var html = __webpack_require__(56);
=======
var fails = __webpack_require__(6);
var classof = __webpack_require__(13);
var bind = __webpack_require__(21);
var html = __webpack_require__(57);
>>>>>>>
var fails = __webpack_require__(7);
var classof = __webpack_require__(13);
var bind = __webpack_require__(21);
var html = __webpack_require__(57);
<<<<<<<
var anObject = __webpack_require__(8);
var isObject = __webpack_require__(9);
var newPromiseCapability = __webpack_require__(23);
=======
var anObject = __webpack_require__(4);
var isObject = __webpack_require__(10);
var newPromiseCapability = __webpack_require__(24);
>>>>>>>
var anObject = __webpack_require__(4);
var isObject = __webpack_require__(10);
var newPromiseCapability = __webpack_require__(24);
<<<<<<<
var getOwnPropertyNamesModule = __webpack_require__(79);
var getOwnPropertySymbolsModule = __webpack_require__(53);
var anObject = __webpack_require__(8);
=======
var getOwnPropertyNamesModule = __webpack_require__(80);
var getOwnPropertySymbolsModule = __webpack_require__(54);
var anObject = __webpack_require__(4);
>>>>>>>
var getOwnPropertyNamesModule = __webpack_require__(80);
var getOwnPropertySymbolsModule = __webpack_require__(54);
var anObject = __webpack_require__(4);
<<<<<<<
var DESCRIPTORS = __webpack_require__(11);
var definePropertyModule = __webpack_require__(13);
var anObject = __webpack_require__(8);
=======
var DESCRIPTORS = __webpack_require__(9);
var definePropertyModule = __webpack_require__(12);
var anObject = __webpack_require__(4);
>>>>>>>
var DESCRIPTORS = __webpack_require__(9);
var definePropertyModule = __webpack_require__(12);
var anObject = __webpack_require__(4);
<<<<<<<
var DESCRIPTORS = __webpack_require__(11);
var fails = __webpack_require__(6);
=======
var DESCRIPTORS = __webpack_require__(9);
var fails = __webpack_require__(6);
>>>>>>>
var DESCRIPTORS = __webpack_require__(9);
var fails = __webpack_require__(7);
<<<<<<<
var DOMIterables = __webpack_require__(109);
var ArrayIteratorMethods = __webpack_require__(110);
var hide = __webpack_require__(7);
=======
var DOMIterables = __webpack_require__(110);
var ArrayIteratorMethods = __webpack_require__(111);
var createNonEnumerableProperty = __webpack_require__(7);
>>>>>>>
var DOMIterables = __webpack_require__(110);
var ArrayIteratorMethods = __webpack_require__(111);
var createNonEnumerableProperty = __webpack_require__(8);
<<<<<<<
var hide = __webpack_require__(7);
=======
var createNonEnumerableProperty = __webpack_require__(7);
var anObject = __webpack_require__(4);
var InternalStateModule = __webpack_require__(20);
var setInternalState = InternalStateModule.set;
var getInternalAggregateErrorState = InternalStateModule.getterFor('AggregateError');
>>>>>>>
var createNonEnumerableProperty = __webpack_require__(8);
var anObject = __webpack_require__(4);
var InternalStateModule = __webpack_require__(20);
var setInternalState = InternalStateModule.set;
var getInternalAggregateErrorState = InternalStateModule.getterFor('AggregateError'); |
<<<<<<<
=======
var global = __webpack_require__(0);
var getOwnPropertyDescriptor = __webpack_require__(31).f;
var hide = __webpack_require__(5);
var redefine = __webpack_require__(14);
var setGlobal = __webpack_require__(36);
var copyConstructorProperties = __webpack_require__(77);
var isForced = __webpack_require__(54);
/*
options.target - name of the target object
options.global - target is the global object
options.stat - export as static methods of target
options.proto - export as prototype methods of target
options.real - real prototype method for the `pure` version
options.forced - export even if the native feature is available
options.bind - bind methods to the target, required for the `pure` version
options.wrap - wrap constructors to preventing global pollution, required for the `pure` version
options.unsafe - use the simple assignment of property instead of delete + defineProperty
options.sham - add a flag to not completely full polyfills
options.enumerable - export as enumerable property
options.noTargetGet - prevent calling a getter on target
*/
module.exports = function (options, source) {
var TARGET = options.target;
var GLOBAL = options.global;
var STATIC = options.stat;
var FORCED, target, key, targetProperty, sourceProperty, descriptor;
if (GLOBAL) {
target = global;
} else if (STATIC) {
target = global[TARGET] || setGlobal(TARGET, {});
} else {
target = (global[TARGET] || {}).prototype;
}
if (target) for (key in source) {
sourceProperty = source[key];
if (options.noTargetGet) {
descriptor = getOwnPropertyDescriptor(target, key);
targetProperty = descriptor && descriptor.value;
} else targetProperty = target[key];
FORCED = isForced(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced);
// contained in target
if (!FORCED && targetProperty !== undefined) {
if (typeof sourceProperty === typeof targetProperty) continue;
copyConstructorProperties(sourceProperty, targetProperty);
}
// add a flag to not completely full polyfills
if (options.sham || (targetProperty && targetProperty.sham)) {
hide(sourceProperty, 'sham', true);
}
// extend global
redefine(target, key, sourceProperty, options);
}
};
/***/ }),
/* 3 */
/***/ (function(module, exports, __webpack_require__) {
>>>>>>>
<<<<<<<
/* 23 */
/***/ (function(module, exports, __webpack_require__) {
var global = __webpack_require__(0);
var shared = __webpack_require__(24);
var hide = __webpack_require__(5);
var has = __webpack_require__(10);
var setGlobal = __webpack_require__(36);
var nativeFunctionToString = __webpack_require__(50);
var InternalStateModule = __webpack_require__(26);
var getInternalState = InternalStateModule.get;
var enforceInternalState = InternalStateModule.enforce;
var TEMPLATE = String(nativeFunctionToString).split('toString');
shared('inspectSource', function (it) {
return nativeFunctionToString.call(it);
});
(module.exports = function (O, key, value, options) {
var unsafe = options ? !!options.unsafe : false;
var simple = options ? !!options.enumerable : false;
var noTargetGet = options ? !!options.noTargetGet : false;
if (typeof value == 'function') {
if (typeof key == 'string' && !has(value, 'name')) hide(value, 'name', key);
enforceInternalState(value).source = TEMPLATE.join(typeof key == 'string' ? key : '');
}
if (O === global) {
if (simple) O[key] = value;
else setGlobal(key, value);
return;
} else if (!unsafe) {
delete O[key];
} else if (!noTargetGet && O[key]) {
simple = true;
}
if (simple) O[key] = value;
else hide(O, key, value);
// add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative
})(Function.prototype, 'toString', function toString() {
return typeof this == 'function' && getInternalState(this).source || nativeFunctionToString.call(this);
});
/***/ }),
/* 24 */
=======
/* 25 */
>>>>>>>
/* 25 */
<<<<<<<
var has = __webpack_require__(10);
var toObject = __webpack_require__(19);
=======
var has = __webpack_require__(9);
var toObject = __webpack_require__(21);
>>>>>>>
var has = __webpack_require__(10);
var toObject = __webpack_require__(21);
<<<<<<<
var has = __webpack_require__(10);
var toIndexedObject = __webpack_require__(22);
var indexOf = __webpack_require__(78).indexOf;
=======
var has = __webpack_require__(9);
var toIndexedObject = __webpack_require__(24);
var indexOf = __webpack_require__(80).indexOf;
>>>>>>>
var has = __webpack_require__(10);
var toIndexedObject = __webpack_require__(24);
var indexOf = __webpack_require__(80).indexOf;
<<<<<<<
var $ = __webpack_require__(3);
var createIteratorConstructor = __webpack_require__(89);
=======
var $ = __webpack_require__(2);
var createIteratorConstructor = __webpack_require__(91);
>>>>>>>
var $ = __webpack_require__(3);
var createIteratorConstructor = __webpack_require__(91);
<<<<<<<
var isObject = __webpack_require__(9);
var newPromiseCapability = __webpack_require__(21);
=======
var isObject = __webpack_require__(8);
var newPromiseCapability = __webpack_require__(23);
>>>>>>>
var isObject = __webpack_require__(9);
var newPromiseCapability = __webpack_require__(23);
<<<<<<<
var $ = __webpack_require__(3);
var $find = __webpack_require__(80).find;
=======
var $ = __webpack_require__(2);
var $find = __webpack_require__(82).find;
>>>>>>>
var $ = __webpack_require__(3);
var $find = __webpack_require__(82).find;
<<<<<<<
var has = __webpack_require__(10);
var ownKeys = __webpack_require__(76);
=======
var has = __webpack_require__(9);
var ownKeys = __webpack_require__(78);
>>>>>>>
var has = __webpack_require__(10);
var ownKeys = __webpack_require__(78);
<<<<<<<
var isObject = __webpack_require__(9);
var isArray = __webpack_require__(82);
=======
var isObject = __webpack_require__(8);
var isArray = __webpack_require__(84);
>>>>>>>
var isObject = __webpack_require__(9);
var isArray = __webpack_require__(84);
<<<<<<<
var $ = __webpack_require__(3);
var from = __webpack_require__(93);
=======
var $ = __webpack_require__(2);
var from = __webpack_require__(95);
>>>>>>>
var $ = __webpack_require__(3);
var from = __webpack_require__(95);
<<<<<<<
var $ = __webpack_require__(3);
var assign = __webpack_require__(98);
=======
var $ = __webpack_require__(2);
var assign = __webpack_require__(100);
>>>>>>>
var $ = __webpack_require__(3);
var assign = __webpack_require__(100);
<<<<<<<
var $ = __webpack_require__(3);
var toObject = __webpack_require__(19);
=======
var $ = __webpack_require__(2);
var toObject = __webpack_require__(21);
>>>>>>>
var $ = __webpack_require__(3);
var toObject = __webpack_require__(21);
<<<<<<<
var $ = __webpack_require__(3);
var IS_PURE = __webpack_require__(25);
=======
var $ = __webpack_require__(2);
var IS_PURE = __webpack_require__(19);
>>>>>>>
var $ = __webpack_require__(3);
var IS_PURE = __webpack_require__(19);
<<<<<<<
var setSpecies = __webpack_require__(111);
var isObject = __webpack_require__(9);
var aFunction = __webpack_require__(16);
var anInstance = __webpack_require__(112);
=======
var setSpecies = __webpack_require__(113);
var isObject = __webpack_require__(8);
var aFunction = __webpack_require__(17);
var anInstance = __webpack_require__(114);
>>>>>>>
var setSpecies = __webpack_require__(113);
var isObject = __webpack_require__(9);
var aFunction = __webpack_require__(17);
var anInstance = __webpack_require__(114);
<<<<<<<
var $ = __webpack_require__(3);
var getBuiltIn = __webpack_require__(14);
var speciesConstructor = __webpack_require__(66);
var promiseResolve = __webpack_require__(69);
=======
var $ = __webpack_require__(2);
var IS_PURE = __webpack_require__(19);
var NativePromise = __webpack_require__(66);
var getBuiltIn = __webpack_require__(15);
var speciesConstructor = __webpack_require__(67);
var promiseResolve = __webpack_require__(70);
var redefine = __webpack_require__(14);
>>>>>>>
var $ = __webpack_require__(3);
var IS_PURE = __webpack_require__(19);
var NativePromise = __webpack_require__(66);
var getBuiltIn = __webpack_require__(15);
var speciesConstructor = __webpack_require__(67);
var promiseResolve = __webpack_require__(70);
var redefine = __webpack_require__(14);
<<<<<<<
"use strict";
var $ = __webpack_require__(3);
var aFunction = __webpack_require__(16);
var newPromiseCapabilityModule = __webpack_require__(21);
var perform = __webpack_require__(29);
var iterate = __webpack_require__(28);
// `Promise.allSettled` method
// https://github.com/tc39/proposal-promise-allSettled
$({ target: 'Promise', stat: true }, {
allSettled: function allSettled(iterable) {
var C = this;
var capability = newPromiseCapabilityModule.f(C);
var resolve = capability.resolve;
var reject = capability.reject;
var result = perform(function () {
var promiseResolve = aFunction(C.resolve);
var values = [];
var counter = 0;
var remaining = 1;
iterate(iterable, function (promise) {
var index = counter++;
var alreadyCalled = false;
values.push(undefined);
remaining++;
promiseResolve.call(C, promise).then(function (value) {
if (alreadyCalled) return;
alreadyCalled = true;
values[index] = { status: 'fulfilled', value: value };
--remaining || resolve(values);
}, function (e) {
if (alreadyCalled) return;
alreadyCalled = true;
values[index] = { status: 'rejected', reason: e };
--remaining || resolve(values);
});
});
--remaining || resolve(values);
});
if (result.error) reject(result.value);
return capability.promise;
}
});
=======
// TODO: Remove from `core-js@4`
__webpack_require__(71);
>>>>>>>
// TODO: Remove from `core-js@4`
__webpack_require__(71);
<<<<<<<
var $ = __webpack_require__(3);
var newPromiseCapabilityModule = __webpack_require__(21);
=======
var $ = __webpack_require__(2);
var newPromiseCapabilityModule = __webpack_require__(23);
>>>>>>>
var $ = __webpack_require__(3);
var newPromiseCapabilityModule = __webpack_require__(23);
<<<<<<<
var $ = __webpack_require__(3);
var aFunction = __webpack_require__(16);
var getBuiltIn = __webpack_require__(14);
var newPromiseCapabilityModule = __webpack_require__(21);
=======
var $ = __webpack_require__(2);
var aFunction = __webpack_require__(17);
var getBuiltIn = __webpack_require__(15);
var newPromiseCapabilityModule = __webpack_require__(23);
>>>>>>>
var $ = __webpack_require__(3);
var aFunction = __webpack_require__(17);
var getBuiltIn = __webpack_require__(15);
var newPromiseCapabilityModule = __webpack_require__(23);
<<<<<<<
/* 129 */
=======
/* 130 */
>>>>>>>
/* 131 */
<<<<<<<
/* 130 */
=======
/* 131 */
>>>>>>>
/* 132 */
<<<<<<<
/* 131 */
=======
/* 132 */
>>>>>>>
/* 133 */
<<<<<<<
/* 132 */
=======
/* 133 */
>>>>>>>
/* 134 */
<<<<<<<
/* 134 */
=======
/* 135 */
>>>>>>>
/* 136 */
<<<<<<<
/* 135 */
=======
/* 136 */
>>>>>>>
/* 137 */
<<<<<<<
/* 136 */
=======
/* 137 */
>>>>>>>
/* 138 */
<<<<<<<
/* 137 */
=======
/* 138 */
>>>>>>>
/* 139 */ |
<<<<<<<
=======
/***/ (function(module, exports) {
module.exports = function (exec) {
try {
return !!exec();
} catch (error) {
return true;
}
};
/***/ }),
/* 5 */
/***/ (function(module, exports) {
var hasOwnProperty = {}.hasOwnProperty;
module.exports = function (it, key) {
return hasOwnProperty.call(it, key);
};
/***/ }),
/* 6 */
>>>>>>>
/***/ (function(module, exports) {
module.exports = function (exec) {
try {
return !!exec();
} catch (error) {
return true;
}
};
/***/ }),
/* 5 */
<<<<<<<
/***/ (function(module, exports, __webpack_require__) {
var fails = __webpack_require__(5);
=======
/***/ (function(module, exports) {
>>>>>>>
/***/ (function(module, exports) {
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var DESCRIPTORS = __webpack_require__(10);
var fails = __webpack_require__(5);
=======
var DESCRIPTORS = __webpack_require__(8);
var fails = __webpack_require__(4);
>>>>>>>
var DESCRIPTORS = __webpack_require__(8);
var fails = __webpack_require__(4);
<<<<<<<
var has = __webpack_require__(7);
var toIndexedObject = __webpack_require__(26);
=======
var has = __webpack_require__(5);
var toIndexedObject = __webpack_require__(25);
>>>>>>>
var has = __webpack_require__(6);
var toIndexedObject = __webpack_require__(26);
<<<<<<<
var toLength = __webpack_require__(27);
var createProperty = __webpack_require__(99);
=======
var toLength = __webpack_require__(26);
var createProperty = __webpack_require__(100);
>>>>>>>
var toLength = __webpack_require__(27);
var createProperty = __webpack_require__(100);
<<<<<<<
var DESCRIPTORS = __webpack_require__(10);
var fails = __webpack_require__(5);
=======
var DESCRIPTORS = __webpack_require__(8);
var fails = __webpack_require__(4);
>>>>>>>
var DESCRIPTORS = __webpack_require__(8);
var fails = __webpack_require__(4);
<<<<<<<
var iterate = __webpack_require__(28);
var createNonEnumerableProperty = __webpack_require__(8);
=======
var iterate = __webpack_require__(27);
var createNonEnumerableProperty = __webpack_require__(11);
>>>>>>>
var iterate = __webpack_require__(28);
var createNonEnumerableProperty = __webpack_require__(11);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5);
<<<<<<<
var constants_1 = __webpack_require__(4);
var events_1 = __webpack_require__(6);
=======
var events_1 = __webpack_require__(7);
>>>>>>>
var constants_1 = __webpack_require__(5);
var events_1 = __webpack_require__(7);
<<<<<<<
var constants_1 = __webpack_require__(4);
=======
var constants_1 = __webpack_require__(6);
>>>>>>>
var constants_1 = __webpack_require__(5); |
<<<<<<<
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
else if(typeof define === 'function' && define.amd)
define([], factory);
else if(typeof exports === 'object')
exports["OpenPlayer"] = factory();
else
root["OpenPlayer"] = factory();
})(this, function() {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
/******/ }
/******/ };
/******/
/******/ // define __esModule on exports
/******/ __webpack_require__.r = function(exports) {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/
/******/ // create a fake namespace object
/******/ // mode & 1: value is a module id, require it
/******/ // mode & 2: merge all properties of value into the ns
/******/ // mode & 4: return value when already ns object
/******/ // mode & 8|1: behave like require
/******/ __webpack_require__.t = function(value, mode) {
/******/ if(mode & 1) value = __webpack_require__(value);
/******/ if(mode & 8) return value;
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
/******/ var ns = Object.create(null);
/******/ __webpack_require__.r(ns);
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
/******/ return ns;
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "/dist/";
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 48);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports) {
var check = function (it) {
return it && it.Math == Math && it;
};
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
module.exports =
// eslint-disable-next-line no-undef
check(typeof globalThis == 'object' && globalThis) ||
check(typeof window == 'object' && window) ||
check(typeof self == 'object' && self) ||
check(typeof global == 'object' && global) ||
// eslint-disable-next-line no-new-func
Function('return this')();
/***/ }),
/* 1 */
/***/ (function(module, exports, __webpack_require__) {
var global = __webpack_require__(0);
var shared = __webpack_require__(52);
<<<<<<< /mnt/batch/tasks/workitems/adfv2-General_1/job-1/2e75b488-68fa-4a5a-9452-cc8372515db3/wd/.temp/athenacommon/9e14ae86-206d-4fae-9fb5-7edf8a482d63.js
var has = __webpack_require__(6);
=======
var has = __webpack_require__(7);
>>>>>>>
if(typeof exports === 'object' && typeof module === 'object')
module.exports = factory();
else if(typeof define === 'function' && define.amd)
define([], factory);
else if(typeof exports === 'object')
exports["OpenPlayer"] = factory();
else
root["OpenPlayer"] = factory();
})(this, function() {
return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
/******/ }
/******/ };
/******/
/******/ // define __esModule on exports
/******/ __webpack_require__.r = function(exports) {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/
/******/ // create a fake namespace object
/******/ // mode & 1: value is a module id, require it
/******/ // mode & 2: merge all properties of value into the ns
/******/ // mode & 4: return value when already ns object
/******/ // mode & 8|1: behave like require
/******/ __webpack_require__.t = function(value, mode) {
/******/ if(mode & 1) value = __webpack_require__(value);
/******/ if(mode & 8) return value;
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
/******/ var ns = Object.create(null);
/******/ __webpack_require__.r(ns);
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
/******/ return ns;
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "/dist/";
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 48);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports) {
var check = function (it) {
return it && it.Math == Math && it;
};
// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
module.exports =
// eslint-disable-next-line no-undef
check(typeof globalThis == 'object' && globalThis) ||
check(typeof window == 'object' && window) ||
check(typeof self == 'object' && self) ||
check(typeof global == 'object' && global) ||
// eslint-disable-next-line no-new-func
Function('return this')();
/***/ }),
/* 1 */
/***/ (function(module, exports, __webpack_require__) {
var global = __webpack_require__(0);
var shared = __webpack_require__(52);
var has = __webpack_require__(7);
<<<<<<<
var createNonEnumerableProperty = __webpack_require__(11);
var has = __webpack_require__(6);
=======
var createNonEnumerableProperty = __webpack_require__(8);
var has = __webpack_require__(7);
>>>>>>>
var createNonEnumerableProperty = __webpack_require__(8);
var has = __webpack_require__(7);
<<<<<<<
var isObject = __webpack_require__(10);
var createNonEnumerableProperty = __webpack_require__(11);
var objectHas = __webpack_require__(6);
=======
var isObject = __webpack_require__(11);
var createNonEnumerableProperty = __webpack_require__(8);
var objectHas = __webpack_require__(7);
>>>>>>>
var isObject = __webpack_require__(11);
var createNonEnumerableProperty = __webpack_require__(8);
var objectHas = __webpack_require__(7);
<<<<<<<
exports.isAutoplaySupported = exports.predictType = exports.isDashSource = exports.isM3USource = exports.isHlsSource = exports.getExtension = void 0;
=======
>>>>>>>
<<<<<<<
var has = __webpack_require__(6);
=======
var has = __webpack_require__(7);
>>>>>>>
var has = __webpack_require__(7);
<<<<<<<
var has = __webpack_require__(6);
=======
var has = __webpack_require__(7);
>>>>>>>
var has = __webpack_require__(7);
<<<<<<<
var has = __webpack_require__(6);
=======
var has = __webpack_require__(7);
>>>>>>>
var has = __webpack_require__(7);
<<<<<<<
var has = __webpack_require__(6);
var toIndexedObject = __webpack_require__(26);
=======
var has = __webpack_require__(7);
var toIndexedObject = __webpack_require__(25);
>>>>>>>
var has = __webpack_require__(7);
var toIndexedObject = __webpack_require__(26);
<<<<<<<
var DESCRIPTORS = __webpack_require__(8);
var fails = __webpack_require__(4);
var has = __webpack_require__(6);
var defineProperty = Object.defineProperty;
var cache = {};
var thrower = function (it) { throw it; };
module.exports = function (METHOD_NAME, options) {
if (has(cache, METHOD_NAME)) return cache[METHOD_NAME];
if (!options) options = {};
var method = [][METHOD_NAME];
var ACCESSORS = has(options, 'ACCESSORS') ? options.ACCESSORS : false;
var argument0 = has(options, 0) ? options[0] : thrower;
var argument1 = has(options, 1) ? options[1] : undefined;
return cache[METHOD_NAME] = !!method && !fails(function () {
if (ACCESSORS && !DESCRIPTORS) return true;
var O = { length: -1 };
if (ACCESSORS) defineProperty(O, 1, { enumerable: true, get: thrower });
else O[1] = 1;
method.call(O, argument0, argument1);
});
};
/***/ }),
/* 91 */
/***/ (function(module, exports, __webpack_require__) {
=======
>>>>>>> |
<<<<<<<
=======
var AbstractAssertion = function(abortOnFailure, client) {
this.abortOnFailure = abortOnFailure;
this.client = client;
}
>>>>>>>
<<<<<<<
var AbstractAssertion = function(abortOnFailure, client) {
this.abortOnFailure = abortOnFailure;
this.client = client;
}
=======
>>>>>>> |
<<<<<<<
/*!
* Module dependencies.
*/
var util = require('util');
var fs = require('fs');
var path = require('path');
var events = require('events');
var HttpRequest = require('./request.js');
var CommandQueue = require('./queue.js');
var Assertion = require('./assertion.js');
var Logger = require('./logger.js');
var Api = require('./api.js');
=======
var util = require('util'),
fs = require('fs'),
path = require('path'),
events = require('events'),
HttpRequest = require('./request.js'),
CommandQueue = require('./queue.js'),
Logger = require('./logger.js');
>>>>>>>
/*!
* Module dependencies.
*/
var util = require('util');
var fs = require('fs');
var path = require('path');
var events = require('events');
var HttpRequest = require('./request.js');
var CommandQueue = require('./queue.js');
var Assertion = require('./assertion.js');
var Logger = require('./logger.js');
var Api = require('./api.js');
<<<<<<<
=======
this.options = options || {};
var self = this;
>>>>>>>
<<<<<<<
this.setOptions(options);
this.setCapabilities();
=======
if (!this.options.screenshots) {
this.options.screenshots = {
'enabled' : false,
'path' : ''
};
}
this.options.output = this.options.output || typeof this.options.output == 'undefined';
this.screenshotPath = this.options.screenshotPath || '';
this.launch_url = this.options.launch_url || null;
if (this.options.silent) {
Logger.disable();
} else {
Logger.enable();
}
if (this.options.selenium_port) {
HttpRequest.setSeleniumPort(this.options.selenium_port);
}
if (this.options.selenium_host) {
HttpRequest.setSeleniumHost(this.options.selenium_host);
}
if (this.options.use_ssl) {
HttpRequest.useSSL(true);
}
if (this.options.username && this.options.access_key) {
HttpRequest.setCredentials({
username : this.options.username,
key : this.options.access_key
});
}
this.desiredCapabilities = {
browserName: 'firefox',
javascriptEnabled: true,
acceptSslCerts: true,
platform: 'ANY'
};
if (this.options.desiredCapabilities) {
for (var prop in this.options.desiredCapabilities) {
this.desiredCapabilities[prop] = this.options.desiredCapabilities[prop];
}
}
>>>>>>>
this.setOptions(options);
this.setCapabilities();
<<<<<<<
Assertion.init(this);
Api.init(this);
=======
>>>>>>>
Assertion.init(this);
Api.init(this);
<<<<<<<
}
Nightwatch.DEFAULT_CAPABILITIES = {
browserName: 'firefox',
javascriptEnabled: true,
acceptSslCerts: true,
platform: 'ANY'
};
=======
this.loadProtocolActions()
.loadCommands()
.addVerifyTests()
.loadAssertions();
if (this.options.custom_commands_path) {
this.loadCustomCommands();
}
}
>>>>>>>
}
Nightwatch.DEFAULT_CAPABILITIES = {
browserName: 'firefox',
javascriptEnabled: true,
acceptSslCerts: true,
platform: 'ANY'
};
<<<<<<<
console.log(Logger.colors.green('OK.'),
Logger.colors.green(this.results.passed) + ' assertions passed.');
} else if (ok && this.results.passed == 0) {
=======
console.log(Logger.colors.green('OK.'), Logger.colors.green(this.results.passed) + ' assertions passed.');
} else if (ok && this.results.passed === 0) {
>>>>>>>
console.log(Logger.colors.green('OK.'),
Logger.colors.green(this.results.passed) + ' assertions passed.');
} else if (ok && this.results.passed == 0) {
<<<<<<<
console.log(Logger.colors.red('FAILED: '), failure_msg.join(', ')
.replace(/,([^,]*)$/g, function($0, $1) {
return ' and' + $1;
=======
console.log(Logger.colors.red('FAILED: '), failure_msg.join(', ').replace(/,([^,]*)$/g, function($0, $1, index, str) {
return ' and' +$1;
>>>>>>>
console.log(Logger.colors.red('FAILED: '), failure_msg.join(', ')
.replace(/,([^,]*)$/g, function($0, $1) {
return ' and' + $1;
<<<<<<<
var dateStamp = d.toLocaleString('en-GB', {
weekday : 'narrow',
year : 'numeric',
month : '2-digit',
day : '2-digit',
timeZoneName : 'short',
hour : '2-digit',
minute : '2-digit',
second : '2-digit',
era : 'short'
}).replace(/:/g,'').replace(/\s/g,'-').replace(/-\(.+?\)/,'');
var fileName = path.join(self.options.screenshots.path, 'ERROR_' +
dateStamp + '.png');
=======
var datestamp = d.toLocaleString('en-GB', {
weekday: 'narrow',
year: 'numeric',
month: '2-digit',
day: '2-digit',
timeZoneName : 'short',
hour : '2-digit',
minute : '2-digit',
second : '2-digit',
era : 'short'
}).replace(/:/g,'').replace(/\s/g,'-').replace(/-\(.+?\)/,'');
var fileName = path.join(self.options.screenshots.path, 'ERROR_' + datestamp + '.png');
>>>>>>>
var dateStamp = d.toLocaleString('en-GB', {
weekday : 'narrow',
year : 'numeric',
month : '2-digit',
day : '2-digit',
timeZoneName : 'short',
hour : '2-digit',
minute : '2-digit',
second : '2-digit',
era : 'short'
}).replace(/:/g,'').replace(/\s/g,'-').replace(/-\(.+?\)/,'');
var fileName = path.join(self.options.screenshots.path, 'ERROR_' +
dateStamp + '.png');
<<<<<<<
var error = new Error('Callback parameter is not a function - ' +
typeof(callback) + ' passed: "' + callback + '"');
this.errors.push(error.stack);
this.results.errors++;
throw error;
=======
var error = new Error('Callback parameter is not a function - ' + typeof(callback) + ' passed: "' + callback + '"');
self.errors.push(error.stack);
self.results.errors++;
} else {
callback.call(self, result);
>>>>>>>
var error = new Error('Callback parameter is not a function - ' + typeof(callback) + ' passed: "' + callback + '"');
self.errors.push(error.stack);
self.results.errors++;
} else {
callback.call(self, result);
<<<<<<<
callback.call(self, result);
=======
>>>>>>>
<<<<<<<
console.log(ex.stack);
=======
self.errors.push('Error while running tests: ' + ex.message);
var stack = ex.stack.split('\n');
var firstLine = stack.shift();
console.log(' ' + Logger.colors.light_green(firstLine));
console.log(stack.join('\n'));
self.results.errors++;
>>>>>>>
self.errors.push('Error while running tests: ' + ex.message);
var stack = ex.stack.split('\n');
var firstLine = stack.shift();
console.log(' ' + Logger.colors.light_green(firstLine));
console.log(stack.join('\n'));
self.results.errors++;
<<<<<<<
=======
>>>>>>>
<<<<<<<
return {
=======
var rv = {
>>>>>>>
return {
<<<<<<<
=======
return rv;
>>>>>>> |
<<<<<<<
console.log(Logger.colors.green('OK. ' + testresults.passed, Logger.colors.background.black),
'total assertions passed. (' + elapsedTime + ' ms)');
=======
console.log(Logger.colors.green('\nOK. ' + testresults.passed), 'total assertions passed. (' + elapsedTime + ' ms)');
>>>>>>>
console.log(Logger.colors.green('OK. ' + testresults.passed),
'total assertions passed. (' + elapsedTime + ' ms)');
<<<<<<<
console.log(Logger.colors.light_red('TEST FAILURE:'), Logger.colors.red(testresults.errors + testresults.failed) +
' assertions failed, ' + Logger.colors.green(testresults.passed) + ' passed' + skipped, '(' + elapsedTime + ' ms)');
=======
var errorsMsg = '';
if (testresults.errors) {
var use_plural = testresults.errors > 1 ? 's' : '';
errorsMsg += Logger.colors.red(testresults.errors) + ' error' + use_plural + ' during execution, ';
}
console.log(Logger.colors.light_red('\nTEST FAILURE:'), errorsMsg + Logger.colors.red(testresults.failed) +
' assertions failed, ' + Logger.colors.green(testresults.passed) + ' passed' + skipped + '.', '(' + elapsedTime + ' ms)');
>>>>>>>
var errorsMsg = '';
if (testresults.errors) {
var use_plural = testresults.errors > 1 ? 's' : '';
errorsMsg += Logger.colors.red(testresults.errors) + ' error' + use_plural + ' during execution, ';
}
console.log(Logger.colors.light_red('\nTEST FAILURE:'), errorsMsg + Logger.colors.red(testresults.failed) +
' assertions failed, ' + Logger.colors.green(testresults.passed) + ' passed' + skipped + '.', '(' + elapsedTime + ' ms)');
<<<<<<<
var testSuiteName = (opts.parallelMode && !opts.live_output ? '' : 'Running ') +
getTestSuiteName(moduleName) + ' Test Suite';
console.log('\n' + Logger.colors.light_green(testSuiteName));
=======
var testSuiteName = 'Running [' + getTestSuiteName(moduleName) + '] Test Suite';
console.log('\n' + Logger.colors.cyan(testSuiteName, Logger.colors.background.black));
>>>>>>>
var testSuiteName = (opts.parallelMode && !opts.live_output ? '' : 'Running ') +
getTestSuiteName(moduleName) + ' Test Suite';
console.log('\n' + Logger.colors.cyan(testSuiteName, Logger.colors.background.black));
<<<<<<<
runModule(module, opts, moduleName, function(err, testresults, modulekeys) {
if (typeof testresults == 'object') {
globalResults.passed += testresults.passed;
globalResults.failed += testresults.failed;
globalResults.errors += testresults.errors;
globalResults.skipped += testresults.skipped;
globalResults.tests += testresults.tests;
}
=======
runModule(module, opts, moduleName, function(err, modulekeys) {
>>>>>>>
runModule(module, opts, moduleName, function(err, modulekeys) { |
<<<<<<<
MOUSE_BUTTON_LEFT = 'left',
MOUSE_BUTTON_MIDDLE = 'middle',
MOUSE_BUTTON_RIGHT = 'right',
DIRECTION_UP = 'up',
DIRECTION_DOWN = 'down';
=======
MOUSE_BUTTON_LEFT = "left",
MOUSE_BUTTON_MIDDLE = "middle",
MOUSE_BUTTON_RIGHT = "right",
DIRECTION_UP = "up",
DIRECTION_DOWN = "down";
>>>>>>>
MOUSE_BUTTON_LEFT = 'left',
MOUSE_BUTTON_MIDDLE = 'middle',
MOUSE_BUTTON_RIGHT = 'right',
DIRECTION_UP = 'up',
DIRECTION_DOWN = 'down';
<<<<<<<
return getRequest.call(this,
'/element/' + id + '/attribute/' + attributeName, callback);
=======
return getRequest.call(this,
"/element/" + id + "/attribute/" + attributeName, callback);
>>>>>>>
return getRequest.call(this,
'/element/' + id + '/attribute/' + attributeName, callback);
<<<<<<<
if (typeof button == 'string') {
=======
if (typeof button == "string") {
>>>>>>>
if (typeof button === 'string') {
<<<<<<<
return postRequest.call(that, '/button' + direction, {button: button}, callback);
}
=======
return postRequest.call(that, "/button" + direction, {button: button}, callback);
};
>>>>>>>
return postRequest.call(that, '/button' + direction, {button: button}, callback);
}
<<<<<<<
return getRequest.call(this,
'/element/' + id + '/css/' + cssProperyName,
=======
return getRequest.call(this,
"/element/" + id + "/css/" + cssProperyName,
>>>>>>>
return getRequest.call(this,
'/element/' + id + '/css/' + cssProperyName,
<<<<<<<
return getRequest.call(this,
'/element/' + id + '/displayed',
=======
return getRequest.call(this,
"/element/" + id + "/displayed",
>>>>>>>
return getRequest.call(this,
'/element/' + id + '/displayed',
<<<<<<<
return getRequest.call(this,
'/element/' + id + '/location_in_view',
=======
return getRequest.call(this,
"/element/" + id + "/location_in_view",
>>>>>>>
return getRequest.call(this,
'/element/' + id + '/location_in_view',
<<<<<<<
return getRequest.call(this,
'/element/' + id + '/name', callback);
=======
return getRequest.call(this,
"/element/" + id + "/name", callback);
>>>>>>>
return getRequest.call(this,
'/element/' + id + '/name', callback);
<<<<<<<
return getRequest.call(this,
'/element/' + id + '/size',
=======
return getRequest.call(this,
"/element/" + id + "/size",
>>>>>>>
return getRequest.call(this,
'/element/' + id + '/size',
<<<<<<<
return getRequest.call(this,
'/element/' + id + '/text',
=======
return getRequest.call(this,
"/element/" + id + "/text",
>>>>>>>
return getRequest.call(this,
'/element/' + id + '/text',
<<<<<<<
return getRequest.call(this,
'/element/' + id + '/value',
callback);
=======
return getRequest.call(this,
"/element/" + id + "/value",
callback);
>>>>>>>
return getRequest.call(this,
'/element/' + id + '/value',
callback);
<<<<<<<
*
* @param {String} using
=======
*
* @param {Object} using
>>>>>>>
*
* @param {String} using
<<<<<<<
*
* @param {String} script
=======
*
* @param {String} string
>>>>>>>
*
* @param {String} script
<<<<<<<
return postRequest.call(this,
'/moveto', data, callback);
=======
return postRequest.call(this,
"/moveto", data, callback);
>>>>>>>
return postRequest.call(this,
'/moveto', data, callback);
<<<<<<<
return postRequest.call(this,
'/element/' + id + '/submit', '', callback);
=======
return postRequest.call(this,
"/element/" + id + "/submit", "", callback);
>>>>>>>
return postRequest.call(this,
'/element/' + id + '/submit', '', callback);
<<<<<<<
return getRequest.call(this, '/status', callback);
=======
return getRequest.call(this, "/status", callback);
>>>>>>>
return getRequest.call(this, '/status', callback);
<<<<<<<
return getRequest.call(this, '/title', callback);
=======
return getRequest.call(this, "/title", callback);
>>>>>>>
return getRequest.call(this, '/title', callback);
<<<<<<<
var callback;
=======
>>>>>>>
var callback;
<<<<<<<
method : 'DELETE'
};
callback = arguments[1] || function() {};
=======
method : "DELETE"
}
var callback = arguments[1] || function() {};
>>>>>>>
method : 'DELETE'
};
callback = arguments[1] || function() {};
<<<<<<<
}
if (typeof url == 'function') {
=======
}
if (typeof url == "function") {
>>>>>>>
}
if (typeof url == 'function') {
<<<<<<<
return getRequest.call(this, '/url', callback);
=======
return getRequest.call(this, "/url", callback);
>>>>>>>
return getRequest.call(this, '/url', callback);
<<<<<<<
if (typeof action === 'function') {
=======
if (typeof action == "function") {
>>>>>>>
if (typeof action === 'function') {
<<<<<<<
options.method = 'GET';
}
return this.runProtocolCommand(options, callback).send();
=======
options.method = "GET";
}
return this.runProtocolCommand(options, callback).send();
>>>>>>>
options.method = 'GET';
}
return this.runProtocolCommand(options, callback).send();
<<<<<<<
path : '/session/' + this.sessionId + path,
method : 'GET'
};
=======
path : "/session/" + this.sessionId + path,
method : "GET"
}
>>>>>>>
path : '/session/' + this.sessionId + path,
method : 'GET'
};
<<<<<<<
path : '/session/' + this.sessionId + path,
method : 'POST',
data : data || ''
};
=======
path : "/session/" + this.sessionId + path,
method : "POST",
data : data || ""
}
>>>>>>>
path : '/session/' + this.sessionId + path,
method : 'POST',
data : data || ''
}; |
<<<<<<<
it('Should have sent an email to the user with an auth token', function(done) {
var email = template.hooks.getLastEmail();
assert.equal(email.from, '[email protected]');
assert.equal(email.to, template.users.user1.data.email);
assert.equal(email.subject, 'New user ' + template.users.user1._id.toString() + ' created');
assert.equal(email.html, 'Email: ' + template.users.user1.data.email);
done();
});
=======
it('Should be able to validate a request with the validate param.', function(done) {
request(app)
.post(hook.alter('url', '/form/' + template.forms.userRegister._id + '/submission?dryrun=1', template))
.send({
data: {
'email': template.users.user2.data.email,
'password': template.users.user2.data.password
}
})
.expect(200)
.expect('Content-Type', /json/)
.end(done);
});
>>>>>>>
it('Should have sent an email to the user with an auth token', function(done) {
var email = template.hooks.getLastEmail();
assert.equal(email.from, '[email protected]');
assert.equal(email.to, template.users.user1.data.email);
assert.equal(email.subject, 'New user ' + template.users.user1._id.toString() + ' created');
assert.equal(email.html, 'Email: ' + template.users.user1.data.email);
done();
});
it('Should be able to validate a request with the validate param.', function(done) {
request(app)
.post(hook.alter('url', '/form/' + template.forms.userRegister._id + '/submission?dryrun=1', template))
.send({
data: {
'email': template.users.user2.data.email,
'password': template.users.user2.data.password
}
})
.expect(200)
.expect('Content-Type', /json/)
.end(done);
}); |
<<<<<<<
module.exports = function(router) {
const audit = router.formio.audit || (() => {});
=======
module.exports = (router) => {
>>>>>>>
module.exports = (router) => {
const audit = router.formio.audit || (() => {});
<<<<<<<
if (!_.get(user.data, passField)) {
audit('EAUTH_BLANKPW', {
...req,
userId: user._id,
}, username);
=======
const hash = _.get(user.data, passField);
if (!hash) {
>>>>>>>
const hash = _.get(user.data, passField);
if (!hash) {
audit('EAUTH_BLANKPW', {
...req,
userId: user._id,
}, username);
<<<<<<<
audit('EAUTH_PASSWORD', req, user._id, username);
return next('User or password was incorrect', {user: user});
=======
return next('User or password was incorrect', {user});
>>>>>>>
audit('EAUTH_PASSWORD', req, user._id, username);
return next('User or password was incorrect', {user});
<<<<<<<
// Allow anyone to hook and modify the token.
const token = hook.alter('token', {
user: {
_id: user._id
},
form: {
_id: form._id
}
}, form);
// Continue with the token data.
audit('AUTH_TOKENCREATE', {
...req,
userId: user._id,
}, router.formio.config.jwt.expireTime * 60);
next(null, {
user: user,
token: {
token: getToken(token),
decoded: token
=======
hook.alter('login', user, req, (err) => {
if (err) {
return next(err);
>>>>>>>
hook.alter('login', user, req, (err) => {
if (err) {
return next(err); |
<<<<<<<
// Allow an alter of the export logic.
hook.alter('export', req, query, form, exporter, (err) => {
if (err) {
return res.status(500).send(err.message);
}
// Initialize the exporter.
exporter.init()
.then(() => {
const addUrl = (data) => {
_.each(data, (field) => {
if (field && field._id) {
// Add url property for resource fields
const fieldUrl = hook.alter('fieldUrl', `/form/${field.form}/submission/${field._id}`, form, field);
const apiHost = router.formio.config.apiHost || router.formio.config.host;
field.url = _url.resolve(apiHost, fieldUrl);
// Recurse for nested resources
addUrl(field.data);
}
});
};
// Skip this owner filter, if the user is the admin or owner.
if (req.skipOwnerFilter !== true && req.isAdmin !== true) {
// The default ownerFilter query.
query.owner = req.token.user._id;
}
// Create the query stream.
const submissionModel = req.submissionModel || router.formio.resources.submission.model;
const stream = submissionModel.find(query)
.snapshot()
.cursor({batchSize: 1000})
.pipe(through(function(doc) {
const row = doc.toObject({getters: true, virtuals: false});
addUrl(row.data);
router.formio.util.removeProtectedFields(form, 'export', row);
this.queue(row);
}));
// Create the stream.
return exporter.stream(stream);
})
.catch((error) => {
// Send the error.
res.status(500).send(error);
});
});
=======
// Initialize the exporter.
exporter.init()
.then(() => {
const addUrl = (data) => {
_.each(data, (field) => {
if (field && field._id) {
// Add url property for resource fields
const fieldUrl = hook.alter('fieldUrl', `/form/${field.form}/submission/${field._id}`, form, field);
const apiHost = router.formio.config.apiHost || router.formio.config.host;
field.url = _url.resolve(apiHost, fieldUrl);
// Recurse for nested resources
addUrl(field.data);
}
});
};
// Skip this owner filter, if the user is the admin or owner.
if (req.skipOwnerFilter !== true && req.isAdmin !== true) {
// The default ownerFilter query.
query.owner = router.formio.util.ObjectId(req.token.user._id);
}
// Create the query stream.
const submissionModel = req.submissionModel || router.formio.resources.submission.model;
const stream = submissionModel.find(query)
.snapshot()
.cursor({batchSize: 1000})
.pipe(through(function(doc) {
const row = doc.toObject({getters: true, virtuals: false});
addUrl(row.data);
router.formio.util.removeProtectedFields(form, 'export', row);
this.queue(row);
}));
// Create the stream.
return exporter.stream(stream);
})
.catch((error) => {
// Send the error.
res.status(500).send(error);
});
>>>>>>>
// Allow an alter of the export logic.
hook.alter('export', req, query, form, exporter, (err) => {
if (err) {
return res.status(500).send(err.message);
}
// Initialize the exporter.
exporter.init()
.then(() => {
const addUrl = (data) => {
_.each(data, (field) => {
if (field && field._id) {
// Add url property for resource fields
const fieldUrl = hook.alter('fieldUrl', `/form/${field.form}/submission/${field._id}`, form, field);
const apiHost = router.formio.config.apiHost || router.formio.config.host;
field.url = _url.resolve(apiHost, fieldUrl);
// Recurse for nested resources
addUrl(field.data);
}
});
};
// Skip this owner filter, if the user is the admin or owner.
if (req.skipOwnerFilter !== true && req.isAdmin !== true) {
// The default ownerFilter query.
query.owner = router.formio.util.ObjectId(req.token.user._id);
}
// Create the query stream.
const submissionModel = req.submissionModel || router.formio.resources.submission.model;
const stream = submissionModel.find(query)
.snapshot()
.cursor({batchSize: 1000})
.pipe(through(function(doc) {
const row = doc.toObject({getters: true, virtuals: false});
addUrl(row.data);
router.formio.util.removeProtectedFields(form, 'export', row);
this.queue(row);
}));
// Create the stream.
return exporter.stream(stream);
})
.catch((error) => {
// Send the error.
res.status(500).send(error);
});
}); |
<<<<<<<
this$1.authInstance.signIn()
.then(function (response) {
this$1._setSession(response)
res()
}, (error) => {
rej(error)
})
})
=======
this$1.authInstance.grantOfflineAccess().then(function (response) {
localStorage.setItem("gapi.refresh_token", response.code);
this$1._setSession(response);
res();
});
});
>>>>>>>
this$1.authInstance.grantOfflineAccess().then(function (response) {
localStorage.setItem("gapi.refresh_token", response.code);
this$1._setSession(response);
res();
}, (error) => {
rej(error)
})
})
<<<<<<<
this$1.authInstance.signOut()
.then(function () {
this$1._clearStorage()
this$1.authenticated = false
res()
}, (error) => {
rej(error)
})
})
=======
this$1.authInstance.signOut().then(function () {
this$1._clearStorage();
this$1.authenticated = false;
res();
});
});
>>>>>>>
this$1.authInstance.signOut().then(function () {
this$1._clearStorage();
this$1.authenticated = false;
res();
}, (error) => {
rej(error)
})
}) |
<<<<<<<
if (this.databaseType === 'sql' || this.databaseType === 'mongodb' || this.databaseType === 'couchbase') {
=======
this.copyFilteringFlag(this, this.data);
if (this.databaseType === 'sql' || this.databaseType === 'mongodb') {
>>>>>>>
this.copyFilteringFlag(this, this.data);
if (this.databaseType === 'sql' || this.databaseType === 'mongodb' || this.databaseType === 'couchbase') { |
<<<<<<<
if (generator.isJhipsterVersionLessThan('5.0.0')) {
generator.removeFile(`${ANGULAR_DIR}/app.route.ts`);
}
=======
if (generator.isJhipsterVersionLessThan('5.0.0')) {
generator.removeFile(`${ANGULAR_DIR}shared/auth/account.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/auth-jwt.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/auth-session.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/csrf.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/principal.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/state-storage.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/user-route-access-service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/language/language.constants.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/language/language.helper.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/login/login-modal.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/login/login.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/model/base-entity.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/model/request-util.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/user/account.model.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/user/user.model.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/user/user.service.ts`);
generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/user/user.service.spec.ts`);
}
>>>>>>>
if (generator.isJhipsterVersionLessThan('5.0.0')) {
generator.removeFile(`${ANGULAR_DIR}/app.route.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/account.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/auth-jwt.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/auth-session.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/csrf.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/principal.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/state-storage.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/auth/user-route-access-service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/language/language.constants.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/language/language.helper.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/login/login-modal.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/login/login.service.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/model/base-entity.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/model/request-util.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/user/account.model.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/user/user.model.ts`);
generator.removeFile(`${ANGULAR_DIR}shared/user/user.service.ts`);
generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/user/user.service.spec.ts`);
} |
<<<<<<<
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap.yml');
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap-dev.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap-dev.yml');
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap-prod.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap-prod.yml');
=======
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap.yml', this, {});
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap-prod.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap-prod.yml', this, {});
>>>>>>>
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap.yml');
this.template(SERVER_MAIN_RES_DIR + 'config/_bootstrap-prod.yml', SERVER_MAIN_RES_DIR + 'config/bootstrap-prod.yml'); |
<<<<<<<
{
condition: generator => generator.authenticationType === 'session',
path: TEST_SRC_DIR,
templates: [
'spec/app/modules/account/sessions/sessions.reducer.spec.ts',
]
}
=======
{
condition: generator => !generator.skipUserManagement,
path: TEST_SRC_DIR,
templates: [
'spec/app/modules/administration/user-management/user-management.reducer.spec.ts'
]
},
// {
// condition: generator => generator.authenticationType === 'session',
// path: TEST_SRC_DIR,
// templates: [
// 'spec/app/account/sessions/_sessions.component.spec.js',
// ]
// },
>>>>>>>
{
condition: generator => !generator.skipUserManagement,
path: TEST_SRC_DIR,
templates: [
'spec/app/modules/administration/user-management/user-management.reducer.spec.ts'
]
},
{
condition: generator => generator.authenticationType === 'session',
path: TEST_SRC_DIR,
templates: [
'spec/app/modules/account/sessions/sessions.reducer.spec.ts',
]
} |
<<<<<<<
context('when passing valid args', () => {
context('with no error', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/complex_jdl.jdl']);
content = JDLParser.parse(input, 'mysql');
});
=======
describe('when passing valid args', () => {
describe('with no error', () => {
const input = parseFromFiles(['./test/test_files/complex_jdl.jdl']);
const content = DocumentParser.parse(input, 'mysql');
>>>>>>>
context('when passing valid args', () => {
context('with no error', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/complex_jdl.jdl']);
content = DocumentParser.parse(input, 'mysql');
});
<<<<<<<
context('with a required relationship', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/required_relationships.jdl']);
content = JDLParser.parse(input, 'sql');
});
=======
describe('with a required relationship', () => {
const input = parseFromFiles(['./test/test_files/required_relationships.jdl']);
const content = DocumentParser.parse(input, 'sql');
>>>>>>>
context('with a required relationship', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/required_relationships.jdl']);
content = DocumentParser.parse(input, 'sql');
});
<<<<<<<
context('with a field name \'id\'', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/id_field.jdl']);
content = JDLParser.parse(input, 'sql');
});
=======
describe('with a field name \'id\'', () => {
const input = parseFromFiles(['./test/test_files/id_field.jdl']);
const content = DocumentParser.parse(input, 'sql');
>>>>>>>
context('with a field name \'id\'', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/id_field.jdl']);
content = DocumentParser.parse(input, 'sql');
});
<<<<<<<
context('with User entity as to for a relationship', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/user_entity_to_relationship.jdl']);
content = JDLParser.parse(input, 'sql');
});
=======
describe('with User entity as to for a relationship', () => {
const input = parseFromFiles(['./test/test_files/user_entity_to_relationship.jdl']);
const content = DocumentParser.parse(input, 'sql');
>>>>>>>
context('with User entity as to for a relationship', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/user_entity_to_relationship.jdl']);
content = DocumentParser.parse(input, 'sql');
});
<<<<<<<
context('with a required enum', () => {
let content = null;
let enumField = null;
before(() => {
const input = parseFromFiles(['./test/test_files/enum.jdl']);
content = JDLParser.parse(input, 'sql');
enumField = new JDLField({
name: 'sourceType',
type: 'MyEnum'
});
enumField.addValidation(new JDLValidation({
name: Validations.REQUIRED
}));
});
=======
describe('with a required enum', () => {
const input = parseFromFiles(['./test/test_files/enum.jdl']);
const content = DocumentParser.parse(input, 'sql');
const enumField = new JDLField({
name: 'sourceType',
type: 'MyEnum'
});
enumField.addValidation(new JDLValidation({
name: Validations.REQUIRED
}));
>>>>>>>
context('with a required enum', () => {
let content = null;
let enumField = null;
before(() => {
const input = parseFromFiles(['./test/test_files/enum.jdl']);
content = DocumentParser.parse(input, 'sql');
enumField = new JDLField({
name: 'sourceType',
type: 'MyEnum'
});
enumField.addValidation(new JDLValidation({
name: Validations.REQUIRED
}));
});
<<<<<<<
context('when using the noFluentMethods option', () => {
let input = null;
let content = null;
before(() => {
input = parseFromFiles(['./test/test_files/fluent_methods.jdl']);
content = JDLParser.parse(input, 'sql');
});
=======
describe('when using the noFluentMethods option', () => {
let input = parseFromFiles(['./test/test_files/fluent_methods.jdl']);
let content = DocumentParser.parse(input, 'sql');
>>>>>>>
context('when using the noFluentMethods option', () => {
let input = null;
let content = null;
before(() => {
input = parseFromFiles(['./test/test_files/fluent_methods.jdl']);
content = DocumentParser.parse(input, 'sql');
});
<<<<<<<
context('when parsing another complex JDL file', () => {
let content = null;
let options = null;
before(() => {
const input = parseFromFiles(['./test/test_files/complex_jdl_2.jdl']);
content = JDLParser.parse(input, 'sql');
options = content.getOptions();
});
context('checking the entities', () => {
it('parses them', () => {
expect(content.entities.A).to.deep.eq({
name: 'A',
tableName: 'A',
fields: {},
comment: undefined
});
expect(content.entities.B).to.deep.eq({
name: 'B',
tableName: 'B',
fields: {},
comment: undefined
});
expect(content.entities.C).to.deep.eq({
name: 'C',
tableName: 'C',
fields: {
name: {
comment: undefined,
name: 'name',
type: 'String',
validations: {
required: {
name: 'required',
value: ''
}
=======
describe('when parsing another complex JDL file', () => {
const input = parseFromFiles(['./test/test_files/complex_jdl_2.jdl']);
const content = DocumentParser.parse(input, 'sql');
it('parses it', () => {
expect(content.entities.A).to.deep.eq({
name: 'A',
tableName: 'A',
fields: {},
comment: undefined
});
expect(content.entities.B).to.deep.eq({
name: 'B',
tableName: 'B',
fields: {},
comment: undefined
});
expect(content.entities.C).to.deep.eq({
name: 'C',
tableName: 'C',
fields: {
name: {
comment: undefined,
name: 'name',
type: 'String',
validations: {
required: {
name: 'required',
value: ''
>>>>>>>
context('when parsing another complex JDL file', () => {
let content = null;
let options = null;
before(() => {
const input = parseFromFiles(['./test/test_files/complex_jdl_2.jdl']);
content = DocumentParser.parse(input, 'sql');
options = content.getOptions();
});
context('checking the entities', () => {
it('parses them', () => {
expect(content.entities.A).to.deep.eq({
name: 'A',
tableName: 'A',
fields: {},
comment: undefined
});
expect(content.entities.B).to.deep.eq({
name: 'B',
tableName: 'B',
fields: {},
comment: undefined
});
expect(content.entities.C).to.deep.eq({
name: 'C',
tableName: 'C',
fields: {
name: {
comment: undefined,
name: 'name',
type: 'String',
validations: {
required: {
name: 'required',
value: ''
}
<<<<<<<
context('when having two consecutive comments for fields', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/field_comments.jdl']);
content = JDLParser.parse(input, 'sql');
});
=======
describe('when having two consecutive comments for fields', () => {
const input = parseFromFiles(['./test/test_files/field_comments.jdl']);
const content = DocumentParser.parse(input, 'sql');
>>>>>>>
context('when having two consecutive comments for fields', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/field_comments.jdl']);
content = DocumentParser.parse(input, 'sql');
});
<<<<<<<
context('when having constants', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/constants.jdl']);
content = JDLParser.parse(input, 'sql');
});
=======
describe('when having constants', () => {
const input = parseFromFiles(['./test/test_files/constants.jdl']);
const content = DocumentParser.parse(input, 'sql');
>>>>>>>
context('when having constants', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/constants.jdl']);
content = DocumentParser.parse(input, 'sql');
});
<<<<<<<
context('when parsing application', () => {
let application = null;
before(() => {
const input = parseFromFiles(['./test/test_files/application.jdl']);
const content = JDLParser.parse(input, 'sql');
application = content.applications.toto.config;
});
it('parses it', () => {
expect(application.baseName).to.eq('toto');
expect(application.packageName).to.eq('com.mathieu.sample');
expect(application.packageFolder).to.eq('com/mathieu/sample');
expect(application.authenticationType).to.eq('jwt');
expect(application.hibernateCache).to.eq('no');
expect(application.clusteredHttpSession).to.eq('no');
expect(application.websocket).to.be.false;
expect(application.databaseType).to.eq('sql');
expect(application.devDatabaseType).to.eq('h2Memory');
expect(application.prodDatabaseType).to.eq('mysql');
expect(application.useCompass).to.be.false;
expect(application.buildTool).to.eq('maven');
expect(application.searchEngine).to.be.false;
expect(application.enableTranslation).to.be.false;
expect(application.applicationType).to.eq('monolith');
expect(application.testFrameworks.size()).to.equal(0);
expect(
application.languages.has('en') && application.languages.has('fr')
).be.true;
expect(application.serverPort).to.eq(8080);
expect(application.enableSocialSignIn).to.be.false;
expect(application.useSass).to.be.false;
expect(application.jhiPrefix).to.eq('jhi');
expect(application.messageBroker).to.be.false;
expect(application.serviceDiscoveryType).to.be.false;
expect(application.clientPackageManager).to.eq('yarn');
expect(application.clientFramework).to.eq('angular1');
expect(application.nativeLanguage).to.eq('en');
expect(application.frontEndBuilder).to.be.null;
expect(application.skipUserManagement).to.be.false;
expect(application.skipClient).to.be.false;
expect(application.skipServer).to.be.false;
});
});
context('when parsing filtered entities', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/filtering_without_service.jdl']);
content = JDLParser.parse(input, 'sql');
});
=======
describe('when parsing filtered entities', () => {
const input = parseFromFiles(['./test/test_files/filtering_without_service.jdl']);
const content = DocumentParser.parse(input, 'sql');
>>>>>>>
context('when parsing application', () => {
let application = null;
before(() => {
const input = parseFromFiles(['./test/test_files/application.jdl']);
const content = DocumentParser.parse(input, 'sql');
application = content.applications.toto.config;
});
it('parses it', () => {
expect(application.baseName).to.eq('toto');
expect(application.packageName).to.eq('com.mathieu.sample');
expect(application.packageFolder).to.eq('com/mathieu/sample');
expect(application.authenticationType).to.eq('jwt');
expect(application.hibernateCache).to.eq('no');
expect(application.clusteredHttpSession).to.eq('no');
expect(application.websocket).to.be.false;
expect(application.databaseType).to.eq('sql');
expect(application.devDatabaseType).to.eq('h2Memory');
expect(application.prodDatabaseType).to.eq('mysql');
expect(application.useCompass).to.be.false;
expect(application.buildTool).to.eq('maven');
expect(application.searchEngine).to.be.false;
expect(application.enableTranslation).to.be.false;
expect(application.applicationType).to.eq('monolith');
expect(application.testFrameworks.size()).to.equal(0);
expect(
application.languages.has('en') && application.languages.has('fr')
).be.true;
expect(application.serverPort).to.eq(8080);
expect(application.enableSocialSignIn).to.be.false;
expect(application.useSass).to.be.false;
expect(application.jhiPrefix).to.eq('jhi');
expect(application.messageBroker).to.be.false;
expect(application.serviceDiscoveryType).to.be.false;
expect(application.clientPackageManager).to.eq('yarn');
expect(application.clientFramework).to.eq('angular1');
expect(application.nativeLanguage).to.eq('en');
expect(application.frontEndBuilder).to.be.null;
expect(application.skipUserManagement).to.be.false;
expect(application.skipClient).to.be.false;
expect(application.skipServer).to.be.false;
});
});
context('when parsing filtered entities', () => {
let content = null;
before(() => {
const input = parseFromFiles(['./test/test_files/filtering_without_service.jdl']);
content = DocumentParser.parse(input, 'sql');
}); |
<<<<<<<
=======
module.exports = {
writeFiles
};
let firstEntityGenerate = true;
>>>>>>>
<<<<<<<
return {
setupReproducibility() {
if (this.skipClient) return;
// In order to have consistent results with Faker, restart seed with current entity name hash.
faker.seed(utils.stringHashCode(this.name.toLowerCase()));
},
writeClientFiles() {
if (this.skipClient) return;
if (this.protractorTests) {
addSampleRegexTestingStrings(this);
}
let files;
let destDir;
let templatesDir;
let microserviceName = this.microserviceName;
if (this.clientFramework === ANGULAR) {
files = angularFiles;
destDir = ANGULAR_DIR;
templatesDir = CLIENT_NG2_TEMPLATES_DIR;
microserviceName = this.microserviceName;
} else if (this.clientFramework === REACT) {
files = reactFiles;
destDir = REACT_DIR;
templatesDir = CLIENT_REACT_TEMPLATES_DIR;
} else {
if (!this.embedded) {
this.addEntityToMenu(this.entityStateName, this.enableTranslation, this.clientFramework, this.entityTranslationKeyMenu);
}
return;
}
const entityTemplatesDir = `entity-client/templates/${templatesDir}`;
this.writeFilesToDisk(files, this, false, this.fetchFromInstalledJHipster(entityTemplatesDir));
addEnumerationFiles(this, templatesDir, destDir);
if (!this.embedded) {
this.addEntityToModule(
this.entityInstance,
this.entityClass,
this.entityAngularName,
this.entityFolderName,
this.entityFileName,
this.entityUrl,
this.clientFramework,
microserviceName
);
this.addEntityToMenu(this.entityStateName, this.enableTranslation, this.clientFramework, this.entityTranslationKeyMenu);
}
},
};
=======
if (this.skipClient) return;
// generate correct values for pattern fields
if (this.protractorTests) {
addSampleRegexTestingStrings(this);
}
// write client side files for Vue.js
this.writeFilesToDisk(vueFiles, this, false, `${CLIENT_VUE_TEMPLATES_DIR}`);
// Add entity to menu
const className = this.entityClass;
const entityName = this.entityInstance;
const entityAngularName = this.entityAngularName;
if (!this.embedded) {
utils.addEntityToMenu(this, this.entityFileName, this.entityTranslationKeyMenu, className);
// Add entity paths to routing system
utils.addEntityToRouterImport(this, entityAngularName, this.entityFileName, this.entityFolderName);
utils.addEntityToRouter(this, entityName, this.entityFileName, entityAngularName, firstEntityGenerate);
firstEntityGenerate = false;
// Add entity services to main
utils.addEntityServiceToMainImport(this, className, this.entityFileName, this.entityFolderName);
utils.addEntityServiceToMain(this, entityName, className);
}
if (!this.enableTranslation) {
if (!this.readOnly) {
utils.replaceTranslation(this, [
`app/entities/${this.entityFolderName}/${this.entityFileName}.vue`,
`app/entities/${this.entityFolderName}/${this.entityFileName}-update.vue`,
`app/entities/${this.entityFolderName}/${this.entityFileName}-details.vue`
]);
} else {
utils.replaceTranslation(this, [
`app/entities/${this.entityFolderName}/${this.entityFileName}.vue`,
`app/entities/${this.entityFolderName}/${this.entityFileName}-details.vue`
]);
}
}
>>>>>>>
if (this.skipClient) return;
// generate correct values for pattern fields
if (this.protractorTests) {
addSampleRegexTestingStrings(this);
}
// write client side files for Vue.js
this.writeFilesToDisk(vueFiles, this, false, `${CLIENT_VUE_TEMPLATES_DIR}`);
// Add entity to menu
const className = this.entityClass;
const entityName = this.entityInstance;
const entityAngularName = this.entityAngularName;
if (!this.embedded) {
utils.addEntityToMenu(this, this.entityFileName, this.entityTranslationKeyMenu, className);
// Add entity paths to routing system
utils.addEntityToRouterImport(this, entityAngularName, this.entityFileName, this.entityFolderName);
utils.addEntityToRouter(this, entityName, this.entityFileName, entityAngularName, firstEntityGenerate);
firstEntityGenerate = false;
// Add entity services to main
utils.addEntityServiceToMainImport(this, className, this.entityFileName, this.entityFolderName);
utils.addEntityServiceToMain(this, entityName, className);
}
if (!this.enableTranslation) {
if (!this.readOnly) {
utils.replaceTranslation(this, [
`app/entities/${this.entityFolderName}/${this.entityFileName}.vue`,
`app/entities/${this.entityFolderName}/${this.entityFileName}-update.vue`,
`app/entities/${this.entityFolderName}/${this.entityFileName}-details.vue`
]);
} else {
utils.replaceTranslation(this, [
`app/entities/${this.entityFolderName}/${this.entityFileName}.vue`,
`app/entities/${this.entityFolderName}/${this.entityFileName}-details.vue`
]);
}
} |
<<<<<<<
this.cacheManagerIsAvailable = ['ehcache', 'hazelcast', 'infinispan', 'memcached', 'redis'].includes(this.cacheProvider);
=======
this.cacheManagerIsAvailable = ['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'memcached'].includes(this.cacheProvider);
>>>>>>>
this.cacheManagerIsAvailable = ['ehcache', 'caffeine', 'hazelcast', 'infinispan', 'memcached', 'redis'].includes(this.cacheProvider); |
<<<<<<<
} else if (['Instant', 'ZonedDateTime', 'LocalDate'].includes(field.fieldType)) {
// Iso: YYYY-MM-DDTHH:mm:ss.sssZ
const isoDate = faker.getRecentDate(1, changelogDate).toISOString();
if (field.fieldType === 'LocalDate') {
data = isoDate.split('T')[0];
} else {
// Write the date without milliseconds so Java can parse it
// See https://stackoverflow.com/a/34053802/150868
// YYYY-MM-DDTHH:mm:ss
data = isoDate.split('.')[0];
if (type === 'cypress') {
// YYYY-MM-DDTHH:mm
data = data.substr(0, data.length - 3);
}
}
=======
} else if (field.fieldType === 'LocalDate') {
data = faker.date.recent(1, changelogDate).toISOString().split('T')[0];
} else if (['Instant', 'ZonedDateTime'].includes(field.fieldType)) {
// Write the date without milliseconds so Java can parse it
// See https://stackoverflow.com/a/34053802/150868
data = faker.date.recent(1, changelogDate).toISOString().split('.')[0];
>>>>>>>
} else if (['Instant', 'ZonedDateTime', 'LocalDate'].includes(field.fieldType)) {
// Iso: YYYY-MM-DDTHH:mm:ss.sssZ
const isoDate = faker.date.recent(1, changelogDate).toISOString();
if (field.fieldType === 'LocalDate') {
data = isoDate.split('T')[0];
} else {
// Write the date without milliseconds so Java can parse it
// See https://stackoverflow.com/a/34053802/150868
// YYYY-MM-DDTHH:mm:ss
data = isoDate.split('.')[0];
if (type === 'cypress') {
// YYYY-MM-DDTHH:mm
data = data.substr(0, data.length - 3);
}
} |
<<<<<<<
=======
'spec/app/admin/metrics/metrics-modal.component.spec.ts',
'spec/app/core/user/account.service.spec.ts',
>>>>>>>
'spec/app/core/user/account.service.spec.ts', |
<<<<<<<
constructor (options = {}) {
super(commentsReplies, {
comment: options.comment,
canComment: options.canComment
});
this.comment = options.comment;
this.form = this.find('form')[0];
this.state('initialized');
this.fetch();
=======
constructor (comment) {
super(commentsReplies, { comment: comment })
this.comment = comment
this.form = this.find('form')[0]
this.state('initialized')
this.fetch()
>>>>>>>
constructor (options = {}) {
super(commentsReplies, {
comment: options.comment,
canComment: options.canComment
});
this.comment = options.comment;
this.form = this.find('form')[0];
this.state('initialized');
this.fetch();
<<<<<<<
log('successfull reply removed %s', id);
messageEl.innerHTML = t('comments.removed');
setTimeout((() => replyEl.remove()), 1000);
view.emit('delete', { id: view.comment.id, replyId: id });
=======
log('successfull reply removed %s', id)
messageEl.innerHTML = t('comments.removed')
setTimeout(() => replyEl.remove(), 1000)
view.emit('delete', { commentId: view.comment.id, replyId: id })
>>>>>>>
log('successfull reply removed %s', id)
messageEl.innerHTML = t('comments.removed')
setTimeout(() => replyEl.remove(), 1000)
view.emit('delete', { id: view.comment.id, replyId: id }) |
<<<<<<<
=======
`${CLIENT_TEST_SRC_DIR}spec/app/admin/metrics/metrics-modal.component.spec.ts`,
`${CLIENT_TEST_SRC_DIR}spec/app/core/user/account.service.spec.ts`,
>>>>>>>
`${CLIENT_TEST_SRC_DIR}spec/app/core/user/account.service.spec.ts`, |
<<<<<<<
const JHIPSTER_DEPENDENCIES_VERSION = '3.8.0-SB2.3-SNAPSHOT';
=======
const JHIPSTER_DEPENDENCIES_VERSION = '3.10.0-SNAPSHOT';
>>>>>>>
const JHIPSTER_DEPENDENCIES_VERSION = '3.8.0-SB2.3-SNAPSHOT';
<<<<<<<
const SPRING_BOOT_VERSION = '2.3.3.RELEASE';
const LIQUIBASE_VERSION = '3.9.0';
=======
const SPRING_BOOT_VERSION = '2.2.9.RELEASE';
const LIQUIBASE_VERSION = '3.10.2';
>>>>>>>
const SPRING_BOOT_VERSION = '2.3.3.RELEASE';
const LIQUIBASE_VERSION = '3.10.2';
<<<<<<<
const DOCKER_CASSANDRA = 'cassandra:3.11.5'; // issues upgrading to 3.11.6
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2017-latest-ubuntu';
const DOCKER_NEO4J = 'neo4j:4.0.4';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.0.3';
=======
const DOCKER_CASSANDRA = 'cassandra:3.11.7';
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU6-ubuntu-16.04';
const DOCKER_NEO4J = 'neo4j:4.1.1';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:3.12.9'; // waiting for https://github.com/jhipster/generator-jhipster/issues/11244
>>>>>>>
const DOCKER_CASSANDRA = 'cassandra:3.11.7';
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU6-ubuntu-16.04';
const DOCKER_NEO4J = 'neo4j:4.1.1';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.0.3';
<<<<<<<
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.6.2'; // The version should be coherent with the one from spring-data-elasticsearch project
=======
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:6.8.10'; // The version should be coherent with the one from spring-data-elasticsearch project
>>>>>>>
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.6.2'; // The version should be coherent with the one from spring-data-elasticsearch project |
<<<<<<<
condition: generator => generator.authenticationType === 'jwt' && !generator.reactive,
path: SERVER_MAIN_SRC_DIR,
templates: [
{
file: 'package/security/jwt/JWTConfigurer.java',
renameTo: generator => `${generator.javaDir}security/jwt/JWTConfigurer.java`
}
]
},
{
condition: generator => !generator.reactive && ((shouldSkipUserManagement(generator)
&& (generator.applicationType !== 'microservice' && generator.authenticationType === 'jwt'))
|| (!shouldSkipUserManagement(generator) && generator.applicationType !== 'uaa')),
=======
condition: generator => generator.applicationType === 'microservice'
|| (generator.applicationType !== 'uaa'
&& ((shouldSkipUserManagement(generator) && generator.authenticationType === 'jwt')
|| !shouldSkipUserManagement(generator)
|| generator.authenticationType === 'uaa')),
>>>>>>>
condition: generator => generator.authenticationType === 'jwt' && !generator.reactive,
path: SERVER_MAIN_SRC_DIR,
templates: [
{
file: 'package/security/jwt/JWTConfigurer.java',
renameTo: generator => `${generator.javaDir}security/jwt/JWTConfigurer.java`
}
]
},
{
condition: generator => !generator.reactive && (generator.applicationType === 'microservice'
|| (generator.applicationType !== 'uaa'
&& ((shouldSkipUserManagement(generator) && generator.authenticationType === 'jwt')
|| !shouldSkipUserManagement(generator)
|| generator.authenticationType === 'uaa'))),
<<<<<<<
condition: generator => !generator.reactive && (generator.applicationType === 'microservice' || (generator.authenticationType === 'uaa' && generator.applicationType !== 'uaa')),
path: SERVER_MAIN_SRC_DIR,
templates: [
{ file: 'package/config/MicroserviceSecurityConfiguration.java', renameTo: generator => `${generator.javaDir}config/SecurityConfiguration.java` }
]
},
{
=======
>>>>>>> |
<<<<<<<
if (this.databaseType == 'sql' || this.databaseType == 'mongodb') {
this.template('src/main/java/package/web/rest/dto/_UserManagementDTO.java', javaDir + 'web/rest/dto/UserManagementDTO.java', this, {});
this.template('src/main/java/package/web/rest/mapper/_UserManagementMapper.java', javaDir + 'web/rest/mapper/UserManagementMapper.java', this, {});
}
=======
this.template('src/main/java/package/web/rest/util/_HeaderUtil.java', javaDir + 'web/rest/util/HeaderUtil.java', this, {});
this.template('src/main/java/package/web/rest/dto/_KeyAndPasswordDTO.java', javaDir + 'web/rest/dto/KeyAndPasswordDTO.java', this, {});
>>>>>>>
this.template('src/main/java/package/web/rest/util/_HeaderUtil.java', javaDir + 'web/rest/util/HeaderUtil.java', this, {});
this.template('src/main/java/package/web/rest/dto/_KeyAndPasswordDTO.java', javaDir + 'web/rest/dto/KeyAndPasswordDTO.java', this, {});
if (this.databaseType == 'sql' || this.databaseType == 'mongodb') {
this.template('src/main/java/package/web/rest/dto/_UserManagementDTO.java', javaDir + 'web/rest/dto/UserManagementDTO.java', this, {});
this.template('src/main/java/package/web/rest/mapper/_UserManagementMapper.java', javaDir + 'web/rest/mapper/UserManagementMapper.java', this, {});
}
<<<<<<<
=======
// Swagger-ui for Jhipster
this.template(webappDir + '/swagger-ui/_index.html', webappDir + 'swagger-ui/index.html', this, {});
this.copy(webappDir + '/swagger-ui/images/throbber.gif', webappDir + 'swagger-ui/images/throbber.gif');
>>>>>>>
// Swagger-ui for Jhipster
this.template(webappDir + '/swagger-ui/_index.html', webappDir + 'swagger-ui/index.html', this, {});
this.copy(webappDir + '/swagger-ui/images/throbber.gif', webappDir + 'swagger-ui/images/throbber.gif'); |
<<<<<<<
exports.all = function all (fn) {
log('Looking for all comments.');
=======
exports.all = function all (fn) {
log('Looking for all comments.')
>>>>>>>
exports.all = function all (fn) {
log('Looking for all comments.')
<<<<<<<
log('Found error %j', err);
return fn(err);
}
=======
log('Found error %j', err)
return fn(err)
}
>>>>>>>
log('Found error %j', err)
return fn(err)
}
<<<<<<<
exports.getById = function getById (id, fn) {
return Comment.findById(id, fn);
};
=======
exports.getById = function getById (id, fn) {
return Comment.findById(id, fn)
}
>>>>>>>
exports.getById = function getById (id, fn) {
return Comment.findById(id, fn)
}
<<<<<<<
exports.reply = function reply (commentId, _reply, fn) {
log('Looking for comment %s to reply with %j', commentId, _reply);
=======
exports.reply = function reply (commentId, reply, fn) {
log('Looking for comment %s to reply with %j', commentId, reply)
>>>>>>>
exports.reply = function reply (commentId, _reply, fn) {
log('Looking for comment %s to reply with %j', commentId, _reply)
<<<<<<<
topicUrl = utils.buildUrl(config, { pathname: '/' + topic.forum.name + '/topic/' + populatedComment.reference });
=======
topicUrl = utils.buildUrl(config, { pathname: '/' + topic.forum.name + '/topic/' + comment.reference })
>>>>>>>
topicUrl = utils.buildUrl(config, { pathname: '/' + topic.forum.name + '/topic/' + populatedComment.reference })
<<<<<<<
topicUrl = utils.buildUrl(config, { pathname: '/topic/' + populatedComment.reference });
=======
topicUrl = utils.buildUrl(config, { pathname: '/topic/' + comment.reference })
>>>>>>>
topicUrl = utils.buildUrl(config, { pathname: '/topic/' + populatedComment.reference })
<<<<<<<
author: { id: _reply.author.id },
text: _reply.text
};
=======
author: { id: reply.author.id },
text: reply.text
}
>>>>>>>
author: { id: _reply.author.id },
text: _reply.text
}
<<<<<<<
id: populatedComment.id,
author: { id: populatedComment.author }
};
=======
id: comment.id,
author: { id: comment.author }
}
>>>>>>>
id: populatedComment.id,
author: { id: populatedComment.author }
}
<<<<<<<
.send(function (notifyErr) {
if (notifyErr) {
log('Error when sending notification for event %s: %j', eventName, notifyErr);
return fn(notifyErr);
=======
.send(function (err, data) {
if (err) {
log('Error when sending notification for event %s: %j', eventName, err)
return fn(err)
>>>>>>>
.send(function (notifyErr) {
if (notifyErr) {
log('Error when sending notification for event %s: %j', eventName, notifyErr)
return fn(notifyErr)
<<<<<<<
exports.editReply = function editReply (comment, reply, fn) {
log('Looking for comment %s to reply with %s', comment.id, reply.id);
=======
exports.editReply = function editReply (comment, reply, fn) {
log('Looking for comment %s to reply with %s', comment.id, reply.id)
>>>>>>>
exports.editReply = function editReply (comment, reply, fn) {
log('Looking for comment %s to reply with %s', comment.id, reply.id)
<<<<<<<
exports.unflag = function unflag (id, user, fn) {
Comment.findById(id, function(err, comment) {
if (err) {
log('Found error %s', err);
return fn(err);
}
log('Downvoting comment %s', comment.id);
comment.unflag(user, function (unflagErr) {
if (unflagErr) {
log('Found error %s', unflagErr);
return fn(unflagErr);
}
=======
exports.unflag = function unflag (id, user, fn) {
Comment.findById(id, function (err, comment) {
if (err) {
log('Found error %s', err)
return fn(err)
}
>>>>>>>
exports.unflag = function unflag (id, user, fn) {
Comment.findById(id, function (err, comment) {
if (err) {
log('Found error %s', err)
return fn(err)
}
<<<<<<<
exports.remove = function remove (comment, fn) {
comment.remove(function(err) {
if (err) {
log('Found error %s', err);
return fn(err);
}
=======
exports.remove = function remove (comment, fn) {
comment.remove(function (err) {
if (err) {
log('Found error %s', err)
return fn(err)
}
>>>>>>>
exports.remove = function remove (comment, fn) {
comment.remove(function (err) {
if (err) {
log('Found error %s', err)
return fn(err)
} |
<<<<<<<
// require('settings');
// require('help');
import '../admin/admin.js';
=======
import '../settings/settings.js';
import '../help/help.js';
// require('admin');
>>>>>>>
import '../admin/admin.js';
import '../settings/settings.js';
import '../help/help.js'; |
<<<<<<<
done();
});
},
loadConfig() {
this.defaultAppsFolders = this.config.get('appsFolders');
this.directoryPath = this.config.get('directoryPath');
this.clusteredDbApps = this.config.get('clusteredDbApps');
this.serviceDiscoveryType = this.config.get('serviceDiscoveryType');
this.monitoring = this.config.get('monitoring');
this.adminPassword = this.config.get('adminPassword');
this.jwtSecretKey = this.config.get('jwtSecretKey');
this.dockerRepositoryName = this.config.get('dockerRepositoryName');
this.dockerPushCommand = this.config.get('dockerPushCommand');
this.openshiftNamespace = this.config.get('openshiftNamespace');
this.storageType = this.config.get('storageType');
this.registryReplicas = this.config.get('registryReplicas');
this.DOCKER_JHIPSTER_REGISTRY = constants.DOCKER_JHIPSTER_REGISTRY;
this.DOCKER_CONSUL = constants.DOCKER_CONSUL;
this.DOCKER_CONSUL_CONFIG_LOADER = constants.DOCKER_CONSUL_CONFIG_LOADER;
this.DOCKER_MYSQL = constants.DOCKER_MYSQL;
this.DOCKER_MARIADB = constants.DOCKER_MARIADB;
this.DOCKER_POSTGRESQL = constants.DOCKER_POSTGRESQL;
this.DOCKER_ORACLE = constants.DOCKER_ORACLE;
this.DOCKER_MONGODB = constants.DOCKER_MONGODB;
this.DOCKER_COUCHBASE = constants.DOCKER_COUCHBASE;
this.DOCKER_ELASTICSEARCH = constants.DOCKER_ELASTICSEARCH;
this.DOCKER_KAFKA = constants.DOCKER_KAFKA;
this.DOCKER_ZOOKEEPER = constants.DOCKER_ZOOKEEPER;
this.DOCKER_CASSANDRA = constants.DOCKER_CASSANDRA;
this.DOCKER_JHIPSTER_ELASTICSEARCH = constants.DOCKER_JHIPSTER_ELASTICSEARCH;
this.DOCKER_JHIPSTER_LOGSTASH = constants.DOCKER_JHIPSTER_LOGSTASH;
this.DOCKER_JHIPSTER_ZIPKIN = constants.DOCKER_JHIPSTER_ZIPKIN;
this.DOCKER_JHIPSTER_CONSOLE = constants.DOCKER_JHIPSTER_CONSOLE;
this.DOCKER_PROMETHEUS = constants.DOCKER_PROMETHEUS;
this.DOCKER_PROMETHEUS_ALERTMANAGER = constants.DOCKER_PROMETHEUS_ALERTMANAGER;
this.DOCKER_GRAFANA = constants.DOCKER_GRAFANA;
if (this.defaultAppsFolders !== undefined) {
this.log('\nFound .yo-rc.json config file...');
=======
>>>>>>> |
<<<<<<<
const DOCKER_MSSQL = 'microsoft/mssql-server-linux:latest';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:3.12.6';
const DOCKER_MEMCACHED = 'memcached:1.5.19-alpine';
const DOCKER_REDIS = 'redis:5.0.6';
const DOCKER_KEYCLOAK = 'jboss/keycloak:7.0.0'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:6.8.5'; // The version should be coerent with the one from spring-data-elasticsearch project
=======
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2017-latest-ubuntu';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:3.12.7';
const DOCKER_MEMCACHED = 'memcached:1.5.20-alpine';
const DOCKER_REDIS = 'redis:5.0.7';
const DOCKER_KEYCLOAK = 'jboss/keycloak:8.0.1'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:6.4.3'; // The version should be coerent with the one from spring-data-elasticsearch project
>>>>>>>
const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2017-latest-ubuntu';
const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:3.12.7';
const DOCKER_MEMCACHED = 'memcached:1.5.20-alpine';
const DOCKER_REDIS = 'redis:5.0.7';
const DOCKER_KEYCLOAK = 'jboss/keycloak:8.0.1'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs
const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:6.8.5'; // The version should be coerent with the one from spring-data-elasticsearch project |
<<<<<<<
const WebpackNotifierPlugin = require('webpack-notifier');
=======
const AddAssetHtmlPlugin = require('add-asset-html-webpack-plugin');
>>>>>>>
<<<<<<<
new StringReplacePlugin(),
new WebpackNotifierPlugin({
title: 'JHipster',
contentImage: path.join(__dirname, 'logo-jhipster.png')
})
=======
new AddAssetHtmlPlugin([
{ filepath: path.resolve('./<%= BUILD_DIR %>www/vendor.dll.js'), includeSourcemap: false }
]),
new StringReplacePlugin()
>>>>>>>
new StringReplacePlugin() |
<<<<<<<
const istio = this.istio;
this.ingressDomain = this.ingressDomain && this.ingressDomain.startsWith('.') ? this.ingressDomain.substring(1) : this.ingressDomain;
=======
>>>>>>>
const istio = this.istio;
this.ingressDomain = this.ingressDomain && this.ingressDomain.startsWith('.') ? this.ingressDomain.substring(1) : this.ingressDomain;
<<<<<<<
if (props.ingressDomain === 'none') {
this.ingressDomain = '';
} else {
this.ingressDomain = props.ingressDomain ? '.'.concat(props.ingressDomain) : '';
}
=======
this.ingressDomain = props.ingressDomain;
>>>>>>>
if (props.ingressDomain === 'none') {
this.ingressDomain = '';
} else {
this.ingressDomain = props.ingressDomain ? props.ingressDomain : '';
} |
<<<<<<<
}
Generator.prototype.isJhipsterVersionLessThan = function(version) {
var jhipsterVersion = this.config.get('jhipsterVersion');
if (!jhipsterVersion) {
return true;
}
return semver.lt(jhipsterVersion, version);
=======
}
Generator.prototype.contains = _.contains;
Generator.prototype.formatAsClassJavadoc = function(text) {
return '/**' + wordwrap(text, WORD_WRAP_WIDTH - 4, '\n * ', false) + '\n */';
};
Generator.prototype.formatAsFieldJavadoc = function(text) {
return ' /**' + wordwrap(text, WORD_WRAP_WIDTH - 8, '\n * ', false) + '\n */';
};
Generator.prototype.formatAsApiModel = function(text) {
return wordwrap(text.replace(/\\/g, '\\\\').replace(/\"/g, '\\\"'), WORD_WRAP_WIDTH - 9, '"\n + "', true)
};
Generator.prototype.formatAsApiModelProperty = function(text) {
return wordwrap(text.replace(/\\/g, '\\\\').replace(/\"/g, '\\\"'), WORD_WRAP_WIDTH - 13, '"\n + "', true)
};
var wordwrap = function(text, width, seperator, keepLF) {
var wrappedText = '';
var rows = text.split('\n');
for (var i = 0; i < rows.length; i++) {
var row = rows[i];
if (keepLF == true && i != 0) {
wrappedText = wrappedText + '\\n';
}
wrappedText = wrappedText + seperator + _s.wrap(row, {
width: width,
seperator: seperator,
preserveSpaces: keepLF
});
}
return wrappedText;
>>>>>>>
}
Generator.prototype.isJhipsterVersionLessThan = function(version) {
var jhipsterVersion = this.config.get('jhipsterVersion');
if (!jhipsterVersion) {
return true;
}
return semver.lt(jhipsterVersion, version);
}
Generator.prototype.contains = _.contains;
Generator.prototype.formatAsClassJavadoc = function(text) {
return '/**' + wordwrap(text, WORD_WRAP_WIDTH - 4, '\n * ', false) + '\n */';
};
Generator.prototype.formatAsFieldJavadoc = function(text) {
return ' /**' + wordwrap(text, WORD_WRAP_WIDTH - 8, '\n * ', false) + '\n */';
};
Generator.prototype.formatAsApiModel = function(text) {
return wordwrap(text.replace(/\\/g, '\\\\').replace(/\"/g, '\\\"'), WORD_WRAP_WIDTH - 9, '"\n + "', true)
};
Generator.prototype.formatAsApiModelProperty = function(text) {
return wordwrap(text.replace(/\\/g, '\\\\').replace(/\"/g, '\\\"'), WORD_WRAP_WIDTH - 13, '"\n + "', true)
};
var wordwrap = function(text, width, seperator, keepLF) {
var wrappedText = '';
var rows = text.split('\n');
for (var i = 0; i < rows.length; i++) {
var row = rows[i];
if (keepLF == true && i != 0) {
wrappedText = wrappedText + '\\n';
}
wrappedText = wrappedText + seperator + _s.wrap(row, {
width: width,
seperator: seperator,
preserveSpaces: keepLF
});
}
return wrappedText; |
<<<<<<<
this.stripMargin(`|<DropdownItem tag={Link} key="${routerName}" to="/entity/${routerName}">
| <FontAwesomeIcon icon={faAsterisk} /> ${_.startCase(routerName)}
| </DropdownItem>,`)
=======
this.stripMargin(`|(
| <DropdownItem tag={Link} key="${routerName}" to="/entity/${routerName}">
| <FontAwesomeIcon icon="asterisk" />
| ${_.startCase(routerName)}
| </DropdownItem>
| ),`)
>>>>>>>
this.stripMargin(`|<DropdownItem tag={Link} key="${routerName}" to="/entity/${routerName}">
| <FontAwesomeIcon icon="asterisk" /> ${_.startCase(routerName)}
| </DropdownItem>,`) |
<<<<<<<
const AddAssetHtmlPlugin = require('add-asset-html-webpack-plugin');
=======
const WebpackNotifierPlugin = require('webpack-notifier');
>>>>>>>
const AddAssetHtmlPlugin = require('add-asset-html-webpack-plugin');
const WebpackNotifierPlugin = require('webpack-notifier');
<<<<<<<
utils.root('src/test'),
])
=======
path.resolve('./src/test'),
]),
new WebpackNotifierPlugin({
title: 'JHipster',
contentImage: path.join(__dirname, 'logo-jhipster.png')
})
>>>>>>>
utils.root('src/test'),
]),
new WebpackNotifierPlugin({
title: 'JHipster',
contentImage: path.join(__dirname, 'logo-jhipster.png')
}) |
<<<<<<<
const { repo, description, url, twitter } = this.state.project;
=======
const {
name,
description,
url,
twitter,
issueNumber
} = this.state.project;
const issueURL = `${url}/issues/${issueNumber}`;
>>>>>>>
const {
repo,
description,
url,
twitter,
issueNumber
} = this.state.project;
const issueURL = `${url}/issues/${issueNumber}`;
<<<<<<<
<Link href={url}>
{repo}
=======
<Link href={issueURL}>
{name}
>>>>>>>
<Link href={issueURL}>
{repo}
<<<<<<<
<Link href={url}>
{repo}
=======
<Link href={issueURL}>
{name}
>>>>>>>
<Link href={issueURL}>
{repo} |
<<<<<<<
// include: ['src/as/**/*.spec.ts'],
// include: ['src/as/**/Mesh.spec.ts'],
// include: ['src/as/**/Geometry.spec.ts'],
include: ['src/as/**/BufferAttribute.spec.ts'],
=======
include: ['src/as/index.spec.ts'],
>>>>>>>
// include: ['src/as/index.spec.ts'],
// include: ['src/as/**/Mesh.spec.ts'],
// include: ['src/as/**/Geometry.spec.ts'],
include: ['src/as/**/BufferAttribute.spec.ts'], |
<<<<<<<
if (!meta) {
=======
if (!meta || !meta.codec) {
if (this._hasAudio === false) {
this._hasAudio = true;
this._mediaInfo.hasAudio = true;
}
>>>>>>>
if (!meta) {
if (this._hasAudio === false) {
this._hasAudio = true;
this._mediaInfo.hasAudio = true;
} |
<<<<<<<
deltaX = Math.abs(pageX - self.startPageX);
deltaY = Math.abs(pageY - self.startPageY);
if (deltaX > 5) {
event.preventDefault();
self.moveReady = true;
self.element.addEventListener('click', self, true);
}
else if (deltaY > 5) {
self.scrolling = false;
self._touchEnd();
=======
var triangle = getTriangleSide(self.startPageX, self.startPageY, pageX, pageY);
if (triangle.z > distanceThreshold) {
if (getAngle(triangle) > angleThrehold) {
event.preventDefault();
self.moveReady = true;
self.element.addEventListener('click', self, true);
}
else {
self.scrolling = false;
}
>>>>>>>
var triangle = getTriangleSide(self.startPageX, self.startPageY, pageX, pageY);
if (triangle.z > distanceThreshold) {
if (getAngle(triangle) > angleThrehold) {
event.preventDefault();
self.moveReady = true;
self.element.addEventListener('click', self, true);
}
else {
self.scrolling = false;
self._touchEnd();
} |
<<<<<<<
test('apiMiddleware must dispatch an error request FSA when [RSAA].options fails', (t) => {
const anAction = {
[RSAA]: {
endpoint: '',
method: 'GET',
options: () => { throw new Error(); },
types: [
{
type: 'REQUEST',
payload: 'ignoredPayload',
meta: 'someMeta'
},
'SUCCESS',
'FAILURE'
]
}
};
const doGetState = () => {};
const nextHandler = apiMiddleware({ getState: doGetState });
const doNext = (action) => {
t.pass('next handler called');
t.equal(
action.type,
'REQUEST',
'dispatched FSA has correct type property'
);
t.equal(
action.payload.message,
'[RSAA].options function failed',
'dispatched FSA has correct payload property'
);
t.equal(
action.meta,
'someMeta',
'dispatched FSA has correct meta property'
);
t.ok(
action.error,
'dispatched FSA has correct error property'
);
};
const actionHandler = nextHandler(doNext);
t.plan(5);
actionHandler(anAction);
});
test('apiMiddleware must dispatch an error request FSA on a request error', (t) => {
=======
test('apiMiddleware must dispatch an error request FSA on a request error', t => {
>>>>>>>
test('apiMiddleware must dispatch an error request FSA on a request error', t => {
<<<<<<<
test('apiMiddleware must use an [RSAA].options function when present', (t) => {
const api = nock('http://127.0.0.1')
.get('/api/users/1')
.reply(200);
const anAction = {
[RSAA]: {
endpoint: 'http://127.0.0.1/api/users/1',
method: 'GET',
options: () => {
t.pass('[RSAA].options function called')
},
types: ['REQUEST', 'SUCCESS', 'FAILURE']
}
};
const doGetState = () => {};
const nextHandler = apiMiddleware({ getState: doGetState });
const doNext = (action) => {};
const actionHandler = nextHandler(doNext);
t.plan(1);
actionHandler(anAction);
});
test('apiMiddleware must dispatch a success FSA on a successful API call with a non-empty JSON response', (t) => {
=======
test('apiMiddleware must dispatch a success FSA on a successful API call with a non-empty JSON response', t => {
>>>>>>>
test('apiMiddleware must use an [RSAA].options function when present', (t) => {
const api = nock('http://127.0.0.1')
.get('/api/users/1')
.reply(200);
const anAction = {
[RSAA]: {
endpoint: 'http://127.0.0.1/api/users/1',
method: 'GET',
options: () => {
t.pass('[RSAA].options function called')
},
types: ['REQUEST', 'SUCCESS', 'FAILURE']
}
};
const doGetState = () => {};
const nextHandler = apiMiddleware({ getState: doGetState });
const doNext = (action) => {};
const actionHandler = nextHandler(doNext);
t.plan(1);
actionHandler(anAction);
});
test('apiMiddleware must dispatch a success FSA on a successful API call with a non-empty JSON response', t => { |
<<<<<<<
// TODO: should we lookup the instance ID for this client here?
// TODO: say not if we havn't given them permission :)
uiChannel.on('start-using-peer-as-proxy-server', function(peerInstanceId) {
startUsingPeerAsProxyServer(state.instanceToClient[peerInstanceId]);
=======
// InstanceId given from extension, because that's where we click from.
uiChannel.on('start-using-peer-as-proxy-server', function(peerInstanceId) {
startUsingPeerAsProxyServer(peerInstanceId);
});
uiChannel.on('stop-proxying', function(peerInstanceId) {
stopUsingPeerAsProxyServer(peerInstanceId);
>>>>>>>
// TODO: say not if we havn't given them permission :)
uiChannel.on('start-using-peer-as-proxy-server', function(peerInstanceId) {
startUsingPeerAsProxyServer(state.instanceToClient[peerInstanceId]);
});
uiChannel.on('stop-proxying', function(peerInstanceId) {
stopUsingPeerAsProxyServer(peerInstanceId); |
<<<<<<<
// TODO: should we lookup the instance ID for this client here?
// TODO: say not if we havn't given them permission :)
freedom.on('startUsingPeerAsProxyServer', peerClientId) {
client.emit("start",
{'host': '127.0.0.1', 'port': 9999,
// peerId of the peer being routed to.
'peerId': peerClientId});
}
client.on('sendSignalToPeer', function(data) {
log.debug('client(sendSignalToPeer):', data);
// TODO: don't use 'message' as a field in a message! that's confusing!
identity.sendMessage(contact, JSON.stringify({message: 'peerconnection-client', data: data}));
=======
// Updating our own UProxy instance's description.
freedom.on('update-description', function (data) {
state.me.description = data;
// TODO(uzimizu): save to storage
var payload = JSON.stringify({
message: 'update-description',
data: {
instanceId: '' + state.me.instanceId,
description: '' + state.me.description,
}
});
// Send the new description to ALL currently online friend instances.
for (var instanceId in state.instances) {
var client = instanceToClient(instanceId);
if (!client || 'offline' == client.status)
continue;
identity.sendMessage(client.clientId, payload);
}
});
client.on('fromClient', function(data) {
log.debug('Connection Setup:', data);
var contact = state.currentSessionsToInitiate['*'];
if (!contact) {
return log.error("Client connection received but no active connections.");
}
identity.sendMessage(contact, JSON.stringify({message: 'connection-setup', data: data}));
>>>>>>>
// TODO: should we lookup the instance ID for this client here?
// TODO: say not if we havn't given them permission :)
freedom.on('startUsingPeerAsProxyServer', peerClientId) {
client.emit("start",
{'host': '127.0.0.1', 'port': 9999,
// peerId of the peer being routed to.
'peerId': peerClientId});
}
client.on('sendSignalToPeer', function(data) {
log.debug('client(sendSignalToPeer):', data);
// TODO: don't use 'message' as a field in a message! that's confusing!
identity.sendMessage(contact, JSON.stringify({message: 'peerconnection-client', data: data}));
<<<<<<<
}
// Now that this module has got itself setup, it sends a 'ready' message to the
// freedom background page.
bgPageChannel.emit('ready');
=======
}
// Update the description for an instanceId.
// Assumes that |instanceId| is valid.
function _handleUpdateDescription(msg, clientId) {
var instanceId = msg.data.instanceId;
var description = msg.data.description;
state.instances[instanceId].description = description;
log.debug('Updating description! ' + JSON.stringify(msg));
freedom.emit('state-change', [{
op: 'replace',
path: '/instances/' + instanceId + '/description',
value: description
}]);
}
>>>>>>>
}
// Update the description for an instanceId.
// Assumes that |instanceId| is valid.
function _handleUpdateDescription(msg, clientId) {
var instanceId = msg.data.instanceId;
var description = msg.data.description;
state.instances[instanceId].description = description;
log.debug('Updating description! ' + JSON.stringify(msg));
freedom.emit('state-change', [{
op: 'replace',
path: '/instances/' + instanceId + '/description',
value: description
}]);
}
// Now that this module has got itself setup, it sends a 'ready' message to the
// freedom background page.
bgPageChannel.emit('ready'); |
<<<<<<<
"identityStatus": {},
=======
'identityStatus': {},
>>>>>>>
'identityStatus': {},
<<<<<<<
// Local client's information.
"me": {
"description": "",
"instanceId": "",
"keyHash": "",
"peerAsProxy": null,
"peersAsClients": []
},
=======
'me': {
'description': '',
'instanceId': '',
'keyHash': '',
'peerAsProxy': null,
'peersAsClients': []
}, // Local client's information.
>>>>>>>
// Local client's information.
'me': {
'description': '',
'instanceId': '',
'keyHash': '',
'peerAsProxy': null,
'peersAsClients': []
},
<<<<<<<
// Merged contact lists from each identity provider.
"roster": {},
=======
'roster': {}, // Merged contact lists from each identity provider.
>>>>>>>
// Merged contact lists from each identity provider.
'roster': {},
<<<<<<<
// instanceId -> instance. Active UProxy installations.
"instances": {},
=======
'instances': {}, // instanceId -> instance. Active UProxy installations.
// ID mappings.
'clientToInstance': {}, // instanceId -> clientId
'instanceToClient': {}, // clientId -> instanceId
>>>>>>>
// instanceId -> instance. Active UProxy installations.
'instances': {},
// ID mappings.
'clientToInstance': {}, // instanceId -> clientId
'instanceToClient': {}, // clientId -> instanceId
<<<<<<<
var asProxy = 'allow' == jsonMessage.message || 'deny' == jsonMessage.message ||
'offer' == jsonMessage.message ? !beingSent : beingSent;
var clientId = jsonMessage.to || jsonMessage.toClientId;
=======
var asProxy = 'allow' == mType || 'deny' == mType ||
'offer' == mType ? !beingSent : beingSent;
var clientId = jsonMessage.to || jsonMessage.toClientId;
>>>>>>>
var asProxy = 'allow' == mType || 'deny' == mType ||
'offer' == mType ? !beingSent : beingSent;
var clientId = jsonMessage.to || jsonMessage.toClientId; |
<<<<<<<
(this.app.hasPythonFileOpen() && !this.lastShown[state]);
=======
(this.app.hasSupportedFileOpen() && !this.lastRejected[state]);
>>>>>>>
(this.app.hasSupportedFileOpen() && !this.lastShown[state]); |
<<<<<<<
if (!symbolId) { return; }
DataLoader.openInWebForId(symbolId(token.Symbol));
=======
DataLoader.openInWebForId(symbolId(token.Symbol || token.symbol));
metrics.track('Context menu Open in web clicked');
>>>>>>>
DataLoader.openInWebForId(symbolId(token.Symbol || token.symbol));
<<<<<<<
=======
trackCompletions() {
atom.packages.activatePackage('autocomplete-plus')
.then(autocompletePlus => {
const { getSuggestions } = completions;
completions.getSuggestions = (...args) => {
return getSuggestions.apply(completions, args)
.then(suggestions => {
completions.lastSuggestions = suggestions;
return suggestions;
}).catch(err => {
completions.lastSuggestions = [];
throw err;
});
};
const acp = autocompletePlus.mainModule;
const autocompleteManager = acp.autocompleteManager || acp.getAutocompleteManager();
if (!autocompleteManager || !autocompleteManager.confirm || !autocompleteManager.displaySuggestions) { return; }
const safeConfirm = autocompleteManager.confirm;
const safeDisplaySuggestions = autocompleteManager.displaySuggestions;
autocompleteManager.displaySuggestions = (suggestions, options) => {
this.trackSuggestions(suggestions, autocompleteManager.editor);
return safeDisplaySuggestions.call(autocompleteManager, suggestions, options);
};
autocompleteManager.confirm = suggestion => {
this.trackUsedSuggestion(suggestion, autocompleteManager.editor);
return safeConfirm.call(autocompleteManager, suggestion);
};
});
},
trackSuggestions(suggestions, editor) {
if (/\.py$/.test(editor.getPath())) {
let hasKiteSuggestions = suggestions.some(s => s.provider === completions);
if (hasKiteSuggestions) {
this.track('Atom shows Kite completions');
} else {
this.track('Atom shows no Kite completions');
}
}
},
trackUsedSuggestion(suggestion, editor) {
if (/\.py$/.test(editor.getPath())) {
if (completions.lastSuggestions &&
completions.lastSuggestions.includes(suggestion)) {
this.track('used completion returned by Kite', {
text: suggestion.text,
hasDocumentation: this.hasDocumentation(suggestion),
});
} else {
this.track('used completion not returned by Kite', {
text: suggestion.text,
hasDocumentation: this.hasDocumentation(suggestion),
});
}
}
},
hasDocumentation(suggestion) {
return (suggestion.description != null && suggestion.description !== '') ||
(suggestion.descriptionMarkdown != null && suggestion.descriptionMarkdown !== '');
},
hasSameSuggestion(suggestion, suggestions) {
return suggestions.some(s => s.text === suggestion.text);
},
track(msg, data) {
metrics.track(msg, data);
},
>>>>>>> |
<<<<<<<
constructor(kite) {
=======
constructor() {
if (!Emitter) { ({Emitter} = require('atom')); }
>>>>>>>
constructor(kite) {
if (!Emitter) { ({Emitter} = require('atom')); } |
<<<<<<<
(this.hasPythonFileOpen() && !this.lastShown[state]);
}
hasPythonFileOpen() {
return atom.workspace.getTextEditors().some(e => /\.py$/.test(e.getPath() || ''));
=======
(this.app.hasPythonFileOpen() && !this.lastRejected[state]);
>>>>>>>
(this.app.hasPythonFileOpen() && !this.lastShown[state]); |
<<<<<<<
if (KiteAPI.hasManyKiteInstallation() ||
KiteAPI.hasManyKiteEnterpriseInstallation()) {
this.instrumentNotification(atom.notifications.addWarning(
=======
if (StateController.hasManyKiteInstallation() ||
StateController.hasManyKiteEnterpriseInstallation()) {
this.queue.addWarning(
>>>>>>>
if (KiteAPI.hasManyKiteInstallation() ||
KiteAPI.hasManyKiteEnterpriseInstallation()) {
this.queue.addWarning( |
<<<<<<<
this.getStatusPanel().setApp(this.app);
=======
this.getSearchItem().setApp(this.app);
>>>>>>>
this.getStatusPanel().setApp(this.app);
this.getSearchItem().setApp(this.app);
<<<<<<<
getStatusPanel() {
if (this.statusPanel) { return this.statusPanel; }
if (!KiteStatusPanel) { KiteStatusPanel = require('./elements/kite-status-panel'); }
this.statusPanel = new KiteStatusPanel();
return this.statusPanel;
},
=======
getSearchItem() {
if (this.search) { return this.search; }
if (!KiteActiveSearch) { KiteActiveSearch = require('./elements/kite-active-search'); }
this.search = new KiteActiveSearch();
return this.search;
},
>>>>>>>
getStatusPanel() {
if (this.statusPanel) { return this.statusPanel; }
if (!KiteStatusPanel) { KiteStatusPanel = require('./elements/kite-status-panel'); }
this.statusPanel = new KiteStatusPanel();
return this.statusPanel;
},
getSearchItem() {
if (this.search) { return this.search; }
if (!KiteActiveSearch) { KiteActiveSearch = require('./elements/kite-active-search'); }
this.search = new KiteActiveSearch();
return this.search;
}, |
<<<<<<<
=======
const ensureKite = () => { if (!Kite) { Kite = require('./kite'); } };
const pendingStatusRequestByEditor = {};
>>>>>>>
const pendingStatusRequestByEditor = {};
<<<<<<<
return KiteAPI.getStatus(editor.getPath());
=======
const filepath = editor.getPath();
const path = statusPath(filepath);
if (pendingStatusRequestByEditor[filepath]) {
return pendingStatusRequestByEditor[filepath];
}
return pendingStatusRequestByEditor[filepath] = promisifyRequest(StateController.client.request({path}))
.then(resp => {
Logger.logResponse(resp);
if (resp.statusCode === 200) {
return promisifyReadResponse(resp)
.then(json => parseJSON(json))
.catch(() => ({status: 'ready'}));
}
return {status: 'ready'};
})
.catch(() => ({status: 'ready'}))
.then(res => {
delete pendingStatusRequestByEditor[filepath];
return res;
});
>>>>>>>
const filepath = editor.getPath();
if (pendingStatusRequestByEditor[filepath]) {
return pendingStatusRequestByEditor[filepath];
}
return pendingStatusRequestByEditor[filepath] = KiteAPI.getStatus(editor.getPath())
.then(res => {
delete pendingStatusRequestByEditor[filepath];
return res;
}); |
<<<<<<<
const EditorEvents = require('./editor-events');
=======
const DataLoader = require('./data-loader');
>>>>>>>
const EditorEvents = require('./editor-events');
const DataLoader = require('./data-loader'); |
<<<<<<<
this.templates = require('./templates')(this);
=======
this.suppressionList = require('./suppressionList')(this);
>>>>>>>
this.suppressionList = require('./suppressionList')(this);
this.templates = require('./templates')(this); |
<<<<<<<
const { Contract } = require('ethers');
=======
const { ethersBnToBn, bnToEthersBn } = require('./utils');
>>>>>>>
const { Contract } = require('ethers');
<<<<<<<
isEthAddress(address, { strict: true });
const { isNative } = contracts;
const getETH = () => contracts.eth.getBalance(address).catch((error) => {
=======
const vAddress = await addressSchema().validate(address);
const rlcAddress = await contracts.fetchRLCAddress();
const getETH = () => contracts.eth.getBalance(vAddress).catch((error) => {
>>>>>>>
const vAddress = await addressSchema().validate(address);
const { isNative } = contracts;
const getETH = () => contracts.eth.getBalance(vAddress).catch((error) => {
<<<<<<<
const balances = {};
if (isNative) {
const weiBalance = await getETH();
Object.assign(balances, {
wei: ethersBnToBn(weiBalance),
nRLC: truncateBnWeiToBnNRlc(ethersBnToBn(weiBalance)),
=======
const getRLC = () => contracts
.getRLCContract({
at: rlcAddress,
})
.balanceOf(vAddress)
.catch((error) => {
debug(error);
return 0;
>>>>>>>
const balances = {};
if (isNative) {
const weiBalance = await getETH();
Object.assign(balances, {
wei: ethersBnToBn(weiBalance),
nRLC: truncateBnWeiToBnNRlc(ethersBnToBn(weiBalance)),
<<<<<<<
to,
value: hexValue,
=======
to: vAddress,
value: vValue,
>>>>>>>
to: vAddress,
value: hexValue,
<<<<<<<
if (contracts.isNative) {
debug('send native token');
const weiValue = bnNRlcToBnWei(new BN(nRlcAmount)).toString();
const txHash = await sendNativeToken(contracts, weiValue, to);
return txHash;
}
debug('send ERC20 token');
const txHash = await sendERC20(contracts, nRlcAmount, to);
return txHash;
=======
const vAddress = await addressSchema().validate(to);
const vAmount = await uint256Schema().validate(amount);
const rlcAddress = await contracts.fetchRLCAddress();
const rlcContract = contracts.getRLCContract({ at: rlcAddress });
const tx = await rlcContract.transfer(vAddress, vAmount);
await tx.wait();
return tx.hash;
>>>>>>>
const vAddress = await addressSchema().validate(to);
const vAmount = await uint256Schema().validate(nRlcAmount);
if (contracts.isNative) {
debug('send native token');
const weiValue = bnNRlcToBnWei(new BN(vAmount)).toString();
const txHash = await sendNativeToken(contracts, weiValue, vAddress);
return txHash;
}
debug('send ERC20 token');
const txHash = await sendERC20(contracts, vAmount, vAddress);
return txHash;
<<<<<<<
isEthAddress(to, { strict: true });
const code = await contracts.eth.getCode(to);
if (code !== '0x') {
throw new Error('Cannot sweep to a contract');
=======
const vAddress = await addressSchema().validate(address);
const vAddressTo = await addressSchema().validate(to);
const balances = await checkBalances(contracts, vAddress);
let sendRLCTxHash;
if (balances.nRLC.gt(new BN(0))) {
sendRLCTxHash = await sendRLC(
contracts,
bnToEthersBn(balances.nRLC),
vAddressTo,
);
>>>>>>>
const vAddress = await addressSchema().validate(address);
const vAddressTo = await addressSchema().validate(to);
const code = await contracts.eth.getCode(vAddressTo);
if (code !== '0x') {
throw new Error('Cannot sweep to a contract');
<<<<<<<
try {
const sendNativeTxHash = await sendNativeToken(
contracts,
bnToEthersBn(sweepNative),
to,
);
debug('sendNativeTxHash', sendNativeTxHash);
Object.assign(res, { sendNativeTxHash });
} catch (error) {
debug(error);
errors.push(`Failed to transfert native token': ${error.message}`);
}
} else {
const err = 'Tx fees are greather than wallet balance';
debug(err);
errors.push(`Failed to transfert native token': ${err}`);
=======
sendETHTxHash = await sendETH(
contracts,
bnToEthersBn(sweepETH).toHexString(),
vAddressTo,
);
>>>>>>>
try {
const sendNativeTxHash = await sendNativeToken(
contracts,
bnToEthersBn(sweepNative),
vAddressTo,
);
debug('sendNativeTxHash', sendNativeTxHash);
Object.assign(res, { sendNativeTxHash });
} catch (error) {
debug(error);
errors.push(`Failed to transfert native token': ${error.message}`);
}
} else {
const err = 'Tx fees are greather than wallet balance';
debug(err);
errors.push(`Failed to transfert native token': ${err}`); |
<<<<<<<
* @fileOverview This file adds support for the {@link chrome.storage.local} API in Firefox. This API isn’t implemented until Firefox version 48 for content-scripts.
* @name background.js<firefox>
* @author Etienne Prud’homme
* @license MIT
=======
* @fileoverview This file adds support for the {@link chrome.storage.local} API in Firefox. This API isn’t implemented until Firefox version 48 for content-scripts.
* @name background.js<firefox>
* @author Etienne Prud’homme
* @license GPLv3
>>>>>>>
* @fileOverview This file adds support for the {@link chrome.storage.local} API in Firefox. This API isn’t implemented until Firefox version 48 for content-scripts.
* @name background.js<firefox>
* @author Etienne Prud’homme
* @license GPLv3 |
<<<<<<<
* @fileOverview This file contains the constructor for a `Suite` of tests.
* @name Suite.js<GE>
* @author Cameron Pittman
* @license MIT
=======
* @fileoverview This file contains the constructor for a `Suite` of tests.
* @name Suite.js<js>
* @author Cameron Pittman
* @license GPLv3
>>>>>>>
* @fileOverview This file contains the constructor for a `Suite` of tests.
* @name Suite.js<js>
* @author Cameron Pittman
* @license GPLv3
<<<<<<<
// Suite.js<GE> ends here
=======
// Suite.js<js> ends here
>>>>>>>
// Suite.js<js> ends here |
<<<<<<<
/**
* @fileOverview Udacity’s library for immediate front-end feedback.
* @name intro.js<GE>
* @author Cameron Pittman
* @license MIT
*/
=======
/**
* @fileOverview Udacity’s library for immediate front-end feedback.
* @name intro.js<js>
* @author Cameron Pittman
* @license GPLv3
*/
/*
*/
>>>>>>>
/**
* @fileOverview Udacity’s library for immediate front-end feedback.
* @name intro.js<js>
* @author Cameron Pittman
* @license GPLv3
*/
<<<<<<<
// intro.js<GE> ends here
=======
// intro.js<js> ends here
>>>>>>>
// intro.js<js> ends here |
<<<<<<<
/**
* @fileOverview This file contains procedures to inject and import the Grading Engine and its widgets.
* @name inject.js<inject>
* @author Cameron Pittman
* @license MIT
*/
=======
/**
* @fileoverview This file manages the injection of several JavaScript files. It contains most procedure for injecting those files, but doesn’t handle the conditional injection part.
* @name inject.js
* @author Cameron Pittman
* Etienne Prud’homme
* @license MIT
*/
/**
* List of items id that were injected in the page. It is used to later remove them.
* @type {string[]}
*/
>>>>>>>
/**
* @fileoverview This file manages the injection of several JavaScript files. It contains most procedure for injecting those files, but doesn’t handle the conditional injection part.
* @name inject.js<inject>
* @author Cameron Pittman
* Etienne Prud’homme
* @license MIT
*/
/**
* List of items id that were injected in the page. It is used to later remove them.
* @type {string[]}
*/ |
<<<<<<<
import { PoseDOM, PoserFLIP, PoserPassive, PoseDrag } from "./plugins/pose";
import {
ReactPose,
ReactPoseChildren,
Group,
EmailList
} from "./plugins/react-pose";
=======
import { PoseDOM, PoserFLIP, PoserPassive, PoseDrag, PoserManualValues } from "./plugins/pose";
import { ReactPose, ReactPoseChildren, Group } from "./plugins/react-pose";
>>>>>>>
import {
PoseDOM,
PoserFLIP,
PoserPassive,
PoseDrag,
PoserManualValues
} from "./plugins/pose";
import {
ReactPose,
ReactPoseChildren,
Group,
EmailList
} from "./plugins/react-pose"; |
<<<<<<<
hasChildren = (preprocessedValue.children !== undefined);
=======
hasChildren = (thisValue.children !== undefined);
thisValue.action = preprocessedValue.link ? 'link' : actor.action;
defaultProps = actionsManager[thisValue.action].valueDefaults;
>>>>>>>
hasChildren = (preprocessedValue.children !== undefined);
thisValue.action = preprocessedValue.link ? 'link' : actor.action;
defaultProps = actionsManager[thisValue.action].valueDefaults; |
<<<<<<<
import { ACTION, cols } from '~/styles/vars';
import { fontSize, lineHeight, fontBold } from '~/styles/fonts';
export const Container = styled.section`
padding-top: ${cols(4)};
display: flex;
align-items: center;
flex-direction: column;
`;
export const Blurb = styled.p`
${fontSize(24)}
${lineHeight(32)}
max-width: ${cols(36)};
text-align: center;
margin-bottom: ${cols(4)};
`;
export const SectionContainer = styled.section`
width: 100%;
`;
export const SectionHeader = styled.h2`
${fontSize(48)}
${fontBold}
text-align: center;
margin-bottom: ${cols(2)};
`;
export const ExampleContainer = styled.div`
`;
export const ExampleHeader = styled.h3`
${fontSize(28)}
${lineHeight(28)}
${fontBold}
margin-bottom: ${cols(1)};
a {
${fontBold}
}
`;
export const Description = styled.p`
${fontSize(18)}
${lineHeight(28)}
width: 50%;
`;
=======
import { fontSize, fontBold } from '~/styles/fonts';
import { ACTION, cols } from '~/styles/vars';
export const Container = styled.section`
display: flex;
flex-direction: column;
align-items: center;
padding: ${cols(5)} 0;
`;
export const Blurb = styled.p`
${fontSize(24)}
max-width: ${cols(30)};
text-align: center;
margin-bottom: ${cols(4)};
`;
export const SectionContainer = styled.section``;
export const SectionHeader = styled.h2`
${fontSize(48)}
${fontBold}
text-align: center;
margin-bottom: ${cols(4)};
`;
export const ExampleContainer = styled.div``;
export const ExampleHeader = styled.h3`
${fontSize(24)}
${fontBold}
a {
color: ${ACTION};
${fontBold}
}
`;
export const Description = styled.p`
max-width: 50%;
${fontSize(18)}
`;
>>>>>>>
import { ACTION, cols } from '~/styles/vars';
import { fontSize, lineHeight, fontBold } from '~/styles/fonts';
export const Container = styled.section`
padding-top: ${cols(4)};
display: flex;
align-items: center;
flex-direction: column;
`;
export const Blurb = styled.p`
${fontSize(24)}
${lineHeight(32)}
max-width: ${cols(30)};
text-align: center;
margin-bottom: ${cols(4)};
`;
export const SectionContainer = styled.section`
width: 100%;
`;
export const SectionHeader = styled.h2`
${fontSize(48)}
${fontBold}
text-align: center;
margin-bottom: ${cols(2)};
`;
export const ExampleContainer = styled.div`
`;
export const ExampleHeader = styled.h3`
${fontSize(28)}
${lineHeight(28)}
${fontBold}
margin-bottom: ${cols(1)};
a {
${fontBold}
}
`;
export const Description = styled.p`
${fontSize(18)}
${lineHeight(28)}
width: 50%;
`; |
<<<<<<<
"use strict";
var KEY = require('../opts/keys.js'),
rQuery = function () {
var REDSHIFT = 'redshift',
execute = function ($element, action, arg1, arg2, arg3) {
$element.each(function () {
var $this = $(this),
thisRedshift = $this.data(REDSHIFT);
// If we haven't stored a Redshift instance on this element, make one
if (!thisRedshift) {
thisRedshift = Redshift.get();
thisRedshift.data(KEY.JQUERY_ELEMENT, $this);
$this.data(REDSHIFT, thisRedshift);
}
thisRedshift[action](arg1, arg2, arg3);
});
};
$.fn.play = function () {
execute(this, 'play', arguments[0], arguments[1]);
return this;
};
$.fn.move = function () {
execute(this, 'move', arguments[0], arguments[1]);
=======
loadPlugins = function (redshift) {
var KEY = require('../opts/keys.js'),
utils = require('../utils/utils.js'),
/*
Get Redshift instance from jQuery object
@param [jQuery element]
*/
getInstance = function ($element) {
var instance = $element.data(KEY.REDSHIFT);
if (!instance) {
instance = redshift.get();
instance.data(KEY.JQUERY_ELEMENT, $element);
$element.data(KEY.REDSHIFT, instance);
}
return instance;
},
/*
Execute Action function
@param [jQuery element]: jQuery element to check for Redshift instance
@param [string]: Action function to call
@param [...arguments]
*/
execute = function ($element, action, arg1, arg2, arg3) {
$element.each(function () {
getInstance($(this))[action](arg1, arg2, arg3);
});
};
$.fn.play = function () {
execute(this, 'play', arguments[0], arguments[1]);
return this;
};
>>>>>>>
"use strict";
loadPlugins = function (redshift) {
var KEY = require('../opts/keys.js'),
utils = require('../utils/utils.js'),
/*
Get Redshift instance from jQuery object
@param [jQuery element]
*/
getInstance = function ($element) {
var instance = $element.data(KEY.REDSHIFT);
if (!instance) {
instance = redshift.get();
instance.data(KEY.JQUERY_ELEMENT, $element);
$element.data(KEY.REDSHIFT, instance);
}
return instance;
},
/*
Execute Action function
@param [jQuery element]: jQuery element to check for Redshift instance
@param [string]: Action function to call
@param [...arguments]
*/
execute = function ($element, action, arg1, arg2, arg3) {
$element.each(function () {
getInstance($(this))[action](arg1, arg2, arg3);
});
};
$.fn.play = function () {
execute(this, 'play', arguments[0], arguments[1]);
return this;
}; |
<<<<<<<
// if (contracts.isNative) {
// const withdrawGas = ethersBnToBn(
// await clerkContract.estimate.withdraw(amount),
// );
// const gasPrice = new BN((await contracts.eth.getGasPrice()).toString());
// const withdrawWeiCost = withdrawGas.mul(gasPrice);
// const weiAmount = bnNRlcToBnWei(new BN(amount));
// debug('withdrawCost', withdrawWeiCost.toString());
// debug('weiAmount', weiAmount.toString());
// if (withdrawWeiCost.gt(weiAmount)) throw Error('withdraw cost is higher than witdrawed amount');
// }
const tx = await clerkContract.withdraw(vAmount);
const txReceipt = await tx.wait();
=======
const tx = await wrapSend(clerkContract.withdraw(vAmount));
const txReceipt = await wrapWait(tx.wait());
>>>>>>>
// if (contracts.isNative) {
// const withdrawGas = ethersBnToBn(
// await clerkContract.estimate.withdraw(amount),
// );
// const gasPrice = new BN((await contracts.eth.getGasPrice()).toString());
// const withdrawWeiCost = withdrawGas.mul(gasPrice);
// const weiAmount = bnNRlcToBnWei(new BN(amount));
// debug('withdrawCost', withdrawWeiCost.toString());
// debug('weiAmount', weiAmount.toString());
// if (withdrawWeiCost.gt(weiAmount)) throw Error('withdraw cost is higher than witdrawed amount');
// }
const tx = await wrapSend(clerkContract.withdraw(vAmount));
const txReceipt = await wrapWait(tx.wait()); |
<<<<<<<
import '@storybook/addon-knobs/register';
import '@storybook/addon-a11y/register';
=======
import '@storybook/addon-knobs/register';
import '@storybook/addon-viewport/register';
>>>>>>>
import '@storybook/addon-knobs/register';
import '@storybook/addon-a11y/register';
import '@storybook/addon-viewport/register'; |
<<<<<<<
const signedOrder = await order.signOrder(
chain.contracts,
order.APP_ORDER,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.APP_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { apporder: signedOrder });
} catch (error) {
failed.push(`apporder: ${error.message}`);
}
=======
const signedOrder = await order.signApporder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.APP_ORDER,
chain.id,
signedOrder,
);
spinner.succeed(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
{ raw: { order: signedOrder } },
);
>>>>>>>
const signedOrder = await order.signApporder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.APP_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { apporder: signedOrder });
} catch (error) {
failed.push(`apporder: ${error.message}`);
}
<<<<<<<
const signedOrder = await order.signOrder(
chain.contracts,
order.DATASET_ORDER,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.DATASET_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { datasetorder: signedOrder });
} catch (error) {
failed.push(`datasetorder: ${error.message}`);
}
=======
const signedOrder = await order.signDatasetorder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.DATASET_ORDER,
chain.id,
signedOrder,
);
spinner.succeed(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
{ raw: { order: signedOrder } },
);
>>>>>>>
const signedOrder = await order.signDatasetorder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.DATASET_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { datasetorder: signedOrder });
} catch (error) {
failed.push(`datasetorder: ${error.message}`);
}
<<<<<<<
const signedOrder = await order.signOrder(
chain.contracts,
order.WORKERPOOL_ORDER,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.WORKERPOOL_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { workerpoolorder: signedOrder });
} catch (error) {
failed.push(`workerpoolorder: ${error.message}`);
}
=======
const signedOrder = await order.signWorkerpoolorder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.WORKERPOOL_ORDER,
chain.id,
signedOrder,
);
spinner.succeed(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
{ raw: { order: signedOrder } },
);
>>>>>>>
const signedOrder = await order.signWorkerpoolorder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.WORKERPOOL_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { workerpoolorder: signedOrder });
} catch (error) {
failed.push(`workerpoolorder: ${error.message}`);
}
<<<<<<<
=======
await chain.contracts.checkDeployedApp(orderObj.app, {
strict: true,
});
const signedOrder = await order.signRequestorder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.REQUEST_ORDER,
chain.id,
signedOrder,
);
spinner.succeed(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
{ raw: { order: signedOrder } },
);
>>>>>>>
<<<<<<<
try {
const orderToPublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToPublish) {
throw new Error(
`Missing signed ${orderName} for chain ${chain.id} in "orders.json"`,
);
}
if (!cmd.force) await prompt.publishOrder(orderName, pretty(orderToPublish));
spinner.start(`publishing ${orderName}`);
const orderHash = await order.publishOrder(
chain.contracts,
orderName,
chain.id,
orderToPublish,
address,
);
spinner.info(
`${orderName} successfully published with orderHash ${orderHash}`,
=======
const orderToPublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToPublish) {
throw new Error(
`Missing signed ${orderName} for chain ${chain.id} in "orders.json"`,
>>>>>>>
try {
const orderToPublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToPublish) {
throw new Error(
`Missing signed ${orderName} for chain ${chain.id} in "orders.json"`,
);
}
if (!cmd.force) await prompt.publishOrder(orderName, pretty(orderToPublish));
spinner.start(`publishing ${orderName}`);
let orderHash;
switch (orderName) {
case order.APP_ORDER:
orderHash = await order.publishApporder(
chain.contracts,
chain.id,
orderToPublish,
address,
);
break;
case order.DATASET_ORDER:
orderHash = await order.publishDatasetorder(
chain.contracts,
chain.id,
orderToPublish,
address,
);
break;
case order.WORKERPOOL_ORDER:
orderHash = await order.publishWorkerpoolorder(
chain.contracts,
chain.id,
orderToPublish,
address,
);
break;
case order.REQUEST_ORDER:
orderHash = await order.publishRequestorder(
chain.contracts,
chain.id,
orderToPublish,
address,
);
break;
default:
}
spinner.info(
`${orderName} successfully published with orderHash ${orderHash}`,
<<<<<<<
=======
if (!cmd.force) await prompt.publishOrder(orderName, pretty(orderToPublish));
spinner.start(`publishing ${orderName}`);
let orderHash;
switch (orderName) {
case order.APP_ORDER:
orderHash = await order.publishApporder(
chain.contracts,
chain.id,
orderToPublish,
address,
);
break;
case order.DATASET_ORDER:
orderHash = await order.publishDatasetorder(
chain.contracts,
chain.id,
orderToPublish,
address,
);
break;
case order.WORKERPOOL_ORDER:
orderHash = await order.publishWorkerpoolorder(
chain.contracts,
chain.id,
orderToPublish,
address,
);
break;
case order.REQUEST_ORDER:
orderHash = await order.publishRequestorder(
chain.contracts,
chain.id,
orderToPublish,
address,
);
break;
default:
}
spinner.succeed(
`${orderName} successfully published with orderHash ${orderHash}`,
{ raw: { orderHash } },
);
>>>>>>>
<<<<<<<
try {
let orderHashToUnpublish;
if (isBytes32(orderHash, { strict: false })) {
orderHashToUnpublish = orderHash;
} else {
spinner.info(
`No orderHash specified for unpublish ${orderName}, using orders.json`,
);
const orderToUnpublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToUnpublish) {
throw new Error(
`No orderHash specified and no signed ${orderName} found for chain ${chain.id} in "orders.json"`,
);
}
orderHashToUnpublish = await order.computeOrderHash(
chain.contracts,
orderName,
orderToUnpublish,
=======
let orderHashToUnpublish;
if (isBytes32(orderHash, { strict: false })) {
orderHashToUnpublish = orderHash;
} else {
spinner.info(
`No orderHash specified for unpublish ${orderName}, using orders.json`,
);
const orderToUnpublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToUnpublish) {
throw new Error(
`No orderHash specified and no signed ${orderName} found for chain ${chain.id} in "orders.json"`,
>>>>>>>
try {
let orderHashToUnpublish;
if (isBytes32(orderHash, { strict: false })) {
orderHashToUnpublish = orderHash;
} else {
spinner.info(
`No orderHash specified for unpublish ${orderName}, using orders.json`,
);
const orderToUnpublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToUnpublish) {
throw new Error(
`No orderHash specified and no signed ${orderName} found for chain ${chain.id} in "orders.json"`,
);
}
orderHashToUnpublish = await order.computeOrderHash(
chain.contracts,
orderName,
orderToUnpublish,
<<<<<<<
=======
spinner.start(`unpublishing ${orderName}`);
let unpublished;
switch (orderName) {
case order.APP_ORDER:
unpublished = await order.unpublishApporder(
chain.contracts,
chain.id,
orderHashToUnpublish,
address,
);
break;
case order.DATASET_ORDER:
unpublished = await order.unpublishDatasetorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
address,
);
break;
case order.WORKERPOOL_ORDER:
unpublished = await order.unpublishWorkerpoolorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
address,
);
break;
case order.REQUEST_ORDER:
unpublished = await order.unpublishRequestorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
address,
);
break;
default:
}
spinner.succeed(
`${orderName} with orderHash ${unpublished} successfully unpublished`,
{ raw: { orderHash: unpublished } },
);
>>>>>>> |
<<<<<<<
truncateBnWeiToBnNRlc,
bnNRlcToBnWei,
=======
encodeTag,
decodeTag,
bytes32Regex,
>>>>>>>
truncateBnWeiToBnNRlc,
bnNRlcToBnWei,
encodeTag,
decodeTag,
bytes32Regex, |
<<<<<<<
const signedOrder = await order.signApporder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.APP_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { apporder: signedOrder });
} catch (error) {
failed.push(`apporder: ${error.message}`);
}
=======
const signedOrder = await order.signApporder(chain.contracts, orderObj);
const { saved, fileName } = await saveSignedOrder(
order.APP_ORDER,
chain.id,
signedOrder,
);
spinner.succeed(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
{ raw: { order: signedOrder } },
);
>>>>>>>
const signedOrder = await order.signApporder(
chain.contracts,
orderObj,
);
const { saved, fileName } = await saveSignedOrder(
order.APP_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { apporder: signedOrder });
} catch (error) {
failed.push(`apporder: ${error.message}`);
}
<<<<<<<
const signedOrder = await order.signDatasetorder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.DATASET_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { datasetorder: signedOrder });
} catch (error) {
failed.push(`datasetorder: ${error.message}`);
}
=======
const signedOrder = await order.signDatasetorder(
chain.contracts,
orderObj,
);
const { saved, fileName } = await saveSignedOrder(
order.DATASET_ORDER,
chain.id,
signedOrder,
);
spinner.succeed(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
{ raw: { order: signedOrder } },
);
>>>>>>>
const signedOrder = await order.signDatasetorder(
chain.contracts,
orderObj,
);
const { saved, fileName } = await saveSignedOrder(
order.DATASET_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { datasetorder: signedOrder });
} catch (error) {
failed.push(`datasetorder: ${error.message}`);
}
<<<<<<<
const signedOrder = await order.signWorkerpoolorder(
chain.contracts,
orderObj,
address,
);
const { saved, fileName } = await saveSignedOrder(
order.WORKERPOOL_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { workerpoolorder: signedOrder });
} catch (error) {
failed.push(`workerpoolorder: ${error.message}`);
}
=======
const signedOrder = await order.signWorkerpoolorder(
chain.contracts,
orderObj,
);
const { saved, fileName } = await saveSignedOrder(
order.WORKERPOOL_ORDER,
chain.id,
signedOrder,
);
spinner.succeed(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
{ raw: { order: signedOrder } },
);
>>>>>>>
const signedOrder = await order.signWorkerpoolorder(
chain.contracts,
orderObj,
);
const { saved, fileName } = await saveSignedOrder(
order.WORKERPOOL_ORDER,
chain.id,
signedOrder,
);
spinner.info(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
);
Object.assign(success, { workerpoolorder: signedOrder });
} catch (error) {
failed.push(`workerpoolorder: ${error.message}`);
}
<<<<<<<
=======
await chain.contracts.checkDeployedApp(orderObj.app, {
strict: true,
});
const signedOrder = await order.signRequestorder(
chain.contracts,
orderObj,
);
const { saved, fileName } = await saveSignedOrder(
order.REQUEST_ORDER,
chain.id,
signedOrder,
);
spinner.succeed(
info.orderSigned(saved, fileName).concat(pretty(signedOrder)),
{ raw: { order: signedOrder } },
);
>>>>>>>
<<<<<<<
const [chain, signedOrders, { address }] = await Promise.all([
=======
const [chain, signedOrders] = await Promise.all([
>>>>>>>
const [chain, signedOrders] = await Promise.all([
<<<<<<<
try {
const orderToPublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToPublish) {
throw new Error(
`Missing signed ${orderName} for chain ${chain.id} in "orders.json"`,
=======
const orderToPublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToPublish) {
throw new Error(
`Missing signed ${orderName} for chain ${chain.id} in "orders.json"`,
);
}
if (!cmd.force) await prompt.publishOrder(orderName, pretty(orderToPublish));
spinner.start(`publishing ${orderName}`);
let orderHash;
switch (orderName) {
case order.APP_ORDER:
orderHash = await order.publishApporder(
chain.contracts,
orderToPublish,
);
break;
case order.DATASET_ORDER:
orderHash = await order.publishDatasetorder(
chain.contracts,
orderToPublish,
);
break;
case order.WORKERPOOL_ORDER:
orderHash = await order.publishWorkerpoolorder(
chain.contracts,
orderToPublish,
);
break;
case order.REQUEST_ORDER:
orderHash = await order.publishRequestorder(
chain.contracts,
orderToPublish,
>>>>>>>
try {
const orderToPublish = signedOrders[chain.id] && signedOrders[chain.id][orderName];
if (!orderToPublish) {
throw new Error(
`Missing signed ${orderName} for chain ${chain.id} in "orders.json"`,
<<<<<<<
const [chain, signedOrders, { address }] = await Promise.all([
=======
const [chain, signedOrders] = await Promise.all([
>>>>>>>
const [chain, signedOrders] = await Promise.all([
<<<<<<<
spinner.start(`unpublishing ${orderName}`);
let unpublished;
switch (orderName) {
case order.APP_ORDER:
unpublished = await order.unpublishApporder(
chain.contracts,
chain.id,
orderHashToUnpublish,
address,
);
break;
case order.DATASET_ORDER:
unpublished = await order.unpublishDatasetorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
address,
);
break;
case order.WORKERPOOL_ORDER:
unpublished = await order.unpublishWorkerpoolorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
address,
);
break;
case order.REQUEST_ORDER:
unpublished = await order.unpublishRequestorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
address,
);
break;
default:
}
spinner.info(
`${orderName} with orderHash ${unpublished} successfully unpublished`,
);
Object.assign(success, { [orderName]: { orderHash: unpublished } });
} catch (error) {
failed.push(`${orderName}: ${error.message}`);
=======
let unpublished;
switch (orderName) {
case order.APP_ORDER:
unpublished = await order.unpublishApporder(
chain.contracts,
orderHashToUnpublish,
);
break;
case order.DATASET_ORDER:
unpublished = await order.unpublishDatasetorder(
chain.contracts,
orderHashToUnpublish,
);
break;
case order.WORKERPOOL_ORDER:
unpublished = await order.unpublishWorkerpoolorder(
chain.contracts,
orderHashToUnpublish,
);
break;
case order.REQUEST_ORDER:
unpublished = await order.unpublishRequestorder(
chain.contracts,
orderHashToUnpublish,
);
break;
default:
>>>>>>>
spinner.start(`unpublishing ${orderName}`);
let unpublished;
switch (orderName) {
case order.APP_ORDER:
unpublished = await order.unpublishApporder(
chain.contracts,
chain.id,
orderHashToUnpublish,
);
break;
case order.DATASET_ORDER:
unpublished = await order.unpublishDatasetorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
);
break;
case order.WORKERPOOL_ORDER:
unpublished = await order.unpublishWorkerpoolorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
);
break;
case order.REQUEST_ORDER:
unpublished = await order.unpublishRequestorder(
chain.contracts,
chain.id,
orderHashToUnpublish,
);
break;
default:
}
spinner.info(
`${orderName} with orderHash ${unpublished} successfully unpublished`,
);
Object.assign(success, { [orderName]: { orderHash: unpublished } });
} catch (error) {
failed.push(`${orderName}: ${error.message}`); |
<<<<<<<
ethersBnToBn,
bnToEthersBn,
ethersBigNumberify,
truncateBnWeiToBnNRlc,
bnNRlcToBnWei,
} = require('./utils');
const foreignBridgeErcToNativeDesc = require('./abi/bridge/ForeignBridgeErcToNative.json');
const homeBridgeErcToNativeDesc = require('./abi/bridge/HomeBridgeErcToNative.json');
const { addressSchema, uint256Schema, throwIfMissing } = require('./validator');
=======
uint256Schema,
addressSchema,
hexnumberSchema,
throwIfMissing,
} = require('./validator');
const { wrapCall, wrapSend, wrapWait } = require('./errorWrappers');
>>>>>>>
ethersBnToBn,
bnToEthersBn,
ethersBigNumberify,
truncateBnWeiToBnNRlc,
bnNRlcToBnWei,
} = require('./utils');
const foreignBridgeErcToNativeDesc = require('./abi/bridge/ForeignBridgeErcToNative.json');
const homeBridgeErcToNativeDesc = require('./abi/bridge/HomeBridgeErcToNative.json');
const { addressSchema, uint256Schema, throwIfMissing } = require('./validator');
const { wrapCall, wrapSend, wrapWait } = require('./errorWrappers');
<<<<<<<
const { isNative } = contracts;
=======
const rlcAddress = await wrapCall(contracts.fetchRLCAddress());
>>>>>>>
const { isNative } = contracts;
<<<<<<<
const [weiBalance, rlcBalance] = await Promise.all([getETH(), getRLC()]);
Object.assign(balances, {
wei: ethersBnToBn(weiBalance),
nRLC: ethersBnToBn(rlcBalance),
});
}
=======
const [weiBalance, rlcBalance] = await Promise.all([
wrapCall(getETH()),
wrapCall(getRLC()),
]);
const balances = {
wei: ethersBnToBn(weiBalance),
nRLC: ethersBnToBn(rlcBalance),
};
>>>>>>>
const [weiBalance, rlcBalance] = await Promise.all([getETH(), getRLC()]);
Object.assign(balances, {
wei: ethersBnToBn(weiBalance),
nRLC: ethersBnToBn(rlcBalance),
});
}
<<<<<<<
const vValue = await uint256Schema().validate(value);
const hexValue = ethersBigNumberify(vValue).toHexString();
const ethSigner = contracts.eth.getSigner();
const tx = await ethSigner.sendTransaction({
data: '0x',
to: vAddress,
value: hexValue,
});
await tx.wait();
=======
const vValue = await hexnumberSchema().validate(value);
const ethSigner = new Web3Provider(contracts.ethProvider).getSigner();
const tx = await wrapSend(
ethSigner.sendTransaction({
data: '0x',
to: vAddress,
value: vValue,
}),
);
await wrapWait(tx.wait());
>>>>>>>
const vValue = await uint256Schema().validate(value);
const hexValue = ethersBigNumberify(vValue).toHexString();
const ethSigner = contracts.eth.getSigner();
const tx = await wrapSend(
ethSigner.sendTransaction({
data: '0x',
to: vAddress,
value: hexValue,
}),
);
await wrapWait(tx.wait());
<<<<<<<
const rlcAddress = await contracts.fetchRLCAddress();
=======
const vAddress = await addressSchema().validate(to);
const vAmount = await uint256Schema().validate(amount);
const rlcAddress = await wrapCall(contracts.fetchRLCAddress());
>>>>>>>
const rlcAddress = await wrapCall(contracts.fetchRLCAddress()); |
<<<<<<<
const {resources, type, name} = task
=======
const {compute_on} = this.state;
const {resources, type} = task
>>>>>>>
const {compute_on} = this.state;
const {resources, type, name} = task |
<<<<<<<
function calcFrameAmount(_frame){
const notationArry = _frame.match(/(\d+)(-)?(\d+)?(;\d)?/g)
const calculateNotation = item => {
if (!isNaN(item))
return 1
if (item.includes(";")) {
[item, diff] = item.split(";");
}
const splitItem = item.split("-")
return Math.floor((Math.max(...splitItem) - Math.min(...splitItem)) / diff) + 1
}
let diff = 1;
return notationArry
.map(calculateNotation)
.reduce((total, amount) => total += amount)
}
=======
function isObjectEmpty(obj) {
if(obj !== null && typeof obj === 'object'){
for(var prop in obj) {
if(obj.hasOwnProperty(prop))
return false;
}
return JSON.stringify(obj) === JSON.stringify({});
}
return true
}
>>>>>>>
function calcFrameAmount(_frame){
const notationArry = _frame.match(/(\d+)(-)?(\d+)?(;\d)?/g)
const calculateNotation = item => {
if (!isNaN(item))
return 1
if (item.includes(";")) {
[item, diff] = item.split(";");
}
const splitItem = item.split("-")
return Math.floor((Math.max(...splitItem) - Math.min(...splitItem)) / diff) + 1
}
let diff = 1;
return notationArry
.map(calculateNotation)
.reduce((total, amount) => total += amount)
}
function isObjectEmpty(obj) {
if(obj !== null && typeof obj === 'object'){
for(var prop in obj) {
if(obj.hasOwnProperty(prop))
return false;
}
return JSON.stringify(obj) === JSON.stringify({});
}
return true
}
<<<<<<<
const {modalData, isDetailPage, presetModal, resolution, frames, formatIndex, output_path, timeout, subtasks, maxSubtasks, subtask_timeout, bid, compositing, presetList, managePresetModal, savePresetLock} = this.state
=======
const {modalData, isDetailPage, resolution, frames, formatIndex, output_path, timeout, subtasks, subtask_timeout, bid, compositing, presetList, savePresetLock, presetModal, managePresetModal} = this.state
>>>>>>>
const {modalData, isDetailPage, resolution, frames, formatIndex, output_path, timeout, subtasks, maxSubtasks, subtask_timeout, bid, compositing, presetList, savePresetLock, presetModal, managePresetModal} = this.state |
<<<<<<<
<ReactTooltip placement="bottom" trigger={['hover']} overlay={this._taskHints(isEngineOn, connectedPeers)} mouseEnterDelay={1} align={{
=======
<ReactTooltip overlayClassName="black" placement="bottom" trigger={['hover']} overlay={isEngineOn ? <p>New Task</p> : <p>Golem is not started yet.</p>} mouseEnterDelay={1} align={{
>>>>>>>
<ReactTooltip overlayClassName="black" placement="bottom" trigger={['hover']} overlay={this._taskHints(isEngineOn, connectedPeers)} mouseEnterDelay={1} align={{ |
<<<<<<<
},
checkUpdate: function (_old, _new) {},
warn: function () {}
=======
},
isMac: function () {}
>>>>>>>
},
checkUpdate: function (_old, _new) {},
warn: function () {},
isMac: function () {}
<<<<<<<
},
checkUpdate: function (_old, _new) {},
warn: function () {}
=======
},
isMac: function () {}
>>>>>>>
},
checkUpdate: function (_old, _new) {},
warn: function () {},
isMac: function () {} |
<<<<<<<
}),
LuxRender: yup.object().shape({
resolution: yup.array().of(yup.number().min(100).max(8000)).required(),
output_path: yup.string(),
format: yup.string(),
samples: yup.number().min(1).required(),
=======
>>>>>>>
<<<<<<<
}
=======
}
// else if (this.props.task.type === taskType.LUXRENDER) {
// haltspp.value = sample_per_pixel
// }
>>>>>>>
}
<<<<<<<
const {resolution, frames, format, output_path, compute_on, timeout, samples, subtasks_count, subtask_timeout, bid, compositing} = this.state
=======
const {bid, compositing, compute_on, concent, frames, format, output_path, resolution, subtasks_count, subtask_timeout, timeout} = this.state
>>>>>>>
const {bid, compositing, compute_on, concent, frames, format, output_path, resolution, samples, subtasks_count, subtask_timeout, timeout} = this.state
<<<<<<<
samples: Number(samples)
=======
resolution,
>>>>>>>
resolution,
samples: Number(samples)
<<<<<<<
=======
// case taskType.LUXRENDER:
// formTemplate.push({
// order: 5,
// content: <div className="item-settings" key="5">
// <InfoLabel type="span" label="Sample per pixel" info={<p className="tooltip_task">Set your file<br/> settings</p>} cls="title" infoHidden={true}/>
// <input ref="haltspp" type="number" placeholder="Type a number" min="1" max="2000" aria-label="Sample per pixel" onChange={this._handleFormInputs.bind(this, 'sample_per_pixel')} required={!isDetailPage} disabled={isDetailPage}/>
// </div>
// })
// break;
>>>>>>> |
<<<<<<<
=======
const appWidth = window.innerWidth
|| document.documentElement.clientWidth
|| document.body.clientWidth;
>>>>>>>
const appWidth = window.innerWidth
|| document.documentElement.clientWidth
|| document.body.clientWidth;
<<<<<<<
const ratio = ((val - min) / (max - min));
const thumbSize = 32
indicator.innerHTML = val;
=======
indicator.innerHTML = isFloat(val) ? val.toFixed(1) : val;
>>>>>>>
indicator.innerHTML = isFloat(val) ? val.toFixed(1) : val;
<<<<<<<
indicator.style.left = (ratio * sliderWidth) + (thumbSize / 2) - (thumbSize * ratio) + iconOffset - (this.props.transform ? 24 : 0) + 'px';
=======
indicator.style.left = (
(val - min)
* ((sliderWidth - 32 )/(max - min))
+ ((((appWidth - sliderWidth)/ 2) + 6)))
- (this.props.transform ? 24 : 0)
- balanceTextToCenter(val)
+ 'px';
>>>>>>>
indicator.style.left = (
(val - min)
* ((sliderWidth - 32 )/(max - min))
+ ((((this.props.iconLeft || this.props.textLeft)
? ((appWidth - sliderWidth)/ 2)
: 0) + 6)))
- (this.props.transform ? 24 : 0)
- balanceTextToCenter(val)
+ 'px';
<<<<<<<
<div className="slider">
{iconLeft
? <span className={`slider-icon ${iconLeft}`}/>
: (textLeft ? <span className="slider-text--left">{textLeft}</span> : "")
}
<div className="slider__input">
<input
ref={this.props.inputId}
type="range"
className="slider__resources"
id={this.props.inputId}
defaultValue={(typeof defaultValue === 'number' && defaultValue !== NaN) ? defaultValue : 0}
min={min || 0}
max={max || 100}
step={step || 1}
list="steplist"
onInput={this._handleFillLower.bind(this, disabled)}
role="slider"
aria-label="Machine's Resource"
onMouseUp={::this._handleCallback}
disabled={disabled}/>
<span className="slider-indicator__resources top" id={`${this.props.inputId}__indicator`}/>
</div>
{iconRight
? <span className={`slider-icon ${iconRight}`}/>
: (textRight ? <span className="slider-text--right">{textRight}</span> : "")
}
</div>
=======
<Tooltip
html={<p>To change resources first stop Golem</p>}
position="top"
trigger="mouseenter"
interactive={false}
distance={-30}
size="small"
disabled={!disabled}>
<div className="slider">
{iconLeft
? <span className={`slider-icon ${iconLeft}`}/>
: (textLeft ? <span className="slider-text--left">{textLeft}</span> : "")
}
<input
ref={this.props.inputId}
type="range"
className="slider__resources"
id={this.props.inputId}
defaultValue={(typeof defaultValue === 'number' && defaultValue !== NaN) ? defaultValue : 0}
min={min || 0}
max={max || 100}
step={step || 1}
list="steplist"
onInput={this._handleFillLower.bind(this, disabled)}
role="slider"
aria-label="Machine's Resource"
onMouseUp={::this._handleCallback}
disabled={disabled}/>
<span className="slider-indicator__resources" id={`${this.props.inputId}__indicator`}/>
{iconRight
? <span className={`slider-icon ${iconRight}`}/>
: (textRight ? <span className="slider-text--right">{textRight}</span> : "")
}
</div>
</Tooltip>
>>>>>>>
<Tooltip
html={<p>To change resources first stop Golem</p>}
position="top"
trigger="mouseenter"
interactive={false}
distance={-30}
size="small"
disabled={!disabled}>
<div className="slider">
{iconLeft
? <span className={`slider-icon ${iconLeft}`}/>
: (textLeft ? <span className="slider-text--left">{textLeft}</span> : "")
}
<input
ref={this.props.inputId}
type="range"
className="slider__resources"
id={this.props.inputId}
defaultValue={(typeof defaultValue === 'number' && defaultValue !== NaN) ? defaultValue : 0}
min={min || 0}
max={max || 100}
step={step || 1}
list="steplist"
onInput={this._handleFillLower.bind(this, disabled)}
role="slider"
aria-label="Machine's Resource"
onMouseUp={::this._handleCallback}
disabled={disabled}/>
<span className="slider-indicator__resources" id={`${this.props.inputId}__indicator`}/>
{iconRight
? <span className={`slider-icon ${iconRight}`}/>
: (textRight ? <span className="slider-text--right">{textRight}</span> : "")
}
</div>
</Tooltip> |
<<<<<<<
=======
>>>>>>> |
<<<<<<<
SET_CONNECTION_PROBLEM: 'SET_CONNECTION_PROBLEM',
SET_COMPONENT_WARNING: 'SET_COMPONENT_WARNING',
SET_FILE_CHECK: 'SET_FILE_CHECK'
})
=======
SET_CONNECTION_PROBLEM: "SET_CONNECTION_PROBLEM",
SET_FILE_CHECK: "SET_FILE_CHECK"
});
>>>>>>>
SET_CONNECTION_PROBLEM: 'SET_CONNECTION_PROBLEM',
SET_COMPONENT_WARNING: 'SET_COMPONENT_WARNING',
SET_FILE_CHECK: 'SET_FILE_CHECK'
});
<<<<<<<
SET_CONNECTION_PROBLEM,
SET_COMPONENT_WARNING,
SET_FILE_CHECK} = dict
=======
SET_CONNECTION_PROBLEM,
SET_FILE_CHECK
} = dict;
>>>>>>>
SET_CONNECTION_PROBLEM,
SET_COMPONENT_WARNING,
SET_FILE_CHECK
} = dict;
<<<<<<<
export const setComponentWarning = (payload) => ({
type: SET_COMPONENT_WARNING,
payload
})
export const setFileCheck = (payload) => ({
=======
export const setFileCheck = payload => ({
>>>>>>>
export const setComponentWarning = (payload) => ({
type: SET_COMPONENT_WARNING,
payload
})
export const setFileCheck = (payload) => ({ |
<<<<<<<
=======
import Lottie from 'react-lottie';
import animData from './../../../assets/anims/warning';
const defaultOptions = {
loop: false,
autoplay: true,
animationData: animData,
rendererSettings: {
preserveAspectRatio: 'xMidYMid slice'
}
};
>>>>>>>
import Lottie from 'react-lottie';
import animData from './../../../assets/anims/warning';
const defaultOptions = {
loop: false,
autoplay: true,
animationData: animData,
rendererSettings: {
preserveAspectRatio: 'xMidYMid slice'
}
};
<<<<<<<
window.routerHistory.push('/tasks');
=======
window.routerHistory.push('/tasks')
>>>>>>>
window.routerHistory.push('/tasks'); |
<<<<<<<
//ACCOUNT
SET_PUBLIC_KEY: 'SET_PUBLIC_KEY',
CALL_WITHDRAW_MODAL: 'CALL_WITHDRAW_MODAL',
WITHDRAW: 'WITHDRAW',
=======
SET_PASSWORD: 'SET_PASSWORD',
>>>>>>>
//ACCOUNT
SET_PUBLIC_KEY: 'SET_PUBLIC_KEY',
CALL_WITHDRAW_MODAL: 'CALL_WITHDRAW_MODAL',
WITHDRAW: 'WITHDRAW',
SET_PASSWORD: 'SET_PASSWORD',
<<<<<<<
//ACCOUNT
CALL_WITHDRAW_MODAL,
WITHDRAW,
=======
SET_PASSWORD,
>>>>>>>
//ACCOUNT
CALL_WITHDRAW_MODAL,
WITHDRAW,
SET_PASSWORD,
<<<<<<<
export const callWithdrawModal = (status, payload) => ({
type: CALL_WITHDRAW_MODAL,
payload: {
status,
payload
}
})
export const withdraw = (payload, _response, _reject) => ({
type: WITHDRAW,
payload,
_response,
_reject
})
=======
export const setPassword = (payload) => ({
type: SET_PASSWORD,
payload
})
>>>>>>>
export const callWithdrawModal = (status, payload) => ({
type: CALL_WITHDRAW_MODAL,
payload: {
status,
payload
}
})
export const withdraw = (payload, _response, _reject) => ({
type: WITHDRAW,
payload,
_response,
_reject
})
export const setPassword = (payload) => ({
type: SET_PASSWORD,
payload
}) |
<<<<<<<
const mapDispatchToProps = dispatch => ({
actions: bindActionCreators(Actions, dispatch)
})
export class Personal extends React.Component {
=======
//<p/><span className="icon-question-mark"/> Deleted
export default class Personal extends React.Component {
>>>>>>>
const mapDispatchToProps = dispatch => ({
actions: bindActionCreators(Actions, dispatch)
})
//<p/><span className="icon-question-mark"/> Deleted
export class Personal extends React.Component { |
<<<<<<<
if (currentStep === 6) {
this.props.actions.updateNodeName(nodeName)
=======
if (currentStep === 2) {
const queuedTask = {
action: "updateNodeName",
arguments: [nodeName]
}
this.props.actions.addQueue(queuedTask)
>>>>>>>
if (currentStep === 6) {
const queuedTask = {
action: "updateNodeName",
arguments: [nodeName]
}
this.props.actions.addQueue(queuedTask) |
<<<<<<<
<InfoLabel type="span" label="Frame Range" info={<p className="tooltip_task">Define frames to render. You can separate frame numbers with ;, eg. 1;4;7 will define<br/>frame 1, 4 and 7. You can also define frames ranges with - <a href="https://docs.golem.network/#/Products/Brass-Beta/Being-a-Requestor?id=render-settings">Learn more</a></p>} cls="title" infoHidden={true} interactive={true}/>
=======
<InfoLabel type="span" label="Frame Range" info={<p className="tooltip_task">Define frames to render. You can separate frame numbers<br/>with ;, eg. 1;4;7 will define frame 1, 4 and 7. You can also define frames ranges with - <a href="https://golem.network/documentation/07-submitting-a-task/#render-settings">Learn more</a></p>} cls="title" infoHidden={true} interactive={true}/>
>>>>>>>
<InfoLabel type="span" label="Frame Range" info={<p className="tooltip_task">Define frames to render. You can separate frame numbers<br/>with ;, eg. 1;4;7 will define frame 1, 4 and 7. You can also define frames ranges with - <a href="https://docs.golem.network/#/Products/Brass-Beta/Being-a-Requestor?id=render-settings">Learn more</a></p>} cls="title" infoHidden={true} interactive={true}/>
<<<<<<<
info={<p className="tooltip_task">Setting a time limit here will let Golem know the maximum time you will wait <br/>for a task to
be accepted by the network. <a href="https://docs.golem.network/#/Products/Brass-Beta/Being-a-Requestor?id=task-and-subtask-timeouts">
=======
info={<p className="tooltip_task">Setting a time limit here will let Golem know the maximum time<br/>you will wait for a task to
be accepted by the network. <a href="https://golem.network/documentation/07-submitting-a-task/#task-and-subtask-timeouts">
>>>>>>>
info={<p className="tooltip_task">Setting a time limit here will let Golem know the maximum time<br/>you will wait for a task to
be accepted by the network. <a href="https://docs.golem.network/#/Products/Brass-Beta/Being-a-Requestor?id=task-and-subtask-timeouts">
<<<<<<<
info={<p className="tooltip_task">Tells the system how many subtasks to break a task into. If you are rendering
<br/>a number of frames you should set subtasks to the same number. <a href="https://docs.golem.network/#/Products/Brass-Beta/Being-a-Requestor?id=task-and-subtask-timeouts">
=======
info={<p className="tooltip_task">Tells the system how many subtasks to break a task into.<br/>If you are rendering
a number of frames you should set subtasks to the same number. <a href="https://golem.network/documentation/07-submitting-a-task/#task-and-subtask-timeouts">
>>>>>>>
info={<p className="tooltip_task">Tells the system how many subtasks to break a task into.<br/>If you are rendering
a number of frames you should set subtasks to the same number. <a href="https://docs.golem.network/#/Products/Brass-Beta/Being-a-Requestor?id=task-and-subtask-timeouts">
<<<<<<<
info={<p className="tooltip_task">The estimated price that you’ll have to pay to render the task is based on Your bid,
<br/>subtask amount and timeout settings. Fiat value may change during computation
<br/>as well as gas price
<a href="https://docs.golem.network/#/Products/Brass-Beta/Being-a-Requestor?id=pricing-best-practices">
=======
info={<p className="tooltip_task">The estimated price that you’ll have to pay to render the task is based on<br/>Your bid,
subtask amount and timeout settings. Fiat value may change during computation
as well as gas price -
<a href="https://golem.network/documentation/08-pricing-best-practices/#the-formula-for-calculating-the-estimated-cost-of-a-task">
>>>>>>>
info={<p className="tooltip_task">The estimated price that you’ll have to pay to render the task is based on<br/>Your bid,
subtask amount and timeout settings. Fiat value may change during computation
as well as gas price -
<a href="https://docs.golem.network/#/Products/Brass-Beta/Being-a-Requestor?id=pricing-best-practices"> |
<<<<<<<
GET_FRAGMENTS,
=======
SET_DIRECTORY_TREE,
>>>>>>>
GET_FRAGMENTS,
SET_DIRECTORY_TREE,
<<<<<<<
SET_CONNECTION_PROBLEM,
SET_FILE_CHECK
} = dict;
=======
SET_CONNECTION_PROBLEM,
SET_COMPONENT_WARNING,
SET_FILE_CHECK
} = dict;
>>>>>>>
SET_CONNECTION_PROBLEM,
SET_COMPONENT_WARNING,
SET_FILE_CHECK
} = dict;
<<<<<<<
});
export const getFragments = payload => ({
type: GET_FRAGMENTS,
payload
});
=======
});
>>>>>>>
});
export const getFragments = payload => ({
type: GET_FRAGMENTS,
payload
});
<<<<<<<
export const setPreviewRadio = payload => ({
=======
export const setDirectoryTree = payload => ({
type: SET_DIRECTORY_TREE,
payload
});
export const setPreviewRadio = payload => ({
>>>>>>>
export const setDirectoryTree = payload => ({
type: SET_DIRECTORY_TREE,
payload
});
export const setPreviewRadio = payload => ({
<<<<<<<
});
=======
});
export const setComponentWarning = (payload) => ({
type: SET_COMPONENT_WARNING,
payload
})
>>>>>>>
});
export const setComponentWarning = payload => ({
type: SET_COMPONENT_WARNING,
payload
});
<<<<<<<
export const showTrust = payload => ({
type: 'TRUST_PAGE',
=======
export const showTrust = payload => ({
type: "TRUST_PAGE",
>>>>>>>
export const showTrust = payload => ({
type: 'TRUST_PAGE', |
<<<<<<<
=======
const {remote} = window.electron
const { configStore, dictConfig } = remote.getGlobal('configStorage')
export const APP_VERSION = "v0.8.1"
>>>>>>>
const {remote} = window.electron
const { configStore, dictConfig } = remote.getGlobal('configStorage') |
<<<<<<<
SET_PASSWORD_MODAL: 'SET_PASSWORD_MODAL',
=======
ADD_QUEUE: 'ADD_QUEUE',
REMOVE_FROM_QUEUE: 'REMOVE_FROM_QUEUE',
>>>>>>>
SET_PASSWORD_MODAL: 'SET_PASSWORD_MODAL',
ADD_QUEUE: 'ADD_QUEUE',
REMOVE_FROM_QUEUE: 'REMOVE_FROM_QUEUE',
<<<<<<<
SET_PASSWORD_MODAL,
=======
ADD_QUEUE,
REMOVE_FROM_QUEUE,
>>>>>>>
SET_PASSWORD_MODAL,
ADD_QUEUE,
REMOVE_FROM_QUEUE,
<<<<<<<
export const setPasswordModal = (payload) => ({
type: SET_PASSWORD_MODAL,
payload
})
=======
export const addQueue = (payload) => ({
type: ADD_QUEUE,
payload
})
export const removeQueuedTask = () => ({
type: REMOVE_FROM_QUEUE
})
>>>>>>>
export const setPasswordModal = (payload) => ({
type: SET_PASSWORD_MODAL,
payload
})
export const addQueue = (payload) => ({
type: ADD_QUEUE,
payload
})
export const removeQueuedTask = () => ({
type: REMOVE_FROM_QUEUE
}) |
<<<<<<<
=======
const isIntersectionObserverSupported = typeof window.IntersectionObserver === 'function';
if (!isIntersectionObserverSupported) {
require('intersection-observer');
}
>>>>>>> |
<<<<<<<
css = marigold.css(["*.styl", "demos/**/*.styl", "doc/**/*.styl"]),
=======
devServer = builder.devServer([
"*.js",
"!gulpfile.js",
"*.css",
"*.html",
"demos/**/*.js",
"demos/**/*.css",
"demos/**/*.html",
"doc/**/*.js",
"doc/**/*.css",
"doc/**/*.html"
]),
html = builder.html("Primrose", ["*.pug", "demos/**/*.pug", "doc/**/*.pug", "templates/**/*.pug"], "src"),
>>>>>>>
css = marigold.css(["*.styl", "demos/**/*.styl", "doc/**/*.styl"]),
<<<<<<<
],
devServer = () => marigold.startServer({ mode: "dev", port: 8080 });
=======
];
>>>>>>>
];
devServer = () => marigold.startServer({ mode: "dev", port: 8080 }); |
<<<<<<<
case 'microsoftteams':
return 'NotificationMicrosoftTeams';
=======
case 'email':
return 'NotificationEmail';
>>>>>>>
case 'microsoftteams':
return 'NotificationMicrosoftTeams';
case 'email':
return 'NotificationEmail';
<<<<<<<
addNotificationMicrosoftTeams,
updateNotificationMicrosoftTeams,
deleteNotificationMicrosoftTeams,
deleteAllNotificationMicrosoftTeams,
=======
addNotificationEmail,
updateNotificationEmail,
deleteNotificationEmail,
deleteAllNotificationEmails,
>>>>>>>
addNotificationMicrosoftTeams,
updateNotificationMicrosoftTeams,
deleteNotificationMicrosoftTeams,
deleteAllNotificationMicrosoftTeams,
addNotificationEmail,
updateNotificationEmail,
deleteNotificationEmail,
deleteAllNotificationEmails, |
<<<<<<<
* License - http://github.com/adaptlearning/adapt_framework/LICENSE
* Maintainers - Alan Bourne, Chris Jones, Daryl Hedley
=======
* License - https://github.com/adaptlearning/adapt_framework/blob/master/LICENSE
* Maintainers - Alan Bourne, Chris Jones
>>>>>>>
* License - https://github.com/adaptlearning/adapt_framework/blob/master/LICENSE
* Maintainers - Alan Bourne, Chris Jones, Daryl Hedley |
<<<<<<<
var NotifyPushView = Backbone.View.extend({
className: function () {
return 'notify-push ' + this.model.get('_classes');
},
attributes: {
'role': 'dialog',
'aria-labelledby': 'notify-push-heading',
'aria-modal': 'false'
},
initialize: function () {
this.listenTo(Adapt, {
'notify:pushShown notify:pushRemoved': this.updateIndexPosition,
'remove': this.remove
});
this.listenTo(this.model.collection, {
'remove': this.updateIndexPosition,
'change:_index': this.updatePushPosition
});
this.preRender();
this.render();
},
events: {
'click .notify-push-close': 'closePush',
'click .notify-push-inner': 'triggerEvent'
},
preRender: function () {
this.hasBeenRemoved = false;
},
render: function () {
var data = this.model.toJSON();
var template = Handlebars.templates['notifyPush'];
this.$el.html(template(data)).appendTo('#wrapper');
_.defer(this.postRender.bind(this));
return this;
},
postRender: function () {
this.$el.addClass('show');
_.delay(this.closePush.bind(this), this.model.get('_timeout'));
Adapt.trigger('notify:pushShown');
},
closePush: function (event) {
if (event) {
event.preventDefault();
}
// Check whether this view has been removed as the delay can cause it to be fired twice
if (this.hasBeenRemoved === false) {
this.hasBeenRemoved = true;
this.$el.removeClass('show');
_.delay(function () {
this.model.collection.remove(this.model);
Adapt.trigger('notify:pushRemoved', this);
this.remove();
}.bind(this), 600);
}
},
triggerEvent: function (event) {
Adapt.trigger(this.model.get('_callbackEvent'));
this.closePush();
},
updateIndexPosition: function () {
if (!this.hasBeenRemoved) {
var models = this.model.collection.models;
for (var i = 0, len = models.length; i < len; i++) {
var index = i;
var model = models[i];
if (model.get('_isActive') === true) {
model.set('_index', index);
this.updatePushPosition();
}
=======
var NotifyPushView = Backbone.View.extend({
className: function () {
var classes = 'notify-push ';
classes += (this.model.get('_classes') || '');
return classes;
},
attributes: {
'role': 'dialog',
'aria-labelledby': 'notify-push-heading',
'aria-modal': 'false'
},
initialize: function () {
this.listenTo(Adapt, {
'notify:pushShown notify:pushRemoved': this.updateIndexPosition,
'remove': this.remove
});
this.listenTo(this.model.collection, {
'remove': this.updateIndexPosition,
'change:_index': this.updatePushPosition
});
this.preRender();
this.render();
},
events: {
'click .notify-push-close': 'closePush',
'click .notify-push-inner': 'triggerEvent'
},
preRender: function () {
this.hasBeenRemoved = false;
},
render: function () {
var data = this.model.toJSON();
var template = Handlebars.templates['notifyPush'];
this.$el.html(template(data)).appendTo('#wrapper');
_.defer(this.postRender.bind(this));
return this;
},
postRender: function () {
this.$el.addClass('show');
_.delay(this.closePush.bind(this), this.model.get('_timeout'));
Adapt.trigger('notify:pushShown');
},
closePush: function (event) {
if (event) {
event.preventDefault();
}
// Check whether this view has been removed as the delay can cause it to be fired twice
if (this.hasBeenRemoved === false) {
this.hasBeenRemoved = true;
this.$el.removeClass('show');
_.delay(function () {
this.model.collection.remove(this.model);
Adapt.trigger('notify:pushRemoved', this);
this.remove();
}.bind(this), 600);
}
},
triggerEvent: function (event) {
Adapt.trigger(this.model.get('_callbackEvent'));
this.closePush();
},
updateIndexPosition: function () {
if (!this.hasBeenRemoved) {
var models = this.model.collection.models;
for (var i = 0, len = models.length; i < len; i++) {
var index = i;
var model = models[i];
if (model.get('_isActive') === true) {
model.set('_index', index);
this.updatePushPosition();
}
}
}
},
updatePushPosition: function () {
if (this.hasBeenRemoved) {
return;
}
if (this.model.get('_index') != undefined) {
var elementHeight = this.$el.height();
var offset = 20;
var navigationHeight = $('.navigation').height();
var currentIndex = this.model.get('_index');
var flippedIndex = (currentIndex == 0) ? 1 : 0;
if (this.model.collection.where({ _isActive: true }).length === 1) {
flippedIndex = 0;
}
var positionLowerPush = (elementHeight + offset) * flippedIndex + navigationHeight + offset;
this.$el.css('top', positionLowerPush);
}
>>>>>>>
var NotifyPushView = Backbone.View.extend({
className: function () {
var classes = 'notify-push ';
classes += (this.model.get('_classes') || '');
return classes;
},
attributes: {
'role': 'dialog',
'aria-labelledby': 'notify-push-heading',
'aria-modal': 'false'
},
initialize: function () {
this.listenTo(Adapt, {
'notify:pushShown notify:pushRemoved': this.updateIndexPosition,
'remove': this.remove
});
this.listenTo(this.model.collection, {
'remove': this.updateIndexPosition,
'change:_index': this.updatePushPosition
});
this.preRender();
this.render();
},
events: {
'click .notify-push-close': 'closePush',
'click .notify-push-inner': 'triggerEvent'
},
preRender: function () {
this.hasBeenRemoved = false;
},
render: function () {
var data = this.model.toJSON();
var template = Handlebars.templates['notifyPush'];
this.$el.html(template(data)).appendTo('#wrapper');
_.defer(this.postRender.bind(this));
return this;
},
postRender: function () {
this.$el.addClass('show');
_.delay(this.closePush.bind(this), this.model.get('_timeout'));
Adapt.trigger('notify:pushShown');
},
closePush: function (event) {
if (event) {
event.preventDefault();
}
// Check whether this view has been removed as the delay can cause it to be fired twice
if (this.hasBeenRemoved === false) {
this.hasBeenRemoved = true;
this.$el.removeClass('show');
_.delay(function () {
this.model.collection.remove(this.model);
Adapt.trigger('notify:pushRemoved', this);
this.remove();
}.bind(this), 600);
}
},
triggerEvent: function (event) {
Adapt.trigger(this.model.get('_callbackEvent'));
this.closePush();
},
updateIndexPosition: function () {
if (!this.hasBeenRemoved) {
var models = this.model.collection.models;
for (var i = 0, len = models.length; i < len; i++) {
var index = i;
var model = models[i];
if (model.get('_isActive') === true) {
model.set('_index', index);
this.updatePushPosition();
} |
<<<<<<<
var AdaptView = Backbone.View.extend({
attributes: function() {
return {
"data-adapt-id": this.model.get('_id')
};
},
initialize: function() {
this.listenTo(Adapt, 'remove', this.remove);
this.listenTo(this.model, {
'change:_isVisible': this.toggleVisibility,
'change:_isHidden': this.toggleHidden,
'change:_isComplete': this.onIsCompleteChange
});
this.model.set( {
'_globals': Adapt.course.get('_globals'),
'_isReady': false
});
this._isRemoved = false;
this.preRender();
this.render();
this.setupOnScreenHandler();
},
preRender: function() {},
postRender: function() {
this.addChildren();
},
render: function() {
Adapt.trigger(this.constructor.type + 'View:preRender', this);
var data = this.model.toJSON();
data.view = this;
var template = Handlebars.templates[this.constructor.template];
this.$el.html(template(data));
Adapt.trigger(this.constructor.type + 'View:render', this);
_.defer(function() {
// don't call postRender after remove
if(this._isRemoved) return;
this.postRender();
Adapt.trigger(this.constructor.type + 'View:postRender', this);
}.bind(this));
return this;
},
setupOnScreenHandler: function() {
var onscreen = this.model.get('_onScreen');
if (!onscreen || !onscreen._isEnabled) return;
this.$el.on('onscreen.adaptView', function (e, m) {
if (!m.onscreen) return;
var minVerticalInview = onscreen._percentInviewVertical || 33;
if (m.percentInviewVertical < minVerticalInview) return;
this.$el.addClass( onscreen._classes || 'onscreen' ).off('onscreen.adaptView');
}.bind(this));
},
addChildren: function() {
var nthChild = 0;
var children = this.model.getChildren();
var models = children.models;
for (var i = 0, len = models.length; i < len; i++) {
var model = models[i];
if (model.get('_isAvailable') && !model.get('_isHidden')) {
nthChild ++;
var ChildView;
var ViewModelObject = this.constructor.childView || Adapt.componentStore[model.get("_component")];
//use view+model object
if (ViewModelObject.view) ChildView = ViewModelObject.view;
//use view only object
else ChildView = ViewModelObject;
if (ChildView) {
var $parentContainer = this.$(this.constructor.childContainer);
model.set("_nthChild", nthChild);
$parentContainer.append(new ChildView({model:model}).$el);
} else {
throw 'The component \'' + models[i].attributes._id + '\'' +
' (\'' + models[i].attributes._component + '\')' +
' has not been installed, and so is not available in your project.';
}
=======
var AdaptView = Backbone.View.extend({
attributes: function() {
return {
"data-adapt-id": this.model.get('_id')
};
},
initialize: function() {
this.listenTo(Adapt, 'remove', this.remove);
this.listenTo(this.model, {
'change:_isVisible': this.toggleVisibility,
'change:_isHidden': this.toggleHidden,
'change:_isComplete': this.onIsCompleteChange
});
this.model.set( {
'_globals': Adapt.course.get('_globals'),
'_isReady': false
});
this._isRemoved = false;
if (Adapt.location._currentId === this.model.get('_id')) {
Adapt.parentView = this;
}
this.preRender();
this.render();
this.setupOnScreenHandler();
},
preRender: function() {},
postRender: function() {
this.addChildren();
},
render: function() {
Adapt.trigger(this.constructor.type + 'View:preRender', this);
var data = this.model.toJSON();
data.view = this;
var template = Handlebars.templates[this.constructor.template];
this.$el.html(template(data));
Adapt.trigger(this.constructor.type + 'View:render', this);
_.defer(function() {
// don't call postRender after remove
if(this._isRemoved) return;
this.postRender();
Adapt.trigger(this.constructor.type + 'View:postRender', this);
}.bind(this));
return this;
},
setupOnScreenHandler: function() {
var onscreen = this.model.get('_onScreen');
if (!onscreen || !onscreen._isEnabled) return;
this.$el.on('onscreen.adaptView', function (e, m) {
if (!m.onscreen) return;
var minVerticalInview = onscreen._percentInviewVertical || 33;
if (m.percentInviewVertical < minVerticalInview) return;
this.$el.addClass( onscreen._classes || 'onscreen' ).off('onscreen.adaptView');
}.bind(this));
},
addChildren: function() {
var nthChild = 0;
var children = this.model.getChildren();
var models = children.models;
this.childViews = {};
for (var i = 0, len = models.length; i < len; i++) {
var model = models[i];
if (!model.get('_isAvailable')) continue;
nthChild++;
model.set("_nthChild", nthChild);
var ViewModelObject = this.constructor.childView || Adapt.componentStore[model.get("_component")];
var ChildView = ViewModelObject.view || ViewModelObject;
if (!ChildView) {
throw 'The component \'' + models[i].attributes._id + '\'' +
' (\'' + models[i].attributes._component + '\')' +
' has not been installed, and so is not available in your project.';
}
var $parentContainer = this.$(this.constructor.childContainer);
var childView = new ChildView({ model: model });
this.childViews[model.get('_id')] = childView;
$parentContainer.append(childView.$el);
}
},
findDescendantViews: function(isParentFirst) {
var descendants = [];
this.childViews && _.each(this.childViews, function(view) {
if (isParentFirst) descendants.push(view);
var children = view.findDescendantViews && view.findDescendantViews(isParentFirst);
if (children) descendants.push.apply(descendants, children);
if (!isParentFirst) descendants.push(view);
});
return descendants;
},
setReadyStatus: function() {
this.model.set('_isReady', true);
},
setCompletionStatus: function() {
if (this.model.get('_isVisible')) {
this.model.set({
'_isComplete': true,
'_isInteractionComplete': true
});
}
},
resetCompletionStatus: function(type) {
if (!this.model.get("_canReset")) return;
var descendantComponents = this.model.findDescendantModels('components');
if (descendantComponents.length === 0) {
this.model.reset(type);
} else {
_.each(descendantComponents, function(model) {
model.reset(type);
});
}
},
preRemove: function() {},
remove: function() {
this.preRemove();
this._isRemoved = true;
Adapt.wait.for(function(end) {
this.$el.off('onscreen.adaptView');
this.model.setOnChildren('_isReady', false);
this.model.set('_isReady', false);
Backbone.View.prototype.remove.call(this);
end();
}.bind(this));
return this;
},
setVisibility: function() {
var visible = "visibility-hidden";
if (this.model.get('_isVisible')) {
visible = "";
}
return visible;
},
toggleVisibility: function() {
if (this.model.get('_isVisible')) {
return this.$el.removeClass('visibility-hidden');
}
this.$el.addClass('visibility-hidden');
},
setHidden: function() {
var hidden = "";
if (this.model.get('_isHidden')) {
hidden = "display-none";
}
return hidden;
},
toggleHidden: function() {
if (!this.model.get('_isHidden')) {
return this.$el.removeClass('display-none');
}
this.$el.addClass('display-none');
},
onIsCompleteChange: function(model, isComplete){
this.$el.toggleClass('completed', isComplete);
},
getChildViews: function() {
return this.childViews;
>>>>>>>
var AdaptView = Backbone.View.extend({
attributes: function() {
return {
"data-adapt-id": this.model.get('_id')
};
},
initialize: function() {
this.listenTo(Adapt, 'remove', this.remove);
this.listenTo(this.model, {
'change:_isVisible': this.toggleVisibility,
'change:_isHidden': this.toggleHidden,
'change:_isComplete': this.onIsCompleteChange
});
this.model.set( {
'_globals': Adapt.course.get('_globals'),
'_isReady': false
});
this._isRemoved = false;
if (Adapt.location._currentId === this.model.get('_id')) {
Adapt.parentView = this;
}
this.preRender();
this.render();
this.setupOnScreenHandler();
},
preRender: function() {},
postRender: function() {
this.addChildren();
},
render: function() {
Adapt.trigger(this.constructor.type + 'View:preRender', this);
var data = this.model.toJSON();
data.view = this;
var template = Handlebars.templates[this.constructor.template];
this.$el.html(template(data));
Adapt.trigger(this.constructor.type + 'View:render', this);
_.defer(function() {
// don't call postRender after remove
if(this._isRemoved) return;
this.postRender();
Adapt.trigger(this.constructor.type + 'View:postRender', this);
}.bind(this));
return this;
},
setupOnScreenHandler: function() {
var onscreen = this.model.get('_onScreen');
if (!onscreen || !onscreen._isEnabled) return;
this.$el.on('onscreen.adaptView', function (e, m) {
if (!m.onscreen) return;
var minVerticalInview = onscreen._percentInviewVertical || 33;
if (m.percentInviewVertical < minVerticalInview) return;
this.$el.addClass( onscreen._classes || 'onscreen' ).off('onscreen.adaptView');
}.bind(this));
},
addChildren: function() {
var nthChild = 0;
var children = this.model.getChildren();
var models = children.models;
this.childViews = {};
for (var i = 0, len = models.length; i < len; i++) {
var model = models[i];
if (!model.get('_isAvailable')) continue;
nthChild ++;
model.set("_nthChild", nthChild);
var ViewModelObject = this.constructor.childView || Adapt.componentStore[model.get("_component")];
var ChildView = ViewModelObject.view || ViewModelObject;
if (!ChildView) {
throw 'The component \'' + models[i].attributes._id + '\'' +
' (\'' + models[i].attributes._component + '\')' +
' has not been installed, and so is not available in your project.'; |
<<<<<<<
The version control base ref for deployments (e.g., branch name, tag, or commit id)
"""
deployBaseRef: String
"""
The version control head ref for deployments (e.g., branch name, tag, or commit id)
"""
deployHeadRef: String
"""
The title of the last deployment (PR title)
"""
deployTitle: String
"""
=======
Should this environment have auto idling enabled (\`1\` or \`0\`)
"""
autoIdle: Int
"""
>>>>>>>
The version control base ref for deployments (e.g., branch name, tag, or commit id)
"""
deployBaseRef: String
"""
The version control head ref for deployments (e.g., branch name, tag, or commit id)
"""
deployHeadRef: String
"""
The title of the last deployment (PR title)
"""
deployTitle: String
"""
Should this environment have auto idling enabled (\`1\` or \`0\`)
"""
autoIdle: Int
""" |
<<<<<<<
input AddCustomerInput {
=======
input DeploymentInput {
id: Int
name: String!
status: DeploymentStatusType!
created: String!
started: String
completed: String
environment: Int!
remoteId: String
}
input DeleteDeploymentInput {
id: Int!
}
input UpdateDeploymentPatchInput {
name: String
status: DeploymentStatusType
created: String
started: String
completed: String
environment: Int
remoteId: String
}
input UpdateDeploymentInput {
id: Int!
patch: UpdateDeploymentPatchInput!
}
input CustomerInput {
>>>>>>>
input AddCustomerInput {
<<<<<<<
removeAllNotificationsFromAllProjects: String
addOpenshift(input: AddOpenshiftInput!): Openshift
updateOpenshift(input: UpdateOpenshiftInput!): Openshift
deleteOpenshift(input: DeleteOpenshiftInput!): String
deleteAllOpenshifts: String
addProject(input: AddProjectInput!): Project
updateProject(input: UpdateProjectInput!): Project
deleteProject(input: DeleteProjectInput!): String
deleteAllProjects: String
addSshKey(input: AddSshKeyInput!): SshKey
updateSshKey(input: UpdateSshKeyInput!): SshKey
deleteSshKey(input: DeleteSshKeyInput!): String
deleteAllSshKeys: String
removeAllSshKeysFromAllUsers: String
addUser(input: AddUserInput!): User
updateUser(input: UpdateUserInput!): User
deleteUser(input: DeleteUserInput!): String
deleteAllUsers: String
addUserToCustomer(input: AddUserToCustomerInput!): Customer
removeUserFromCustomer(input: RemoveUserFromCustomerInput!): Customer
removeAllUsersFromAllCustomers: String
addUserToProject(input: AddUserToProjectInput!): Project
removeUserFromProject(input: RemoveUserFromProjectInput!): Project
removeAllUsersFromAllProjects: String
=======
addSshKeyToProject(input: SshKeyToProjectInput!): Project
removeSshKeyFromProject(input: RemoveSshKeyFromProjectInput!): Project
addSshKeyToCustomer(input: SshKeyToCustomerInput!): Customer
removeSshKeyFromCustomer(input: RemoveSshKeyFromCustomerInput!): Customer
addDeployment(input: DeploymentInput!): Deployment
deleteDeployment(input: DeleteDeploymentInput!): String
updateDeployment(input: UpdateDeploymentInput): Deployment
truncateTable(tableName: String!): String
>>>>>>>
removeAllNotificationsFromAllProjects: String
addOpenshift(input: AddOpenshiftInput!): Openshift
updateOpenshift(input: UpdateOpenshiftInput!): Openshift
deleteOpenshift(input: DeleteOpenshiftInput!): String
deleteAllOpenshifts: String
addProject(input: AddProjectInput!): Project
updateProject(input: UpdateProjectInput!): Project
deleteProject(input: DeleteProjectInput!): String
deleteAllProjects: String
addSshKey(input: AddSshKeyInput!): SshKey
updateSshKey(input: UpdateSshKeyInput!): SshKey
deleteSshKey(input: DeleteSshKeyInput!): String
deleteAllSshKeys: String
removeAllSshKeysFromAllUsers: String
addUser(input: AddUserInput!): User
updateUser(input: UpdateUserInput!): User
deleteUser(input: DeleteUserInput!): String
deleteAllUsers: String
addUserToCustomer(input: AddUserToCustomerInput!): Customer
removeUserFromCustomer(input: RemoveUserFromCustomerInput!): Customer
removeAllUsersFromAllCustomers: String
addUserToProject(input: AddUserToProjectInput!): Project
removeUserFromProject(input: RemoveUserFromProjectInput!): Project
removeAllUsersFromAllProjects: String
addDeployment(input: DeploymentInput!): Deployment
deleteDeployment(input: DeleteDeploymentInput!): String
updateDeployment(input: UpdateDeploymentInput): Deployment
<<<<<<<
const getDao = req => req.app.get('context').dao;
=======
const deploymentStatusTypeToString = R.cond([
[R.equals('NEW'), R.toLower],
[R.equals('PENDING'), R.toLower],
[R.equals('RUNNING'), R.toLower],
[R.equals('CANCELLED'), R.toLower],
[R.equals('ERROR'), R.toLower],
[R.equals('FAILED'), R.toLower],
[R.equals('COMPLETE'), R.toLower],
[R.T, R.identity],
]);
const getCtx = req => req.app.get('context');
const getDao = req => getCtx(req).dao;
>>>>>>>
const getDao = req => req.app.get('context').dao;
const deploymentStatusTypeToString = R.cond([
[R.equals('NEW'), R.toLower],
[R.equals('PENDING'), R.toLower],
[R.equals('RUNNING'), R.toLower],
[R.equals('CANCELLED'), R.toLower],
[R.equals('ERROR'), R.toLower],
[R.equals('FAILED'), R.toLower],
[R.equals('COMPLETE'), R.toLower],
[R.T, R.identity],
]);
<<<<<<<
removeAllUsersFromAllProjects: async (root, args, req) => {
=======
addDeployment: async (root, args, req) => {
const dao = getDao(req);
const input = R.over(R.lensProp('status'), deploymentStatusTypeToString)(
args.input,
);
const ret = await dao.addDeployment(req.credentials, input);
return ret;
},
deleteDeployment: async (root, args, req) => {
const dao = getDao(req);
const ret = await dao.deleteDeployment(req.credentials, args.input);
return ret;
},
updateDeployment: async (root, args, req) => {
const dao = getDao(req);
const input = R.over(R.lensPath(['patch', 'status']), deploymentStatusTypeToString)(
args.input
);
const ret = await dao.updateDeployment(req.credentials, input);
return ret;
},
truncateTable: async (root, args, req) => {
>>>>>>>
removeAllUsersFromAllProjects: async (root, args, req) => { |
<<<<<<<
'breadcrumbs': false,
'iframe': iframeBaseSettings
=======
'iframe': iframeBaseSettings,
'fileDownloadApi': false
>>>>>>>
'breadcrumbs': false,
'fileDownloadApi': false,
'iframe': iframeBaseSettings |
<<<<<<<
Mousetrap.prototype.stopCallback = function(event, element) {
=======
Mousetrap.stopCallback = function(event, element) {
if (!mouseTrapEnabled) {
return true;
}
>>>>>>>
Mousetrap.prototype.stopCallback = function(event, element) {
if (!mouseTrapEnabled) {
return true;
} |
<<<<<<<
"""
Lagoon Customer (used for grouping multiple Projects)
"""
=======
type User {
id: Int
email: String
firstName: String
lastName: String
comment: String
gitlabId: Int
sshKeys: [SshKey]
}
>>>>>>>
type User {
id: Int
email: String
firstName: String
lastName: String
comment: String
gitlabId: Int
sshKeys: [SshKey]
}
"""
Lagoon Customer (used for grouping multiple Projects)
"""
<<<<<<<
"""
SSH Private Key of Customer
Will be used to authenticate against the Git Repos of the Project that are assigned to this project
Needs to be in single string separated by \`\n\`, example:
\`\`\`
-----BEGIN RSA PRIVATE KEY-----\nMIIJKQIBAAKCAgEA+o[...]P0yoL8BoQQG2jCvYfWh6vyglQdrDYx/o6/8ecTwXokKKh6fg1q\n-----END RSA PRIVATE KEY-----
\`\`\`
"""
private_key: String
"""
Reference to SshKey API Objects which will have access to all Projects that are assigned to this Customer
"""
sshKeys: [SshKey]
"""
Unix Timestamp of when this customer has been created.
"""
=======
privateKey: String
users: [User]
>>>>>>>
"""
SSH Private Key of Customer
Will be used to authenticate against the Git Repos of the Project that are assigned to this project
Needs to be in single string separated by \`\n\`, example:
\`\`\`
-----BEGIN RSA PRIVATE KEY-----\nMIIJKQIBAAKCAgEA+o[...]P0yoL8BoQQG2jCvYfWh6vyglQdrDYx/o6/8ecTwXokKKh6fg1q\n-----END RSA PRIVATE KEY-----
\`\`\`
"""
privateKey: String
users: [User]
<<<<<<<
"""
Which Deployment Type this environment is, can be \`branch\`, \`pullrequest\`, \`promote\`
"""
deploy_type: String
"""
Which Environment Type this environment is, can be \`production\`, \`development\`
"""
environment_type: String
"""
Name of the OpenShift Project/Namespace this environemnt is deployed into
"""
openshift_projectname: String
"""
Unix Timestamp of the last time this environment has been updated
"""
=======
deployType: String
environmentType: String
openshiftProjectName: String
>>>>>>>
"""
Which Deployment Type this environment is, can be \`branch\`, \`pullrequest\`, \`promote\`
"""
deployType: String
"""
Which Environment Type this environment is, can be \`production\`, \`development\`
"""
environmentType: String
"""
Name of the OpenShift Project/Namespace this environemnt is deployed into
"""
openshiftProjectName: String
"""
Unix Timestamp of the last time this environment has been updated
"""
<<<<<<<
"""
Reference to EnvironmentHoursMonth API Object, which returns how many hours this environment ran in a specific month
"""
hours_month(month: Date): EnvironmentHoursMonth
"""
Reference to EnvironmentStorage API Object, which shows the Storage consumption of this environment per day
"""
=======
hoursMonth(month: Date): EnvironmentHoursMonth
>>>>>>>
"""
Reference to EnvironmentHoursMonth API Object, which returns how many hours this environment ran in a specific month
"""
hoursMonth(month: Date): EnvironmentHoursMonth
"""
Reference to EnvironmentStorage API Object, which shows the Storage consumption of this environment per day
"""
<<<<<<<
"""
Reference to EnvironmentStorageMonth API Object, which returns how many storage per day this environment used in a specific month
"""
storage_month(month: Date): EnvironmentStorageMonth
"""
Reference to EnviornmentHitsMonth API Object, which returns how many hits this environment generated in a specific month
"""
hits_month(month: Date): EnviornmentHitsMonth
=======
storageMonth(month: Date): EnvironmentStorageMonth
hitsMonth(month: Date): EnviornmentHitsMonth
route: String
routes: String
monitoringUrls: String
deployments: [Deployment]
>>>>>>>
"""
Reference to EnvironmentStorageMonth API Object, which returns how many storage per day this environment used in a specific month
"""
storageMonth(month: Date): EnvironmentStorageMonth
"""
Reference to EnviornmentHitsMonth API Object, which returns how many hits this environment generated in a specific month
"""
hitsMonth(month: Date): EnviornmentHitsMonth
route: String
routes: String
monitoringUrls: String
deployments: [Deployment]
<<<<<<<
"""
Returns Customer Object by a given name
"""
=======
userBySshKey(sshKey: String!): User
>>>>>>>
"""
Returns User Object by a given sshKey
"""
userBySshKey(sshKey: String!): User
"""
Returns Customer Object by a given name
"""
<<<<<<<
"""
Returns Environment Object by a given openshiftProjectName
"""
environmentByOpenshiftProjectName(openshiftProjectName: String!): Environment
"""
Returns all Project Objects matching given filters (all if no filter defined)
"""
=======
environmentByName(name: String!, project: Int!): Environment
environmentByOpenshiftProjectName(
openshiftProjectName: String!
): Environment
deploymentByRemoteId(id: String): Deployment
>>>>>>>
environmentByName(name: String!, project: Int!): Environment
"""
Returns Environment Object by a given openshiftProjectName
"""
environmentByOpenshiftProjectName(
openshiftProjectName: String!
): Environment
deploymentByRemoteId(id: String): Deployment
"""
Returns all Project Objects matching given filters (all if no filter defined)
"""
<<<<<<<
"""
Returns all Environments matching given filter (all if no filter defined)
"""
allEnvironments(createdAfter: String): [Environment]
=======
allEnvironments(createdAfter: String, type: EnvType): [Environment]
>>>>>>>
"""
Returns all Environments matching given filter (all if no filter defined)
"""
allEnvironments(createdAfter: String, type: EnvType): [Environment]
<<<<<<<
"""
Add Environment or update if it is already existing
"""
addOrUpdateEnvironment(input: EnvironmentInput!): Environment
"""
Add or update Storage Information for Environment
"""
addOrUpdateEnvironmentStorage(input: EnvironmentStorageInput!): EnvironmentStorage
deleteEnvironment(input: DeleteEnvironmentInput!): String
addSshKey(input: SshKeyInput!): SshKey
=======
deleteAllProjects: String
addSshKey(input: AddSshKeyInput!): SshKey
updateSshKey(input: UpdateSshKeyInput!): SshKey
>>>>>>>
deleteAllProjects: String
addSshKey(input: AddSshKeyInput!): SshKey
updateSshKey(input: UpdateSshKeyInput!): SshKey
<<<<<<<
addCustomer(input: CustomerInput!): Customer
deleteCustomer(input: DeleteCustomerInput!): String
addOpenshift(input: OpenshiftInput!): Openshift
deleteOpenshift(input: DeleteOpenshiftInput!): String
addNotificationRocketChat(input: NotificationRocketChatInput!): NotificationRocketChat
addNotificationSlack(input: NotificationSlackInput!): NotificationSlack
deleteNotificationRocketChat(input: DeleteNotificationRocketChatInput!): String
deleteNotificationSlack(input: DeleteNotificationSlackInput!): String
"""
Connect previous created Notification to a Project
"""
addNotificationToProject(input: NotificationToProjectInput!): Project
removeNotificationFromProject(input: RemoveNotificationFromProjectInput!): Project
addSshKeyToProject(input: SshKeyToProjectInput!): Project
removeSshKeyFromProject(input: RemoveSshKeyFromProjectInput!): Project
addSshKeyToCustomer(input: SshKeyToCustomerInput!): Customer
removeSshKeyFromCustomer(input: RemoveSshKeyFromCustomerInput!): Customer
"""
Truncates a whole API Table. ** This is destructive, USE WITH CAUTION **
"""
truncateTable(tableName: String!): String
=======
deleteAllSshKeys: String
removeAllSshKeysFromAllUsers: String
addUser(input: AddUserInput!): User
updateUser(input: UpdateUserInput!): User
deleteUser(input: DeleteUserInput!): String
deleteAllUsers: String
addUserToCustomer(input: AddUserToCustomerInput!): Customer
removeUserFromCustomer(input: RemoveUserFromCustomerInput!): Customer
removeAllUsersFromAllCustomers: String
addUserToProject(input: AddUserToProjectInput!): Project
removeUserFromProject(input: RemoveUserFromProjectInput!): Project
removeAllUsersFromAllProjects: String
addDeployment(input: DeploymentInput!): Deployment
deleteDeployment(input: DeleteDeploymentInput!): String
updateDeployment(input: UpdateDeploymentInput): Deployment
>>>>>>>
deleteAllSshKeys: String
removeAllSshKeysFromAllUsers: String
addUser(input: AddUserInput!): User
updateUser(input: UpdateUserInput!): User
deleteUser(input: DeleteUserInput!): String
deleteAllUsers: String
addUserToCustomer(input: AddUserToCustomerInput!): Customer
removeUserFromCustomer(input: RemoveUserFromCustomerInput!): Customer
removeAllUsersFromAllCustomers: String
addUserToProject(input: AddUserToProjectInput!): Project
removeUserFromProject(input: RemoveUserFromProjectInput!): Project
removeAllUsersFromAllProjects: String
addDeployment(input: DeploymentInput!): Deployment
deleteDeployment(input: DeleteDeploymentInput!): String
updateDeployment(input: UpdateDeploymentInput): Deployment |
<<<<<<<
require('../lib/tile-layer.directive.spec');
require('../lib/popup.directive.spec');
=======
require('../lib/tile-layer.directive.spec');
require('../lib/image-overlay.directive.spec');
>>>>>>>
require('../lib/tile-layer.directive.spec');
require('../lib/image-overlay.directive.spec');
require('../lib/popup.directive.spec'); |
<<<<<<<
fontWatcher.watch([], {}, true);
=======
fontWatcher.watchFonts([], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([], {}, true);
<<<<<<<
fontWatcher.watch([], {}, false);
=======
fontWatcher.watchFonts([], {}, FakeFontWatchRunner, false);
>>>>>>>
fontWatcher.watchFonts([], {}, false);
<<<<<<<
fontWatcher.watch([font1], {}, false);
=======
fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, false);
>>>>>>>
fontWatcher.watchFonts([font1], {}, false);
<<<<<<<
fontWatcher.watch([font1], {}, true);
=======
fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([font1], {}, true);
<<<<<<<
fontWatcher.watch([font1], {}, true);
=======
fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([font1], {}, true);
<<<<<<<
fontWatcher.watch([font1, font2, font3], {}, true);
=======
fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([font1, font2, font3], {}, true);
<<<<<<<
fontWatcher.watch([font1, font2, font3], {}, true);
=======
fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([font1, font2, font3], {}, true);
<<<<<<<
fontWatcher.watch([font1, font2, font3], {}, true);
=======
fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([font1, font2, font3], {}, true);
<<<<<<<
fontWatcher.watch([font5, font6, font7, font8, font9], {}, true);
=======
fontWatcher.watchFonts([font5, font6, font7, font8, font9], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([font5, font6, font7, font8, font9], {}, true);
<<<<<<<
fontWatcher.watch([font1], {}, true);
=======
fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
>>>>>>>
fontWatcher.watchFonts([font1], {}, true); |
<<<<<<<
const { sendToLagoonLogs } = require('@lagoon/commons/src/logs');
const { createTaskTask } = require('@lagoon/commons/src/tasks');
const { pubSub, createEnvironmentFilteredSubscriber } = require('../../clients/pubSub');
const esClient = require('../../clients/esClient');
=======
>>>>>>>
const { sendToLagoonLogs } = require('@lagoon/commons/src/logs');
const { createTaskTask } = require('@lagoon/commons/src/tasks');
const { pubSub, createEnvironmentFilteredSubscriber } = require('../../clients/pubSub');
const esClient = require('../../clients/esClient');
<<<<<<<
const projectSql = require('../project/sql');
const environmentSql = require('../environment/sql');
const EVENTS = require('./events');
=======
const Helpers = require('./helpers');
const environmentHelpers = require('../environment/helpers');
const envValidators = require('../environment/validators');
>>>>>>>
const EVENTS = require('./events');
const Helpers = require('./helpers');
const projectSql = require('../project/sql');
const environmentSql = require('../environment/sql');
const environmentHelpers = require('../environment/helpers');
const envValidators = require('../environment/validators');
<<<<<<<
const newestFirst = R.sort(R.descend(R.prop('created')), rows);
return newestFirst.map(row => injectLogs(row));
=======
return rows.map(row => Helpers.injectLogs(row));
>>>>>>>
const newestFirst = R.sort(R.descend(R.prop('created')), rows);
return newestFirst.map(row => Helpers.injectLogs(row));
<<<<<<<
if (role !== 'admin') {
const rows = await query(
sqlClient,
Sql.selectPermsForEnvironment(environment),
);
if (
!R.contains(R.path(['0', 'pid'], rows), projects) &&
!R.contains(R.path(['0', 'cid'], rows), customers)
) {
throw new Error('Unauthorized.');
}
}
const {
info: { insertId },
} = await query(
sqlClient,
Sql.insertTask({
id,
name,
status,
created,
started,
completed,
environment,
service,
command,
remoteId,
}),
);
let rows = await query(sqlClient, Sql.selectTask(insertId));
const taskData = await injectLogs(R.prop(0, rows));
pubSub.publish(EVENTS.TASK.ADDED, taskData);
// Allow creating task data w/o executing the task
if (role === 'admin' && execute === false) {
return taskData;
}
rows = await query(sqlClient, environmentSql.selectEnvironmentById(taskData.environment));
const environmentData = R.prop(0, rows);
rows = await query(sqlClient, projectSql.selectProject(environmentData.project));
const projectData = R.prop(0, rows);
try {
await createTaskTask({ task: taskData, project: projectData, environment: environmentData });
} catch (error) {
sendToLagoonLogs(
'error',
projectData.name,
'',
'api:addTask',
{ taskId: taskData.id },
`*[${projectData.name}]* Task not initiated, reason: ${error}`,
);
}
return taskData;
=======
return Helpers.injectLogs(taskData);
>>>>>>>
return taskData;
<<<<<<<
pubSub.publish(EVENTS.TASK.UPDATED, taskData);
return taskData;
=======
return Helpers.injectLogs(R.prop(0, rows));
};
const taskDrushArchiveDump = async (
root,
{
environment: environmentId,
},
{
credentials,
},
) => {
await envValidators.environmentExists(environmentId);
await envValidators.userAccessEnvironment(credentials, environmentId);
await envValidators.environmentHasService(environmentId, 'cli');
const environment = await environmentHelpers.getEnvironmentById(environmentId);
const filename = `drupal-${Date.now()}-${Math.floor(Math.random() * 998) + 1}.tar.gz`;
const command = String.raw`drush status --format=yaml | \
grep '%files' | \
awk '{print $2}' | \
xargs -I_path drush ard --pipe --destination=_path/private/${filename} | \
xargs -I_file -- printf 'Your archive has been saved to _file.\nYou can download it by running "drush rsync @${
environment.name
}:_file ./".'`;
const taskData = await Helpers.addTask({
name: 'Drush archive-dump',
environment: environmentId,
service: 'cli',
command,
execute: true,
});
return Helpers.injectLogs(taskData);
};
const taskDrushSqlSync = async (
root,
{
sourceEnvironment: sourceEnvironmentId,
destinationEnvironment: destinationEnvironmentId,
},
{
credentials,
},
) => {
await envValidators.environmentExists(sourceEnvironmentId);
await envValidators.environmentExists(destinationEnvironmentId);
await envValidators.environmentsHaveSameProject([sourceEnvironmentId, destinationEnvironmentId]);
await envValidators.userAccessEnvironment(credentials, sourceEnvironmentId);
await envValidators.userAccessEnvironment(credentials, destinationEnvironmentId);
await envValidators.environmentHasService(sourceEnvironmentId, 'cli');
const sourceEnvironment = await environmentHelpers.getEnvironmentById(sourceEnvironmentId);
const destinationEnvironment = await environmentHelpers.getEnvironmentById(destinationEnvironmentId);
const taskData = await Helpers.addTask({
name: `Sync DB ${sourceEnvironment.name} -> ${destinationEnvironment.name}`,
environment: destinationEnvironmentId,
service: 'cli',
command: `drush -y sql-sync @${sourceEnvironment.name} @self`,
execute: true,
});
return Helpers.injectLogs(taskData);
};
const taskDrushRsyncFiles = async (
root,
{
sourceEnvironment: sourceEnvironmentId,
destinationEnvironment: destinationEnvironmentId,
},
{
credentials,
},
) => {
await envValidators.environmentExists(sourceEnvironmentId);
await envValidators.environmentExists(destinationEnvironmentId);
await envValidators.environmentsHaveSameProject([sourceEnvironmentId, destinationEnvironmentId]);
await envValidators.userAccessEnvironment(credentials, sourceEnvironmentId);
await envValidators.userAccessEnvironment(credentials, destinationEnvironmentId);
await envValidators.environmentHasService(sourceEnvironmentId, 'cli');
const sourceEnvironment = await environmentHelpers.getEnvironmentById(sourceEnvironmentId);
const destinationEnvironment = await environmentHelpers.getEnvironmentById(destinationEnvironmentId);
const taskData = await Helpers.addTask({
name: `Sync files ${sourceEnvironment.name} -> ${destinationEnvironment.name}`,
environment: destinationEnvironmentId,
service: 'cli',
command: `drush -y rsync @${sourceEnvironment.name}:%files @self:%files`,
execute: true,
});
return Helpers.injectLogs(taskData);
>>>>>>>
pubSub.publish(EVENTS.TASK.UPDATED, taskData);
return taskData;
};
const taskDrushArchiveDump = async (
root,
{
environment: environmentId,
},
{
credentials,
},
) => {
await envValidators.environmentExists(environmentId);
await envValidators.userAccessEnvironment(credentials, environmentId);
await envValidators.environmentHasService(environmentId, 'cli');
const environment = await environmentHelpers.getEnvironmentById(environmentId);
const filename = `drupal-${Date.now()}-${Math.floor(Math.random() * 998) + 1}.tar.gz`;
const command = String.raw`drush status --format=yaml | \
grep '%files' | \
awk '{print $2}' | \
xargs -I_path drush ard --pipe --destination=_path/private/${filename} | \
xargs -I_file -- printf 'Your archive has been saved to _file.\nYou can download it by running "drush rsync @${
environment.name
}:_file ./".'`;
const taskData = await Helpers.addTask({
name: 'Drush archive-dump',
environment: environmentId,
service: 'cli',
command,
execute: true,
});
return taskData;
};
const taskDrushSqlSync = async (
root,
{
sourceEnvironment: sourceEnvironmentId,
destinationEnvironment: destinationEnvironmentId,
},
{
credentials,
},
) => {
await envValidators.environmentExists(sourceEnvironmentId);
await envValidators.environmentExists(destinationEnvironmentId);
await envValidators.environmentsHaveSameProject([sourceEnvironmentId, destinationEnvironmentId]);
await envValidators.userAccessEnvironment(credentials, sourceEnvironmentId);
await envValidators.userAccessEnvironment(credentials, destinationEnvironmentId);
await envValidators.environmentHasService(sourceEnvironmentId, 'cli');
const sourceEnvironment = await environmentHelpers.getEnvironmentById(sourceEnvironmentId);
const destinationEnvironment = await environmentHelpers.getEnvironmentById(destinationEnvironmentId);
const taskData = await Helpers.addTask({
name: `Sync DB ${sourceEnvironment.name} -> ${destinationEnvironment.name}`,
environment: destinationEnvironmentId,
service: 'cli',
command: `drush -y sql-sync @${sourceEnvironment.name} @self`,
execute: true,
});
return taskData;
};
const taskDrushRsyncFiles = async (
root,
{
sourceEnvironment: sourceEnvironmentId,
destinationEnvironment: destinationEnvironmentId,
},
{
credentials,
},
) => {
await envValidators.environmentExists(sourceEnvironmentId);
await envValidators.environmentExists(destinationEnvironmentId);
await envValidators.environmentsHaveSameProject([sourceEnvironmentId, destinationEnvironmentId]);
await envValidators.userAccessEnvironment(credentials, sourceEnvironmentId);
await envValidators.userAccessEnvironment(credentials, destinationEnvironmentId);
await envValidators.environmentHasService(sourceEnvironmentId, 'cli');
const sourceEnvironment = await environmentHelpers.getEnvironmentById(sourceEnvironmentId);
const destinationEnvironment = await environmentHelpers.getEnvironmentById(destinationEnvironmentId);
const taskData = await Helpers.addTask({
name: `Sync files ${sourceEnvironment.name} -> ${destinationEnvironment.name}`,
environment: destinationEnvironmentId,
service: 'cli',
command: `drush -y rsync @${sourceEnvironment.name}:%files @self:%files`,
execute: true,
});
return taskData;
<<<<<<<
taskSubscriber,
=======
taskDrushArchiveDump,
taskDrushSqlSync,
taskDrushRsyncFiles,
>>>>>>>
taskDrushArchiveDump,
taskDrushSqlSync,
taskDrushRsyncFiles,
taskSubscriber, |
<<<<<<<
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true,
0, { 'My Other Family': true });
=======
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo,
{ 'My Other Family': true });
>>>>>>>
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo,
0, { 'My Other Family': true });
<<<<<<<
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true,
0, { 'My Family': true });
=======
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo,
{ 'My Family': true });
>>>>>>>
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true,
0, { 'My Family': true });
<<<<<<<
domHelper, fontSizer, asyncCall, getTime, '__webfontloader_test__', '',
userAgent.getBrowserInfo().hasWebKitFallbackBug(), 500);
=======
domHelper, fontSizer, asyncCall, getTime, '__webfontloader_test__', '', userAgent.getBrowserInfo());
>>>>>>>
domHelper, fontSizer, asyncCall, getTime, '__webfontloader_test__', '',
userAgent.getBrowserInfo(), 500);
<<<<<<<
domHelper, fontSizer, asyncCall, getTime, 'SourceSansA', '',
userAgent.getBrowserInfo().hasWebKitFallbackBug(), 500),
=======
domHelper, fontSizer, asyncCall, getTime, 'SourceSansA', '', userAgent.getBrowserInfo()),
>>>>>>>
domHelper, fontSizer, asyncCall, getTime, 'SourceSansA', '',
userAgent.getBrowserInfo(), 500),
<<<<<<<
domHelper, fontSizer, asyncCall, getTime, 'Elena', '',
userAgent.getBrowserInfo().hasWebKitFallbackBug(), 500);
=======
domHelper, fontSizer, asyncCall, getTime, 'Elena', '', userAgent.getBrowserInfo());
>>>>>>>
domHelper, fontSizer, asyncCall, getTime, 'Elena', '',
userAgent.getBrowserInfo(), 500);
<<<<<<<
domHelper, fontSizer, asyncCall, getTime, 'SourceSansB', '',
userAgent.getBrowserInfo().hasWebKitFallbackBug(), 500),
=======
domHelper, fontSizer, asyncCall, getTime, 'SourceSansB', '', userAgent.getBrowserInfo()),
>>>>>>>
domHelper, fontSizer, asyncCall, getTime, 'SourceSansB', '',
userAgent.getBrowserInfo(), 500),
<<<<<<<
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily,
fontDescription, false, 0, {}, 'TestString');
=======
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo, {}, 'TestString');
>>>>>>>
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily,
fontDescription, browserInfo, 0, {}, 'TestString'); |
<<<<<<<
FontRuler = webfont.FontRuler;
var domHelper = null,
=======
FontRuler = webfont.FontRuler,
domHelper = new DomHelper(window),
fontFamily = 'My Family',
fontDescription = 'n4';
var timesToCheckSizeBeforeChange = 0,
TARGET_SIZE = new Size(3, 3),
FALLBACK_SIZE_A = new Size(1, 1),
FALLBACK_SIZE_B = new Size(2, 2),
LAST_RESORT_SIZE = new Size(4, 4),
browserInfo = new BrowserInfo(true, false, false),
setupSizes = [FALLBACK_SIZE_A, FALLBACK_SIZE_B, LAST_RESORT_SIZE],
actualSizes = [],
fakeGetSizeCount = 0,
setupFinished = false,
fakeFontSizer = {
getSize: function (el) {
var result = null;
if (setupFinished) {
// If you are getting an exception here your tests does not specify enough
// size data to run properly.
if (fakeGetSizeCount >= actualSizes.length) {
throw 'Invalid test data';
}
result = actualSizes[fakeGetSizeCount];
fakeGetSizeCount += 1;
} else {
result = setupSizes[Math.min(fakeGetSizeCount, setupSizes.length - 1)];
fakeGetSizeCount += 1;
}
return result;
}
},
timesToGetTimeBeforeTimeout = 10,
fakeGetTime = function () {
if (timesToGetTimeBeforeTimeout <= 0) {
return 6000;
} else {
timesToGetTimeBeforeTimeout -= 1;
return 1;
}
},
asyncCount = 0,
fakeAsyncCall = function (func, timeout) {
asyncCount += 1;
func();
},
setupFinished = false,
originalStartMethod = null,
>>>>>>>
FontRuler = webfont.FontRuler;
var domHelper = null,
<<<<<<<
setupSizes = [],
actualSizes = [],
timesToGetTimeBeforeTimeout = 10;
=======
var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
>>>>>>>
browserInfo = new BrowserInfo(true, false, false),
fallbackBugBrowserInfo = new BrowserInfo(true, true, false),
setupSizes = [],
actualSizes = [],
timesToGetTimeBeforeTimeout = 10;
<<<<<<<
var setupFinished = false,
fakeGetSizeCount = 0;
=======
var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
>>>>>>>
var setupFinished = false,
fakeGetSizeCount = 0;
<<<<<<<
var originalStart = FontWatchRunner.prototype.start;
=======
var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
>>>>>>>
var originalStart = FontWatchRunner.prototype.start;
<<<<<<<
it('should call active if fonts are already loaded', function () {
=======
describe('WebKit fallback bug', function () {
var fallbackBugBrowserInfo = null;
beforeEach(function () {
fallbackBugBrowserInfo = new BrowserInfo(true, true, false);
});
it('should ignore fallback size and call active', function () {
>>>>>>>
it('should call active if fonts are already loaded', function () {
<<<<<<<
domHelper, fontFamily, fontDescription, false);
=======
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo);
>>>>>>>
domHelper, fontFamily, fontDescription, browserInfo);
<<<<<<<
domHelper, fontFamily, fontDescription, false);
=======
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo);
>>>>>>>
domHelper, fontFamily, fontDescription, browserInfo);
<<<<<<<
domHelper, fontFamily, fontDescription, false);
=======
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo);
>>>>>>>
domHelper, fontFamily, fontDescription, browserInfo);
<<<<<<<
domHelper, '__webfontloader_test__', '', userAgent.getBrowserInfo().hasWebKitFallbackBug());
=======
domHelper, fontSizer, asyncCall, getTime, '__webfontloader_test__', '',
userAgent.getBrowserInfo(), 500);
>>>>>>>
domHelper, '__webfontloader_test__', '', userAgent.getBrowserInfo(), 500);
<<<<<<<
domHelper, 'SourceSansA', '', userAgent.getBrowserInfo().hasWebKitFallbackBug()),
ruler = new FontRuler(domHelper, 'abcdef'),
=======
domHelper, fontSizer, asyncCall, getTime, 'SourceSansA', '',
userAgent.getBrowserInfo(), 500),
ruler = new FontRuler(domHelper, fontSizer, 'abcdef'),
>>>>>>>
domHelper, 'SourceSansA', '', userAgent.getBrowserInfo(), 500),
ruler = new FontRuler(domHelper, 'abcdef'),
<<<<<<<
domHelper, 'Elena', '', userAgent.getBrowserInfo().hasWebKitFallbackBug());
=======
domHelper, fontSizer, asyncCall, getTime, 'Elena', '',
userAgent.getBrowserInfo(), 500);
>>>>>>>
domHelper, 'Elena', '', userAgent.getBrowserInfo(), 500);
<<<<<<<
domHelper, 'SourceSansB', '', userAgent.getBrowserInfo().hasWebKitFallbackBug()),
ruler = new FontRuler(domHelper, 'abcdef'),
=======
domHelper, fontSizer, asyncCall, getTime, 'SourceSansB', '',
userAgent.getBrowserInfo(), 500),
ruler = new FontRuler(domHelper, fontSizer, 'abcdef'),
>>>>>>>
domHelper, 'SourceSansB', '', userAgent.getBrowserInfo(), 500),
ruler = new FontRuler(domHelper, 'abcdef'),
<<<<<<<
=======
describe('test string', function () {
var fontWatchRunner = null;
beforeEach(function () {
spyOn(domHelper, 'createElement').andCallThrough();
});
it('should be the default', function () {
actualSizes = [
TARGET_SIZE, TARGET_SIZE
];
fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
fontWatchRunner.start();
expect(domHelper.createElement.mostRecentCall.args[2]).toEqual('BESbswy');
});
it('should be a custom string', function () {
actualSizes = [
TARGET_SIZE, TARGET_SIZE
];
fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily,
fontDescription, browserInfo, 0, {}, 'TestString');
fontWatchRunner.start();
expect(domHelper.createElement.mostRecentCall.args[2]).toEqual('TestString');
});
});
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.